Removed training files checkbox from Settings

josephmyers · josephmyers · commit 15b46ceb28a8 · 2025-06-25T07:43:32.000+05:30
diff --git a/src/RealtimeServer/scriptureforge/models/sf-project-test-data.ts b/src/RealtimeServer/scriptureforge/models/sf-project-test-data.ts
@@ -19,7 +19,6 @@ function testProjectProfile(ordinal: number): SFProjectProfile {
       preTranslate: false,
       defaultNoteTagId: 1,
       draftConfig: {
-        additionalTrainingData: false,
         additionalTrainingSourceEnabled: false,
         alternateSourceEnabled: false,
         alternateTrainingSourceEnabled: false,
diff --git a/src/RealtimeServer/scriptureforge/models/translate-config.ts b/src/RealtimeServer/scriptureforge/models/translate-config.ts
@@ -53,7 +53,6 @@ export interface DraftUsfmConfig {
 }
 
 export interface DraftConfig {
-  additionalTrainingData: boolean;
   additionalTrainingSourceEnabled: boolean;
   additionalTrainingSource?: TranslateSource;
   alternateSourceEnabled: boolean;
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/models/sf-project-settings.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/models/sf-project-settings.ts
@@ -8,7 +8,6 @@ export interface SFProjectSettings {
   sourceParatextId?: string | null;
   biblicalTermsEnabled?: boolean | null;
 
-  additionalTrainingData?: boolean | null;
   additionalTrainingDataFiles?: string[] | null;
   additionalTrainingSourceEnabled?: boolean | null;
   additionalTrainingSourceParatextId?: string | null;
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/settings/settings.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/settings/settings.component.html
@@ -138,22 +138,6 @@ <h1>{{ t("settings") }}</h1>
                       </p>
                     }
                   }
-
-                  <div class="tool-setting">
-                    <div class="tool-setting-field checkbox-field">
-                      <mat-checkbox
-                        formControlName="additionalTrainingData"
-                        id="checkbox-pre-translation-additional-training-data"
-                        >{{ t("pre_translation_additional_training_data") }}</mat-checkbox
-                      >
-                      <app-info [text]="t('pre_translation_additional_training_data_info')"></app-info>
-                      <app-write-status
-                        [state]="getControlState('additionalTrainingData')"
-                        [formGroup]="form"
-                        id="pre-translation-additional-training-data-status"
-                      ></app-write-status>
-                    </div>
-                  </div>
                 }
                 @if (canUpdateServalConfig) {
                   <p
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/settings/settings.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/settings/settings.component.spec.ts
@@ -190,41 +190,6 @@ describe('SettingsComponent', () => {
       expect(env.inputElement(env.translationSuggestionsCheckbox).disabled).toBe(false);
     }));
 
-    describe('Additional Training Data', () => {
-      it('should update when the additional training data checkbox is ticked', fakeAsync(() => {
-        const env = new TestEnvironment();
-        env.setupProject();
-        env.wait();
-        expect(env.statusDone(env.additionalTrainingDataStatus)).toBeNull();
-        expect(env.inputElement(env.additionalTrainingDataCheckbox).checked).toBe(false);
-        env.clickElement(env.inputElement(env.additionalTrainingDataCheckbox));
-        expect(env.inputElement(env.additionalTrainingDataCheckbox).checked).toBe(true);
-        env.wait();
-
-        expect(env.statusDone(env.additionalTrainingDataStatus)).not.toBeNull();
-      }));
-
-      it('should update when the additional training data checkbox is unticked', fakeAsync(() => {
-        const env = new TestEnvironment();
-        env.setupProject({
-          translateConfig: {
-            draftConfig: {
-              additionalTrainingData: true
-            },
-            preTranslate: true
-          }
-        });
-        env.wait();
-        expect(env.statusDone(env.additionalTrainingDataStatus)).toBeNull();
-        expect(env.inputElement(env.additionalTrainingDataCheckbox).checked).toBe(true);
-        env.clickElement(env.inputElement(env.additionalTrainingDataCheckbox));
-        expect(env.inputElement(env.additionalTrainingDataCheckbox).checked).toBe(false);
-        env.wait();
-
-        expect(env.statusDone(env.additionalTrainingDataStatus)).not.toBeNull();
-      }));
-    });
-
     describe('Serval Config TextArea', () => {
       it('should not display for non-serval administrators', fakeAsync(() => {
         const env = new TestEnvironment();
@@ -1102,14 +1067,6 @@ class TestEnvironment {
     return (this.basedOnSelectComponent.projects || []).concat(this.basedOnSelectComponent.resources || []);
   }
 
-  get additionalTrainingDataCheckbox(): DebugElement {
-    return this.fixture.debugElement.query(By.css('#checkbox-pre-translation-additional-training-data'));
-  }
-
-  get additionalTrainingDataStatus(): DebugElement {
-    return this.fixture.debugElement.query(By.css('#pre-translation-additional-training-data-status'));
-  }
-
   get translatorsShareCheckbox(): DebugElement {
     return this.fixture.debugElement.query(By.css('#checkbox-translators-share'));
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/settings/settings.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/settings/settings.component.ts
@@ -39,7 +39,6 @@ export class SettingsComponent extends DataLoadingComponent implements OnInit {
   translationSuggestionsEnabled = new FormControl(false);
   sourceParatextId = new FormControl<string | undefined>(undefined);
   biblicalTermsEnabled = new FormControl(false);
-  additionalTrainingData = new FormControl(false);
   servalConfig = new FormControl<string | undefined>(undefined);
   checkingEnabled = new FormControl(false);
   usersSeeEachOthersResponses = new FormControl(false);
@@ -58,7 +57,6 @@ export class SettingsComponent extends DataLoadingComponent implements OnInit {
     translationSuggestionsEnabled: this.translationSuggestionsEnabled,
     sourceParatextId: this.sourceParatextId,
     biblicalTermsEnabled: this.biblicalTermsEnabled,
-    additionalTrainingData: this.additionalTrainingData,
     servalConfig: this.servalConfig,
     checkingEnabled: this.checkingEnabled,
     usersSeeEachOthersResponses: this.usersSeeEachOthersResponses,
@@ -353,10 +351,6 @@ export class SettingsComponent extends DataLoadingComponent implements OnInit {
       return;
     }
 
-    if (this.settingChanged(newValue, 'additionalTrainingData')) {
-      this.updateSetting(newValue, 'additionalTrainingData');
-    }
-
     this.updateCheckingConfig(newValue);
 
     // Update the sharing settings
@@ -441,7 +435,6 @@ export class SettingsComponent extends DataLoadingComponent implements OnInit {
       translationSuggestionsEnabled: this.projectDoc.data.translateConfig.translationSuggestionsEnabled,
       sourceParatextId: this.projectDoc.data.translateConfig.source?.paratextId,
       biblicalTermsEnabled: this.projectDoc.data.biblicalTermsConfig.biblicalTermsEnabled,
-      additionalTrainingData: this.projectDoc.data.translateConfig.draftConfig.additionalTrainingData,
       servalConfig: this.projectDoc.data.translateConfig.draftConfig.servalConfig,
       checkingEnabled: this.projectDoc.data.checkingConfig.checkingEnabled,
       usersSeeEachOthersResponses: this.projectDoc.data.checkingConfig.usersSeeEachOthersResponses,
@@ -487,7 +480,6 @@ export class SettingsComponent extends DataLoadingComponent implements OnInit {
     this.controlStates.set('translationSuggestionsEnabled', ElementState.InSync);
     this.controlStates.set('sourceParatextId', ElementState.InSync);
     this.controlStates.set('biblicalTermsEnabled', ElementState.InSync);
-    this.controlStates.set('additionalTrainingData', ElementState.InSync);
     this.controlStates.set('servalConfig', ElementState.InSync);
     this.controlStates.set('checkingEnabled', ElementState.InSync);
     this.controlStates.set('usersSeeEachOthersResponses', ElementState.InSync);
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation-steps/draft-generation-steps.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation-steps/draft-generation-steps.component.spec.ts
@@ -843,7 +843,7 @@ describe('DraftGenerationStepsComponent', () => {
         texts: availableBooks,
         translateConfig: {
           source: { projectRef: 'sourceProject', shortName: 'sP1', writingSystem: { tag: 'eng' } },
-          draftConfig: { additionalTrainingData: true, lastSelectedTrainingDataFiles: ['file1'] }
+          draftConfig: { lastSelectedTrainingDataFiles: ['file1'] }
         },
         writingSystem: { tag: 'nllb' }
       })
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation-steps/draft-generation-steps.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation-steps/draft-generation-steps.component.ts
@@ -443,9 +443,8 @@ export class DraftGenerationStepsComponent implements OnInit {
         }
       }
 
-      const trainingFiles = this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.additionalTrainingData
-        ? this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.lastSelectedTrainingDataFiles
-        : [];
+      const trainingFiles =
+        this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.lastSelectedTrainingDataFiles ?? [];
 
       this.done.emit({
         trainingScriptureRanges: trainingData,
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.html
@@ -110,16 +110,14 @@ <h1>{{ t("configure_draft_sources") }}</h1>
             [placeholder]="projectPlaceholder(source)"
           ></app-project-select>
         }
-        @if (trainingDataFilesAvailable) {
-          <p>{{ t("training_files_description", { sourceLanguageDisplayName, targetLanguageDisplayName }) }}</p>
-          <div class="training-files">
-            <app-training-data-multi-select
-              [availableTrainingData]="availableTrainingFiles"
-              [selectedTrainingDataIds]="selectedTrainingFileIds"
-              (trainingDataSelect)="onTrainingDataSelect($event)"
-            ></app-training-data-multi-select>
-          </div>
-        }
+        <p>{{ t("training_files_description", { sourceLanguageDisplayName, targetLanguageDisplayName }) }}</p>
+        <div class="training-files">
+          <app-training-data-multi-select
+            [availableTrainingData]="availableTrainingFiles"
+            [selectedTrainingDataIds]="selectedTrainingFileIds"
+            (trainingDataSelect)="onTrainingDataSelect($event)"
+          ></app-training-data-multi-select>
+        </div>
 
         <ng-container *ngTemplateOutlet="navigationButtons"></ng-container>
       </div>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.spec.ts
@@ -695,7 +695,6 @@ class TestEnvironment {
     sfProject0.translateConfig.draftConfig.alternateTrainingSource = usersSFResources[2];
     sfProject0.translateConfig.draftConfig.additionalTrainingSourceEnabled = true;
     sfProject0.translateConfig.draftConfig.additionalTrainingSource = usersSFProjects[2];
-    sfProject0.translateConfig.draftConfig.additionalTrainingData = false;
     sfProject0.translateConfig.translationSuggestionsEnabled = false;
     sfProject0.translateConfig.preTranslate = true;
 
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
@@ -104,7 +104,6 @@ export class DraftSourcesComponent extends DataLoadingComponent implements Confi
 
   private controlStates = new Map<string, ElementState>();
   private isTrainingDataInitialized: boolean = false;
-  protected trainingDataFilesAvailable: boolean = false;
   private trainingDataQuery?: RealtimeQuery<TrainingDataDoc>;
   private trainingDataQuerySubscription?: Subscription;
 
@@ -176,10 +175,7 @@ export class DraftSourcesComponent extends DataLoadingComponent implements Confi
       .pipe(quietTakeUntilDestroyed(this.destroyRef, { logWarnings: false }))
       .subscribe(() => {
         this.availableTrainingFiles = [];
-        if (projectDoc.data?.translateConfig.draftConfig.additionalTrainingData) {
-          this.availableTrainingFiles =
-            this.trainingDataQuery?.docs.filter(d => d.data != null).map(d => d.data!) ?? [];
-        }
+        this.availableTrainingFiles = this.trainingDataQuery?.docs.filter(d => d.data != null).map(d => d.data!) ?? [];
         if (!this.isTrainingDataInitialized) {
           // Set the selection based on previous builds
           this.isTrainingDataInitialized = true;
@@ -195,8 +191,6 @@ export class DraftSourcesComponent extends DataLoadingComponent implements Confi
 
           // Set the selected data files to the intersection, or if the intersection is empty, do not select any
           this.selectedTrainingFileIds = intersection.length > 0 ? intersection : [];
-          this.trainingDataFilesAvailable =
-            projectDoc.data?.translateConfig.draftConfig.additionalTrainingData ?? false;
         }
       });
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.stories.ts
@@ -12,6 +12,7 @@ import { AuthService } from 'xforge-common/auth.service';
 import { DialogService } from 'xforge-common/dialog.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { SFUserProjectsService } from 'xforge-common/user-projects.service';
+import { UserService } from 'xforge-common/user.service';
 import { ParatextProject } from '../../../core/models/paratext-project';
 import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
 import { ParatextService, SelectableProjectWithLanguageCode } from '../../../core/paratext.service';
@@ -28,6 +29,7 @@ const mockedRouter = mock(Router);
 const mockedAuthService = mock(AuthService);
 const mockedOnlineStatusService = mock(OnlineStatusService);
 const mockedTrainingDataService = mock(TrainingDataService);
+const mockedUserService = mock(UserService);
 
 const blankProjectDoc = { id: 'project1', data: createTestProjectProfile() } as SFProjectProfileDoc;
 
@@ -159,6 +161,7 @@ export default {
         { provide: AuthService, useValue: instance(mockedAuthService) },
         { provide: OnlineStatusService, useValue: instance(mockedOnlineStatusService) },
         { provide: TrainingDataService, useValue: instance(mockedTrainingDataService) },
+        { provide: UserService, useValue: instance(mockedUserService) },
         defaultTranslocoMarkupTranspilers()
       ]
     })
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/assets/i18n/non_checking_en.json b/src/SIL.XForge.Scripture/ClientApp/src/assets/i18n/non_checking_en.json
@@ -647,8 +647,6 @@
     "exporting_answers": "Exporting Answers",
     "log_in_with_paratext": "Log in to Paratext",
     "pre_translation_drafting": "Translation draft generation",
-    "pre_translation_additional_training_data": "Allow additional training data",
-    "pre_translation_additional_training_data_info": "These are two column CSV files specially crafted to provide training data pairs.",
     "pre_translation_alternate_source_info": "Select a different source for drafting, if your currently selected source is not to be used for pre-translation drafting.",
     "pre_translation_alternate_training_source_info": "Selecting a separate translation for training, such as a back translation, can improve drafting quality.",
     "pre_translation_alternate_training_source_text_placeholder": "Alternate training source text (optional)",
diff --git a/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs b/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs
@@ -149,7 +149,6 @@ public async Task<IRpcMethodResult> UpdateSettings(string projectId, SFProjectSe
                     { "CheckingAnswerExport", settings?.CheckingAnswerExport },
                     { "SourceParatextId", settings?.SourceParatextId },
                     { "BiblicalTermsEnabled", settings?.BiblicalTermsEnabled?.ToString() },
-                    { "AdditionalTrainingData", settings?.AdditionalTrainingData?.ToString() },
                     { "AdditionalTrainingDataFiles", settings?.AdditionalTrainingDataFiles?.ToString() },
                     { "AlternateSourceParatextId", settings?.AlternateSourceParatextId },
                     { "AlternateTrainingSourceEnabled", settings?.AlternateTrainingSourceEnabled?.ToString() },
diff --git a/src/SIL.XForge.Scripture/Models/DraftConfig.cs b/src/SIL.XForge.Scripture/Models/DraftConfig.cs
@@ -1,9 +1,11 @@
+using System;
 using System.Collections.Generic;
 
 namespace SIL.XForge.Scripture.Models;
 
 public class DraftConfig
 {
+    [Obsolete("For backwards compatibility with older frontend clients. Deprecated June 2025.")]
     public bool AdditionalTrainingData { get; set; }
     public bool AdditionalTrainingSourceEnabled { get; set; }
     public TranslateSource? AdditionalTrainingSource { get; set; }
diff --git a/src/SIL.XForge.Scripture/Models/SFProjectSettings.cs b/src/SIL.XForge.Scripture/Models/SFProjectSettings.cs
@@ -18,6 +18,7 @@ public class SFProjectSettings
     public bool? TranslateShareEnabled { get; set; }
 
     // pre-translation settings
+    [Obsolete("For backwards compatibility with older frontend clients. Deprecated June 2025.")]
     public bool? AdditionalTrainingData { get; set; }
     public IEnumerable<string>? AdditionalTrainingDataFiles { get; set; }
     public bool? AdditionalTrainingSourceEnabled { get; set; }
diff --git a/src/SIL.XForge.Scripture/Services/SFProjectService.cs b/src/SIL.XForge.Scripture/Services/SFProjectService.cs
@@ -546,11 +546,6 @@ await projectDoc.SubmitJson0OpAsync(op =>
                 additionalTrainingSource,
                 unsetAdditionalTrainingSourceProject
             );
-            UpdateSetting(
-                op,
-                p => p.TranslateConfig.DraftConfig.AdditionalTrainingData,
-                settings.AdditionalTrainingData
-            );
             UpdateSetting(
                 op,
                 p => p.TranslateConfig.DraftConfig.LastSelectedTrainingDataFiles,

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ export interface DraftUsfmConfig {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`export interface DraftConfig {`
`56`		`- additionalTrainingData: boolean;`
`57`	`56`	`additionalTrainingSourceEnabled: boolean;`
`58`	`57`	`additionalTrainingSource?: TranslateSource;`
`59`	`58`	`alternateSourceEnabled: boolean;`
Original file line number	Diff line number	Diff line change
`@@ -443,9 +443,8 @@ export class DraftGenerationStepsComponent implements OnInit {`
`443`	`443`	`}`
`444`	`444`	`}`
`445`	`445`
`446`		`- const trainingFiles = this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.additionalTrainingData`
`447`		`- ? this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.lastSelectedTrainingDataFiles`
`448`		`- : [];`
	`446`	`+ const trainingFiles =`
	`447`	`+ this.activatedProject.projectDoc?.data?.translateConfig.draftConfig.lastSelectedTrainingDataFiles ?? [];`
`449`	`448`
`450`	`449`	`this.done.emit({`
`451`	`450`	`trainingScriptureRanges: trainingData,`