Skip to content

Commit 6f7bff2

Browse files
RaymondLuong3Nateowami
authored andcommitted
Do not require selecting formatting if not latest draft
1 parent c82a885 commit 6f7bff2

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-draft/editor-draft.component.spec.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
77
import { cloneDeep } from 'lodash-es';
88
import { TranslocoMarkupModule } from 'ngx-transloco-markup';
99
import { Delta } from 'quill';
10+
import { SFProjectRole } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-role';
1011
import { createTestProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-test-data';
1112
import { ParagraphBreakFormat, QuoteFormat } from 'realtime-server/lib/esm/scriptureforge/models/translate-config';
1213
import { of } from 'rxjs';
@@ -355,6 +356,12 @@ describe('EditorDraftComponent', () => {
355356
it('should allow user to apply draft when formatting selected', fakeAsync(() => {
356357
const testProjectDoc: SFProjectProfileDoc = {
357358
data: createTestProjectProfile({
359+
texts: [
360+
{
361+
bookNum: 1,
362+
chapters: [{ number: 1, permissions: { user01: SFProjectRole.ParatextAdministrator }, hasDraft: true }]
363+
}
364+
],
358365
translateConfig: {
359366
draftConfig: {
360367
usfmConfig: { paragraphFormat: ParagraphBreakFormat.BestGuess, quoteFormat: QuoteFormat.Denormalized }
@@ -381,7 +388,14 @@ describe('EditorDraftComponent', () => {
381388

382389
it('should guide user to select formatting options when formatting not selected', fakeAsync(() => {
383390
const testProjectDoc: SFProjectProfileDoc = {
384-
data: createTestProjectProfile()
391+
data: createTestProjectProfile({
392+
texts: [
393+
{
394+
bookNum: 1,
395+
chapters: [{ number: 1, permissions: { user01: SFProjectRole.ParatextAdministrator }, hasDraft: true }]
396+
}
397+
]
398+
})
385399
} as SFProjectProfileDoc;
386400
when(mockDraftGenerationService.draftExists(anything(), anything(), anything())).thenReturn(of(true));
387401
when(mockDraftGenerationService.getGeneratedDraftHistory(anything(), anything(), anything())).thenReturn(

src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-draft/editor-draft.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class EditorDraftComponent implements AfterViewInit, OnChanges {
119119
}
120120

121121
get mustChooseFormattingOptions(): boolean {
122-
return this.featureFlags.usfmFormat.enabled && !this.hasFormattingSelected;
122+
return this.featureFlags.usfmFormat.enabled && !this.hasFormattingSelected && this.doesLatestHaveDraft;
123123
}
124124

125125
ngOnChanges(): void {

0 commit comments

Comments
 (0)