Hiding these checks behind the feature flag

Author: josephmyers

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

@@ -4903,6 +4903,7 @@ class TestEnvironment {
     when(mockedDraftGenerationService.draftExists(anything(), anything(), anything())).thenReturn(of(true));
     when(mockedPermissionsService.isUserOnProject(anything())).thenResolve(true);
     when(mockedFeatureFlagService.newDraftHistory).thenReturn(createTestFeatureFlag(false));
+    when(mockedFeatureFlagService.usfmFormat).thenReturn(createTestFeatureFlag(true));
     when(mockedLynxWorkspaceService.rawInsightSource$).thenReturn(of([]));
 
     this.realtimeService = TestBed.inject(TestRealtimeService);

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

@@ -85,6 +85,7 @@ import { CONSOLE, ConsoleInterface } from 'xforge-common/browser-globals';
 import { DataLoadingComponent } from 'xforge-common/data-loading-component';
 import { DialogService } from 'xforge-common/dialog.service';
 import { ErrorReportingService } from 'xforge-common/error-reporting.service';
+import { FeatureFlagService } from 'xforge-common/feature-flags/feature-flag.service';
 import { FontService } from 'xforge-common/font.service';
 import { I18nService } from 'xforge-common/i18n.service';
 import { Breakpoint, MediaBreakpointService } from 'xforge-common/media-breakpoints/media-breakpoint.service';
@@ -317,7 +318,8 @@ export class EditorComponent extends DataLoadingComponent implements OnDestroy,
     private readonly breakpointObserver: BreakpointObserver,
     private readonly mediaBreakpointService: MediaBreakpointService,
     private readonly permissionsService: PermissionsService,
-    readonly editorInsightState: LynxInsightStateService
+    readonly editorInsightState: LynxInsightStateService,
+    private readonly featureFlagService: FeatureFlagService
   ) {
     super(noticeService);
     const wordTokenizer = new LatinWordTokenizer();
@@ -1489,6 +1491,7 @@ export class EditorComponent extends DataLoadingComponent implements OnDestroy,
       this.userService.currentUserId
     );
     const hasSetDraftFormatting =
+      !this.featureFlagService.usfmFormat.enabled ||
       this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.usfmConfig != null;
     if (((hasDraft && !draftApplied) || urlDraftActive) && canViewDrafts && hasSetDraftFormatting) {
       // URL may indicate to select the 'draft' tab (such as when coming from generate draft page)

src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/tabs/editor-tab-menu.service.spec.ts

@@ -6,6 +6,7 @@ import { of, take } from 'rxjs';
 import { anything, mock, when } from 'ts-mockito';
 import { v4 as uuid } from 'uuid';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { createTestFeatureFlag, FeatureFlagService } from 'xforge-common/feature-flags/feature-flag.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { TestOnlineStatusModule } from 'xforge-common/test-online-status.module';
 import { TestOnlineStatusService } from 'xforge-common/test-online-status.service';
@@ -24,6 +25,7 @@ const activatedProjectMock = mock(ActivatedProjectService);
 const tabStateMock: TabStateService<any, any> = mock(TabStateService);
 const mockUserService = mock(UserService);
 const mockPermissionsService = mock(PermissionsService);
+const mockFeatureFlagService = mock(FeatureFlagService);
 
 describe('EditorTabMenuService', () => {
   configureTestingModule(() => ({
@@ -34,7 +36,8 @@ describe('EditorTabMenuService', () => {
       { provide: TabStateService, useMock: tabStateMock },
       { provide: UserService, useMock: mockUserService },
       { provide: PermissionsService, useMock: mockPermissionsService },
-      { provide: OnlineStatusService, useClass: TestOnlineStatusService }
+      { provide: OnlineStatusService, useClass: TestOnlineStatusService },
+      { provide: FeatureFlagService, useMock: mockFeatureFlagService }
     ]
   }));
 
@@ -320,6 +323,7 @@ class TestEnvironment {
     when(activatedProjectMock.projectDoc).thenReturn(projectDoc as any);
     when(mockUserService.currentUserId).thenReturn('user01');
     when(mockPermissionsService.canAccessDrafts(anything(), anything())).thenReturn(true);
+    when(mockFeatureFlagService.usfmFormat).thenReturn(createTestFeatureFlag(true));
     service = TestBed.inject(EditorTabMenuService);
   }
 

src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/tabs/editor-tab-menu.service.ts

@@ -8,6 +8,7 @@ import { isParatextRole } from 'realtime-server/lib/esm/scriptureforge/models/sf
 import { combineLatest, map, Observable, of } from 'rxjs';
 import { shareReplay, switchMap } from 'rxjs/operators';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { FeatureFlagService } from 'xforge-common/feature-flags/feature-flag.service';
 import { I18nService } from 'xforge-common/i18n.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { UserService } from 'xforge-common/user.service';
@@ -29,7 +30,8 @@ export class EditorTabMenuService implements TabMenuService<EditorTabGroupType>
     private readonly onlineStatus: OnlineStatusService,
     private readonly tabState: TabStateService<EditorTabGroupType, EditorTabInfo>,
     private readonly permissionsService: PermissionsService,
-    private readonly i18n: I18nService
+    private readonly i18n: I18nService,
+    private readonly featureFlagService: FeatureFlagService
   ) {}
 
   getMenuItems(): Observable<TabMenuItem[]> {
@@ -47,12 +49,15 @@ export class EditorTabMenuService implements TabMenuService<EditorTabGroupType>
         return combineLatest([of(projectDoc), of(isOnline), this.tabState.tabs$]);
       }),
       switchMap(([projectDoc, isOnline, existingTabs]) => {
+        const hasSetDraftFormatting =
+          !this.featureFlagService.usfmFormat.enabled ||
+          this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.usfmConfig != null;
         const showDraft =
           isOnline &&
           projectDoc.data != null &&
           SFProjectService.hasDraft(projectDoc.data) &&
           this.permissionsService.canAccessDrafts(projectDoc, this.userService.currentUserId) &&
-          this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.usfmConfig != null;
+          hasSetDraftFormatting;
         const items: Observable<TabMenuItem>[] = [];
 
         for (const tabType of editorTabTypes) {