Add project date cut off calculation and code review fixes

Author: pmachapman

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-list.component.html

@@ -14,9 +14,9 @@ <h2>{{ t("previously_generated_drafts") }}</h2>
       <app-draft-history-entry [entry]="entry" />
     }
   }
-  @if (nonActiveBuilds.length > 0) {
+  @if (showOlderDraftsNotSupportedWarning && nonActiveBuilds.length > 0) {
     <app-notice [icon]="'summarize'" class="older-drafts">{{
-      t("older_drafts_not_available", { date: draftHistoryCutoffDate })
+      t("older_drafts_not_available", { date: draftHistoryCutOffDateFormatted })
     }}</app-notice>
   }
 </ng-container>

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-list.component.spec.ts

@@ -68,7 +68,7 @@ describe('DraftHistoryListComponent', () => {
     const activeBuild = { state: BuildStates.Active } as BuildDto;
     const completedBuild = {
       state: BuildStates.Completed,
-      additionalInfo: { dateGenerated: '2025-08-01T12:00:00.000Z' }
+      additionalInfo: { dateRequested: '2025-08-01T12:00:00.000Z' }
     } as BuildDto;
     const env = new TestEnvironment([completedBuild, activeBuild]);
     expect(env.component.history).toEqual([activeBuild, completedBuild]);
@@ -148,13 +148,18 @@ describe('DraftHistoryListComponent', () => {
   it('should filter draft history and hide builds that are not saved to the database', fakeAsync(() => {
     const build = {
       state: BuildStates.Completed,
-      additionalInfo: { dateGenerated: '2025-08-01T12:00:00.000Z' }
+      additionalInfo: { dateRequested: '2025-08-01T12:00:00.000Z' }
     } as BuildDto;
     const olderBuild = {
       state: BuildStates.Completed
     } as BuildDto;
     const buildHistory = [olderBuild, build];
     const env = new TestEnvironment(buildHistory);
+
+    // Ensure that the warning shows, even though the project ID is invalid.
+    env.component.showOlderDraftsNotSupportedWarning = true;
+    env.fixture.detectChanges();
+
     expect(env.component.history).toEqual(buildHistory);
     expect(env.component.savedHistoricalBuilds).toEqual([]);
     expect(env.component.isBuildActive).toBe(false);
@@ -168,15 +173,17 @@ describe('DraftHistoryListComponent', () => {
     const build = {
       id: 'completed',
       state: BuildStates.Completed,
-      additionalInfo: { dateGenerated: '2025-08-01T12:00:00.000Z' }
+      additionalInfo: { dateRequested: '2025-08-01T12:00:00.000Z' }
     } as BuildDto;
     const canceled = {
       id: 'canceled',
-      state: BuildStates.Canceled
+      state: BuildStates.Canceled,
+      additionalInfo: { dateRequested: '2025-07-02T12:00:00.000Z' }
     } as BuildDto;
     const faulted = {
       id: 'faulted',
-      state: BuildStates.Faulted
+      state: BuildStates.Faulted,
+      additionalInfo: { dateRequested: '2025-07-01T12:00:00.000Z' }
     } as BuildDto;
     const buildHistory = [faulted, canceled, build];
     const env = new TestEnvironment(buildHistory);
@@ -188,14 +195,48 @@ describe('DraftHistoryListComponent', () => {
     expect(env.component.nonActiveBuilds).toEqual(buildHistory);
   }));
 
+  it('should not show the drafts not supported warning for projects created after 4 June 2025', fakeAsync(() => {
+    const build = {
+      state: BuildStates.Completed,
+      additionalInfo: { dateRequested: '2025-08-01T12:00:00.000Z' }
+    } as BuildDto;
+    const olderBuild = {
+      state: BuildStates.Completed,
+      additionalInfo: { dateRequested: '2025-08-01T12:00:00.000Z' }
+    } as BuildDto;
+    const buildHistory = [olderBuild, build];
+    // ObjectID was created at 2025-06-03T00:00:00.000Z
+    const env = new TestEnvironment(buildHistory, '683e3b000000000000000000');
+    expect(env.component.history).toEqual(buildHistory);
+    expect(env.component.nonActiveBuilds).toEqual(buildHistory);
+    expect(env.olderDraftsMessage).not.toBeNull();
+  }));
+
+  it('should show the drafts not supported warning for projects created before 4 June 2025', fakeAsync(() => {
+    const build = {
+      state: BuildStates.Completed,
+      additionalInfo: { dateRequested: '2025-08-01T12:00:00.000Z' }
+    } as BuildDto;
+    const olderBuild = {
+      state: BuildStates.Completed,
+      additionalInfo: { dateRequested: '2025-08-01T12:00:00.000Z' }
+    } as BuildDto;
+    const buildHistory = [olderBuild, build];
+    // ObjectID was created at 2025-06-05T00:00:00.000Z
+    const env = new TestEnvironment(buildHistory, '6840de000000000000000000');
+    expect(env.component.history).toEqual(buildHistory);
+    expect(env.component.nonActiveBuilds).toEqual(buildHistory);
+    expect(env.olderDraftsMessage).toBeNull();
+  }));
+
   class TestEnvironment {
     component: DraftHistoryListComponent;
     fixture: ComponentFixture<DraftHistoryListComponent>;
 
-    constructor(buildHistory: BuildDto[] | undefined) {
-      when(mockedActivatedProjectService.projectId$).thenReturn(of('project01'));
+    constructor(buildHistory: BuildDto[] | undefined, projectId: string = 'project01') {
+      when(mockedActivatedProjectService.projectId$).thenReturn(of(projectId));
       when(mockedActivatedProjectService.changes$).thenReturn(of(undefined)); // Required for DraftPreviewBooksComponent
-      when(mockedDraftGenerationService.getBuildHistory('project01')).thenReturn(new BehaviorSubject(buildHistory));
+      when(mockedDraftGenerationService.getBuildHistory(projectId)).thenReturn(new BehaviorSubject(buildHistory));
       when(mockedFeatureFlagsService.usfmFormat).thenReturn(createTestFeatureFlag(true));
 
       this.fixture = TestBed.createComponent(DraftHistoryListComponent);

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-list.component.ts

@@ -1,14 +1,15 @@
 import { Component, DestroyRef } from '@angular/core';
 import { MatIconModule } from '@angular/material/icon';
 import { TranslocoModule, TranslocoService } from '@ngneat/transloco';
+import ObjectID from 'bson-objectid';
 import { take } from 'rxjs';
-import { NoticeComponent } from 'src/app/shared/notice/notice.component';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { I18nService } from 'xforge-common/i18n.service';
 import { filterNullish, quietTakeUntilDestroyed } from 'xforge-common/util/rxjs-util';
-import { I18nService } from '../../../../xforge-common/i18n.service';
 import { ProjectNotificationService } from '../../../core/project-notification.service';
 import { BuildDto } from '../../../machine-api/build-dto';
 import { BuildStates } from '../../../machine-api/build-states';
+import { NoticeComponent } from '../../../shared/notice/notice.component';
 import { activeBuildStates } from '../draft-generation';
 import { DraftGenerationService } from '../draft-generation.service';
 import { DraftHistoryEntryComponent } from './draft-history-entry/draft-history-entry.component';
@@ -21,8 +22,11 @@ import { DraftHistoryEntryComponent } from './draft-history-entry/draft-history-
   styleUrl: './draft-history-list.component.scss'
 })
 export class DraftHistoryListComponent {
+  showOlderDraftsNotSupportedWarning: boolean = false;
   history: BuildDto[] = [];
-  readonly draftHistoryCutoffDate: string = this.i18n.formatDate(new Date('2024-12-03T12:00:00.000Z'));
+  // This is just after SFv5.33.0 was released
+  readonly draftHistoryCutOffDate: Date = new Date('2025-06-03T21:00:00Z');
+  readonly draftHistoryCutOffDateFormatted: string = this.i18n.formatDate(this.draftHistoryCutOffDate);
 
   constructor(
     activatedProject: ActivatedProjectService,
@@ -35,6 +39,9 @@ export class DraftHistoryListComponent {
     activatedProject.projectId$
       .pipe(quietTakeUntilDestroyed(destroyRef), filterNullish(), take(1))
       .subscribe(async projectId => {
+        // Determine whether to show or hide the older drafts warning
+        this.showOlderDraftsNotSupportedWarning =
+          ObjectID.isValid(projectId) && new ObjectID(projectId).getTimestamp() < this.draftHistoryCutOffDate;
         // Initially load the history
         this.loadHistory(projectId);
         // Start the connection to SignalR
@@ -84,9 +91,11 @@ export class DraftHistoryListComponent {
   }
 
   get savedHistoricalBuilds(): BuildDto[] {
-    // The date generated is available if the draft has been stored in the realtime database.
+    // The requested date, if not set for the build in MongoDB, will be set based on the build id in the Machine API
     return this.historicalBuilds.filter(
-      entry => entry.state !== BuildStates.Completed || entry.additionalInfo?.dateGenerated != null
+      entry =>
+        entry.additionalInfo?.dateRequested != null &&
+        new Date(entry.additionalInfo.dateRequested) > this.draftHistoryCutOffDate
     );
   }
 

src/SIL.XForge.Scripture/ClientApp/src/assets/i18n/non_checking_en.json

@@ -294,7 +294,7 @@
     "draft_canceled": "The draft was canceled",
     "draft_completed": "The draft is ready",
     "draft_faulted": "The draft failed",
-    "older_drafts_not_available": "Older drafts generated before {{ date }} are not available.",
+    "older_drafts_not_available": "Older drafts requested before {{ date }} are not available.",
     "previously_generated_drafts": "Previously generated drafts"
   },
   "draft_preview_books": {