From 2ff8416750fe91c99428905c1e221cb1ff5b8f31 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 3 Dec 2025 13:37:58 +1300
Subject: [PATCH 01/40] SF-3633 Mark AddChapters obsolete so it can be removed
 at a later date

---
 .../Controllers/SFProjectsRpcController.cs                    | 1 +
 src/SIL.XForge.Scripture/Services/SFProjectService.cs         | 1 +
 .../Controllers/SFProjectsRpcControllerTests.cs               | 3 +++
 .../Services/SFProjectServiceTests.cs                         | 4 ++++
 4 files changed, 9 insertions(+)

diff --git a/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs b/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs
index 37a2a206c0..6937be73ce 100644
--- a/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs
+++ b/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs
@@ -1114,6 +1114,7 @@ public async Task<IRpcMethodResult> DeleteAudioTimingData(string projectId, int
         }
     }
 
+    [Obsolete("Use ApplyPreTranslationToProject instead. Deprecated 2025-12")]
     public async Task<IRpcMethodResult> AddChapters(string projectId, int book, int[] chapters)
     {
         try
diff --git a/src/SIL.XForge.Scripture/Services/SFProjectService.cs b/src/SIL.XForge.Scripture/Services/SFProjectService.cs
index 8e467c760f..8868e091b3 100644
--- a/src/SIL.XForge.Scripture/Services/SFProjectService.cs
+++ b/src/SIL.XForge.Scripture/Services/SFProjectService.cs
@@ -1509,6 +1509,7 @@ Dictionary<string, string> chapterPermissions
         });
     }
 
+    [Obsolete("Use MachineApiService.ApplyPreTranslationToProjectAsync instead. Deprecated 2025-12")]
     public async Task AddChaptersAsync(string userId, string projectId, int book, int[] chapters)
     {
         await using IConnection conn = await RealtimeService.ConnectAsync();
diff --git a/test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs b/test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs
index 92e8b0955c..dd5fd054b6 100644
--- a/test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs
+++ b/test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs
@@ -630,6 +630,7 @@ public void RetrievePreTranslationStatus_UnknownError()
     }
 
     [Test]
+    [Obsolete]
     public async Task AddChapters_Success()
     {
         var env = new TestEnvironment();
@@ -643,6 +644,7 @@ public async Task AddChapters_Success()
     }
 
     [Test]
+    [Obsolete]
     public async Task AddChapters_Forbidden()
     {
         var env = new TestEnvironment();
@@ -657,6 +659,7 @@ public async Task AddChapters_Forbidden()
     }
 
     [Test]
+    [Obsolete]
     public async Task AddChapters_NotFound()
     {
         var env = new TestEnvironment();
diff --git a/test/SIL.XForge.Scripture.Tests/Services/SFProjectServiceTests.cs b/test/SIL.XForge.Scripture.Tests/Services/SFProjectServiceTests.cs
index 77b051bf46..7a2cbf4d20 100644
--- a/test/SIL.XForge.Scripture.Tests/Services/SFProjectServiceTests.cs
+++ b/test/SIL.XForge.Scripture.Tests/Services/SFProjectServiceTests.cs
@@ -3955,6 +3955,7 @@ public void SetUsfmConfigAsync_UserIsNotParatext()
     }
 
     [Test]
+    [Obsolete]
     public void AddChaptersAsync_BookMustBeInProject()
     {
         var env = new TestEnvironment();
@@ -3968,6 +3969,7 @@ public void AddChaptersAsync_BookMustBeInProject()
     }
 
     [Test]
+    [Obsolete]
     public void AddChaptersAsync_UserMustHaveBookPermission()
     {
         var env = new TestEnvironment();
@@ -3979,6 +3981,7 @@ public void AddChaptersAsync_UserMustHaveBookPermission()
     }
 
     [Test]
+    [Obsolete]
     public async Task AddChaptersAsync_Success()
     {
         var env = new TestEnvironment();
@@ -3996,6 +3999,7 @@ public async Task AddChaptersAsync_Success()
     }
 
     [Test]
+    [Obsolete]
     public async Task AddChaptersAsync_SuccessSkipsExistingChapters()
     {
         var env = new TestEnvironment();

From c503515404c697869d31530d4d9807b03f16a6a0 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 6 Jan 2026 13:16:22 +1300
Subject: [PATCH 02/40] SF-3633 Update backend to report draft import status
 correctly

---
 .../Models/DraftApplyState.cs                 |   8 +-
 .../Models/DraftApplyStatus.cs                |  10 ++
 .../Services/MachineApiService.cs             | 133 ++++++++++++++----
 3 files changed, 121 insertions(+), 30 deletions(-)
 create mode 100644 src/SIL.XForge.Scripture/Models/DraftApplyStatus.cs

diff --git a/src/SIL.XForge.Scripture/Models/DraftApplyState.cs b/src/SIL.XForge.Scripture/Models/DraftApplyState.cs
index 46fb274c64..15185ab10f 100644
--- a/src/SIL.XForge.Scripture/Models/DraftApplyState.cs
+++ b/src/SIL.XForge.Scripture/Models/DraftApplyState.cs
@@ -2,7 +2,9 @@ namespace SIL.XForge.Scripture.Models;
 
 public class DraftApplyState
 {
-    public bool Failed { get; set; }
-    public string? State { get; set; }
-    public bool Success { get; set; }
+    public int BookNum { get; set; }
+    public int ChapterNum { get; set; }
+    public int TotalChapters { get; set; }
+    public string? Message { get; set; }
+    public DraftApplyStatus Status { get; set; }
 }
diff --git a/src/SIL.XForge.Scripture/Models/DraftApplyStatus.cs b/src/SIL.XForge.Scripture/Models/DraftApplyStatus.cs
new file mode 100644
index 0000000000..cb0659e5cf
--- /dev/null
+++ b/src/SIL.XForge.Scripture/Models/DraftApplyStatus.cs
@@ -0,0 +1,10 @@
+namespace SIL.XForge.Scripture.Models;
+
+public enum DraftApplyStatus
+{
+    None = 0,
+    InProgress = 1,
+    Successful = 2,
+    Warning = 3,
+    Failed = 4,
+}
diff --git a/src/SIL.XForge.Scripture/Services/MachineApiService.cs b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
index ec65ee90c7..171281357f 100644
--- a/src/SIL.XForge.Scripture/Services/MachineApiService.cs
+++ b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
@@ -158,13 +158,8 @@ CancellationToken cancellationToken
             // Get the drafts for the scripture range
             foreach ((string book, List<int> bookChapters) in booksAndChapters)
             {
-                await hubContext.NotifyDraftApplyProgress(
-                    sfProjectId,
-                    new DraftApplyState { State = $"Retrieving draft for {book}." }
-                );
+                // Warn if the last chapter is different (this will affect chapter creation)
                 int bookNum = Canon.BookIdToNumber(book);
-
-                // Warn if the last chapter is different (this will affect chapter creation
                 int lastChapter = versification.GetLastChapter(bookNum);
                 int targetLastChapter = targetVersification.GetLastChapter(bookNum);
                 if (lastChapter != targetLastChapter)
@@ -174,7 +169,16 @@ await hubContext.NotifyDraftApplyProgress(
                         + $" while the target project ({targetProjectDoc.Data.ShortName.Sanitize()}) has {targetLastChapter} chapters.";
                     logger.LogWarning(message);
                     result.Log += $"{message}\n";
-                    await hubContext.NotifyDraftApplyProgress(sfProjectId, new DraftApplyState { State = message });
+                    await hubContext.NotifyDraftApplyProgress(
+                        sfProjectId,
+                        new DraftApplyState
+                        {
+                            BookNum = bookNum,
+                            ChapterNum = 0,
+                            Status = DraftApplyStatus.Warning,
+                            Message = message,
+                        }
+                    );
                 }
 
                 // Ensure that if chapters is blank, it contains every chapter in the book.
@@ -185,6 +189,16 @@ await hubContext.NotifyDraftApplyProgress(
                 {
                     chapters = [.. Enumerable.Range(1, lastChapter)];
                 }
+                await hubContext.NotifyDraftApplyProgress(
+                    sfProjectId,
+                    new DraftApplyState
+                    {
+                        BookNum = bookNum,
+                        ChapterNum = 0,
+                        Status = DraftApplyStatus.InProgress,
+                        Message = $"Retrieving draft for {book}.",
+                    }
+                );
 
                 // Store the USJ for each chapter, so if we download form Serval we only do it once per book
                 List<Usj> chapterUsj = [];
@@ -226,7 +240,10 @@ await hubContext.NotifyDraftApplyProgress(
                                     sfProjectId,
                                     new DraftApplyState
                                     {
-                                        State = $"No draft available for {Canon.BookNumberToId(bookNum)}.",
+                                        BookNum = bookNum,
+                                        ChapterNum = 0,
+                                        Status = DraftApplyStatus.Failed,
+                                        Message = $"No draft available for {Canon.BookNumberToId(bookNum)}.",
                                     }
                                 );
                                 break;
@@ -240,7 +257,10 @@ await hubContext.NotifyDraftApplyProgress(
                                     sfProjectId,
                                     new DraftApplyState
                                     {
-                                        State =
+                                        BookNum = bookNum,
+                                        ChapterNum = 0,
+                                        Status = DraftApplyStatus.Failed,
+                                        Message =
                                             $"Could not retrieve a valid draft for {Canon.BookNumberToId(bookNum)}.",
                                     }
                                 );
@@ -274,7 +294,10 @@ await hubContext.NotifyDraftApplyProgress(
                                 sfProjectId,
                                 new DraftApplyState
                                 {
-                                    State =
+                                    BookNum = bookNum,
+                                    ChapterNum = chapterNum,
+                                    Status = DraftApplyStatus.Failed,
+                                    Message =
                                         $"Could not retrieve draft for {Canon.BookNumberToId(bookNum)} {chapterNum}.",
                                 }
                             );
@@ -294,7 +317,10 @@ await hubContext.NotifyDraftApplyProgress(
                             sfProjectId,
                             new DraftApplyState
                             {
-                                State = $"Could not retrieve draft for {Canon.BookNumberToId(bookNum)} {chapterNum}.",
+                                BookNum = bookNum,
+                                ChapterNum = chapterNum,
+                                Status = DraftApplyStatus.Failed,
+                                Message = $"Could not retrieve draft for {Canon.BookNumberToId(bookNum)} {chapterNum}.",
                             }
                         );
                         continue;
@@ -313,6 +339,18 @@ await hubContext.NotifyDraftApplyProgress(
                         chapterDeltas.Add((chapterDelta, bookNum));
                     }
                 }
+
+                await hubContext.NotifyDraftApplyProgress(
+                    sfProjectId,
+                    new DraftApplyState
+                    {
+                        BookNum = bookNum,
+                        ChapterNum = 0,
+                        TotalChapters = chapterDeltas.Count(cd => cd.bookNum == bookNum),
+                        Status = DraftApplyStatus.InProgress,
+                        Message = $"Calculated last chapter for {book}.",
+                    }
+                );
             }
         }
         catch (Exception e)
@@ -326,7 +364,13 @@ await hubContext.NotifyDraftApplyProgress(
             result.Log += $"{e}\n";
             await hubContext.NotifyDraftApplyProgress(
                 sfProjectId,
-                new DraftApplyState { Failed = true, State = result.Log }
+                new DraftApplyState
+                {
+                    BookNum = 0,
+                    ChapterNum = 0,
+                    Status = DraftApplyStatus.Failed,
+                    Message = result.Log,
+                }
             );
 
             // Do not proceed to save the draft to the project
@@ -403,7 +447,13 @@ await targetProjectDoc.SubmitJson0OpAsync(op =>
             {
                 await hubContext.NotifyDraftApplyProgress(
                     sfProjectId,
-                    new DraftApplyState { State = "Loading permissions from Paratext." }
+                    new DraftApplyState
+                    {
+                        BookNum = 0,
+                        ChapterNum = 0,
+                        Status = DraftApplyStatus.InProgress,
+                        Message = "Loading permissions from Paratext.",
+                    }
                 );
                 if (createdBooks.Count == 0)
                 {
@@ -441,7 +491,13 @@ await paratextService.UpdateParatextPermissionsForNewBooksAsync(
                         // Only notify the book failure once per book
                         await hubContext.NotifyDraftApplyProgress(
                             sfProjectId,
-                            new DraftApplyState { State = $"Could not save draft for {Canon.BookNumberToId(bookNum)}." }
+                            new DraftApplyState
+                            {
+                                BookNum = bookNum,
+                                ChapterNum = 0,
+                                Status = DraftApplyStatus.Failed,
+                                Message = $"Could not save draft for {Canon.BookNumberToId(bookNum)}.",
+                            }
                         );
                     }
 
@@ -465,7 +521,13 @@ await hubContext.NotifyDraftApplyProgress(
                         // Only notify the book failure once per book
                         await hubContext.NotifyDraftApplyProgress(
                             sfProjectId,
-                            new DraftApplyState { State = $"Could not save draft for {Canon.BookNumberToId(bookNum)}." }
+                            new DraftApplyState
+                            {
+                                BookNum = bookNum,
+                                ChapterNum = 0,
+                                Status = DraftApplyStatus.Failed,
+                                Message = $"Could not save draft for {Canon.BookNumberToId(bookNum)}.",
+                            }
                         );
                     }
 
@@ -483,7 +545,11 @@ await hubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
-                            State = $"Could not save draft for {Canon.BookNumberToId(bookNum)} {chapterDelta.Number}.",
+                            BookNum = bookNum,
+                            ChapterNum = chapterDelta.Number,
+                            Status = DraftApplyStatus.Failed,
+                            Message =
+                                $"Could not save draft for {Canon.BookNumberToId(bookNum)} {chapterDelta.Number}.",
                         }
                     );
                     continue;
@@ -513,7 +579,11 @@ await hubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
-                            State = $"Could not save draft for {Canon.BookNumberToId(bookNum)} {chapterDelta.Number}.",
+                            BookNum = bookNum,
+                            ChapterNum = chapterDelta.Number,
+                            Status = DraftApplyStatus.Failed,
+                            Message =
+                                $"Could not save draft for {Canon.BookNumberToId(bookNum)} {chapterDelta.Number}.",
                         }
                     );
                     continue;
@@ -536,7 +606,10 @@ await hubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
-                            State = $"Updating {Canon.BookNumberToId(bookNum)} {chapterDelta.Number}.",
+                            BookNum = bookNum,
+                            ChapterNum = chapterDelta.Number,
+                            Status = DraftApplyStatus.Successful,
+                            Message = $"Updated {Canon.BookNumberToId(bookNum)} {chapterDelta.Number}.",
                         }
                     );
                 }
@@ -548,7 +621,10 @@ await hubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
-                            State = $"Creating {Canon.BookNumberToId(bookNum)} {chapterDelta.Number}.",
+                            BookNum = bookNum,
+                            ChapterNum = chapterDelta.Number,
+                            Status = DraftApplyStatus.Successful,
+                            Message = $"Created {Canon.BookNumberToId(bookNum)} {chapterDelta.Number}.",
                         }
                     );
                 }
@@ -575,20 +651,23 @@ await hubContext.NotifyDraftApplyProgress(
             if (successful)
             {
                 await connection.CommitTransactionAsync();
-                await hubContext.NotifyDraftApplyProgress(
-                    sfProjectId,
-                    new DraftApplyState { Success = true, State = result.Log }
-                );
             }
             else
             {
                 connection.RollbackTransaction();
-                await hubContext.NotifyDraftApplyProgress(
-                    sfProjectId,
-                    new DraftApplyState { Failed = true, State = result.Log }
-                );
             }
 
+            await hubContext.NotifyDraftApplyProgress(
+                sfProjectId,
+                new DraftApplyState
+                {
+                    BookNum = 0,
+                    ChapterNum = 0,
+                    Status = successful ? DraftApplyStatus.Successful : DraftApplyStatus.Failed,
+                    Message = result.Log,
+                }
+            );
+
             result.ChangesSaved = successful;
         }
 

From 4aed29b2a63d17abaac6355d13377c7656187611 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 3 Dec 2025 13:26:48 +1300
Subject: [PATCH 03/40] SF-3633 Frontend work-in-progress

---
 .../draft-history-entry.component.html        |   3 +
 .../draft-history-entry.component.ts          |  16 +-
 .../draft-import-wizard.component.html        | 362 ++++++++
 .../draft-import-wizard.component.scss        |  83 ++
 .../draft-import-wizard.component.ts          | 867 ++++++++++++++++++
 .../draft-preview-books.component.html        |  24 +-
 .../draft-preview-books.component.ts          | 203 +---
 .../src/assets/i18n/non_checking_en.json      |  58 +-
 8 files changed, 1398 insertions(+), 218 deletions(-)
 create mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
 create mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
 create mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
index 15f2a029be..77a3334f8a 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
@@ -48,6 +48,9 @@
               <app-draft-preview-books [build]="entry" />
             </p>
             <div class="draft-options">
+              <button mat-stroked-button class="add-to-project" (click)="openImportWizard()">
+                <mat-icon>input</mat-icon> {{ t("add_to_project") }}
+              </button>
               <app-draft-download-button [build]="entry" [flat]="true" />
               @if (formattingOptionsSupported && isLatestBuild) {
                 <button mat-button class="format-usfm" [routerLink]="['format']">
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
index 992035a3f9..13afa6c0b1 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
@@ -1,6 +1,7 @@
 import { NgClass } from '@angular/common';
 import { Component, DestroyRef, Input } from '@angular/core';
 import { MatButton } from '@angular/material/button';
+import { MatDialog } from '@angular/material/dialog';
 import {
   MatExpansionPanel,
   MatExpansionPanelDescription,
@@ -36,6 +37,7 @@ import { BuildStates } from '../../../../machine-api/build-states';
 import { booksFromScriptureRange } from '../../../../shared/utils';
 import { RIGHT_TO_LEFT_MARK } from '../../../../shared/verse-utils';
 import { DraftDownloadButtonComponent } from '../../draft-download-button/draft-download-button.component';
+import { DraftImportWizardComponent } from '../../draft-import-wizard/draft-import-wizard.component';
 import { DraftOptionsService } from '../../draft-options.service';
 import { DraftPreviewBooksComponent } from '../../draft-preview-books/draft-preview-books.component';
 import { TrainingDataService } from '../../training-data/training-data.service';
@@ -336,7 +338,8 @@ export class DraftHistoryEntryComponent {
     readonly featureFlags: FeatureFlagService,
     private readonly draftOptionsService: DraftOptionsService,
     private readonly permissionsService: PermissionsService,
-    private readonly destroyRef: DestroyRef
+    private readonly destroyRef: DestroyRef,
+    private readonly dialog: MatDialog
   ) {}
 
   formatDate(date?: string): string {
@@ -355,4 +358,15 @@ export class DraftHistoryEntryComponent {
   getScriptureRangeAsLocalizedBooks(scriptureRange: string): string {
     return this.i18n.enumerateList(booksFromScriptureRange(scriptureRange).map(b => this.i18n.localizeBook(b)));
   }
+
+  openImportWizard(): void {
+    if (this._entry == null) return;
+
+    this.dialog.open(DraftImportWizardComponent, {
+      data: this._entry,
+      width: '800px',
+      maxWidth: '90vw',
+      disableClose: true
+    });
+  }
 }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
new file mode 100644
index 0000000000..ddba6a3fed
--- /dev/null
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -0,0 +1,362 @@
+<ng-container *transloco="let t; read: 'draft_import_wizard'">
+  <div mat-dialog-content>
+    <mat-stepper linear [disableRipple]="true" labelPosition="bottom" (selectionChange)="onStepSelectionChange($event)">
+      <!-- Icon overrides -->
+      <ng-template matStepperIcon="edit" let-index="index">{{ index + 1 }}</ng-template>
+
+      <!-- Step 1: Project Selection -->
+      <mat-step
+        [stepControl]="projectSelectionForm"
+        [completed]="projectSelectionForm.valid"
+        [editable]="!isConnecting && !isImporting"
+      >
+        <ng-template matStepLabel>{{ t("select_project") }}</ng-template>
+
+        <h1>{{ t("select_project") }}</h1>
+        <p>{{ t("select_project_description") }}</p>
+
+        @if (isLoadingProjects) {
+          <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
+        }
+
+        <form [formGroup]="projectSelectionForm">
+          @if (!isLoadingProjects && !projectLoadingFailed) {
+            <app-project-select
+              [projects]="projects"
+              [placeholder]="t('choose_project')"
+              [isDisabled]="projects.length === 0 || isImporting || projectLoadingFailed"
+              [invalidMessageMapper]="invalidMessageMapper"
+              (projectSelect)="projectSelected($event.paratextId)"
+              formControlName="targetParatextId"
+            ></app-project-select>
+          }
+
+          @if (projectLoadingFailed) {
+            <app-notice type="error">{{ t("failed_to_load_projects") }}</app-notice>
+            <div class="project-retry-row">
+              <button mat-stroked-button color="primary" (click)="reloadProjects()" [disabled]="isLoadingProjects">
+                <mat-icon>refresh</mat-icon>
+                {{ t("retry") }}
+              </button>
+            </div>
+          }
+
+          @if (!isAppOnline) {
+            <mat-error class="offline-message">{{ t("connect_to_the_internet") }}</mat-error>
+          }
+
+          @if (noDraftsAvailable) {
+            <app-notice type="warning">{{ t("no_books_ready_for_import") }}</app-notice>
+          }
+
+          @if (projectSelectionForm.valid && (targetProject$ | async); as project) {
+            <app-notice [icon]="'verified'">
+              {{ t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name }) }}
+            </app-notice>
+
+            @if (projectHasMissingChapters) {
+              <mat-checkbox formControlName="createChapters">
+                {{ t("create_missing_chapters") }}
+              </mat-checkbox>
+            }
+          }
+
+          @if (bookCreationError != null) {
+            <app-notice type="error">{{ bookCreationError }}</app-notice>
+          }
+
+          @if (isEnsuringBooks) {
+            <app-notice type="info">{{ t("creating_missing_books") }}</app-notice>
+            <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
+          }
+        </form>
+
+        <div class="button-strip">
+          <button mat-stroked-button (click)="cancel()" [disabled]="isImporting">
+            <mat-icon>close</mat-icon>
+            {{ t("cancel") }}
+          </button>
+          <button
+            mat-flat-button
+            color="primary"
+            (click)="advanceFromProjectSelection()"
+            [disabled]="
+              !projectSelectionForm.valid ||
+              isConnecting ||
+              isImporting ||
+              noDraftsAvailable ||
+              projectLoadingFailed ||
+              booksMissingWithoutPermission ||
+              isEnsuringBooks
+            "
+          >
+            {{ t("next") }}
+            <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+          </button>
+        </div>
+      </mat-step>
+
+      <!-- Step 2: Connect Confirmation (conditional) -->
+      @if (needsConnection) {
+        <mat-step
+          [completed]="!needsConnection || isConnecting || connectionError != null"
+          [editable]="!isConnecting && !isImporting"
+        >
+          <ng-template matStepLabel>{{ t("connect_project") }}</ng-template>
+
+          <h1>{{ t("connect_project") }}</h1>
+
+          @if (selectedParatextProject != null) {
+            <p>
+              {{
+                t("connect_project_description", {
+                  projectShortName: selectedParatextProject.shortName,
+                  projectName: selectedParatextProject.name
+                })
+              }}
+            </p>
+          }
+
+          <div class="button-strip">
+            <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
+              <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+              {{ t("back") }}
+            </button>
+            <button
+              mat-flat-button
+              color="primary"
+              (click)="connectToProject()"
+              [disabled]="isConnecting || isImporting"
+            >
+              {{ t("connect") }}
+              <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+            </button>
+          </div>
+        </mat-step>
+
+        <!-- Step 3: Connecting (conditional) -->
+        <mat-step [completed]="!isConnecting && connectionError == null" [editable]="!isConnecting && !isImporting">
+          <ng-template matStepLabel>{{ t("connecting") }}</ng-template>
+
+          @if (isConnecting) {
+            <h1>{{ t("connecting_project") }}</h1>
+            @if (targetProjectDoc$ | async; as projectDoc) {
+              <app-sync-progress [projectDoc]="$any(projectDoc)" [showSyncStatus]="true"></app-sync-progress>
+            } @else {
+              <p>{{ t("setting_up_project") }}</p>
+              <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
+            }
+          }
+
+          @if (connectionError != null) {
+            <h1>{{ t("connection_failed") }}</h1>
+            <app-notice type="error">{{ connectionError }}</app-notice>
+            <div class="button-strip">
+              <button mat-stroked-button matStepperPrevious [disabled]="isImporting">
+                <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+                {{ t("back") }}
+              </button>
+              <button mat-flat-button color="primary" (click)="retryProjectConnection()" [disabled]="isImporting">
+                <mat-icon>refresh</mat-icon>
+                {{ t("retry") }}
+              </button>
+            </div>
+          }
+        </mat-step>
+      }
+
+      <!-- Step 4: Book Selection (conditional - only if multiple books) -->
+      @if (showBookSelection) {
+        <mat-step [completed]="selectedBooks.length > 0" [editable]="!isConnecting && !isImporting">
+          <ng-template matStepLabel>{{ t("select_books") }}</ng-template>
+
+          <h1>{{ t("select_books_to_import") }}</h1>
+          <app-book-multi-select
+            [availableBooks]="availableBooksForImport"
+            [selectedBooks]="selectedBooks"
+            [basicMode]="true"
+            [readonly]="isImporting || noDraftsAvailable"
+            (bookSelect)="onBookSelect($event)"
+          ></app-book-multi-select>
+
+          <div class="button-strip">
+            <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
+              <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+              {{ t("back") }}
+            </button>
+            <button
+              mat-flat-button
+              color="primary"
+              matStepperNext
+              [disabled]="selectedBooks.length === 0 || isConnecting || isImporting || noDraftsAvailable"
+            >
+              {{ t("next") }}
+              <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+            </button>
+          </div>
+        </mat-step>
+      }
+
+      <!-- Step 5: Overwrite Confirmation (conditional - shows appropriate variant) -->
+      @if (showOverwriteConfirmation) {
+        <mat-step
+          [stepControl]="overwriteForm"
+          [completed]="overwriteForm.valid"
+          [editable]="!isConnecting && !isImporting"
+        >
+          <ng-template matStepLabel>{{ t("confirm_overwrite") }}</ng-template>
+
+          @if (booksWithExistingText.length === 1) {
+            <!-- Single book variant -->
+            <h1>{{ t("overwrite_book_question", { bookName: singleBookName }) }}</h1>
+            <p>
+              {{
+                t("overwrite_book_description", {
+                  bookName: singleBookName,
+                  numChapters: booksWithExistingText[0].chaptersWithText.length
+                })
+              }}
+            </p>
+          } @else {
+            <!-- Multiple books variant -->
+            <h1>{{ t("overwrite_books_question") }}</h1>
+            <p>{{ t("overwrite_books_description") }}</p>
+            <ul>
+              @for (book of booksWithExistingText; track book.bookNum) {
+                <li>{{ book.bookName }}: {{ t("num_chapters", { count: book.chaptersWithText.length }) }}</li>
+              }
+            </ul>
+          }
+
+          @if (isConnecting || isImporting) {
+            <app-notice type="info">
+              {{ isConnecting ? t("waiting_for_connection_to_finish") : t("waiting_for_import_to_finish") }}
+            </app-notice>
+            <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
+          }
+
+          <form [formGroup]="overwriteForm">
+            <mat-checkbox formControlName="confirmOverwrite">
+              {{ t("i_understand_overwrite_content") }}
+            </mat-checkbox>
+          </form>
+
+          <div class="button-strip">
+            <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
+              <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+              {{ t("back") }}
+            </button>
+            <button
+              mat-flat-button
+              color="primary"
+              matStepperNext
+              [disabled]="!overwriteForm.valid || isConnecting || isImporting"
+            >
+              {{ t("continue") }}
+              <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+            </button>
+          </div>
+        </mat-step>
+      }
+
+      <!-- Step 6: Import Progress -->
+      <mat-step #importStep [completed]="importComplete" [editable]="!isConnecting && !isImporting">
+        <ng-template matStepLabel>{{ t("importing") }}</ng-template>
+
+        <h1>{{ t("importing_draft") }}</h1>
+
+        @if (isImporting || importComplete || importError != null) {
+          @for (progress of importProgress; track progress.bookNum) {
+            <div class="book-progress">
+              <p>{{ progress.bookName }}</p>
+              <mat-progress-bar
+                mode="determinate"
+                [value]="(progress.completedChapters / progress.totalChapters) * 100"
+              ></mat-progress-bar>
+              <span class="progress-text">
+                {{ progress.completedChapters }} / {{ progress.totalChapters }} {{ t("chapters") }}
+              </span>
+              @if (progress.failedChapters.length > 0 && !isImporting) {
+                <div class="failed-chapters">
+                  <mat-icon class="error-icon">error</mat-icon>
+                  <span>Failed: {{ getFailedChapters(progress) }}</span>
+                </div>
+              }
+            </div>
+          }
+        }
+
+        @if (importError != null) {
+          <app-notice type="error">{{ importError }}</app-notice>
+          <div class="button-strip align-end">
+            <button mat-stroked-button (click)="retryImport()" [disabled]="isImporting">
+              <mat-icon>refresh</mat-icon>
+              {{ t("retry") }}
+            </button>
+          </div>
+        }
+
+        @if (importComplete) {
+          <app-notice [icon]="'check_circle'" type="success">{{ t("import_complete") }}</app-notice>
+          <div class="button-strip align-end">
+            <button mat-flat-button color="primary" matStepperNext [disabled]="isConnecting || isImporting">
+              {{ t("next") }}
+              <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+            </button>
+          </div>
+        }
+      </mat-step>
+
+      <!-- Step 7: Sync Confirmation and Completion -->
+      <mat-step [completed]="syncComplete || skipSync" [editable]="!isConnecting && !isImporting && !isSyncing">
+        <ng-template matStepLabel>{{ t("complete") }}</ng-template>
+
+        @if (!isSyncing && !syncComplete && !skipSync) {
+          <h1>{{ t("sync_project_question") }}</h1>
+          <p>{{ t("sync_project_description") }}</p>
+
+          <div class="button-strip">
+            <button mat-stroked-button (click)="selectSkipSync()" [disabled]="isSyncing || isImporting">
+              {{ t("skip_sync") }}
+            </button>
+            <button mat-flat-button color="primary" (click)="selectSync()" [disabled]="isSyncing || isImporting">
+              {{ t("sync") }}
+              <mat-icon iconPositionEnd>sync</mat-icon>
+            </button>
+          </div>
+        }
+
+        @if (isSyncing) {
+          <h1>{{ t("syncing_project") }}</h1>
+          @if (targetProjectDoc$ | async; as projectDoc) {
+            <app-sync-progress [projectDoc]="$any(projectDoc)"></app-sync-progress>
+          }
+        }
+
+        @if (syncError != null) {
+          <app-notice type="error">{{ syncError }}</app-notice>
+          <div class="button-strip">
+            <button mat-stroked-button (click)="selectSkipSync()" [disabled]="isImporting">
+              {{ t("skip_sync") }}
+            </button>
+            <button mat-flat-button color="primary" (click)="retrySync()" [disabled]="isImporting">
+              <mat-icon>refresh</mat-icon>
+              {{ t("retry") }}
+            </button>
+          </div>
+        }
+
+        @if (syncComplete || skipSync) {
+          <app-notice [icon]="'check_circle'" type="success">
+            {{ skipSync ? t("import_complete_no_sync") : t("import_and_sync_complete") }}
+          </app-notice>
+          <div class="button-strip align-end">
+            <button mat-flat-button color="primary" (click)="close()" [disabled]="isImporting || isSyncing">
+              {{ t("done") }}
+            </button>
+          </div>
+        }
+      </mat-step>
+    </mat-stepper>
+  </div>
+</ng-container>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
new file mode 100644
index 0000000000..c1f6094a69
--- /dev/null
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
@@ -0,0 +1,83 @@
+.button-strip {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 1.5rem;
+  gap: 0.5rem;
+
+  &.align-end {
+    justify-content: flex-end;
+  }
+}
+
+.offline-message {
+  margin-top: 1rem;
+  display: block;
+}
+
+.project-retry-row {
+  margin: 0.5rem 0 1.5rem;
+  display: flex;
+}
+
+.book-progress {
+  margin-bottom: 1.5rem;
+
+  p {
+    margin-bottom: 0.5rem;
+    font-weight: 500;
+  }
+
+  mat-progress-bar {
+    margin-bottom: 0.25rem;
+  }
+
+  .progress-text {
+    font-size: 0.875rem;
+    color: var(--mdc-theme-text-secondary-on-background, rgba(0, 0, 0, 0.6));
+  }
+
+  .failed-chapters {
+    display: flex;
+    align-items: center;
+    column-gap: 0.35rem;
+    margin-top: 0.35rem;
+    color: var(--mdc-theme-error, #b00020);
+
+    .error-icon {
+      font-size: 1.1rem;
+    }
+  }
+}
+
+h1 {
+  margin-bottom: 1rem;
+}
+
+mat-checkbox {
+  margin-top: 1rem;
+  display: block;
+}
+
+ul {
+  margin: 1rem 0;
+  padding-left: 1.5rem;
+
+  li {
+    margin-bottom: 0.5rem;
+  }
+}
+
+app-notice {
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+}
+
+app-sync-progress {
+  margin: 2rem 0;
+}
+
+::ng-deep {
+  mat-dialog-content {
+    min-height: 400px;
+  }
+}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
new file mode 100644
index 0000000000..59825bee91
--- /dev/null
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -0,0 +1,867 @@
+import { StepperSelectionEvent } from '@angular/cdk/stepper';
+import { AsyncPipe } from '@angular/common';
+import { Component, Inject, OnInit, ViewChild } from '@angular/core';
+import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
+import { MatButton } from '@angular/material/button';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { MAT_DIALOG_DATA, MatDialogContent, MatDialogRef } from '@angular/material/dialog';
+import { MatError } from '@angular/material/form-field';
+import { MatIcon } from '@angular/material/icon';
+import { MatProgressBar } from '@angular/material/progress-bar';
+import {
+  MatStep,
+  MatStepLabel,
+  MatStepper,
+  MatStepperIcon,
+  MatStepperNext,
+  MatStepperPrevious
+} from '@angular/material/stepper';
+import { TranslocoModule } from '@ngneat/transloco';
+import { Canon } from '@sillsdev/scripture';
+import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project';
+import { TextInfoPermission } from 'realtime-server/lib/esm/scriptureforge/models/text-info-permission';
+import { BehaviorSubject } from 'rxjs';
+import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { I18nService } from 'xforge-common/i18n.service';
+import { OnlineStatusService } from 'xforge-common/online-status.service';
+import { UserService } from 'xforge-common/user.service';
+import { ParatextProject } from '../../../core/models/paratext-project';
+import { SFProjectDoc } from '../../../core/models/sf-project-doc';
+import { TextDoc, TextDocId } from '../../../core/models/text-doc';
+import { ParatextService } from '../../../core/paratext.service';
+import { SFProjectService } from '../../../core/sf-project.service';
+import { TextDocService } from '../../../core/text-doc.service';
+import { BuildDto } from '../../../machine-api/build-dto';
+import { ProjectSelectComponent } from '../../../project-select/project-select.component';
+import { BookMultiSelectComponent } from '../../../shared/book-multi-select/book-multi-select.component';
+import { NoticeComponent } from '../../../shared/notice/notice.component';
+import { CustomValidatorState as CustomErrorState, SFValidators } from '../../../shared/sfvalidators';
+import { booksFromScriptureRange } from '../../../shared/utils';
+import { SyncProgressComponent } from '../../../sync/sync-progress/sync-progress.component';
+import { DraftHandlingService } from '../draft-handling.service';
+
+/**
+ * Represents a book available for import with its draft chapters.
+ */
+interface BookForImport {
+  number: number; // Alias for bookNum to match Book interface
+  bookNum: number;
+  bookId: string;
+  bookName: string;
+  chapters: number[];
+  selected: boolean;
+}
+
+/**
+ * Tracks the progress of importing drafts.
+ */
+interface ImportProgress {
+  bookNum: number;
+  bookName: string;
+  totalChapters: number;
+  completedChapters: number;
+  failedChapters: { chapter: number; message: string }[];
+}
+
+/**
+ * Multi-step wizard dialog for importing drafts to a project.
+ * Guides users through project selection, optional connection, book selection,
+ * overwrite confirmation, import progress, and sync completion.
+ */
+@Component({
+  selector: 'app-draft-import-wizard',
+  imports: [
+    AsyncPipe,
+    FormsModule,
+    ReactiveFormsModule,
+    MatButton,
+    MatCheckbox,
+    MatDialogContent,
+    MatError,
+    MatIcon,
+    MatProgressBar,
+    MatStep,
+    MatStepLabel,
+    MatStepper,
+    MatStepperIcon,
+    MatStepperNext,
+    MatStepperPrevious,
+    TranslocoModule,
+    NoticeComponent,
+    ProjectSelectComponent,
+    BookMultiSelectComponent,
+    SyncProgressComponent
+  ],
+  templateUrl: './draft-import-wizard.component.html',
+  styleUrl: './draft-import-wizard.component.scss'
+})
+export class DraftImportWizardComponent implements OnInit {
+  @ViewChild(MatStepper) stepper?: MatStepper;
+  @ViewChild(ProjectSelectComponent) projectSelect?: ProjectSelectComponent;
+  @ViewChild('importStep') importStep?: MatStep;
+
+  // Step 1: Project selection
+  projectSelectionForm = new FormGroup({
+    targetParatextId: new FormControl<string | undefined>(undefined, Validators.required),
+    createChapters: new FormControl(false)
+  });
+  projects: ParatextProject[] = [];
+  isLoadingProjects = true;
+  targetProjectId?: string;
+  selectedParatextProject?: ParatextProject;
+  targetProject$ = new BehaviorSubject<SFProjectProfile | undefined>(undefined);
+  targetProjectDoc$ = new BehaviorSubject<SFProjectDoc | undefined>(undefined);
+  canEditProject = true;
+  booksMissingWithoutPermission = false;
+  missingBookNames: string[] = [];
+  bookCreationError?: string;
+  isEnsuringBooks = false;
+  projectHasMissingChapters = false;
+  projectLoadingFailed = false;
+  private sourceProjectId?: string;
+  noDraftsAvailable = false;
+
+  // Step 2-3: Project connection (conditional)
+  needsConnection = false;
+  isConnecting = false;
+  connectionError?: string;
+
+  async connectToProject(skipStepperAdvance: boolean = false): Promise<void> {
+    const paratextId = this.projectSelectionForm.value.targetParatextId;
+    if (paratextId == null) {
+      this.connectionError = this.i18n.translateStatic('draft_import_wizard.please_select_valid_project');
+      return;
+    }
+
+    if (this.isConnecting) {
+      return;
+    }
+
+    if (!skipStepperAdvance) {
+      this.stepper?.next();
+    }
+
+    this.connectionError = undefined;
+    this.isConnecting = true;
+
+    const paratextProject = this.projects.find(p => p.paratextId === paratextId);
+    if (paratextProject == null) {
+      this.connectionError = this.i18n.translateStatic('draft_import_wizard.please_select_valid_project');
+      this.isConnecting = false;
+      return;
+    }
+
+    try {
+      if (this.targetProjectId != null) {
+        // SF project exists, just add user to it
+        await this.projectService.onlineAddCurrentUser(this.targetProjectId);
+
+        // Reload project data after connection
+        const projectDoc = await this.projectService.get(this.targetProjectId);
+        this.targetProjectDoc$.next(projectDoc);
+        if (projectDoc.data != null) {
+          await this.analyzeTargetProject(projectDoc.data, paratextProject);
+        }
+      } else {
+        // Create SF project for this Paratext project
+        this.targetProjectId = await this.projectService.onlineCreateResourceProject(paratextId);
+
+        if (this.targetProjectId != null) {
+          const projectDoc = await this.projectService.get(this.targetProjectId);
+          this.targetProjectDoc$.next(projectDoc);
+          if (projectDoc.data != null) {
+            await this.analyzeTargetProject(projectDoc.data, paratextProject);
+          }
+        }
+      }
+
+      try {
+        await this.analyzeBooksForOverwrite();
+      } catch (analysisError) {
+        console.error('Failed to analyze books for overwrite', analysisError);
+      }
+
+      this.isConnecting = false;
+      this.stepper?.next();
+      this.needsConnection = false;
+    } catch (error) {
+      this.connectionError =
+        error instanceof Error && error.message.length > 0
+          ? error.message
+          : this.i18n.translateStatic('draft_import_wizard.failed_to_connect_project');
+      this.isConnecting = false;
+    }
+  }
+
+  retryProjectConnection(): void {
+    void this.connectToProject(true);
+  }
+
+  onStepSelectionChange(event: StepperSelectionEvent): void {
+    if (event.selectedStep === this.importStep && !this.importStepTriggered) {
+      if (this.noDraftsAvailable) {
+        return;
+      }
+      this.importStepTriggered = true;
+      void this.startImport();
+    }
+  }
+
+  // Step 4: Book Selection (conditional)
+  availableBooksForImport: BookForImport[] = [];
+  showBookSelection = false;
+
+  // Step 5: Overwrite confirmation (conditional)
+  showOverwriteConfirmation = false;
+  overwriteForm = new FormGroup({
+    confirmOverwrite: new FormControl(false, Validators.requiredTrue)
+  });
+  booksWithExistingText: { bookNum: number; bookName: string; chaptersWithText: number[] }[] = [];
+
+  // Step 6: Import progress
+  isImporting = false;
+  importProgress: ImportProgress[] = [];
+  importError?: string;
+  importComplete = false;
+  private importStepTriggered = false;
+
+  // Step 7: Sync confirmation and completion
+  showSyncConfirmation = false;
+  isSyncing = false;
+  syncError?: string;
+  syncComplete = false;
+  skipSync = false;
+
+  invalidMessageMapper: { [key: string]: string } = {};
+
+  constructor(
+    @Inject(MAT_DIALOG_DATA) readonly data: BuildDto,
+    @Inject(MatDialogRef) private readonly dialogRef: MatDialogRef<DraftImportWizardComponent, boolean>,
+    private readonly paratextService: ParatextService,
+    private readonly projectService: SFProjectService,
+    private readonly textDocService: TextDocService,
+    private readonly draftHandlingService: DraftHandlingService,
+    readonly i18n: I18nService,
+    private readonly userService: UserService,
+    private readonly onlineStatusService: OnlineStatusService,
+    private readonly activatedProjectService: ActivatedProjectService
+  ) {}
+
+  get isAppOnline(): boolean {
+    return this.onlineStatusService.isOnline;
+  }
+
+  get availableBooksFromBuild(): number[] {
+    const translationRanges = this.data.additionalInfo?.translationScriptureRanges ?? [];
+    const bookNumbers = translationRanges.flatMap(range => booksFromScriptureRange(range.scriptureRange));
+    return Array.from(new Set(bookNumbers));
+  }
+
+  get selectedBooks(): BookForImport[] {
+    return this.availableBooksForImport.filter(b => b.selected);
+  }
+
+  private getBooksToImport(): BookForImport[] {
+    return this.showBookSelection ? this.selectedBooks : this.availableBooksForImport;
+  }
+
+  get singleBookName(): string {
+    if (this.booksWithExistingText.length === 1) {
+      return this.booksWithExistingText[0].bookName;
+    }
+    return '';
+  }
+
+  ngOnInit(): void {
+    this.setupInvalidMessageMapper();
+    void this.loadProjects();
+    this.initializeAvailableBooks();
+    void this.loadSourceProjectContext();
+  }
+
+  private setupInvalidMessageMapper(): void {
+    this.invalidMessageMapper = {
+      invalidProject: this.i18n.translateStatic('draft_import_wizard.please_select_valid_project'),
+      bookNotFound: this.i18n.translateStatic('draft_import_wizard.book_does_not_exist'),
+      noWritePermissions: this.i18n.translateStatic('draft_import_wizard.no_write_permissions')
+    };
+  }
+
+  private async loadProjects(): Promise<void> {
+    try {
+      const allProjects = await this.paratextService.getProjects();
+      // Filter to show only connectable projects (already have SF project or user is PT admin)
+      this.projects = this.filterConnectable(allProjects);
+      this.projectLoadingFailed = false;
+    } catch (error) {
+      this.projectLoadingFailed = true;
+      this.projects = [];
+      console.error('Failed to load projects:', error);
+    } finally {
+      this.isLoadingProjects = false;
+    }
+  }
+
+  reloadProjects(): void {
+    if (this.isLoadingProjects) {
+      return;
+    }
+    this.isLoadingProjects = true;
+    this.projectLoadingFailed = false;
+    void this.loadProjects();
+  }
+
+  /**
+   * From the given paratext projects, returns those that either:
+   * - already have a corresponding SF project
+   * - or have current user as admin on the PT project
+   */
+  private filterConnectable(projects: ParatextProject[] | undefined): ParatextProject[] {
+    return projects?.filter(project => project.projectId != null || project.isConnectable) ?? [];
+  }
+
+  private initializeAvailableBooks(): void {
+    const bookNums = this.availableBooksFromBuild;
+    this.availableBooksForImport = bookNums.map(bookNum => ({
+      number: bookNum, // Alias for compatibility with Book interface
+      bookNum,
+      bookId: Canon.bookNumberToId(bookNum),
+      bookName: this.i18n.localizeBook(bookNum),
+      chapters: [], // Will be populated when we have project context
+      selected: true // Pre-select all books by default
+    }));
+
+    // Show book selection only if multiple books
+    this.showBookSelection = this.availableBooksForImport.length > 1;
+  }
+
+  private async loadSourceProjectContext(): Promise<void> {
+    this.sourceProjectId = this.activatedProjectService.projectId;
+    const cachedDoc = this.activatedProjectService.projectDoc;
+    if (cachedDoc?.data != null) {
+      this.applySourceProject(cachedDoc.data);
+      return;
+    }
+
+    if (this.sourceProjectId == null) {
+      this.noDraftsAvailable = this.availableBooksForImport.length === 0;
+      return;
+    }
+
+    const projectProfileDoc = await this.projectService.getProfile(this.sourceProjectId);
+    if (projectProfileDoc.data != null) {
+      this.applySourceProject(projectProfileDoc.data);
+    } else {
+      this.noDraftsAvailable = true;
+    }
+  }
+
+  private applySourceProject(project: SFProjectProfile): void {
+    const updatedBooks: BookForImport[] = [];
+    for (const book of this.availableBooksForImport) {
+      const chaptersWithDrafts = this.getDraftChapters(project, book.bookNum);
+      if (chaptersWithDrafts.length === 0) {
+        continue;
+      }
+      updatedBooks.push({
+        ...book,
+        chapters: chaptersWithDrafts,
+        selected: book.selected !== false
+      });
+    }
+    this.availableBooksForImport = updatedBooks;
+    this.showBookSelection = this.availableBooksForImport.length > 1;
+    this.noDraftsAvailable = this.availableBooksForImport.length === 0;
+    this.resetImportState();
+  }
+
+  private getDraftChapters(project: SFProjectProfile, bookNum: number): number[] {
+    const text = project.texts.find(t => t.bookNum === bookNum);
+    if (text == null) {
+      return [];
+    }
+    return text.chapters
+      .filter(chapter => chapter.hasDraft === true && chapter.number > 0)
+      .map(chapter => chapter.number);
+  }
+
+  async projectSelected(paratextId: string): Promise<void> {
+    this.projectSelectionForm.controls.createChapters.setValue(false);
+    if (paratextId == null) {
+      this.targetProject$.next(undefined);
+      this.targetProjectDoc$.next(undefined);
+      this.selectedParatextProject = undefined;
+      this.resetProjectValidation();
+      this.resetImportState();
+      return;
+    }
+
+    const paratextProject = this.projects.find(p => p.paratextId === paratextId);
+    if (paratextProject == null) {
+      this.canEditProject = false;
+      this.booksMissingWithoutPermission = false;
+      this.bookCreationError = undefined;
+      this.missingBookNames = [];
+      this.targetProject$.next(undefined);
+      this.targetProjectDoc$.next(undefined);
+      this.selectedParatextProject = undefined;
+      await this.validateProject();
+      this.resetImportState();
+      return;
+    }
+
+    this.selectedParatextProject = paratextProject;
+    this.resetProjectValidation();
+    this.resetImportState();
+
+    // Determine if we need to create SF project or connect to existing one
+    if (paratextProject.projectId != null) {
+      // SF project exists
+      this.targetProjectId = paratextProject.projectId;
+      this.needsConnection = !paratextProject.isConnected;
+
+      // Get the project profile to analyze
+      const projectDoc = await this.projectService.get(this.targetProjectId);
+      if (projectDoc.data != null) {
+        await this.analyzeTargetProject(projectDoc.data, paratextProject);
+      }
+    } else {
+      // Need to create SF project - this will happen after connection step
+      this.targetProjectId = undefined;
+      this.needsConnection = true;
+      this.canEditProject = paratextProject.isConnectable;
+      this.targetProject$.next(undefined);
+      this.targetProjectDoc$.next(undefined);
+      await this.validateProject();
+    }
+  }
+
+  private async analyzeTargetProject(project: SFProjectProfile, paratextProject: ParatextProject): Promise<void> {
+    // Check permissions for all books
+    const hasGeneralEditRight = this.textDocService.userHasGeneralEditRight(project);
+    let hasWritePermissionForSelection = hasGeneralEditRight;
+    const booksToImport = this.getBooksToImport().map(book => book.bookNum);
+
+    if (hasWritePermissionForSelection) {
+      for (const bookNum of booksToImport) {
+        const targetBook = project.texts.find(t => t.bookNum === bookNum);
+        if (targetBook == null) {
+          continue;
+        }
+
+        const userPermission = targetBook.permissions?.[this.userService.currentUserId];
+        if (userPermission !== TextInfoPermission.Write) {
+          hasWritePermissionForSelection = false;
+          break;
+        }
+      }
+    }
+
+    this.canEditProject = hasWritePermissionForSelection;
+
+    // Connection status comes from ParatextProject
+    this.needsConnection = !paratextProject.isConnected && hasWritePermissionForSelection;
+
+    // Update chapters for available books and check for missing chapters
+    this.projectHasMissingChapters = false;
+    for (const book of this.getBooksToImport()) {
+      if (book.chapters.length === 0) {
+        continue;
+      }
+      const targetBook = project.texts.find(t => t.bookNum === book.bookNum);
+      if (targetBook == null) {
+        continue;
+      }
+      const targetChapterNumbers = targetBook.chapters.map(c => c.number);
+      const missingChapters = book.chapters.filter(chapter => !targetChapterNumbers.includes(chapter));
+      if (missingChapters.length > 0) {
+        this.projectHasMissingChapters = true;
+      }
+      const bookIsEmpty =
+        targetBook.chapters.length === 0 || (targetBook.chapters.length === 1 && targetBook.chapters[0].lastVerse < 1);
+      if (bookIsEmpty) {
+        this.projectHasMissingChapters = true;
+      }
+    }
+
+    if (this.projectHasMissingChapters) {
+      this.projectSelectionForm.controls.createChapters.addValidators(Validators.requiredTrue);
+    } else {
+      this.projectSelectionForm.controls.createChapters.clearValidators();
+    }
+    this.projectSelectionForm.controls.createChapters.updateValueAndValidity();
+
+    if (this.canEditProject && this.targetProjectId != null) {
+      this.targetProject$.next(project);
+      // Load the full project doc for sync component
+      const projectDoc = await this.projectService.get(this.targetProjectId);
+      this.targetProjectDoc$.next(projectDoc);
+    } else {
+      this.targetProject$.next(undefined);
+      this.targetProjectDoc$.next(undefined);
+    }
+
+    await this.validateProject();
+  }
+
+  private async ensureSelectedBooksExist(): Promise<boolean> {
+    if (this.targetProjectId == null) {
+      return false;
+    }
+
+    let project = this.targetProject$.value;
+    if (project == null) {
+      const profileDoc = await this.projectService.getProfile(this.targetProjectId);
+      project = profileDoc.data ?? undefined;
+      if (project != null) {
+        this.targetProject$.next(project);
+      } else {
+        return false;
+      }
+    }
+
+    const booksToImport = this.getBooksToImport();
+    const missingBooks: BookForImport[] = booksToImport.filter(book =>
+      project.texts.every(text => text.bookNum !== book.bookNum)
+    );
+
+    this.missingBookNames = missingBooks.map(book => book.bookName);
+
+    if (missingBooks.length === 0) {
+      this.booksMissingWithoutPermission = false;
+      this.bookCreationError = undefined;
+      return true;
+    }
+
+    const canCreateBooks = this.textDocService.userHasGeneralEditRight(project);
+    if (!canCreateBooks) {
+      this.booksMissingWithoutPermission = true;
+      const booksDescription = this.missingBookNames.length > 0 ? ` (${this.missingBookNames.join(', ')})` : '';
+      this.bookCreationError = this.i18n.translateStatic('draft_import_wizard.books_missing_no_permission', {
+        booksDescription
+      });
+      await this.validateProject();
+      return false;
+    }
+
+    this.booksMissingWithoutPermission = false;
+    this.bookCreationError = undefined;
+    this.isEnsuringBooks = true;
+
+    try {
+      for (const book of missingBooks) {
+        if (book.chapters.length === 0) {
+          continue;
+        }
+        // Was onlineAddBookWithChapters()
+        await this.projectService.onlineAddChapters(this.targetProjectId, book.bookNum, book.chapters);
+        for (const chapter of book.chapters) {
+          const textDocId = new TextDocId(this.targetProjectId, book.bookNum, chapter);
+          await this.textDocService.createTextDoc(textDocId);
+        }
+      }
+
+      const refreshedProfile = await this.projectService.getProfile(this.targetProjectId);
+      if (refreshedProfile.data != null && this.selectedParatextProject != null) {
+        await this.analyzeTargetProject(refreshedProfile.data, this.selectedParatextProject);
+      }
+
+      return true;
+    } finally {
+      this.isEnsuringBooks = false;
+    }
+  }
+
+  private resetProjectValidation(): void {
+    this.canEditProject = true;
+    this.booksMissingWithoutPermission = false;
+    this.bookCreationError = undefined;
+    this.missingBookNames = [];
+    this.projectHasMissingChapters = false;
+  }
+
+  private async validateProject(): Promise<void> {
+    await new Promise<void>(resolve => {
+      setTimeout(() => {
+        this.projectSelect?.customValidate(SFValidators.customValidator(this.getCustomErrorState()));
+        resolve();
+      });
+    });
+  }
+
+  private getCustomErrorState(): CustomErrorState {
+    if (!this.projectSelectionForm.controls.targetParatextId.valid) {
+      return CustomErrorState.InvalidProject;
+    }
+    if (this.booksMissingWithoutPermission) {
+      return CustomErrorState.BookNotFound;
+    }
+    if (!this.canEditProject) {
+      return CustomErrorState.NoWritePermissions;
+    }
+    return CustomErrorState.None;
+  }
+
+  onBookSelect(selectedBooks: number[]): void {
+    for (const book of this.availableBooksForImport) {
+      book.selected = selectedBooks.includes(book.bookNum);
+    }
+    this.resetImportState();
+    this.booksMissingWithoutPermission = false;
+    this.bookCreationError = undefined;
+    this.missingBookNames = [];
+    void this.analyzeBooksForOverwrite();
+    void this.validateProject();
+  }
+
+  async advanceFromProjectSelection(): Promise<void> {
+    if (!this.projectSelectionForm.valid) {
+      return;
+    }
+
+    if (this.noDraftsAvailable) {
+      return;
+    }
+
+    // If project needs connection, advance to connection step (targetProjectId may be undefined)
+    if (this.needsConnection) {
+      this.stepper?.next();
+      return;
+    }
+
+    // For connected projects, ensure we have a targetProjectId before proceeding
+    if (this.targetProjectId == null) {
+      return;
+    }
+
+    const booksReady = await this.ensureSelectedBooksExist();
+    if (!booksReady) {
+      return;
+    }
+
+    // Analyze books for overwrite confirmation
+    await this.analyzeBooksForOverwrite();
+
+    this.stepper?.next();
+  }
+
+  private async analyzeBooksForOverwrite(): Promise<void> {
+    if (this.targetProjectId == null) return;
+
+    this.booksWithExistingText = [];
+    const booksToCheck = this.getBooksToImport();
+
+    for (const book of booksToCheck) {
+      const chaptersWithText = await this.getChaptersWithText(book.bookNum);
+      if (chaptersWithText.length > 0) {
+        this.booksWithExistingText.push({
+          bookNum: book.bookNum,
+          bookName: book.bookName,
+          chaptersWithText
+        });
+      }
+    }
+
+    this.showOverwriteConfirmation = this.booksWithExistingText.length > 0;
+  }
+
+  private async getChaptersWithText(bookNum: number): Promise<number[]> {
+    if (this.targetProjectId == null) return [];
+
+    const project = this.targetProject$.value;
+    if (project == null) return [];
+
+    const targetBook = project.texts.find(t => t.bookNum === bookNum);
+    if (targetBook == null) return [];
+
+    const chaptersWithText: number[] = [];
+    for (const chapter of targetBook.chapters) {
+      const textDocId = new TextDocId(this.targetProjectId, bookNum, chapter.number);
+      const hasText = await this.hasTextInChapter(textDocId);
+      if (hasText) {
+        chaptersWithText.push(chapter.number);
+      }
+    }
+
+    return chaptersWithText;
+  }
+
+  private async hasTextInChapter(textDocId: TextDocId): Promise<boolean> {
+    const textDoc: TextDoc = await this.projectService.getText(textDocId);
+    return textDoc.getNonEmptyVerses().length > 0;
+  }
+
+  async startImport(): Promise<void> {
+    this.importStepTriggered = true;
+    if (this.targetProjectId == null || this.sourceProjectId == null) {
+      this.importError = this.i18n.translateStatic('draft_import_wizard.project_context_unavailable');
+      return;
+    }
+
+    this.isImporting = true;
+    this.importError = undefined;
+    this.importComplete = false;
+
+    const booksToImport = this.getBooksToImport().filter(book => book.selected && book.chapters.length > 0);
+
+    if (booksToImport.length === 0) {
+      this.isImporting = false;
+      this.importError = this.i18n.translateStatic('draft_import_wizard.no_books_ready_for_import');
+      return;
+    }
+
+    // Initialize progress tracking
+    this.importProgress = booksToImport.map(book => ({
+      bookNum: book.bookNum,
+      bookName: book.bookName,
+      totalChapters: book.chapters.length,
+      completedChapters: 0,
+      failedChapters: []
+    }));
+
+    try {
+      await this.performImport(booksToImport);
+
+      // Check if there were any failures
+      const totalFailures = this.importProgress.reduce((sum, p) => sum + p.failedChapters.length, 0);
+      if (totalFailures > 0) {
+        this.importError = `Failed to import ${totalFailures} chapter(s). See details above.`;
+      } else {
+        this.importComplete = true;
+      }
+    } catch (error) {
+      this.importError = error instanceof Error ? error.message : 'Unknown error occurred';
+    } finally {
+      this.isImporting = false;
+    }
+  }
+
+  private async performImport(books: BookForImport[]): Promise<void> {
+    if (this.targetProjectId == null || this.sourceProjectId == null) {
+      throw new Error('Missing project context for import');
+    }
+
+    const targetProjectDoc = await this.projectService.getProfile(this.targetProjectId);
+    const targetProject = targetProjectDoc.data;
+    if (targetProject == null) {
+      throw new Error('Target project not found');
+    }
+
+    const sourceProjectId = this.sourceProjectId;
+    const allowChapterCreation = this.projectSelectionForm.value.createChapters === true;
+
+    for (const book of books) {
+      const progress = this.importProgress.find(p => p.bookNum === book.bookNum);
+      if (progress == null) continue;
+
+      // Create missing chapters if needed
+      const targetBook = targetProject.texts.find(t => t.bookNum === book.bookNum);
+      const existingChapters = targetBook?.chapters.map(c => c.number) ?? [];
+      const missingChapters = book.chapters.filter(c => !existingChapters.includes(c));
+
+      if (missingChapters.length > 0) {
+        if (!allowChapterCreation) {
+          for (const chapter of missingChapters) {
+            progress.failedChapters.push({
+              chapter,
+              message: this.i18n.translateStatic('draft_import_wizard.missing_chapter_needs_creation')
+            });
+          }
+          continue;
+        }
+
+        await this.projectService.onlineAddChapters(this.targetProjectId, book.bookNum, missingChapters);
+        for (const chapter of missingChapters) {
+          const textDocId = new TextDocId(this.targetProjectId, book.bookNum, chapter);
+          await this.textDocService.createTextDoc(textDocId);
+        }
+      }
+
+      // Apply draft to each chapter
+      for (const chapter of book.chapters) {
+        try {
+          const sourceTextDocId = new TextDocId(sourceProjectId, book.bookNum, chapter);
+          const targetTextDocId = new TextDocId(this.targetProjectId, book.bookNum, chapter);
+
+          let timestamp: Date | undefined;
+          if (this.data.additionalInfo?.dateGenerated != null) {
+            timestamp = new Date(this.data.additionalInfo.dateGenerated);
+          }
+
+          const error = await this.draftHandlingService.getAndApplyDraftAsync(
+            targetProject,
+            sourceTextDocId,
+            targetTextDocId,
+            timestamp
+          );
+
+          if (error != null) {
+            progress.failedChapters.push({ chapter, message: error });
+          } else {
+            progress.completedChapters++;
+          }
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+          progress.failedChapters.push({ chapter, message: errorMessage });
+        }
+      }
+    }
+  }
+
+  retryImport(): void {
+    this.resetImportState();
+    void this.startImport();
+  }
+
+  async selectSync(): Promise<void> {
+    this.skipSync = false;
+    await this.performSync();
+  }
+
+  selectSkipSync(): void {
+    this.skipSync = true;
+    this.stepper?.next();
+  }
+
+  private async performSync(): Promise<void> {
+    if (this.targetProjectId == null) return;
+
+    this.isSyncing = true;
+    this.syncError = undefined;
+
+    try {
+      await this.projectService.onlineSync(this.targetProjectId);
+      this.syncComplete = true;
+      this.stepper?.next();
+    } catch (error) {
+      this.syncError = error instanceof Error ? error.message : 'Sync failed';
+    } finally {
+      this.isSyncing = false;
+    }
+  }
+
+  retrySync(): void {
+    this.syncError = undefined;
+    void this.performSync();
+  }
+
+  close(): void {
+    this.dialogRef.close(this.importComplete);
+  }
+
+  cancel(): void {
+    this.dialogRef.close(false);
+  }
+
+  getFailedChapters(progress: ImportProgress): string {
+    return progress.failedChapters.map(f => f.chapter).join(', ');
+  }
+
+  private resetImportState(): void {
+    this.isImporting = false;
+    this.importProgress = [];
+    this.importError = undefined;
+    this.importComplete = false;
+    this.importStepTriggered = false;
+  }
+}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.html
index 195cce4d8d..c154396d2f 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.html
@@ -1,25 +1,13 @@
 <ng-container *transloco="let t; read: 'draft_preview_books'">
   @for (book of booksWithDrafts$ | async; track book.bookId) {
-    <mat-button-toggle-group
-      class="draft-book-option"
+    <button
+      mat-stroked-button
+      class="draft-book-button"
       [disabled]="book.chaptersWithDrafts.length === 0"
-      (change)="$event.source.checked = false"
+      (click)="navigate(book)"
     >
-      <mat-button-toggle class="book-name" (click)="navigate(book)">
-        {{ "canon.book_names." + book.bookId | transloco }}
-      </mat-button-toggle>
-      <mat-button-toggle class="book-more" [mat-menu-trigger-for]="menu">
-        <mat-icon>more_vert</mat-icon>
-      </mat-button-toggle>
-    </mat-button-toggle-group>
-    <mat-menu #menu="matMenu">
-      <button mat-menu-item (click)="chooseProjectToAddDraft(book, projectParatextId)">
-        <mat-icon>input</mat-icon>{{ book.draftApplied ? t("readd_to_project") : t("add_to_project") }}
-      </button>
-      <button mat-menu-item (click)="chooseProjectToAddDraft(book)">
-        <mat-icon>output</mat-icon>{{ t("add_to_different_project") }}
-      </button>
-    </mat-menu>
+      {{ "canon.book_names." + book.bookId | transloco }}
+    </button>
   } @empty {
     <strong>{{ t("no_books_have_drafts") }}</strong>
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.ts
index 52d40a74da..51519dd832 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.ts
@@ -1,37 +1,18 @@
 import { AsyncPipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
-import { MatButtonToggle, MatButtonToggleGroup } from '@angular/material/button-toggle';
-import { MatDialogRef } from '@angular/material/dialog';
-import { MatIcon } from '@angular/material/icon';
-import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
+import { MatButton } from '@angular/material/button';
 import { Router } from '@angular/router';
 import { TranslocoModule } from '@ngneat/transloco';
 import { Canon } from '@sillsdev/scripture';
-import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project';
 import { TextInfo } from 'realtime-server/lib/esm/scriptureforge/models/text-info';
 import { TextInfoPermission } from 'realtime-server/lib/esm/scriptureforge/models/text-info-permission';
-import { BehaviorSubject, firstValueFrom, map, Observable, tap } from 'rxjs';
+import { map, Observable, tap } from 'rxjs';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
-import { DialogService } from 'xforge-common/dialog.service';
-import { ErrorReportingService } from 'xforge-common/error-reporting.service';
 import { UserService } from 'xforge-common/user.service';
 import { filterNullish } from 'xforge-common/util/rxjs-util';
-import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
-import { TextDocId } from '../../../core/models/text-doc';
 import { SFProjectService } from '../../../core/sf-project.service';
-import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
 import { booksFromScriptureRange } from '../../../shared/utils';
-import {
-  DraftApplyDialogComponent,
-  DraftApplyDialogConfig as DraftApplyDialogData,
-  DraftApplyDialogResult
-} from '../draft-apply-dialog/draft-apply-dialog.component';
-import {
-  DraftApplyProgress,
-  DraftApplyProgressDialogComponent
-} from '../draft-apply-progress-dialog/draft-apply-progress-dialog.component';
-import { DraftHandlingService } from '../draft-handling.service';
 
 export interface BookWithDraft {
   bookNumber: number;
@@ -45,16 +26,7 @@ export interface BookWithDraft {
   selector: 'app-draft-preview-books',
   templateUrl: './draft-preview-books.component.html',
   styleUrls: ['./draft-preview-books.component.scss'],
-  imports: [
-    AsyncPipe,
-    MatButtonToggle,
-    MatMenu,
-    MatMenuItem,
-    MatMenuTrigger,
-    MatIcon,
-    MatButtonToggleGroup,
-    TranslocoModule
-  ]
+  imports: [AsyncPipe, MatButton, TranslocoModule]
 })
 export class DraftPreviewBooksComponent {
   @Input() build: BuildDto | undefined;
@@ -102,187 +74,22 @@ export class DraftPreviewBooksComponent {
     })
   );
 
-  draftApplyProgress$: BehaviorSubject<DraftApplyProgress | undefined> = new BehaviorSubject<
-    DraftApplyProgress | undefined
-  >(undefined);
-
   protected projectParatextId?: string;
 
-  private applyChapters: number[] = [];
-  private draftApplyBookNum: number = 0;
-  private chaptersApplied: number[] = [];
-  private errorMessages: { chapter: number; message: string }[] = [];
-
   constructor(
     private readonly activatedProjectService: ActivatedProjectService,
-    private readonly projectService: SFProjectService,
     private readonly userService: UserService,
-    private readonly draftHandlingService: DraftHandlingService,
-    private readonly dialogService: DialogService,
-    private readonly textDocService: TextDocService,
-    private readonly errorReportingService: ErrorReportingService,
-    private readonly router: Router
+    private readonly router: Router,
+    private readonly projectService: SFProjectService
   ) {}
 
-  get numChaptersApplied(): number {
-    return this.chaptersApplied.length;
-  }
-
   linkForBookAndChapter(bookId: string, chapterNumber: number): string[] {
     return ['/projects', this.activatedProjectService.projectId!, 'translate', bookId, chapterNumber.toString()];
   }
 
-  async chooseProjectToAddDraft(bookWithDraft: BookWithDraft, paratextId?: string): Promise<void> {
-    const dialogData: DraftApplyDialogData = {
-      initialParatextId: paratextId,
-      bookNum: bookWithDraft.bookNumber,
-      chapters: bookWithDraft.chaptersWithDrafts
-    };
-    const dialogRef: MatDialogRef<DraftApplyDialogComponent, DraftApplyDialogResult> = this.dialogService.openMatDialog(
-      DraftApplyDialogComponent,
-      { data: dialogData, width: '600px' }
-    );
-    const result: DraftApplyDialogResult | undefined = await firstValueFrom(dialogRef.afterClosed());
-    if (result == null || result.projectId == null) {
-      return;
-    }
-
-    const projectDoc: SFProjectProfileDoc = await this.projectService.getProfile(result.projectId);
-    const projectTextInfo: TextInfo = projectDoc.data?.texts.find(
-      t => t.bookNum === bookWithDraft.bookNumber && t.chapters
-    )!;
-
-    const projectChapters: number[] = projectTextInfo.chapters.map(c => c.number);
-    const missingChapters: number[] = bookWithDraft.chaptersWithDrafts.filter(c => !projectChapters.includes(c));
-    if (missingChapters.length > 0) {
-      await this.projectService.onlineAddChapters(result.projectId, bookWithDraft.bookNumber, missingChapters);
-      for (const chapter of missingChapters) {
-        const textDocId = new TextDocId(result.projectId, bookWithDraft.bookNumber, chapter);
-        await this.textDocService.createTextDoc(textDocId);
-      }
-    }
-    await this.applyBookDraftAsync(bookWithDraft, result.projectId);
-  }
-
-  private async applyBookDraftAsync(bookWithDraft: BookWithDraft, targetProjectId: string): Promise<void> {
-    this.applyChapters = bookWithDraft.chaptersWithDrafts;
-    this.draftApplyBookNum = bookWithDraft.bookNumber;
-    this.chaptersApplied = [];
-    this.errorMessages = [];
-    this.updateProgress();
-
-    const promises: Promise<string | undefined>[] = [];
-    const targetProject = (await this.projectService.getProfile(targetProjectId)).data!;
-    for (const chapter of bookWithDraft.chaptersWithDrafts) {
-      const draftTextDocId = new TextDocId(this.activatedProjectService.projectId!, bookWithDraft.bookNumber, chapter);
-      const targetTextDocId = new TextDocId(targetProjectId, bookWithDraft.bookNumber, chapter);
-      promises.push(this.applyAndReportChapter(targetProject, draftTextDocId, targetTextDocId));
-    }
-
-    try {
-      this.openProgressDialog();
-      const results: (string | undefined)[] = await Promise.all(promises);
-      if (results.some(result => result !== undefined)) {
-        this.updateProgress(undefined, true);
-        // The draft is in the legacy format. This can only be applied chapter by chapter.
-        return;
-      }
-    } catch (error) {
-      this.updateProgress(undefined, true);
-      // report the error to bugsnag
-      this.errorReportingService.silentError(
-        'Error while trying to apply a draft',
-        ErrorReportingService.normalizeError(error)
-      );
-    }
-  }
-
   navigate(book: BookWithDraft): void {
     void this.router.navigate(this.linkForBookAndChapter(book.bookId, book.chaptersWithDrafts[0]), {
       queryParams: { 'draft-active': true, 'draft-timestamp': this.build?.additionalInfo?.dateGenerated }
     });
   }
-
-  openProgressDialog(): void {
-    this.dialogService.openMatDialog(DraftApplyProgressDialogComponent, {
-      data: { draftApplyProgress$: this.draftApplyProgress$ },
-      disableClose: true
-    });
-  }
-
-  private async applyAndReportChapter(
-    project: SFProjectProfile,
-    draftTextDocId: TextDocId,
-    targetTextDocId: TextDocId
-  ): Promise<string | undefined> {
-    let timestamp: Date | undefined = undefined;
-    if (this.build?.additionalInfo?.dateGenerated != null) {
-      timestamp = new Date(this.build.additionalInfo.dateGenerated);
-    }
-    return await this.draftHandlingService
-      .getAndApplyDraftAsync(project, draftTextDocId, targetTextDocId, timestamp)
-      .then(result => {
-        this.updateProgress(
-          result === undefined ? targetTextDocId.chapterNum : undefined,
-          undefined,
-          result === undefined ? undefined : { chapter: targetTextDocId.chapterNum, message: result }
-        );
-        return result;
-      });
-  }
-
-  private updateProgress(
-    bookCompleted?: number,
-    completed?: boolean,
-    error?: { chapter: number; message: string }
-  ): void {
-    if (bookCompleted != null) {
-      this.chaptersApplied.push(bookCompleted);
-    }
-    if (error != null) {
-      this.errorMessages.push(error);
-      this.errorMessages.sort((a, b) => a.chapter - b.chapter);
-    }
-
-    this.draftApplyProgress$.next({
-      bookNum: this.draftApplyBookNum,
-      chapters: this.applyChapters,
-      chaptersApplied: this.chaptersApplied,
-      completed: !!completed ? completed : this.chaptersApplied.length === this.applyChapters.length,
-      errorMessages: DraftPreviewBooksComponent.combineErrorMessages(this.errorMessages)
-    });
-  }
-
-  private static combineErrorMessages(errorMessages: { chapter: number; message: string }[]): string[] {
-    const formattedErrors: string[] = [];
-    if (errorMessages.length > 0) {
-      let rangeStart = errorMessages[0].chapter;
-      let currentMessage = errorMessages[0].message;
-
-      for (let i = 1; i < errorMessages.length; i++) {
-        const prevChapter = errorMessages[i - 1].chapter;
-        const currentChapter = errorMessages[i].chapter;
-        const message = errorMessages[i].message;
-
-        if (message !== currentMessage || currentChapter !== prevChapter + 1) {
-          const rangeEnd = errorMessages[i - 1].chapter;
-          if (rangeStart === rangeEnd) {
-            formattedErrors.push(`${rangeStart}: ${currentMessage}`);
-          } else {
-            formattedErrors.push(`${rangeStart}-${rangeEnd}: ${currentMessage}`);
-          }
-          rangeStart = currentChapter;
-          currentMessage = message;
-        }
-      }
-
-      const lastError = errorMessages[errorMessages.length - 1];
-      if (rangeStart === lastError.chapter) {
-        formattedErrors.push(`${rangeStart}: ${currentMessage}`);
-      } else {
-        formattedErrors.push(`${rangeStart}-${lastError.chapter}: ${currentMessage}`);
-      }
-    }
-    return formattedErrors;
-  }
 }
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
index b32c469766..147d21705a 100644
--- 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
@@ -280,7 +280,8 @@
     "use_echo": "Use Echo Translation Engine"
   },
   "draft_history_entry": {
-    "click_book_to_preview": "Click a book below to preview the draft and add it to your project.",
+    "add_to_project": "Add to project",
+    "click_book_to_preview": "Click a book below to preview the draft and add it to your project",
     "download_zip": "Download draft as ZIP file",
     "draft_active": "Running",
     "draft_canceled": "Canceled",
@@ -311,6 +312,61 @@
     "older_drafts_not_available": "Older drafts requested before {{ date }} are not available.",
     "previously_generated_drafts": "Previously generated drafts"
   },
+  "draft_import_wizard": {
+    "add_to_project": "Add to project",
+    "book_does_not_exist": "One or more selected books do not exist in this project, and you do not have permission to create them",
+    "books_missing_no_permission": "The selected books{{ booksDescription }} do not exist in this project, and you do not have permission to create them. Choose another project or contact a project administrator for access.",
+    "back": "Back",
+    "cancel": "Cancel",
+    "chapters": "chapters",
+    "choose_project": "Choose a project",
+    "complete": "Complete",
+    "confirm_overwrite": "Confirm overwrite",
+    "creating_missing_books": "Creating the selected books in the project...",
+    "connect_project_description": "The project you selected, {{ projectShortName }} - {{ projectName }}, has not yet been connected in Scripture Forge. Do you want to connect it so you can import the draft to it?",
+    "connect_project": "Connect project",
+    "connect_to_the_internet": "Connect to the internet to import drafts",
+    "connect": "Connect",
+    "connecting_project": "Connecting project",
+    "connecting": "Connecting",
+    "connection_failed": "Connection failed",
+    "continue": "Continue",
+    "create_missing_chapters": "Create missing chapters in the project",
+    "done": "Done",
+    "failed_to_connect_project": "Something went wrong while connecting. Please try again.",
+    "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again.",
+    "i_understand_overwrite_content": "I understand that existing content will be overwritten",
+    "import_and_sync_complete": "Import and sync complete! Your draft has been added to the project.",
+    "import_complete_no_sync": "Import complete! Your draft has been added to the project.",
+    "import_complete": "Import complete",
+    "importing_draft": "Importing draft",
+    "importing": "Importing",
+    "next": "Next",
+    "no_books_ready_for_import": "No draft chapters are ready for import. Generate a draft and try again.",
+    "no_write_permissions": "You do not have write permissions for the selected book(s)",
+    "missing_chapter_needs_creation": "Chapter must be created in the project before importing.",
+    "num_chapters": "{{ count }} chapters",
+    "overwrite_book_description": "{{ bookName }} has {{ numChapters }} chapters with existing text that will be overwritten.",
+    "overwrite_book_question": "Overwrite {{ bookName }}?",
+    "overwrite_books_description": "The following books have chapters with existing text that will be overwritten:",
+    "overwrite_books_question": "Overwrite books?",
+    "please_select_valid_project": "Please select a valid project",
+    "project_context_unavailable": "Project context unavailable. Please close the wizard and try again.",
+    "ready_to_import": "Ready to import draft to “{{ projectShortName }} - {{ projectName }}”",
+    "retry": "Retry",
+    "setting_up_project": "Setting up the project...",
+    "select_books_to_import": "Select books to import",
+    "select_books": "Select books",
+    "select_project": "Select project",
+    "select_project_description": "Select the project you want to add the draft to.",
+    "skip_sync": "Skip sync",
+    "sync_project_description": "It is recommended to sync the project to save your changes to Paratext.",
+    "sync_project_question": "Sync project now?",
+    "sync": "Sync",
+    "syncing_project": "Syncing project",
+    "waiting_for_connection_to_finish": "Please wait while the project finishes connecting.",
+    "waiting_for_import_to_finish": "Please wait until the current import finishes."
+  },
   "draft_preview_books": {
     "add_to_project": "Add to project",
     "add_to_different_project": "Add to a different project",

From 9860c4f11892cdaf9f9227a36ebb495faf96502f Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 3 Dec 2025 15:08:05 +1300
Subject: [PATCH 04/40] SF-3633 Frontend work-in-progress part 2

---
 .../draft-import-wizard.component.html        |   6 -
 .../draft-import-wizard.component.ts          | 118 +++---------------
 .../src/assets/i18n/non_checking_en.json      |   1 -
 3 files changed, 18 insertions(+), 107 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index ddba6a3fed..9c8415102f 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -53,12 +53,6 @@ <h1>{{ t("select_project") }}</h1>
             <app-notice [icon]="'verified'">
               {{ t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name }) }}
             </app-notice>
-
-            @if (projectHasMissingChapters) {
-              <mat-checkbox formControlName="createChapters">
-                {{ t("create_missing_chapters") }}
-              </mat-checkbox>
-            }
           }
 
           @if (bookCreationError != null) {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 59825bee91..988d4d8fdc 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -38,7 +38,6 @@ import { NoticeComponent } from '../../../shared/notice/notice.component';
 import { CustomValidatorState as CustomErrorState, SFValidators } from '../../../shared/sfvalidators';
 import { booksFromScriptureRange } from '../../../shared/utils';
 import { SyncProgressComponent } from '../../../sync/sync-progress/sync-progress.component';
-import { DraftHandlingService } from '../draft-handling.service';
 
 /**
  * Represents a book available for import with its draft chapters.
@@ -102,8 +101,7 @@ export class DraftImportWizardComponent implements OnInit {
 
   // Step 1: Project selection
   projectSelectionForm = new FormGroup({
-    targetParatextId: new FormControl<string | undefined>(undefined, Validators.required),
-    createChapters: new FormControl(false)
+    targetParatextId: new FormControl<string | undefined>(undefined, Validators.required)
   });
   projects: ParatextProject[] = [];
   isLoadingProjects = true;
@@ -116,7 +114,6 @@ export class DraftImportWizardComponent implements OnInit {
   missingBookNames: string[] = [];
   bookCreationError?: string;
   isEnsuringBooks = false;
-  projectHasMissingChapters = false;
   projectLoadingFailed = false;
   private sourceProjectId?: string;
   noDraftsAvailable = false;
@@ -240,7 +237,6 @@ export class DraftImportWizardComponent implements OnInit {
     private readonly paratextService: ParatextService,
     private readonly projectService: SFProjectService,
     private readonly textDocService: TextDocService,
-    private readonly draftHandlingService: DraftHandlingService,
     readonly i18n: I18nService,
     private readonly userService: UserService,
     private readonly onlineStatusService: OnlineStatusService,
@@ -257,8 +253,14 @@ export class DraftImportWizardComponent implements OnInit {
     return Array.from(new Set(bookNumbers));
   }
 
+  private _selectedBooks: BookForImport[] = [];
   get selectedBooks(): BookForImport[] {
-    return this.availableBooksForImport.filter(b => b.selected);
+    const value = this.availableBooksForImport.filter(b => b.selected);
+    if (this._selectedBooks.toString() !== value.toString()) {
+      this._selectedBooks = value;
+    }
+
+    return this._selectedBooks;
   }
 
   private getBooksToImport(): BookForImport[] {
@@ -386,7 +388,6 @@ export class DraftImportWizardComponent implements OnInit {
   }
 
   async projectSelected(paratextId: string): Promise<void> {
-    this.projectSelectionForm.controls.createChapters.setValue(false);
     if (paratextId == null) {
       this.targetProject$.next(undefined);
       this.targetProjectDoc$.next(undefined);
@@ -462,35 +463,6 @@ export class DraftImportWizardComponent implements OnInit {
     // Connection status comes from ParatextProject
     this.needsConnection = !paratextProject.isConnected && hasWritePermissionForSelection;
 
-    // Update chapters for available books and check for missing chapters
-    this.projectHasMissingChapters = false;
-    for (const book of this.getBooksToImport()) {
-      if (book.chapters.length === 0) {
-        continue;
-      }
-      const targetBook = project.texts.find(t => t.bookNum === book.bookNum);
-      if (targetBook == null) {
-        continue;
-      }
-      const targetChapterNumbers = targetBook.chapters.map(c => c.number);
-      const missingChapters = book.chapters.filter(chapter => !targetChapterNumbers.includes(chapter));
-      if (missingChapters.length > 0) {
-        this.projectHasMissingChapters = true;
-      }
-      const bookIsEmpty =
-        targetBook.chapters.length === 0 || (targetBook.chapters.length === 1 && targetBook.chapters[0].lastVerse < 1);
-      if (bookIsEmpty) {
-        this.projectHasMissingChapters = true;
-      }
-    }
-
-    if (this.projectHasMissingChapters) {
-      this.projectSelectionForm.controls.createChapters.addValidators(Validators.requiredTrue);
-    } else {
-      this.projectSelectionForm.controls.createChapters.clearValidators();
-    }
-    this.projectSelectionForm.controls.createChapters.updateValueAndValidity();
-
     if (this.canEditProject && this.targetProjectId != null) {
       this.targetProject$.next(project);
       // Load the full project doc for sync component
@@ -554,6 +526,7 @@ export class DraftImportWizardComponent implements OnInit {
           continue;
         }
         // Was onlineAddBookWithChapters()
+        // TODO: Remove? I don't think this should be called
         await this.projectService.onlineAddChapters(this.targetProjectId, book.bookNum, book.chapters);
         for (const chapter of book.chapters) {
           const textDocId = new TextDocId(this.targetProjectId, book.bookNum, chapter);
@@ -577,7 +550,6 @@ export class DraftImportWizardComponent implements OnInit {
     this.booksMissingWithoutPermission = false;
     this.bookCreationError = undefined;
     this.missingBookNames = [];
-    this.projectHasMissingChapters = false;
   }
 
   private async validateProject(): Promise<void> {
@@ -736,76 +708,22 @@ export class DraftImportWizardComponent implements OnInit {
     }
   }
 
-  private async performImport(books: BookForImport[]): Promise<void> {
+  private async performImport(_books: BookForImport[]): Promise<void> {
     if (this.targetProjectId == null || this.sourceProjectId == null) {
       throw new Error('Missing project context for import');
     }
 
-    const targetProjectDoc = await this.projectService.getProfile(this.targetProjectId);
-    const targetProject = targetProjectDoc.data;
-    if (targetProject == null) {
-      throw new Error('Target project not found');
-    }
-
-    const sourceProjectId = this.sourceProjectId;
-    const allowChapterCreation = this.projectSelectionForm.value.createChapters === true;
-
-    for (const book of books) {
-      const progress = this.importProgress.find(p => p.bookNum === book.bookNum);
-      if (progress == null) continue;
-
-      // Create missing chapters if needed
-      const targetBook = targetProject.texts.find(t => t.bookNum === book.bookNum);
-      const existingChapters = targetBook?.chapters.map(c => c.number) ?? [];
-      const missingChapters = book.chapters.filter(c => !existingChapters.includes(c));
-
-      if (missingChapters.length > 0) {
-        if (!allowChapterCreation) {
-          for (const chapter of missingChapters) {
-            progress.failedChapters.push({
-              chapter,
-              message: this.i18n.translateStatic('draft_import_wizard.missing_chapter_needs_creation')
-            });
-          }
-          continue;
-        }
-
-        await this.projectService.onlineAddChapters(this.targetProjectId, book.bookNum, missingChapters);
-        for (const chapter of missingChapters) {
-          const textDocId = new TextDocId(this.targetProjectId, book.bookNum, chapter);
-          await this.textDocService.createTextDoc(textDocId);
-        }
-      }
-
-      // Apply draft to each chapter
-      for (const chapter of book.chapters) {
-        try {
-          const sourceTextDocId = new TextDocId(sourceProjectId, book.bookNum, chapter);
-          const targetTextDocId = new TextDocId(this.targetProjectId, book.bookNum, chapter);
-
-          let timestamp: Date | undefined;
+    // TODO: Generate a scripture range
+    // TODO: Get timestamp
+    /*
+         let timestamp: Date | undefined;
           if (this.data.additionalInfo?.dateGenerated != null) {
             timestamp = new Date(this.data.additionalInfo.dateGenerated);
           }
-
-          const error = await this.draftHandlingService.getAndApplyDraftAsync(
-            targetProject,
-            sourceTextDocId,
-            targetTextDocId,
-            timestamp
-          );
-
-          if (error != null) {
-            progress.failedChapters.push({ chapter, message: error });
-          } else {
-            progress.completedChapters++;
-          }
-        } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-          progress.failedChapters.push({ chapter, message: errorMessage });
-        }
-      }
-    }
+    */
+    // TODO: Submit to the backend
+    // TODO: Update this.progress.failedChapters
+    // TODO: Update this.progress.completedChapters
   }
 
   retryImport(): void {
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
index 147d21705a..80ff23f351 100644
--- 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
@@ -344,7 +344,6 @@
     "next": "Next",
     "no_books_ready_for_import": "No draft chapters are ready for import. Generate a draft and try again.",
     "no_write_permissions": "You do not have write permissions for the selected book(s)",
-    "missing_chapter_needs_creation": "Chapter must be created in the project before importing.",
     "num_chapters": "{{ count }} chapters",
     "overwrite_book_description": "{{ bookName }} has {{ numChapters }} chapters with existing text that will be overwritten.",
     "overwrite_book_question": "Overwrite {{ bookName }}?",

From 11d0e146c39d098b61cb6f77f0d1a42960115c2e Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 8 Dec 2025 14:36:59 +1300
Subject: [PATCH 05/40] SF-3633 Frontend work-in-progress part 3

---
 .../draft-import-wizard.component.html        |  12 +-
 .../draft-import-wizard.component.ts          | 122 +++++-------------
 .../src/assets/i18n/non_checking_en.json      |   1 -
 3 files changed, 35 insertions(+), 100 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 9c8415102f..0db1f9ffef 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -29,6 +29,10 @@ <h1>{{ t("select_project") }}</h1>
               (projectSelect)="projectSelected($event.paratextId)"
               formControlName="targetParatextId"
             ></app-project-select>
+
+            @if (isLoadingProject) {
+              <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
+            }
           }
 
           @if (projectLoadingFailed) {
@@ -58,11 +62,6 @@ <h1>{{ t("select_project") }}</h1>
           @if (bookCreationError != null) {
             <app-notice type="error">{{ bookCreationError }}</app-notice>
           }
-
-          @if (isEnsuringBooks) {
-            <app-notice type="info">{{ t("creating_missing_books") }}</app-notice>
-            <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
-          }
         </form>
 
         <div class="button-strip">
@@ -80,8 +79,7 @@ <h1>{{ t("select_project") }}</h1>
               isImporting ||
               noDraftsAvailable ||
               projectLoadingFailed ||
-              booksMissingWithoutPermission ||
-              isEnsuringBooks
+              booksMissingWithoutPermission
             "
           >
             {{ t("next") }}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 988d4d8fdc..fce8e9dd2d 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -19,12 +19,10 @@ import {
 import { TranslocoModule } from '@ngneat/transloco';
 import { Canon } from '@sillsdev/scripture';
 import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project';
-import { TextInfoPermission } from 'realtime-server/lib/esm/scriptureforge/models/text-info-permission';
 import { BehaviorSubject } from 'rxjs';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
 import { I18nService } from 'xforge-common/i18n.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
-import { UserService } from 'xforge-common/user.service';
 import { ParatextProject } from '../../../core/models/paratext-project';
 import { SFProjectDoc } from '../../../core/models/sf-project-doc';
 import { TextDoc, TextDocId } from '../../../core/models/text-doc';
@@ -104,6 +102,7 @@ export class DraftImportWizardComponent implements OnInit {
     targetParatextId: new FormControl<string | undefined>(undefined, Validators.required)
   });
   projects: ParatextProject[] = [];
+  isLoadingProject = false;
   isLoadingProjects = true;
   targetProjectId?: string;
   selectedParatextProject?: ParatextProject;
@@ -113,7 +112,6 @@ export class DraftImportWizardComponent implements OnInit {
   booksMissingWithoutPermission = false;
   missingBookNames: string[] = [];
   bookCreationError?: string;
-  isEnsuringBooks = false;
   projectLoadingFailed = false;
   private sourceProjectId?: string;
   noDraftsAvailable = false;
@@ -238,7 +236,6 @@ export class DraftImportWizardComponent implements OnInit {
     private readonly projectService: SFProjectService,
     private readonly textDocService: TextDocService,
     readonly i18n: I18nService,
-    private readonly userService: UserService,
     private readonly onlineStatusService: OnlineStatusService,
     private readonly activatedProjectService: ActivatedProjectService
   ) {}
@@ -339,52 +336,30 @@ export class DraftImportWizardComponent implements OnInit {
 
   private async loadSourceProjectContext(): Promise<void> {
     this.sourceProjectId = this.activatedProjectService.projectId;
-    const cachedDoc = this.activatedProjectService.projectDoc;
-    if (cachedDoc?.data != null) {
-      this.applySourceProject(cachedDoc.data);
-      return;
-    }
-
     if (this.sourceProjectId == null) {
       this.noDraftsAvailable = this.availableBooksForImport.length === 0;
       return;
     }
 
-    const projectProfileDoc = await this.projectService.getProfile(this.sourceProjectId);
-    if (projectProfileDoc.data != null) {
-      this.applySourceProject(projectProfileDoc.data);
-    } else {
-      this.noDraftsAvailable = true;
-    }
+    await this.applySourceProject(this.sourceProjectId);
   }
 
-  private applySourceProject(project: SFProjectProfile): void {
-    const updatedBooks: BookForImport[] = [];
-    for (const book of this.availableBooksForImport) {
-      const chaptersWithDrafts = this.getDraftChapters(project, book.bookNum);
-      if (chaptersWithDrafts.length === 0) {
-        continue;
-      }
-      updatedBooks.push({
-        ...book,
-        chapters: chaptersWithDrafts,
-        selected: book.selected !== false
-      });
-    }
-    this.availableBooksForImport = updatedBooks;
-    this.showBookSelection = this.availableBooksForImport.length > 1;
-    this.noDraftsAvailable = this.availableBooksForImport.length === 0;
-    this.resetImportState();
-  }
+  private async applySourceProject(projectId: string): Promise<void> {
+    // Build a scripture range and timestamp to import
+    const scriptureRange = this.availableBooksForImport.map(b => b.bookId).join(';');
+    const timestamp: Date =
+      this.data.additionalInfo?.dateGenerated != null ? new Date(this.data.additionalInfo.dateGenerated) : new Date();
 
-  private getDraftChapters(project: SFProjectProfile, bookNum: number): number[] {
-    const text = project.texts.find(t => t.bookNum === bookNum);
-    if (text == null) {
-      return [];
-    }
-    return text.chapters
-      .filter(chapter => chapter.hasDraft === true && chapter.number > 0)
-      .map(chapter => chapter.number);
+    // Apply the pre-translation draft to the project
+    await this.projectService.onlineApplyPreTranslationToProject(
+      this.activatedProjectService.projectId!,
+      scriptureRange,
+      projectId,
+      timestamp
+    );
+
+    // TODO: Subscribe to SignalR for import status/updates
+    this.resetImportState();
   }
 
   async projectSelected(paratextId: string): Promise<void> {
@@ -422,9 +397,14 @@ export class DraftImportWizardComponent implements OnInit {
       this.needsConnection = !paratextProject.isConnected;
 
       // Get the project profile to analyze
-      const projectDoc = await this.projectService.get(this.targetProjectId);
-      if (projectDoc.data != null) {
-        await this.analyzeTargetProject(projectDoc.data, paratextProject);
+      this.isLoadingProject = true;
+      try {
+        const projectDoc = await this.projectService.getProfile(this.targetProjectId);
+        if (projectDoc.data != null) {
+          await this.analyzeTargetProject(projectDoc.data, paratextProject);
+        }
+      } finally {
+        this.isLoadingProject = false;
       }
     } else {
       // Need to create SF project - this will happen after connection step
@@ -439,29 +419,10 @@ export class DraftImportWizardComponent implements OnInit {
 
   private async analyzeTargetProject(project: SFProjectProfile, paratextProject: ParatextProject): Promise<void> {
     // Check permissions for all books
-    const hasGeneralEditRight = this.textDocService.userHasGeneralEditRight(project);
-    let hasWritePermissionForSelection = hasGeneralEditRight;
-    const booksToImport = this.getBooksToImport().map(book => book.bookNum);
-
-    if (hasWritePermissionForSelection) {
-      for (const bookNum of booksToImport) {
-        const targetBook = project.texts.find(t => t.bookNum === bookNum);
-        if (targetBook == null) {
-          continue;
-        }
-
-        const userPermission = targetBook.permissions?.[this.userService.currentUserId];
-        if (userPermission !== TextInfoPermission.Write) {
-          hasWritePermissionForSelection = false;
-          break;
-        }
-      }
-    }
-
-    this.canEditProject = hasWritePermissionForSelection;
+    this.canEditProject = this.textDocService.userHasGeneralEditRight(project);
 
     // Connection status comes from ParatextProject
-    this.needsConnection = !paratextProject.isConnected && hasWritePermissionForSelection;
+    this.needsConnection = !paratextProject.isConnected && this.canEditProject;
 
     if (this.canEditProject && this.targetProjectId != null) {
       this.targetProject$.next(project);
@@ -518,31 +479,7 @@ export class DraftImportWizardComponent implements OnInit {
 
     this.booksMissingWithoutPermission = false;
     this.bookCreationError = undefined;
-    this.isEnsuringBooks = true;
-
-    try {
-      for (const book of missingBooks) {
-        if (book.chapters.length === 0) {
-          continue;
-        }
-        // Was onlineAddBookWithChapters()
-        // TODO: Remove? I don't think this should be called
-        await this.projectService.onlineAddChapters(this.targetProjectId, book.bookNum, book.chapters);
-        for (const chapter of book.chapters) {
-          const textDocId = new TextDocId(this.targetProjectId, book.bookNum, chapter);
-          await this.textDocService.createTextDoc(textDocId);
-        }
-      }
-
-      const refreshedProfile = await this.projectService.getProfile(this.targetProjectId);
-      if (refreshedProfile.data != null && this.selectedParatextProject != null) {
-        await this.analyzeTargetProject(refreshedProfile.data, this.selectedParatextProject);
-      }
-
-      return true;
-    } finally {
-      this.isEnsuringBooks = false;
-    }
+    return true;
   }
 
   private resetProjectValidation(): void {
@@ -674,7 +611,7 @@ export class DraftImportWizardComponent implements OnInit {
     this.importError = undefined;
     this.importComplete = false;
 
-    const booksToImport = this.getBooksToImport().filter(book => book.selected && book.chapters.length > 0);
+    const booksToImport = this.getBooksToImport().filter(book => book.selected);
 
     if (booksToImport.length === 0) {
       this.isImporting = false;
@@ -748,6 +685,7 @@ export class DraftImportWizardComponent implements OnInit {
     this.syncError = undefined;
 
     try {
+      // TODO: Register for SignalR updates for sync
       await this.projectService.onlineSync(this.targetProjectId);
       this.syncComplete = true;
       this.stepper?.next();
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
index 80ff23f351..66eb23448c 100644
--- 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
@@ -322,7 +322,6 @@
     "choose_project": "Choose a project",
     "complete": "Complete",
     "confirm_overwrite": "Confirm overwrite",
-    "creating_missing_books": "Creating the selected books in the project...",
     "connect_project_description": "The project you selected, {{ projectShortName }} - {{ projectName }}, has not yet been connected in Scripture Forge. Do you want to connect it so you can import the draft to it?",
     "connect_project": "Connect project",
     "connect_to_the_internet": "Connect to the internet to import drafts",

From 72fd59fd1d07f52f2d7deb1747b9ee3c6541df63 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 15 Dec 2025 13:37:01 +1300
Subject: [PATCH 06/40] SF-3633 Frontend work-in-progress part 4

---
 .../app/core/project-notification.service.ts  | 11 ++-
 .../draft-import-wizard.component.html        | 18 ++--
 .../draft-import-wizard.component.ts          | 93 +++++++++++++------
 .../src/assets/i18n/non_checking_en.json      |  5 +-
 4 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
index eb54a551a7..bfaaf77e22 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
@@ -1,5 +1,11 @@
 import { Injectable } from '@angular/core';
-import { AbortError, HubConnection, HubConnectionBuilder, IHttpConnectionOptions } from '@microsoft/signalr';
+import {
+  AbortError,
+  HubConnection,
+  HubConnectionBuilder,
+  HubConnectionState,
+  IHttpConnectionOptions
+} from '@microsoft/signalr';
 import { AuthService } from 'xforge-common/auth.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 
@@ -43,6 +49,9 @@ export class ProjectNotificationService {
   }
 
   async start(): Promise<void> {
+    if (this.connection.state !== HubConnectionState.Disconnected) {
+      await this.connection.stop();
+    }
     await this.connection.start().catch(err => {
       // Suppress AbortErrors, as they are not caused by server error, but the SignalR connection state
       // These will be thrown if a user navigates away quickly after
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 0db1f9ffef..35a526a40a 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -96,7 +96,7 @@ <h1>{{ t("select_project") }}</h1>
         >
           <ng-template matStepLabel>{{ t("connect_project") }}</ng-template>
 
-          <h1>{{ t("connect_project") }}</h1>
+          <h1>{{ t("connect_to_project") }}</h1>
 
           @if (selectedParatextProject != null) {
             <p>
@@ -131,9 +131,12 @@ <h1>{{ t("connect_project") }}</h1>
           <ng-template matStepLabel>{{ t("connecting") }}</ng-template>
 
           @if (isConnecting) {
-            <h1>{{ t("connecting_project") }}</h1>
+            <h1>{{ t("connecting_to_project") }}</h1>
             @if (targetProjectDoc$ | async; as projectDoc) {
-              <app-sync-progress [projectDoc]="$any(projectDoc)" [showSyncStatus]="true"></app-sync-progress>
+              <app-sync-progress
+                [projectDoc]="$any(projectDoc)"
+                (inProgress)="updateConnectStatus($event)"
+              ></app-sync-progress>
             } @else {
               <p>{{ t("setting_up_project") }}</p>
               <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
@@ -182,7 +185,7 @@ <h1>{{ t("select_books_to_import") }}</h1>
               matStepperNext
               [disabled]="selectedBooks.length === 0 || isConnecting || isImporting || noDraftsAvailable"
             >
-              {{ t("next") }}
+              {{ showOverwriteConfirmation ? t("next") : t("import") }}
               <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
             </button>
           </div>
@@ -244,7 +247,7 @@ <h1>{{ t("overwrite_books_question") }}</h1>
               matStepperNext
               [disabled]="!overwriteForm.valid || isConnecting || isImporting"
             >
-              {{ t("continue") }}
+              {{ t("import") }}
               <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
             </button>
           </div>
@@ -321,7 +324,10 @@ <h1>{{ t("sync_project_question") }}</h1>
         @if (isSyncing) {
           <h1>{{ t("syncing_project") }}</h1>
           @if (targetProjectDoc$ | async; as projectDoc) {
-            <app-sync-progress [projectDoc]="$any(projectDoc)"></app-sync-progress>
+            <app-sync-progress
+              [projectDoc]="$any(projectDoc)"
+              (inProgress)="updateSyncStatus($event)"
+            ></app-sync-progress>
           }
         }
 
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index fce8e9dd2d..817ee41bd4 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -155,30 +155,33 @@ export class DraftImportWizardComponent implements OnInit {
         const projectDoc = await this.projectService.get(this.targetProjectId);
         this.targetProjectDoc$.next(projectDoc);
         if (projectDoc.data != null) {
-          await this.analyzeTargetProject(projectDoc.data, paratextProject);
+          await this.analyzeTargetProject(projectDoc.data, paratextProject.isConnected);
         }
+
+        try {
+          await this.analyzeBooksForOverwrite();
+        } catch (analysisError) {
+          console.error('Failed to analyze books for overwrite', analysisError);
+        }
+
+        this.isConnecting = false;
+        this.stepper?.next();
       } else {
         // Create SF project for this Paratext project
-        this.targetProjectId = await this.projectService.onlineCreateResourceProject(paratextId);
+        this.targetProjectId = await this.projectService.onlineCreate({
+          paratextId: paratextId,
+          sourceParatextId: null,
+          checkingEnabled: false
+        });
+
+        // updateSyncStatus() will handle the sync finishing and move to the next step after "connecting"
+        this.stepper?.next();
 
         if (this.targetProjectId != null) {
           const projectDoc = await this.projectService.get(this.targetProjectId);
           this.targetProjectDoc$.next(projectDoc);
-          if (projectDoc.data != null) {
-            await this.analyzeTargetProject(projectDoc.data, paratextProject);
-          }
         }
       }
-
-      try {
-        await this.analyzeBooksForOverwrite();
-      } catch (analysisError) {
-        console.error('Failed to analyze books for overwrite', analysisError);
-      }
-
-      this.isConnecting = false;
-      this.stepper?.next();
-      this.needsConnection = false;
     } catch (error) {
       this.connectionError =
         error instanceof Error && error.message.length > 0
@@ -192,6 +195,36 @@ export class DraftImportWizardComponent implements OnInit {
     void this.connectToProject(true);
   }
 
+  updateConnectStatus(inProgress: boolean): void {
+    if (!inProgress) {
+      const projectDoc = this.targetProjectDoc$.value;
+      if (projectDoc?.data == null) {
+        this.isConnecting = false;
+        this.stepper?.next();
+        return;
+      }
+
+      void this.analyzeTargetProject(projectDoc.data, false)
+        .then(async () => {
+          try {
+            return await this.analyzeBooksForOverwrite();
+          } catch (analysisError) {
+            console.error('Failed to analyze books for overwrite', analysisError);
+          }
+        })
+        .finally(() => {
+          this.isConnecting = false;
+          this.stepper?.next();
+          // TODO: Why is this step not advancing?
+          // TODO: Why is the book step shown as ticked?
+        });
+    }
+  }
+
+  updateSyncStatus(inProgress: boolean): void {
+    if (!inProgress) this.syncComplete = true;
+  }
+
   onStepSelectionChange(event: StepperSelectionEvent): void {
     if (event.selectedStep === this.importStep && !this.importStepTriggered) {
       if (this.noDraftsAvailable) {
@@ -340,11 +373,10 @@ export class DraftImportWizardComponent implements OnInit {
       this.noDraftsAvailable = this.availableBooksForImport.length === 0;
       return;
     }
-
-    await this.applySourceProject(this.sourceProjectId);
   }
 
-  private async applySourceProject(projectId: string): Promise<void> {
+  async applyDraftToProject(projectId: string): Promise<void> {
+    // TODO: Use this function!
     // Build a scripture range and timestamp to import
     const scriptureRange = this.availableBooksForImport.map(b => b.bookId).join(';');
     const timestamp: Date =
@@ -401,28 +433,33 @@ export class DraftImportWizardComponent implements OnInit {
       try {
         const projectDoc = await this.projectService.getProfile(this.targetProjectId);
         if (projectDoc.data != null) {
-          await this.analyzeTargetProject(projectDoc.data, paratextProject);
+          await this.analyzeTargetProject(projectDoc.data, paratextProject.isConnected);
         }
       } finally {
         this.isLoadingProject = false;
       }
     } else {
       // Need to create SF project - this will happen after connection step
-      this.targetProjectId = undefined;
-      this.needsConnection = true;
-      this.canEditProject = paratextProject.isConnectable;
-      this.targetProject$.next(undefined);
-      this.targetProjectDoc$.next(undefined);
-      await this.validateProject();
+      this.isLoadingProject = true;
+      try {
+        this.targetProjectId = undefined;
+        this.needsConnection = true;
+        this.canEditProject = paratextProject.isConnectable;
+        this.targetProject$.next(undefined);
+        this.targetProjectDoc$.next(undefined);
+        await this.validateProject();
+      } finally {
+        this.isLoadingProject = false;
+      }
     }
   }
 
-  private async analyzeTargetProject(project: SFProjectProfile, paratextProject: ParatextProject): Promise<void> {
+  private async analyzeTargetProject(project: SFProjectProfile, isConnected: boolean): Promise<void> {
     // Check permissions for all books
     this.canEditProject = this.textDocService.userHasGeneralEditRight(project);
 
     // Connection status comes from ParatextProject
-    this.needsConnection = !paratextProject.isConnected && this.canEditProject;
+    this.needsConnection = !isConnected && this.canEditProject;
 
     if (this.canEditProject && this.targetProjectId != null) {
       this.targetProject$.next(project);
@@ -685,9 +722,7 @@ export class DraftImportWizardComponent implements OnInit {
     this.syncError = undefined;
 
     try {
-      // TODO: Register for SignalR updates for sync
       await this.projectService.onlineSync(this.targetProjectId);
-      this.syncComplete = true;
       this.stepper?.next();
     } catch (error) {
       this.syncError = error instanceof Error ? error.message : 'Sync failed';
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
index 66eb23448c..1c274ac812 100644
--- 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
@@ -324,17 +324,18 @@
     "confirm_overwrite": "Confirm overwrite",
     "connect_project_description": "The project you selected, {{ projectShortName }} - {{ projectName }}, has not yet been connected in Scripture Forge. Do you want to connect it so you can import the draft to it?",
     "connect_project": "Connect project",
+    "connect_to_project": "Connect to project",
     "connect_to_the_internet": "Connect to the internet to import drafts",
     "connect": "Connect",
-    "connecting_project": "Connecting project",
+    "connecting_to_project": "Connecting to project",
     "connecting": "Connecting",
     "connection_failed": "Connection failed",
-    "continue": "Continue",
     "create_missing_chapters": "Create missing chapters in the project",
     "done": "Done",
     "failed_to_connect_project": "Something went wrong while connecting. Please try again.",
     "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again.",
     "i_understand_overwrite_content": "I understand that existing content will be overwritten",
+    "import": "Import",
     "import_and_sync_complete": "Import and sync complete! Your draft has been added to the project.",
     "import_complete_no_sync": "Import complete! Your draft has been added to the project.",
     "import_complete": "Import complete",

From 8fcf700053ffe32509d7695a76816b7207e025d1 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 16 Dec 2025 10:56:36 +1300
Subject: [PATCH 07/40] SF-3633 Frontend work-in-progress part 5

---
 .../draft-import-wizard.component.html        | 27 +++++++++++++++++--
 .../draft-import-wizard.component.ts          |  6 +----
 .../src/assets/i18n/non_checking_en.json      |  3 ++-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 35a526a40a..7dc488ae8b 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -91,7 +91,7 @@ <h1>{{ t("select_project") }}</h1>
       <!-- Step 2: Connect Confirmation (conditional) -->
       @if (needsConnection) {
         <mat-step
-          [completed]="!needsConnection || isConnecting || connectionError != null"
+          [completed]="!needsConnection || isConnecting || connectionError == null"
           [editable]="!isConnecting && !isImporting"
         >
           <ng-template matStepLabel>{{ t("connect_project") }}</ng-template>
@@ -109,6 +109,10 @@ <h1>{{ t("connect_to_project") }}</h1>
             </p>
           }
 
+          @if (connectionError != null) {
+            <app-notice type="error">{{ connectionError }}</app-notice>
+          }
+
           <div class="button-strip">
             <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
               <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
@@ -118,7 +122,7 @@ <h1>{{ t("connect_to_project") }}</h1>
               mat-flat-button
               color="primary"
               (click)="connectToProject()"
-              [disabled]="isConnecting || isImporting"
+              [disabled]="isConnecting || isImporting || connectionError != null"
             >
               {{ t("connect") }}
               <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -156,6 +160,25 @@ <h1>{{ t("connection_failed") }}</h1>
                 {{ t("retry") }}
               </button>
             </div>
+          } @else if (!isConnecting) {
+            <h1>{{ t("connected_to_project") }}</h1>
+            @if (targetProject$ | async; as project) {
+              <app-notice [icon]="'verified'">
+                {{
+                  t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name })
+                }}
+              </app-notice>
+            }
+            <div class="button-strip">
+              <button mat-stroked-button matStepperPrevious [disabled]="isImporting">
+                <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+                {{ t("back") }}
+              </button>
+              <button mat-flat-button matStepperNext color="primary" [disabled]="isImporting">
+                {{ t("next") }}
+                <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+              </button>
+            </div>
           }
         </mat-step>
       }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 817ee41bd4..9a1d6ad3d9 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -174,7 +174,7 @@ export class DraftImportWizardComponent implements OnInit {
           checkingEnabled: false
         });
 
-        // updateSyncStatus() will handle the sync finishing and move to the next step after "connecting"
+        // updateConnectStatus() will handle the sync finishing and move to the next step after "connecting"
         this.stepper?.next();
 
         if (this.targetProjectId != null) {
@@ -200,7 +200,6 @@ export class DraftImportWizardComponent implements OnInit {
       const projectDoc = this.targetProjectDoc$.value;
       if (projectDoc?.data == null) {
         this.isConnecting = false;
-        this.stepper?.next();
         return;
       }
 
@@ -214,9 +213,6 @@ export class DraftImportWizardComponent implements OnInit {
         })
         .finally(() => {
           this.isConnecting = false;
-          this.stepper?.next();
-          // TODO: Why is this step not advancing?
-          // TODO: Why is the book step shown as ticked?
         });
     }
   }
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
index 1c274ac812..0b532af509 100644
--- 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
@@ -327,6 +327,7 @@
     "connect_to_project": "Connect to project",
     "connect_to_the_internet": "Connect to the internet to import drafts",
     "connect": "Connect",
+    "connected_to_project": "Connected to project",
     "connecting_to_project": "Connecting to project",
     "connecting": "Connecting",
     "connection_failed": "Connection failed",
@@ -357,7 +358,7 @@
     "select_books_to_import": "Select books to import",
     "select_books": "Select books",
     "select_project": "Select project",
-    "select_project_description": "Select the project you want to add the draft to.",
+    "select_project_description": "Please select the project you want to add the draft to.",
     "skip_sync": "Skip sync",
     "sync_project_description": "It is recommended to sync the project to save your changes to Paratext.",
     "sync_project_question": "Sync project now?",

From 07034abc42b8e076ccb2a08a238ac132bc921d79 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 6 Jan 2026 14:47:51 +1300
Subject: [PATCH 08/40] SF-3633 Frontend work-in-progress part 6

---
 .../app/core/project-notification.service.ts  |   4 +
 .../draft-import-wizard.component.html        |  19 +-
 .../draft-import-wizard.component.ts          | 159 ++++++---
 .../draft-preview-books.component.spec.ts     | 331 +-----------------
 4 files changed, 133 insertions(+), 380 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
index bfaaf77e22..97f231bddf 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
@@ -40,6 +40,10 @@ export class ProjectNotificationService {
     this.connection.off('notifySyncProgress', handler);
   }
 
+  setNotifyDraftApplyProgressHandler(handler: any): void {
+    this.connection.on('notifyDraftApplyProgress', handler);
+  }
+
   setNotifyBuildProgressHandler(handler: any): void {
     this.connection.on('notifyBuildProgress', handler);
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 7dc488ae8b..570a9b94df 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -53,7 +53,7 @@ <h1>{{ t("select_project") }}</h1>
             <app-notice type="warning">{{ t("no_books_ready_for_import") }}</app-notice>
           }
 
-          @if (projectSelectionForm.valid && (targetProject$ | async); as project) {
+          @if (projectSelectionForm.valid && !isLoadingProject && (targetProject$ | async); as project) {
             <app-notice [icon]="'verified'">
               {{ t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name }) }}
             </app-notice>
@@ -77,6 +77,7 @@ <h1>{{ t("select_project") }}</h1>
               !projectSelectionForm.valid ||
               isConnecting ||
               isImporting ||
+              isLoadingProject ||
               noDraftsAvailable ||
               projectLoadingFailed ||
               booksMissingWithoutPermission
@@ -278,7 +279,11 @@ <h1>{{ t("overwrite_books_question") }}</h1>
       }
 
       <!-- Step 6: Import Progress -->
-      <mat-step #importStep [completed]="importComplete" [editable]="!isConnecting && !isImporting">
+      <mat-step
+        #importStep
+        [completed]="importComplete"
+        [editable]="!isConnecting && !isImporting && (!showOverwriteConfirmation || overwriteForm.valid)"
+      >
         <ng-template matStepLabel>{{ t("importing") }}</ng-template>
 
         <h1>{{ t("importing_draft") }}</h1>
@@ -289,10 +294,10 @@ <h1>{{ t("importing_draft") }}</h1>
               <p>{{ progress.bookName }}</p>
               <mat-progress-bar
                 mode="determinate"
-                [value]="(progress.completedChapters / progress.totalChapters) * 100"
+                [value]="(progress.completedChapters.length / progress.totalChapters) * 100"
               ></mat-progress-bar>
               <span class="progress-text">
-                {{ progress.completedChapters }} / {{ progress.totalChapters }} {{ t("chapters") }}
+                {{ progress.completedChapters.length }} / {{ progress.totalChapters }} {{ t("chapters") }}
               </span>
               @if (progress.failedChapters.length > 0 && !isImporting) {
                 <div class="failed-chapters">
@@ -306,7 +311,11 @@ <h1>{{ t("importing_draft") }}</h1>
 
         @if (importError != null) {
           <app-notice type="error">{{ importError }}</app-notice>
-          <div class="button-strip align-end">
+          <div class="button-strip">
+            <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
+              <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+              {{ t("back") }}
+            </button>
             <button mat-stroked-button (click)="retryImport()" [disabled]="isImporting">
               <mat-icon>refresh</mat-icon>
               {{ t("retry") }}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 9a1d6ad3d9..d48494b6b2 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -1,6 +1,6 @@
 import { StepperSelectionEvent } from '@angular/cdk/stepper';
 import { AsyncPipe } from '@angular/common';
-import { Component, Inject, OnInit, ViewChild } from '@angular/core';
+import { Component, DestroyRef, Inject, OnInit, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
 import { MatCheckbox } from '@angular/material/checkbox';
@@ -27,6 +27,7 @@ import { ParatextProject } from '../../../core/models/paratext-project';
 import { SFProjectDoc } from '../../../core/models/sf-project-doc';
 import { TextDoc, TextDocId } from '../../../core/models/text-doc';
 import { ParatextService } from '../../../core/paratext.service';
+import { ProjectNotificationService } from '../../../core/project-notification.service';
 import { SFProjectService } from '../../../core/sf-project.service';
 import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
@@ -45,7 +46,6 @@ interface BookForImport {
   bookNum: number;
   bookId: string;
   bookName: string;
-  chapters: number[];
   selected: boolean;
 }
 
@@ -54,10 +54,27 @@ interface BookForImport {
  */
 interface ImportProgress {
   bookNum: number;
+  bookId: string;
   bookName: string;
   totalChapters: number;
-  completedChapters: number;
-  failedChapters: { chapter: number; message: string }[];
+  completedChapters: number[];
+  failedChapters: { chapterNum: number; message?: string }[];
+}
+
+interface DraftApplyState {
+  bookNum: number;
+  chapterNum: number;
+  totalChapters: number;
+  message?: string;
+  status: DraftApplyStatus;
+}
+
+enum DraftApplyStatus {
+  None = 0,
+  InProgress = 1,
+  Successful = 2,
+  Warning = 3,
+  Failed = 4
 }
 
 /**
@@ -236,7 +253,7 @@ export class DraftImportWizardComponent implements OnInit {
   showBookSelection = false;
 
   // Step 5: Overwrite confirmation (conditional)
-  showOverwriteConfirmation = false;
+  showOverwriteConfirmation = true;
   overwriteForm = new FormGroup({
     confirmOverwrite: new FormControl(false, Validators.requiredTrue)
   });
@@ -261,13 +278,25 @@ export class DraftImportWizardComponent implements OnInit {
   constructor(
     @Inject(MAT_DIALOG_DATA) readonly data: BuildDto,
     @Inject(MatDialogRef) private readonly dialogRef: MatDialogRef<DraftImportWizardComponent, boolean>,
+    readonly destroyRef: DestroyRef,
     private readonly paratextService: ParatextService,
+    private readonly projectNotificationService: ProjectNotificationService,
     private readonly projectService: SFProjectService,
     private readonly textDocService: TextDocService,
     readonly i18n: I18nService,
     private readonly onlineStatusService: OnlineStatusService,
     private readonly activatedProjectService: ActivatedProjectService
-  ) {}
+  ) {
+    this.projectNotificationService.setNotifyDraftApplyProgressHandler(
+      (projectId: string, draftApplyState: DraftApplyState) => {
+        this.updateDraftApplyState(projectId, draftApplyState);
+      }
+    );
+    destroyRef.onDestroy(async () => {
+      // Stop the SignalR connection when the component is destroyed
+      await projectNotificationService.stop();
+    });
+  }
 
   get isAppOnline(): boolean {
     return this.onlineStatusService.isOnline;
@@ -355,7 +384,6 @@ export class DraftImportWizardComponent implements OnInit {
       bookNum,
       bookId: Canon.bookNumberToId(bookNum),
       bookName: this.i18n.localizeBook(bookNum),
-      chapters: [], // Will be populated when we have project context
       selected: true // Pre-select all books by default
     }));
 
@@ -371,25 +399,6 @@ export class DraftImportWizardComponent implements OnInit {
     }
   }
 
-  async applyDraftToProject(projectId: string): Promise<void> {
-    // TODO: Use this function!
-    // Build a scripture range and timestamp to import
-    const scriptureRange = this.availableBooksForImport.map(b => b.bookId).join(';');
-    const timestamp: Date =
-      this.data.additionalInfo?.dateGenerated != null ? new Date(this.data.additionalInfo.dateGenerated) : new Date();
-
-    // Apply the pre-translation draft to the project
-    await this.projectService.onlineApplyPreTranslationToProject(
-      this.activatedProjectService.projectId!,
-      scriptureRange,
-      projectId,
-      timestamp
-    );
-
-    // TODO: Subscribe to SignalR for import status/updates
-    this.resetImportState();
-  }
-
   async projectSelected(paratextId: string): Promise<void> {
     if (paratextId == null) {
       this.targetProject$.next(undefined);
@@ -576,8 +585,10 @@ export class DraftImportWizardComponent implements OnInit {
       return;
     }
 
+    this.isLoadingProject = true;
     const booksReady = await this.ensureSelectedBooksExist();
     if (!booksReady) {
+      this.isLoadingProject = false;
       return;
     }
 
@@ -585,6 +596,7 @@ export class DraftImportWizardComponent implements OnInit {
     await this.analyzeBooksForOverwrite();
 
     this.stepper?.next();
+    this.isLoadingProject = false;
   }
 
   private async analyzeBooksForOverwrite(): Promise<void> {
@@ -655,45 +667,94 @@ export class DraftImportWizardComponent implements OnInit {
     // Initialize progress tracking
     this.importProgress = booksToImport.map(book => ({
       bookNum: book.bookNum,
+      bookId: book.bookId,
       bookName: book.bookName,
-      totalChapters: book.chapters.length,
-      completedChapters: 0,
+      totalChapters: 0,
+      completedChapters: [],
       failedChapters: []
     }));
 
     try {
       await this.performImport(booksToImport);
-
-      // Check if there were any failures
-      const totalFailures = this.importProgress.reduce((sum, p) => sum + p.failedChapters.length, 0);
-      if (totalFailures > 0) {
-        this.importError = `Failed to import ${totalFailures} chapter(s). See details above.`;
-      } else {
-        this.importComplete = true;
-      }
     } catch (error) {
       this.importError = error instanceof Error ? error.message : 'Unknown error occurred';
-    } finally {
       this.isImporting = false;
     }
   }
 
-  private async performImport(_books: BookForImport[]): Promise<void> {
+  private async performImport(books: BookForImport[]): Promise<void> {
     if (this.targetProjectId == null || this.sourceProjectId == null) {
       throw new Error('Missing project context for import');
     }
 
-    // TODO: Generate a scripture range
-    // TODO: Get timestamp
-    /*
-         let timestamp: Date | undefined;
-          if (this.data.additionalInfo?.dateGenerated != null) {
-            timestamp = new Date(this.data.additionalInfo.dateGenerated);
+    // Subscribe to SignalR updates
+    await this.projectNotificationService.start();
+    await this.projectNotificationService.subscribeToProject(this.sourceProjectId);
+
+    // Build a scripture range and timestamp to import
+    const scriptureRange = books.map(b => b.bookId).join(';');
+    const timestamp: Date =
+      this.data.additionalInfo?.dateGenerated != null ? new Date(this.data.additionalInfo.dateGenerated) : new Date();
+
+    // Apply the pre-translation draft to the project
+    await this.projectService.onlineApplyPreTranslationToProject(
+      this.sourceProjectId,
+      scriptureRange,
+      this.targetProjectId,
+      timestamp
+    );
+  }
+
+  /**
+   * Handler for SignalR notifications when applying a draft.
+   *
+   * @param projectId The project identifier.
+   * @param draftApplyState The draft apply state from the backend.
+   */
+  updateDraftApplyState(projectId: string, draftApplyState: DraftApplyState): void {
+    if (projectId !== this.sourceProjectId) return;
+
+    // Update based on book or chapter
+    if (draftApplyState.bookNum === 0 && draftApplyState.chapterNum === 0) {
+      // Handle the final states
+      if (draftApplyState.status === DraftApplyStatus.Successful) {
+        // Check if there were any failures
+        this.isImporting = false;
+        const totalFailures = this.importProgress.reduce((sum, p) => sum + p.failedChapters.length, 0);
+        if (totalFailures > 0) {
+          this.importError = `Failed to import ${totalFailures} chapter(s). See details above.`;
+        } else {
+          this.importComplete = true;
+        }
+      } else if (draftApplyState.status === DraftApplyStatus.Failed) {
+        // Clear all completed chapters
+        this.importProgress.forEach(p => {
+          p.completedChapters.length = 0;
+        });
+        this.isImporting = false;
+        this.importError = draftApplyState.message;
+      }
+    } else if (draftApplyState.bookNum > 0) {
+      // Handle the in-progress states
+      const progress: ImportProgress | undefined = this.importProgress.find(p => p.bookNum === draftApplyState.bookNum);
+      if (progress != null) {
+        if (draftApplyState.status === DraftApplyStatus.Failed) {
+          const failedChapter = progress.failedChapters.find(c => c.chapterNum === draftApplyState.chapterNum);
+          if (failedChapter != null && draftApplyState.message != null) {
+            failedChapter.message = draftApplyState.message;
+          } else {
+            progress.failedChapters.push({ chapterNum: draftApplyState.chapterNum, message: draftApplyState.message });
           }
-    */
-    // TODO: Submit to the backend
-    // TODO: Update this.progress.failedChapters
-    // TODO: Update this.progress.completedChapters
+        } else if (
+          draftApplyState.status === DraftApplyStatus.Successful &&
+          !progress.completedChapters.includes(draftApplyState.chapterNum)
+        ) {
+          progress.completedChapters.push(draftApplyState.chapterNum);
+        } else if (draftApplyState.status === DraftApplyStatus.InProgress && draftApplyState.totalChapters > 0) {
+          progress.totalChapters = draftApplyState.totalChapters;
+        }
+      }
+    }
   }
 
   retryImport(): void {
@@ -741,7 +802,7 @@ export class DraftImportWizardComponent implements OnInit {
   }
 
   getFailedChapters(progress: ImportProgress): string {
-    return progress.failedChapters.map(f => f.chapter).join(', ');
+    return progress.failedChapters.map(f => f.chapterNum).join(', ');
   }
 
   private resetImportState(): void {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.spec.ts
index af2997e812..89ad64f2bf 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.spec.ts
@@ -1,35 +1,26 @@
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { MatDialogRef } from '@angular/material/dialog';
-import { MatMenuHarness } from '@angular/material/menu/testing';
 import { provideNoopAnimations } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { SFProjectRole } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-role';
 import { createTestProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-test-data';
 import { TextInfoPermission } from 'realtime-server/lib/esm/scriptureforge/models/text-info-permission';
-import { BehaviorSubject, filter, of, Subscription } from 'rxjs';
-import { anything, capture, instance, mock, verify, when } from 'ts-mockito';
+import { of, Subscription } from 'rxjs';
+import { anything, capture, mock, verify, when } from 'ts-mockito';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
-import { DialogService } from 'xforge-common/dialog.service';
 import { ErrorReportingService } from 'xforge-common/error-reporting.service';
 import { configureTestingModule, getTestTranslocoModule } from 'xforge-common/test-utils';
 import { UserService } from 'xforge-common/user.service';
 import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
 import { SFProjectService } from '../../../core/sf-project.service';
-import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
-import { DraftApplyDialogComponent } from '../draft-apply-dialog/draft-apply-dialog.component';
 import { DraftApplyProgress } from '../draft-apply-progress-dialog/draft-apply-progress-dialog.component';
-import { DraftHandlingService } from '../draft-handling.service';
 import { BookWithDraft, DraftPreviewBooksComponent } from './draft-preview-books.component';
 
 const mockedActivatedProjectService = mock(ActivatedProjectService);
 const mockedProjectService = mock(SFProjectService);
 const mockedUserService = mock(UserService);
-const mockedDraftHandlingService = mock(DraftHandlingService);
-const mockedDialogService = mock(DialogService);
-const mockedTextService = mock(TextDocService);
 const mockedErrorReportingService = mock(ErrorReportingService);
 const mockedRouter = mock(Router);
 
@@ -42,9 +33,6 @@ describe('DraftPreviewBooks', () => {
       { provide: ActivatedProjectService, useMock: mockedActivatedProjectService },
       { provide: SFProjectService, useMock: mockedProjectService },
       { provide: UserService, useMock: mockedUserService },
-      { provide: DraftHandlingService, useMock: mockedDraftHandlingService },
-      { provide: DialogService, useMock: mockedDialogService },
-      { provide: TextDocService, useMock: mockedTextService },
       { provide: ErrorReportingService, useMock: mockedErrorReportingService },
       { provide: Router, useMock: mockedRouter },
       provideNoopAnimations()
@@ -69,7 +57,7 @@ describe('DraftPreviewBooks', () => {
 
   it('can navigate to a specific book', fakeAsync(() => {
     env = new TestEnvironment();
-    env.getBookButtonAtIndex(0).querySelector('button')!.click();
+    env.getBookButtonAtIndex(0).click();
     tick();
     env.fixture.detectChanges();
     verify(mockedRouter.navigate(anything(), anything())).once();
@@ -79,307 +67,6 @@ describe('DraftPreviewBooks', () => {
       queryParams: { 'draft-active': true, 'draft-timestamp': undefined }
     });
   }));
-
-  it('opens more menu with options', fakeAsync(async () => {
-    env = new TestEnvironment();
-    const moreButton: HTMLElement = env.getBookButtonAtIndex(0).querySelector('.book-more')!;
-    moreButton.click();
-    tick();
-    env.fixture.detectChanges();
-    const harness: MatMenuHarness = await env.moreMenuHarness();
-    const items = await harness.getItems();
-    expect(items.length).toEqual(2);
-    harness.close();
-    tick();
-    env.fixture.detectChanges();
-  }));
-
-  it('does not apply draft if user cancels', fakeAsync(() => {
-    env = new TestEnvironment();
-    const bookWithDraft: BookWithDraft = env.booksWithDrafts[0];
-    setupDialog();
-    expect(env.getBookButtonAtIndex(0).querySelector('.book-more')).toBeTruthy();
-    env.component.chooseProjectToAddDraft(bookWithDraft);
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).never();
-  }));
-
-  it('notifies user if applying a draft failed due to an error', fakeAsync(() => {
-    env = new TestEnvironment();
-    const bookWithDraft: BookWithDraft = env.booksWithDrafts[0];
-    setupDialog('project01');
-    when(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything()))
-      .thenReject(new Error('Draft error'))
-      .thenResolve(undefined)
-      .thenResolve('error');
-    expect(env.getBookButtonAtIndex(0).querySelector('.book-more')).toBeTruthy();
-    env.component.chooseProjectToAddDraft(bookWithDraft);
-    tick();
-    env.fixture.detectChanges();
-    expect(env.draftApplyProgress!.chaptersApplied).toEqual([2]);
-    expect(env.draftApplyProgress!.completed).toBe(true);
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).times(3);
-    verify(mockedErrorReportingService.silentError(anything(), anything())).once();
-  }));
-
-  it('can apply all chapters of a draft to a book', fakeAsync(() => {
-    env = new TestEnvironment();
-    const bookWithDraft: BookWithDraft = env.booksWithDrafts[0];
-    setupDialog('project01');
-    when(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).thenResolve(
-      undefined
-    );
-    expect(env.getBookButtonAtIndex(0).querySelector('.book-more')).toBeTruthy();
-    env.component.chooseProjectToAddDraft(bookWithDraft);
-    tick();
-    env.fixture.detectChanges();
-    expect(env.draftApplyProgress!.chaptersApplied).toEqual([1, 2, 3]);
-    expect(env.draftApplyProgress!.completed).toBe(true);
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).times(3);
-  }));
-
-  it('can apply a historic draft', fakeAsync(() => {
-    env = new TestEnvironment({
-      additionalInfo: {
-        translationScriptureRanges: [{ projectId: 'project01', scriptureRange: 'GEN;EXO;LEV' }],
-        dateGenerated: '2024-08-27T01:02:03.004+00:00'
-      }
-    } as BuildDto);
-    const bookWithDraft: BookWithDraft = env.booksWithDrafts[1];
-    setupDialog('project01');
-    when(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).thenResolve(
-      undefined
-    );
-    expect(env.getBookButtonAtIndex(1).querySelector('.book-more')).toBeTruthy();
-    env.component.chooseProjectToAddDraft(bookWithDraft);
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).times(2);
-  }));
-
-  it('can open dialog with the current project', fakeAsync(() => {
-    env = new TestEnvironment();
-    expect(env.getBookButtonAtIndex(0).querySelector('.book-more')).toBeTruthy();
-    const mockedDialogRef: MatDialogRef<DraftApplyDialogComponent> = mock(MatDialogRef<DraftApplyDialogComponent>);
-    when(mockedDialogRef.afterClosed()).thenReturn(of({ projectId: 'project01' }));
-    when(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).thenReturn(
-      instance(mockedDialogRef)
-    );
-    expect(env.component['projectParatextId']).toEqual(env.paratextId);
-    env.component.chooseProjectToAddDraft(env.booksWithDrafts[0], env.paratextId);
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).times(
-      env.booksWithDrafts[0].chaptersWithDrafts.length
-    );
-    verify(mockedProjectService.onlineAddChapters('project01', anything(), anything())).never();
-  }));
-
-  it('can open dialog to apply draft to a different project', fakeAsync(() => {
-    env = new TestEnvironment();
-    expect(env.getBookButtonAtIndex(0).querySelector('.book-more')).toBeTruthy();
-    const mockedDialogRef: MatDialogRef<DraftApplyDialogComponent> = mock(MatDialogRef<DraftApplyDialogComponent>);
-    when(mockedDialogRef.afterClosed()).thenReturn(of({ projectId: 'otherProject' }));
-    when(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).thenReturn(
-      instance(mockedDialogRef)
-    );
-    env.component.chooseProjectToAddDraft(env.booksWithDrafts[0]);
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).times(
-      env.booksWithDrafts[0].chaptersWithDrafts.length
-    );
-    verify(mockedProjectService.onlineAddChapters('otherProject', anything(), anything())).never();
-  }));
-
-  it('translators can add draft to different project', fakeAsync(async () => {
-    env = new TestEnvironment();
-    when(mockedUserService.currentUserId).thenReturn('user02');
-    const moreButton: HTMLElement = env.getBookButtonAtIndex(0).querySelector('.book-more')!;
-    moreButton.click();
-    tick();
-    env.fixture.detectChanges();
-    const harness: MatMenuHarness = await env.moreMenuHarness();
-    const items = await harness.getItems();
-    expect(items.length).toEqual(2);
-    harness.close();
-    tick();
-    env.fixture.detectChanges();
-  }));
-
-  it('does not apply draft if user cancels applying to a different project', fakeAsync(() => {
-    env = new TestEnvironment();
-    setupDialog();
-    env.component.chooseProjectToAddDraft(env.booksWithDrafts[0]);
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).never();
-    expect().nothing();
-  }));
-
-  it('creates the chapters in the project if they do not exist', fakeAsync(() => {
-    env = new TestEnvironment();
-    expect(env.getBookButtonAtIndex(0).querySelector('.book-more')).toBeTruthy();
-    const projectEmptyBook = 'projectEmptyBook';
-    const mockedDialogRef: MatDialogRef<DraftApplyDialogComponent> = mock(MatDialogRef<DraftApplyDialogComponent>);
-    when(mockedDialogRef.afterClosed()).thenReturn(of({ projectId: projectEmptyBook }));
-    when(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).thenReturn(
-      instance(mockedDialogRef)
-    );
-
-    when(mockedProjectService.onlineAddChapters(projectEmptyBook, anything(), anything())).thenResolve();
-    const projectWithChaptersMissing = createTestProjectProfile({
-      texts: [
-        { bookNum: 1, chapters: [{ number: 1, lastVerse: 0 }], permissions: { user01: TextInfoPermission.Write } }
-      ]
-    });
-    when(mockedProjectService.getProfile(projectEmptyBook)).thenResolve({
-      id: projectEmptyBook,
-      data: projectWithChaptersMissing
-    } as SFProjectProfileDoc);
-    env.component.chooseProjectToAddDraft(env.booksWithDrafts[0], 'project01');
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedProjectService.onlineAddChapters(projectEmptyBook, anything(), anything())).once();
-    // needs to create 2 texts
-    verify(mockedTextService.createTextDoc(anything())).twice();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).times(
-      env.booksWithDrafts[0].chaptersWithDrafts.length
-    );
-  }));
-
-  it('shows message to generate a new draft if legacy USFM draft', fakeAsync(() => {
-    env = new TestEnvironment();
-    const bookWithDraft: BookWithDraft = env.booksWithDrafts[0];
-    setupDialog('project01');
-    when(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).thenResolve(
-      'error: legacy format'
-    );
-    expect(env.getBookButtonAtIndex(0).querySelector('.book-more')).toBeTruthy();
-    env.component.chooseProjectToAddDraft(bookWithDraft);
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).times(3);
-  }));
-
-  it('can track progress of chapters applied', fakeAsync(() => {
-    env = new TestEnvironment();
-    const bookWithDraft: BookWithDraft = env.booksWithDrafts[0];
-    setupDialog('project01');
-    const resolveSubject$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-    const promise: Promise<string | undefined> = new Promise<string | undefined>(resolve => {
-      resolveSubject$.pipe(filter(value => value)).subscribe(() => resolve(undefined));
-    });
-    when(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything()))
-      .thenResolve(undefined)
-      .thenReturn(promise);
-    expect(env.getBookButtonAtIndex(0).querySelector('.book-more')).toBeTruthy();
-    env.component.chooseProjectToAddDraft(bookWithDraft);
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).once();
-    verify(mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())).times(3);
-    expect(env.component.numChaptersApplied).toEqual(1);
-    resolveSubject$.next(true);
-    resolveSubject$.complete();
-    tick();
-    env.fixture.detectChanges();
-    expect(env.component.numChaptersApplied).toEqual(3);
-  }));
-
-  describe('combineErrorMessages', () => {
-    it('should return an empty array if there are no error messages', () => {
-      const errorMessages: { chapter: number; message: string }[] = [];
-      const result = DraftPreviewBooksComponent['combineErrorMessages'](errorMessages);
-      expect(result).toEqual([]);
-    });
-
-    it('should format a single error message', () => {
-      const errorMessages = [{ chapter: 1, message: 'Error message' }];
-      const result = DraftPreviewBooksComponent['combineErrorMessages'](errorMessages);
-      expect(result).toEqual(['1: Error message']);
-    });
-
-    it('should format multiple error messages for non-consecutive chapters', () => {
-      const errorMessages = [
-        { chapter: 1, message: 'Error message' },
-        { chapter: 3, message: 'Another error message' }
-      ];
-      const result = DraftPreviewBooksComponent['combineErrorMessages'](errorMessages);
-      expect(result).toEqual(['1: Error message', '3: Another error message']);
-    });
-
-    it('should group consecutive chapters with the same error message', () => {
-      const errorMessages = [
-        { chapter: 1, message: 'Error message' },
-        { chapter: 2, message: 'Error message' },
-        { chapter: 3, message: 'Error message' }
-      ];
-      const result = DraftPreviewBooksComponent['combineErrorMessages'](errorMessages);
-      expect(result).toEqual(['1-3: Error message']);
-    });
-
-    it('should handle a mix of single and ranged error messages', () => {
-      const errorMessages = [
-        { chapter: 1, message: 'Error message' },
-        { chapter: 2, message: 'Error message' },
-        { chapter: 4, message: 'Another error message' }
-      ];
-      const result = DraftPreviewBooksComponent['combineErrorMessages'](errorMessages);
-      expect(result).toEqual(['1-2: Error message', '4: Another error message']);
-    });
-
-    it('should handle multiple ranges', () => {
-      const errorMessages = [
-        { chapter: 1, message: 'Error message' },
-        { chapter: 2, message: 'Error message' },
-        { chapter: 4, message: 'Another error message' },
-        { chapter: 5, message: 'Another error message' }
-      ];
-      const result = DraftPreviewBooksComponent['combineErrorMessages'](errorMessages);
-      expect(result).toEqual(['1-2: Error message', '4-5: Another error message']);
-    });
-
-    it('should handle ranges and singletons with different messages', () => {
-      const errorMessages = [
-        { chapter: 1, message: 'Error message 1' },
-        { chapter: 2, message: 'Error message 1' },
-        { chapter: 3, message: 'Error message 2' },
-        { chapter: 4, message: 'Error message 1' },
-        { chapter: 5, message: 'Error message 1' }
-      ];
-      const result = DraftPreviewBooksComponent['combineErrorMessages'](errorMessages);
-      expect(result).toEqual(['1-2: Error message 1', '3: Error message 2', '4-5: Error message 1']);
-    });
-
-    it('should handle a single error at the end of a range', () => {
-      const errorMessages = [
-        { chapter: 1, message: 'Error message 1' },
-        { chapter: 2, message: 'Error message 1' },
-        { chapter: 3, message: 'Error message 2' }
-      ];
-      const result = DraftPreviewBooksComponent['combineErrorMessages'](errorMessages);
-      expect(result).toEqual(['1-2: Error message 1', '3: Error message 2']);
-    });
-  });
-
-  function setupDialog(projectId?: string): void {
-    const mockedDialogRef: MatDialogRef<DraftApplyDialogComponent> = mock(MatDialogRef<DraftApplyDialogComponent>);
-    when(mockedDialogRef.afterClosed()).thenReturn(of(projectId ? { projectId } : undefined));
-    when(mockedDialogService.openMatDialog(DraftApplyDialogComponent, anything())).thenReturn(
-      instance(mockedDialogRef)
-    );
-  }
 });
 
 class TestEnvironment {
@@ -428,9 +115,6 @@ class TestEnvironment {
   constructor(build: BuildDto | undefined = undefined) {
     when(mockedActivatedProjectService.changes$).thenReturn(of(this.mockProjectDoc));
     when(mockedActivatedProjectService.projectDoc).thenReturn(this.mockProjectDoc);
-    when(
-      mockedDraftHandlingService.getAndApplyDraftAsync(anything(), anything(), anything(), anything())
-    ).thenResolve();
     when(mockedActivatedProjectService.projectId).thenReturn('project01');
     when(mockedUserService.currentUserId).thenReturn('user01');
     when(mockedProjectService.hasDraft(anything(), anything())).thenReturn(true);
@@ -439,20 +123,15 @@ class TestEnvironment {
     this.component = this.fixture.componentInstance;
     this.component.build = build;
     this.loader = TestbedHarnessEnvironment.loader(this.fixture);
-    this.component.draftApplyProgress$.subscribe(progress => (this.draftApplyProgress = progress));
     tick();
     this.fixture.detectChanges();
   }
 
   draftBookCount(): number {
-    return this.fixture.nativeElement.querySelectorAll('.draft-book-option').length;
+    return this.fixture.nativeElement.querySelectorAll('.draft-book-button').length;
   }
 
   getBookButtonAtIndex(index: number): HTMLElement {
-    return this.fixture.nativeElement.querySelectorAll('.draft-book-option')[index];
-  }
-
-  async moreMenuHarness(): Promise<MatMenuHarness> {
-    return await this.loader.getHarness(MatMenuHarness.with({ selector: '.book-more' }));
+    return this.fixture.nativeElement.querySelectorAll('.draft-book-button')[index];
   }
 }

From f174c6ad8326cf52197c8ce43df12ae54b765e0d Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Thu, 8 Jan 2026 07:42:53 +1300
Subject: [PATCH 09/40] SF-3633 Hide the wizard steps at the top of the dialog

---
 .../draft-import-wizard/draft-import-wizard.component.scss   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
index c1f6094a69..894c1dc0f6 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
@@ -80,4 +80,9 @@ app-sync-progress {
   mat-dialog-content {
     min-height: 400px;
   }
+
+  /* Hide the wizard headings at the top of the dialog */
+  mat-stepper .mat-horizontal-stepper-header-container {
+    display: none;
+  }
 }

From 52bedb01fa886902bdb66cce4259f338f907d06a Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 12 Jan 2026 11:35:04 +1300
Subject: [PATCH 10/40] SF-3633 Simplified download draft button, made it
 secondary

---
 .../draft-download-button.component.html      | 71 +++++++------------
 .../draft-download-button.component.ts        |  4 +-
 .../draft-history-entry.component.html        |  8 +--
 3 files changed, 30 insertions(+), 53 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-download-button/draft-download-button.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-download-button/draft-download-button.component.html
index 92e11414f9..55a8eadb79 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-download-button/draft-download-button.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-download-button/draft-download-button.component.html
@@ -1,49 +1,26 @@
 <ng-container *transloco="let t; read: 'draft_generation'">
-  @if (flat) {
-    <button
-      mat-flat-button
-      (click)="downloadDraft()"
-      [disabled]="downloadProgress > 0"
-      data-test-id="download-button"
-      color="primary"
-    >
-      @if (downloadProgress === 0) {
-        <mat-icon class="material-icons-outlined">cloud_download</mat-icon>
-      } @else if (downloadProgress > 0) {
-        <mat-icon>
-          <mat-spinner
-            diameter="18"
-            [value]="downloadProgress"
-            mode="determinate"
-            color="accent"
-            data-test-id="download-spinner"
-          ></mat-spinner>
-        </mat-icon>
-      }
-      {{ t("download_draft") }}
-    </button>
-  } @else {
-    <button
-      mat-button
-      (click)="downloadDraft()"
-      [disabled]="downloadProgress > 0"
-      data-test-id="download-button"
-      color="primary"
-    >
-      @if (downloadProgress === 0) {
-        <mat-icon>cloud_download</mat-icon>
-      } @else if (downloadProgress > 0) {
-        <mat-icon>
-          <mat-spinner
-            diameter="18"
-            [value]="downloadProgress"
-            mode="determinate"
-            color="accent"
-            data-test-id="download-spinner"
-          ></mat-spinner>
-        </mat-icon>
-      }
-      {{ t("download_draft") }}
-    </button>
-  }
+  <button
+    [matButton]="matButton"
+    (click)="downloadDraft()"
+    [disabled]="downloadProgress > 0"
+    data-test-id="download-button"
+    color="primary"
+  >
+    @if (downloadProgress === 0) {
+      <mat-icon [class]="matButton === 'filled' ? 'material-icons-outlined' : 'material-icons'">
+        cloud_download
+      </mat-icon>
+    } @else if (downloadProgress > 0) {
+      <mat-icon>
+        <mat-spinner
+          diameter="18"
+          [value]="downloadProgress"
+          mode="determinate"
+          color="accent"
+          data-test-id="download-spinner"
+        ></mat-spinner>
+      </mat-icon>
+    }
+    {{ t("download_draft") }}
+  </button>
 </ng-container>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-download-button/draft-download-button.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-download-button/draft-download-button.component.ts
index e9a9fe7a10..45b4a0c432 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-download-button/draft-download-button.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-download-button/draft-download-button.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { MatButton } from '@angular/material/button';
+import { MatButton, MatButtonAppearance } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { TranslocoModule } from '@ngneat/transloco';
@@ -26,7 +26,7 @@ export class DraftDownloadButtonComponent {
   zipSubscription?: Subscription;
 
   @Input() build: BuildDto | undefined;
-  @Input() flat: boolean = false;
+  @Input() matButton: MatButtonAppearance = 'text';
 
   constructor(
     private readonly activatedProject: ActivatedProjectService,
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
index 77a3334f8a..20fef98d8f 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
@@ -26,7 +26,7 @@
             {{ t("select_formatting_options") }}
           </p>
           <div class="formatting-options-container">
-            <button mat-flat-button class="format-usfm" [routerLink]="['format']">
+            <button matButton="filled" class="format-usfm" [routerLink]="['format']">
               <mat-icon>build</mat-icon>
               <span class="hide-lt-lg">{{ t("formatting_options") }}</span>
               <span class="hide-gt-lg">{{ t("formatting") }}</span>
@@ -48,12 +48,12 @@
               <app-draft-preview-books [build]="entry" />
             </p>
             <div class="draft-options">
-              <button mat-stroked-button class="add-to-project" (click)="openImportWizard()">
+              <button matButton="filled" class="add-to-project" (click)="openImportWizard()">
                 <mat-icon>input</mat-icon> {{ t("add_to_project") }}
               </button>
-              <app-draft-download-button [build]="entry" [flat]="true" />
+              <app-draft-download-button matButton="outlined" [build]="entry" />
               @if (formattingOptionsSupported && isLatestBuild) {
-                <button mat-button class="format-usfm" [routerLink]="['format']">
+                <button matButton class="format-usfm" [routerLink]="['format']">
                   <mat-icon>build</mat-icon> {{ t("formatting_options") }}
                 </button>
               }

From 94bed0bc82add7ba277b58abf23063422354a372 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 12 Jan 2026 12:44:54 +1300
Subject: [PATCH 11/40] SF-3633 Import dialog fixes

---
 .../draft-history-entry.component.ts          |   2 +-
 .../draft-import-wizard.component.html        | 706 +++++++++---------
 .../draft-import-wizard.component.scss        |   3 +-
 .../draft-import-wizard.component.ts          |  33 +-
 .../src/assets/i18n/non_checking_en.json      |  15 +-
 5 files changed, 408 insertions(+), 351 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
index 13afa6c0b1..b3a757279d 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
@@ -366,7 +366,7 @@ export class DraftHistoryEntryComponent {
       data: this._entry,
       width: '800px',
       maxWidth: '90vw',
-      disableClose: true
+      disableClose: false
     });
   }
 }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 570a9b94df..f08563d130 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -1,392 +1,426 @@
-<ng-container *transloco="let t; read: 'draft_import_wizard'">
-  <div mat-dialog-content>
-    <mat-stepper linear [disableRipple]="true" labelPosition="bottom" (selectionChange)="onStepSelectionChange($event)">
-      <!-- Icon overrides -->
-      <ng-template matStepperIcon="edit" let-index="index">{{ index + 1 }}</ng-template>
+<mat-dialog-content *transloco="let t; read: 'draft_import_wizard'">
+  <mat-stepper linear [disableRipple]="true" labelPosition="bottom" (selectionChange)="onStepSelectionChange($event)">
+    <!-- Icon overrides -->
+    <ng-template matStepperIcon="edit" let-index="index">{{ index + 1 }}</ng-template>
+
+    <!-- Step 1: Project Selection -->
+    <mat-step
+      [stepControl]="projectSelectionForm"
+      [completed]="projectSelectionForm.valid"
+      [editable]="!isConnecting && !isImporting"
+    >
+      <ng-template matStepLabel>{{ t("select_project") }}</ng-template>
+
+      <h1>{{ t("select_project") }}</h1>
+      <p>{{ t("select_project_description") }}</p>
+
+      @if (isLoadingProjects) {
+        <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
+      }
 
-      <!-- Step 1: Project Selection -->
-      <mat-step
-        [stepControl]="projectSelectionForm"
-        [completed]="projectSelectionForm.valid"
-        [editable]="!isConnecting && !isImporting"
-      >
-        <ng-template matStepLabel>{{ t("select_project") }}</ng-template>
+      <form [formGroup]="projectSelectionForm">
+        @if (!isLoadingProjects && !projectLoadingFailed) {
+          <app-project-select
+            [projects]="projects"
+            [placeholder]="t('choose_project')"
+            [isDisabled]="projects.length === 0 || isImporting || projectLoadingFailed"
+            [invalidMessageMapper]="invalidMessageMapper"
+            (projectSelect)="projectSelected($event.paratextId)"
+            formControlName="targetParatextId"
+          ></app-project-select>
+
+          @if (isLoadingProject) {
+            <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
+          }
+        }
 
-        <h1>{{ t("select_project") }}</h1>
-        <p>{{ t("select_project_description") }}</p>
+        @if (projectLoadingFailed) {
+          <app-notice type="error">{{ t("failed_to_load_projects") }}</app-notice>
+          <div class="project-retry-row">
+            <button matButton="outlined" color="primary" (click)="reloadProjects()" [disabled]="isLoadingProjects">
+              <mat-icon>refresh</mat-icon>
+              {{ t("retry") }}
+            </button>
+          </div>
+        }
 
-        @if (isLoadingProjects) {
-          <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
+        @if (!isAppOnline) {
+          <mat-error class="offline-message">{{ t("connect_to_the_internet") }}</mat-error>
         }
 
-        <form [formGroup]="projectSelectionForm">
-          @if (!isLoadingProjects && !projectLoadingFailed) {
-            <app-project-select
-              [projects]="projects"
-              [placeholder]="t('choose_project')"
-              [isDisabled]="projects.length === 0 || isImporting || projectLoadingFailed"
-              [invalidMessageMapper]="invalidMessageMapper"
-              (projectSelect)="projectSelected($event.paratextId)"
-              formControlName="targetParatextId"
-            ></app-project-select>
-
-            @if (isLoadingProject) {
-              <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
-            }
-          }
+        @if (noDraftsAvailable) {
+          <app-notice type="warning">{{ t("no_books_ready_for_import") }}</app-notice>
+        }
 
-          @if (projectLoadingFailed) {
-            <app-notice type="error">{{ t("failed_to_load_projects") }}</app-notice>
-            <div class="project-retry-row">
-              <button mat-stroked-button color="primary" (click)="reloadProjects()" [disabled]="isLoadingProjects">
-                <mat-icon>refresh</mat-icon>
-                {{ t("retry") }}
-              </button>
-            </div>
-          }
+        @if (projectSelectionForm.valid && !isLoadingProject && (targetProject$ | async); as project) {
+          <app-notice [icon]="'verified'">
+            {{ t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name }) }}
+          </app-notice>
+        }
 
-          @if (!isAppOnline) {
-            <mat-error class="offline-message">{{ t("connect_to_the_internet") }}</mat-error>
-          }
+        @if (bookCreationError != null) {
+          <app-notice type="error">{{ bookCreationError }}</app-notice>
+        }
+      </form>
+
+      <div class="button-strip">
+        <button matButton="text" (click)="cancel()" [disabled]="isImporting">
+          <mat-icon>close</mat-icon>
+          {{ t("cancel") }}
+        </button>
+        <button
+          matButton="filled"
+          color="primary"
+          (click)="advanceFromProjectSelection()"
+          [disabled]="
+            !projectSelectionForm.valid ||
+            isConnecting ||
+            isImporting ||
+            isLoadingProject ||
+            noDraftsAvailable ||
+            projectLoadingFailed ||
+            booksMissingWithoutPermission
+          "
+        >
+          {{ needsConnection || showBookSelection || showOverwriteConfirmation ? t("next") : t("import") }}
+          <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+        </button>
+      </div>
+    </mat-step>
+
+    <!-- Step 2: Connect Confirmation (conditional) -->
+    @if (needsConnection) {
+      <mat-step
+        [completed]="!needsConnection || isConnecting || connectionError == null"
+        [editable]="!isConnecting && !isImporting"
+      >
+        <ng-template matStepLabel>{{ t("connect_project") }}</ng-template>
 
-          @if (noDraftsAvailable) {
-            <app-notice type="warning">{{ t("no_books_ready_for_import") }}</app-notice>
-          }
+        <h1>{{ t("connect_to_project") }}</h1>
 
-          @if (projectSelectionForm.valid && !isLoadingProject && (targetProject$ | async); as project) {
-            <app-notice [icon]="'verified'">
-              {{ t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name }) }}
-            </app-notice>
-          }
+        @if (selectedParatextProject != null) {
+          <p
+            [innerHtml]="
+              i18n.translateAndInsertTags('draft_import_wizard.connect_project_description', {
+                projectShortName: selectedParatextProject.shortName,
+                projectName: selectedParatextProject.name
+              })
+            "
+          ></p>
+        }
 
-          @if (bookCreationError != null) {
-            <app-notice type="error">{{ bookCreationError }}</app-notice>
-          }
-        </form>
+        @if (connectionError != null) {
+          <app-notice type="error">{{ connectionError }}</app-notice>
+        }
 
         <div class="button-strip">
-          <button mat-stroked-button (click)="cancel()" [disabled]="isImporting">
-            <mat-icon>close</mat-icon>
-            {{ t("cancel") }}
+          <button matButton="outlined" matStepperPrevious [disabled]="isConnecting || isImporting">
+            <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+            {{ t("back") }}
           </button>
           <button
-            mat-flat-button
+            matButton="filled"
             color="primary"
-            (click)="advanceFromProjectSelection()"
-            [disabled]="
-              !projectSelectionForm.valid ||
-              isConnecting ||
-              isImporting ||
-              isLoadingProject ||
-              noDraftsAvailable ||
-              projectLoadingFailed ||
-              booksMissingWithoutPermission
-            "
+            (click)="connectToProject()"
+            [disabled]="isConnecting || isImporting || connectionError != null"
           >
-            {{ t("next") }}
+            {{ t("connect") }}
             <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
           </button>
         </div>
       </mat-step>
 
-      <!-- Step 2: Connect Confirmation (conditional) -->
-      @if (needsConnection) {
-        <mat-step
-          [completed]="!needsConnection || isConnecting || connectionError == null"
-          [editable]="!isConnecting && !isImporting"
-        >
-          <ng-template matStepLabel>{{ t("connect_project") }}</ng-template>
-
-          <h1>{{ t("connect_to_project") }}</h1>
-
-          @if (selectedParatextProject != null) {
-            <p>
-              {{
-                t("connect_project_description", {
-                  projectShortName: selectedParatextProject.shortName,
-                  projectName: selectedParatextProject.name
-                })
-              }}
-            </p>
-          }
-
-          @if (connectionError != null) {
-            <app-notice type="error">{{ connectionError }}</app-notice>
-          }
-
-          <div class="button-strip">
-            <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
-              <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
-              {{ t("back") }}
-            </button>
-            <button
-              mat-flat-button
-              color="primary"
-              (click)="connectToProject()"
-              [disabled]="isConnecting || isImporting || connectionError != null"
-            >
-              {{ t("connect") }}
-              <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
-            </button>
-          </div>
-        </mat-step>
-
-        <!-- Step 3: Connecting (conditional) -->
-        <mat-step [completed]="!isConnecting && connectionError == null" [editable]="!isConnecting && !isImporting">
-          <ng-template matStepLabel>{{ t("connecting") }}</ng-template>
-
-          @if (isConnecting) {
-            <h1>{{ t("connecting_to_project") }}</h1>
-            @if (targetProjectDoc$ | async; as projectDoc) {
-              <app-sync-progress
-                [projectDoc]="$any(projectDoc)"
-                (inProgress)="updateConnectStatus($event)"
-              ></app-sync-progress>
-            } @else {
-              <p>{{ t("setting_up_project") }}</p>
-              <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
-            }
-          }
+      <!-- Step 3: Connecting (conditional) -->
+      <mat-step [completed]="!isConnecting && connectionError == null" [editable]="!isConnecting && !isImporting">
+        <ng-template matStepLabel>{{ t("connecting") }}</ng-template>
 
-          @if (connectionError != null) {
-            <h1>{{ t("connection_failed") }}</h1>
-            <app-notice type="error">{{ connectionError }}</app-notice>
-            <div class="button-strip">
-              <button mat-stroked-button matStepperPrevious [disabled]="isImporting">
-                <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
-                {{ t("back") }}
-              </button>
-              <button mat-flat-button color="primary" (click)="retryProjectConnection()" [disabled]="isImporting">
-                <mat-icon>refresh</mat-icon>
-                {{ t("retry") }}
-              </button>
-            </div>
-          } @else if (!isConnecting) {
-            <h1>{{ t("connected_to_project") }}</h1>
-            @if (targetProject$ | async; as project) {
-              <app-notice [icon]="'verified'">
-                {{
-                  t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name })
-                }}
-              </app-notice>
-            }
-            <div class="button-strip">
-              <button mat-stroked-button matStepperPrevious [disabled]="isImporting">
-                <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
-                {{ t("back") }}
-              </button>
-              <button mat-flat-button matStepperNext color="primary" [disabled]="isImporting">
-                {{ t("next") }}
-                <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
-              </button>
-            </div>
+        @if (isConnecting) {
+          <h1>{{ t("connecting_to_project") }}</h1>
+          @if (targetProjectDoc$ | async; as projectDoc) {
+            <app-sync-progress
+              [projectDoc]="$any(projectDoc)"
+              (inProgress)="updateConnectStatus($event)"
+            ></app-sync-progress>
+          } @else {
+            <p>{{ t("setting_up_project", { projectName: selectedParatextProject?.name }) }}</p>
+            <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
           }
-        </mat-step>
-      }
-
-      <!-- Step 4: Book Selection (conditional - only if multiple books) -->
-      @if (showBookSelection) {
-        <mat-step [completed]="selectedBooks.length > 0" [editable]="!isConnecting && !isImporting">
-          <ng-template matStepLabel>{{ t("select_books") }}</ng-template>
-
-          <h1>{{ t("select_books_to_import") }}</h1>
-          <app-book-multi-select
-            [availableBooks]="availableBooksForImport"
-            [selectedBooks]="selectedBooks"
-            [basicMode]="true"
-            [readonly]="isImporting || noDraftsAvailable"
-            (bookSelect)="onBookSelect($event)"
-          ></app-book-multi-select>
+        }
 
+        @if (connectionError != null) {
+          <h1>{{ t("connection_failed") }}</h1>
+          <app-notice type="error">{{ connectionError }}</app-notice>
           <div class="button-strip">
-            <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
+            <button matButton="outlined" matStepperPrevious [disabled]="isImporting">
               <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
               {{ t("back") }}
             </button>
-            <button
-              mat-flat-button
-              color="primary"
-              matStepperNext
-              [disabled]="selectedBooks.length === 0 || isConnecting || isImporting || noDraftsAvailable"
-            >
-              {{ showOverwriteConfirmation ? t("next") : t("import") }}
-              <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+            <button matButton="filled" color="primary" (click)="retryProjectConnection()" [disabled]="isImporting">
+              <mat-icon>refresh</mat-icon>
+              {{ t("retry") }}
             </button>
           </div>
-        </mat-step>
-      }
-
-      <!-- Step 5: Overwrite Confirmation (conditional - shows appropriate variant) -->
-      @if (showOverwriteConfirmation) {
-        <mat-step
-          [stepControl]="overwriteForm"
-          [completed]="overwriteForm.valid"
-          [editable]="!isConnecting && !isImporting"
-        >
-          <ng-template matStepLabel>{{ t("confirm_overwrite") }}</ng-template>
-
-          @if (booksWithExistingText.length === 1) {
-            <!-- Single book variant -->
-            <h1>{{ t("overwrite_book_question", { bookName: singleBookName }) }}</h1>
-            <p>
-              {{
-                t("overwrite_book_description", {
-                  bookName: singleBookName,
-                  numChapters: booksWithExistingText[0].chaptersWithText.length
-                })
-              }}
-            </p>
-          } @else {
-            <!-- Multiple books variant -->
-            <h1>{{ t("overwrite_books_question") }}</h1>
-            <p>{{ t("overwrite_books_description") }}</p>
-            <ul>
-              @for (book of booksWithExistingText; track book.bookNum) {
-                <li>{{ book.bookName }}: {{ t("num_chapters", { count: book.chaptersWithText.length }) }}</li>
-              }
-            </ul>
-          }
-
-          @if (isConnecting || isImporting) {
-            <app-notice type="info">
-              {{ isConnecting ? t("waiting_for_connection_to_finish") : t("waiting_for_import_to_finish") }}
+        } @else if (!isConnecting) {
+          <h1>{{ t("connected_to_project") }}</h1>
+          @if (targetProject$ | async; as project) {
+            <app-notice [icon]="'verified'">
+              {{ t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name }) }}
             </app-notice>
-            <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
           }
-
-          <form [formGroup]="overwriteForm">
-            <mat-checkbox formControlName="confirmOverwrite">
-              {{ t("i_understand_overwrite_content") }}
-            </mat-checkbox>
-          </form>
-
           <div class="button-strip">
-            <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
+            <button matButton="outlined" matStepperPrevious [disabled]="isImporting">
               <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
               {{ t("back") }}
             </button>
-            <button
-              mat-flat-button
-              color="primary"
-              matStepperNext
-              [disabled]="!overwriteForm.valid || isConnecting || isImporting"
-            >
-              {{ t("import") }}
+            <button matButton="filled" matStepperNext color="primary" [disabled]="isImporting">
+              {{ showBookSelection || showOverwriteConfirmation ? t("next") : t("import") }}
               <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
             </button>
           </div>
-        </mat-step>
-      }
+        }
+      </mat-step>
+    }
+
+    <!-- Step 4: Book Selection (conditional - only if multiple books) -->
+    @if (showBookSelection) {
+      <mat-step [completed]="selectedBooks.length > 0" [editable]="!isConnecting && !isImporting">
+        <ng-template matStepLabel>{{ t("select_books") }}</ng-template>
+
+        <h1>{{ t("select_books_to_import") }}</h1>
+        <app-book-multi-select
+          [availableBooks]="availableBooksForImport"
+          [selectedBooks]="selectedBooks"
+          [basicMode]="true"
+          [readonly]="isImporting || noDraftsAvailable"
+          (bookSelect)="onBookSelect($event)"
+        ></app-book-multi-select>
+
+        <div class="button-strip">
+          <button matButton="outlined" matStepperPrevious [disabled]="isConnecting || isImporting">
+            <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+            {{ t("back") }}
+          </button>
+          <button
+            matButton="filled"
+            color="primary"
+            matStepperNext
+            [disabled]="selectedBooks.length === 0 || isConnecting || isImporting || noDraftsAvailable"
+          >
+            {{ showOverwriteConfirmation ? t("next") : t("import") }}
+            <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+          </button>
+        </div>
+      </mat-step>
+    }
 
-      <!-- Step 6: Import Progress -->
+    <!-- Step 5: Overwrite Confirmation (conditional - shows appropriate variant) -->
+    @if (showOverwriteConfirmation) {
       <mat-step
-        #importStep
-        [completed]="importComplete"
-        [editable]="!isConnecting && !isImporting && (!showOverwriteConfirmation || overwriteForm.valid)"
+        [stepControl]="overwriteForm"
+        [completed]="overwriteForm.valid"
+        [editable]="!isConnecting && !isImporting"
       >
-        <ng-template matStepLabel>{{ t("importing") }}</ng-template>
-
-        <h1>{{ t("importing_draft") }}</h1>
-
-        @if (isImporting || importComplete || importError != null) {
-          @for (progress of importProgress; track progress.bookNum) {
-            <div class="book-progress">
-              <p>{{ progress.bookName }}</p>
-              <mat-progress-bar
-                mode="determinate"
-                [value]="(progress.completedChapters.length / progress.totalChapters) * 100"
-              ></mat-progress-bar>
-              <span class="progress-text">
-                {{ progress.completedChapters.length }} / {{ progress.totalChapters }} {{ t("chapters") }}
-              </span>
-              @if (progress.failedChapters.length > 0 && !isImporting) {
-                <div class="failed-chapters">
-                  <mat-icon class="error-icon">error</mat-icon>
-                  <span>Failed: {{ getFailedChapters(progress) }}</span>
-                </div>
-              }
-            </div>
-          }
+        <ng-template matStepLabel>{{ t("confirm_overwrite") }}</ng-template>
+
+        @if (booksWithExistingText.length === 1) {
+          <!-- Single book variant -->
+          <h1>{{ t("overwrite_book_question", { bookName: singleBookName }) }}</h1>
+          <p
+            [innerHTML]="
+              i18n.translateAndInsertTags('draft_import_wizard.overwrite_book_description', {
+                bookName: singleBookName,
+                numChapters: booksWithExistingText[0].chaptersWithText.length,
+                projectShortName: selectedParatextProject?.shortName,
+                projectName: selectedParatextProject?.name
+              })
+            "
+          ></p>
+        } @else {
+          <!-- Multiple books variant -->
+          <h1>{{ t("overwrite_books_question") }}</h1>
+          <p
+            [innerHTML]="
+              i18n.translateAndInsertTags('draft_import_wizard.overwrite_books_description', {
+                projectShortName: selectedParatextProject?.shortName,
+                projectName: selectedParatextProject?.name
+              })
+            "
+          ></p>
+          <ul>
+            @for (book of booksWithExistingText; track book.bookNum) {
+              <li>{{ book.bookName }}: {{ t("num_chapters", { count: book.chaptersWithText.length }) }}</li>
+            }
+          </ul>
         }
 
-        @if (importError != null) {
-          <app-notice type="error">{{ importError }}</app-notice>
-          <div class="button-strip">
-            <button mat-stroked-button matStepperPrevious [disabled]="isConnecting || isImporting">
-              <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
-              {{ t("back") }}
-            </button>
-            <button mat-stroked-button (click)="retryImport()" [disabled]="isImporting">
-              <mat-icon>refresh</mat-icon>
-              {{ t("retry") }}
-            </button>
-          </div>
+        @if (isConnecting || isImporting) {
+          <app-notice type="info">
+            {{ isConnecting ? t("waiting_for_connection_to_finish") : t("waiting_for_import_to_finish") }}
+          </app-notice>
+          <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
         }
 
-        @if (importComplete) {
-          <app-notice [icon]="'check_circle'" type="success">{{ t("import_complete") }}</app-notice>
-          <div class="button-strip align-end">
-            <button mat-flat-button color="primary" matStepperNext [disabled]="isConnecting || isImporting">
-              {{ t("next") }}
-              <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
-            </button>
+        <form [formGroup]="overwriteForm">
+          <mat-checkbox formControlName="confirmOverwrite">
+            {{ t("i_understand_overwrite_content") }}
+          </mat-checkbox>
+        </form>
+
+        <div class="button-strip">
+          <button matButton="outlined" matStepperPrevious [disabled]="isConnecting || isImporting">
+            <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+            {{ t("back") }}
+          </button>
+          <button
+            matButton="filled"
+            color="primary"
+            matStepperNext
+            [disabled]="!overwriteForm.valid || isConnecting || isImporting"
+          >
+            {{ t("import") }}
+            <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+          </button>
+        </div>
+      </mat-step>
+    }
+
+    <!-- Step 6: Import Progress -->
+    <mat-step
+      #importStep
+      [completed]="importComplete"
+      [editable]="!isConnecting && !isImporting && (!showOverwriteConfirmation || overwriteForm.valid)"
+    >
+      <ng-template matStepLabel>{{ t("importing") }}</ng-template>
+
+      <h1>{{ t("importing_draft") }}</h1>
+
+      @if (isImporting || importComplete || importError != null) {
+        @for (progress of importProgress; track progress.bookNum) {
+          <div class="book-progress">
+            <p>{{ progress.bookName }}</p>
+            <mat-progress-bar
+              mode="determinate"
+              [value]="(progress.completedChapters.length / progress.totalChapters) * 100"
+            ></mat-progress-bar>
+            <span class="progress-text">
+              {{ progress.completedChapters.length }} / {{ progress.totalChapters }} {{ t("chapters") }}
+            </span>
+            @if (progress.failedChapters.length > 0 && !isImporting) {
+              <div class="failed-chapters">
+                <mat-icon class="error-icon">error</mat-icon>
+                <span>Failed: {{ getFailedChapters(progress) }}</span>
+              </div>
+            }
           </div>
         }
-      </mat-step>
+      }
+
+      @if (importError != null) {
+        <app-notice type="error">{{ importError }}</app-notice>
+        <div class="button-strip">
+          <button matButton="outlined" matStepperPrevious [disabled]="isConnecting || isImporting">
+            <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
+            {{ t("back") }}
+          </button>
+          <button matButton="outlined" (click)="retryImport()" [disabled]="isImporting">
+            <mat-icon>refresh</mat-icon>
+            {{ t("retry") }}
+          </button>
+        </div>
+      }
 
-      <!-- Step 7: Sync Confirmation and Completion -->
-      <mat-step [completed]="syncComplete || skipSync" [editable]="!isConnecting && !isImporting && !isSyncing">
-        <ng-template matStepLabel>{{ t("complete") }}</ng-template>
+      @if (importComplete) {
+        <app-notice [icon]="'check_circle'" type="success">{{ t("import_complete") }}</app-notice>
+        <div class="button-strip align-end">
+          <button matButton="filled" color="primary" matStepperNext [disabled]="isConnecting || isImporting">
+            {{ t("next") }}
+            <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
+          </button>
+        </div>
+      }
+    </mat-step>
+
+    <!-- Step 7: Sync Confirmation and Completion -->
+    <mat-step [completed]="syncComplete || skipSync" [editable]="!isConnecting && !isImporting && !isSyncing">
+      <ng-template matStepLabel>{{ t("complete") }}</ng-template>
+
+      @if (!isSyncing && !syncComplete && !skipSync) {
+        <h1>{{ t("sync_project_question") }}</h1>
+        <p
+          [innerHtml]="
+            i18n.translateAndInsertTags('draft_import_wizard.sync_project_description', {
+              projectShortName: selectedParatextProject?.shortName,
+              projectName: selectedParatextProject?.name
+            })
+          "
+        ></p>
 
-        @if (!isSyncing && !syncComplete && !skipSync) {
-          <h1>{{ t("sync_project_question") }}</h1>
-          <p>{{ t("sync_project_description") }}</p>
+        <div class="button-strip">
+          <button matButton="outlined" (click)="selectSkipSync()" [disabled]="isSyncing || isImporting">
+            {{ t("skip_sync") }}
+          </button>
+          <button matButton="filled" color="primary" (click)="selectSync()" [disabled]="isSyncing || isImporting">
+            {{ t("sync") }}
+            <mat-icon iconPositionEnd>sync</mat-icon>
+          </button>
+        </div>
+      }
 
-          <div class="button-strip">
-            <button mat-stroked-button (click)="selectSkipSync()" [disabled]="isSyncing || isImporting">
-              {{ t("skip_sync") }}
-            </button>
-            <button mat-flat-button color="primary" (click)="selectSync()" [disabled]="isSyncing || isImporting">
-              {{ t("sync") }}
-              <mat-icon iconPositionEnd>sync</mat-icon>
-            </button>
-          </div>
+      @if (isSyncing) {
+        <h1>{{ t("syncing_project") }}</h1>
+        @if (targetProjectDoc$ | async; as projectDoc) {
+          <app-sync-progress
+            [projectDoc]="$any(projectDoc)"
+            (inProgress)="updateSyncStatus($event)"
+          ></app-sync-progress>
         }
+      }
 
-        @if (isSyncing) {
-          <h1>{{ t("syncing_project") }}</h1>
-          @if (targetProjectDoc$ | async; as projectDoc) {
-            <app-sync-progress
-              [projectDoc]="$any(projectDoc)"
-              (inProgress)="updateSyncStatus($event)"
-            ></app-sync-progress>
-          }
-        }
+      @if (syncError != null) {
+        <h1>{{ t("sync") }}</h1>
+        <app-notice type="error">{{ syncError }}</app-notice>
+        <div class="button-strip">
+          <button matButton="outlined" (click)="selectSkipSync()" [disabled]="isImporting">
+            {{ t("skip_sync") }}
+          </button>
+          <button matButton="filled" color="primary" (click)="retrySync()" [disabled]="isImporting">
+            <mat-icon>refresh</mat-icon>
+            {{ t("retry") }}
+          </button>
+        </div>
+      }
 
-        @if (syncError != null) {
-          <app-notice type="error">{{ syncError }}</app-notice>
-          <div class="button-strip">
-            <button mat-stroked-button (click)="selectSkipSync()" [disabled]="isImporting">
-              {{ t("skip_sync") }}
-            </button>
-            <button mat-flat-button color="primary" (click)="retrySync()" [disabled]="isImporting">
-              <mat-icon>refresh</mat-icon>
-              {{ t("retry") }}
-            </button>
-          </div>
+      @if (syncComplete || skipSync) {
+        <h1>{{ t("complete") }}</h1>
+        @if (skipSync) {
+          <p
+            [innerHtml]="
+              i18n.translateAndInsertTags('draft_import_wizard.import_complete_no_sync', {
+                projectShortName: selectedParatextProject?.shortName,
+                projectName: selectedParatextProject?.name
+              })
+            "
+          ></p>
+        } @else {
+          <p
+            [innerHtml]="
+              i18n.translateAndInsertTags('draft_import_wizard.import_and_sync_complete', {
+                projectShortName: selectedParatextProject?.shortName,
+                projectName: selectedParatextProject?.name
+              })
+            "
+          ></p>
+          <p>
+            <b>{{ t("import_and_sync_complete_reminder") }}</b>
+          </p>
         }
 
-        @if (syncComplete || skipSync) {
-          <app-notice [icon]="'check_circle'" type="success">
-            {{ skipSync ? t("import_complete_no_sync") : t("import_and_sync_complete") }}
-          </app-notice>
-          <div class="button-strip align-end">
-            <button mat-flat-button color="primary" (click)="close()" [disabled]="isImporting || isSyncing">
-              {{ t("done") }}
-            </button>
-          </div>
-        }
-      </mat-step>
-    </mat-stepper>
-  </div>
-</ng-container>
+        <div class="button-strip align-end">
+          <button matButton="filled" color="primary" (click)="close()" [disabled]="isImporting || isSyncing">
+            {{ t("done") }}
+          </button>
+        </div>
+      }
+    </mat-step>
+  </mat-stepper>
+</mat-dialog-content>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
index 894c1dc0f6..b58a465fef 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
@@ -78,7 +78,8 @@ app-sync-progress {
 
 ::ng-deep {
   mat-dialog-content {
-    min-height: 400px;
+    /* Use the same text color as the main application body, not the lighter dialog text color */
+    color: var(--mat-sidenav-content-text-color, var(--mat-sys-on-background)) !important;
   }
 
   /* Hide the wizard headings at the top of the dialog */
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index d48494b6b2..083a905ec9 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -134,8 +134,16 @@ export class DraftImportWizardComponent implements OnInit {
   noDraftsAvailable = false;
 
   // Step 2-3: Project connection (conditional)
+  private _isConnecting = false;
+  public get isConnecting(): boolean {
+    return this._isConnecting;
+  }
+  public set isConnecting(value: boolean) {
+    this.dialogRef.disableClose = value;
+    this._isConnecting = value;
+  }
+
   needsConnection = false;
-  isConnecting = false;
   connectionError?: string;
 
   async connectToProject(skipStepperAdvance: boolean = false): Promise<void> {
@@ -235,7 +243,10 @@ export class DraftImportWizardComponent implements OnInit {
   }
 
   updateSyncStatus(inProgress: boolean): void {
-    if (!inProgress) this.syncComplete = true;
+    if (!inProgress && this.isSyncing) {
+      this.isSyncing = false;
+      this.syncComplete = true;
+    }
   }
 
   onStepSelectionChange(event: StepperSelectionEvent): void {
@@ -260,7 +271,15 @@ export class DraftImportWizardComponent implements OnInit {
   booksWithExistingText: { bookNum: number; bookName: string; chaptersWithText: number[] }[] = [];
 
   // Step 6: Import progress
-  isImporting = false;
+  private _isImporting = false;
+  public get isImporting(): boolean {
+    return this._isImporting;
+  }
+  public set isImporting(value: boolean) {
+    this.dialogRef.disableClose = value;
+    this._isImporting = value;
+  }
+
   importProgress: ImportProgress[] = [];
   importError?: string;
   importComplete = false;
@@ -440,6 +459,9 @@ export class DraftImportWizardComponent implements OnInit {
         if (projectDoc.data != null) {
           await this.analyzeTargetProject(projectDoc.data, paratextProject.isConnected);
         }
+
+        // Analyze books for overwrite confirmation
+        await this.analyzeBooksForOverwrite();
       } finally {
         this.isLoadingProject = false;
       }
@@ -775,15 +797,14 @@ export class DraftImportWizardComponent implements OnInit {
   private async performSync(): Promise<void> {
     if (this.targetProjectId == null) return;
 
-    this.isSyncing = true;
     this.syncError = undefined;
 
     try {
-      await this.projectService.onlineSync(this.targetProjectId);
       this.stepper?.next();
+      await this.projectService.onlineSync(this.targetProjectId);
+      this.isSyncing = true;
     } catch (error) {
       this.syncError = error instanceof Error ? error.message : 'Sync failed';
-    } finally {
       this.isSyncing = false;
     }
   }
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
index 0b532af509..9b8ec2809e 100644
--- 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
@@ -322,7 +322,7 @@
     "choose_project": "Choose a project",
     "complete": "Complete",
     "confirm_overwrite": "Confirm overwrite",
-    "connect_project_description": "The project you selected, {{ projectShortName }} - {{ projectName }}, has not yet been connected in Scripture Forge. Do you want to connect it so you can import the draft to it?",
+    "connect_project_description": "The selected project {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} has not yet been connected in Scripture Forge. Do you want to connect it so you can import the draft to it?",
     "connect_project": "Connect project",
     "connect_to_project": "Connect to project",
     "connect_to_the_internet": "Connect to the internet to import drafts",
@@ -337,8 +337,9 @@
     "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again.",
     "i_understand_overwrite_content": "I understand that existing content will be overwritten",
     "import": "Import",
-    "import_and_sync_complete": "Import and sync complete! Your draft has been added to the project.",
-    "import_complete_no_sync": "Import complete! Your draft has been added to the project.",
+    "import_and_sync_complete": "The draft has been imported to {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} with Paratext and synced with Paratext.",
+    "import_and_sync_complete_reminder": "Please remember to do a Send/Receive in Paratext to see the draft.",
+    "import_complete_no_sync": "Make sure to sync {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} in Scripture Forge, then do a Send/Receive in Paratext to make the draft available in Paratext.",
     "import_complete": "Import complete",
     "importing_draft": "Importing draft",
     "importing": "Importing",
@@ -346,21 +347,21 @@
     "no_books_ready_for_import": "No draft chapters are ready for import. Generate a draft and try again.",
     "no_write_permissions": "You do not have write permissions for the selected book(s)",
     "num_chapters": "{{ count }} chapters",
-    "overwrite_book_description": "{{ bookName }} has {{ numChapters }} chapters with existing text that will be overwritten.",
+    "overwrite_book_description": "{{ bookName }} in {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} has {{ numChapters }} chapters with existing text that will be overwritten.",
     "overwrite_book_question": "Overwrite {{ bookName }}?",
-    "overwrite_books_description": "The following books have chapters with existing text that will be overwritten:",
+    "overwrite_books_description": "The following books in {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} have chapters with existing text that will be overwritten:",
     "overwrite_books_question": "Overwrite books?",
     "please_select_valid_project": "Please select a valid project",
     "project_context_unavailable": "Project context unavailable. Please close the wizard and try again.",
     "ready_to_import": "Ready to import draft to “{{ projectShortName }} - {{ projectName }}”",
     "retry": "Retry",
-    "setting_up_project": "Setting up the project...",
+    "setting_up_project": "Setting up {{ projectName }}...",
     "select_books_to_import": "Select books to import",
     "select_books": "Select books",
     "select_project": "Select project",
     "select_project_description": "Please select the project you want to add the draft to.",
     "skip_sync": "Skip sync",
-    "sync_project_description": "It is recommended to sync the project to save your changes to Paratext.",
+    "sync_project_description": "It is recommended to sync {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} to save your changes to Paratext.",
     "sync_project_question": "Sync project now?",
     "sync": "Sync",
     "syncing_project": "Syncing project",

From dc0bffe3bc464edb1e8618199464fa929a9d0016 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 14 Jan 2026 12:07:06 +1300
Subject: [PATCH 12/40] SF-3633 Allow clicking next before the project is
 selected

---
 .../draft-import-wizard.component.html        | 21 ++++++------------
 .../draft-import-wizard.component.ts          | 22 ++++++++++++++-----
 .../src/assets/i18n/non_checking_en.json      |  3 ++-
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index f08563d130..fdf6e73c82 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -61,6 +61,12 @@ <h1>{{ t("select_project") }}</h1>
         @if (bookCreationError != null) {
           <app-notice type="error">{{ bookCreationError }}</app-notice>
         }
+
+        @if (cannotAdvanceFromProjectSelection && !projectReadyToImport) {
+          <app-notice type="error" icon="error">{{
+            !projectSelectionForm.valid ? t("select_project_description") : t("waiting_for_project_to_load")
+          }}</app-notice>
+        }
       </form>
 
       <div class="button-strip">
@@ -68,20 +74,7 @@ <h1>{{ t("select_project") }}</h1>
           <mat-icon>close</mat-icon>
           {{ t("cancel") }}
         </button>
-        <button
-          matButton="filled"
-          color="primary"
-          (click)="advanceFromProjectSelection()"
-          [disabled]="
-            !projectSelectionForm.valid ||
-            isConnecting ||
-            isImporting ||
-            isLoadingProject ||
-            noDraftsAvailable ||
-            projectLoadingFailed ||
-            booksMissingWithoutPermission
-          "
-        >
+        <button matButton="filled" color="primary" (click)="advanceFromProjectSelection()">
           {{ needsConnection || showBookSelection || showOverwriteConfirmation ? t("next") : t("import") }}
           <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
         </button>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 083a905ec9..f10156774d 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -132,6 +132,7 @@ export class DraftImportWizardComponent implements OnInit {
   projectLoadingFailed = false;
   private sourceProjectId?: string;
   noDraftsAvailable = false;
+  cannotAdvanceFromProjectSelection = false;
 
   // Step 2-3: Project connection (conditional)
   private _isConnecting = false;
@@ -587,13 +588,24 @@ export class DraftImportWizardComponent implements OnInit {
     void this.validateProject();
   }
 
-  async advanceFromProjectSelection(): Promise<void> {
-    if (!this.projectSelectionForm.valid) {
-      return;
-    }
+  get projectReadyToImport(): boolean {
+    return (
+      this.projectSelectionForm.valid &&
+      !this.isConnecting &&
+      !this.isImporting &&
+      !this.isLoadingProject &&
+      !this.noDraftsAvailable &&
+      !this.projectLoadingFailed &&
+      !this.booksMissingWithoutPermission
+    );
+  }
 
-    if (this.noDraftsAvailable) {
+  async advanceFromProjectSelection(): Promise<void> {
+    if (!this.projectReadyToImport) {
+      this.cannotAdvanceFromProjectSelection = true;
       return;
+    } else {
+      this.cannotAdvanceFromProjectSelection = false;
     }
 
     // If project needs connection, advance to connection step (targetProjectId may be undefined)
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
index 9b8ec2809e..62e7700492 100644
--- 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
@@ -366,7 +366,8 @@
     "sync": "Sync",
     "syncing_project": "Syncing project",
     "waiting_for_connection_to_finish": "Please wait while the project finishes connecting.",
-    "waiting_for_import_to_finish": "Please wait until the current import finishes."
+    "waiting_for_import_to_finish": "Please wait until the current import finishes.",
+    "waiting_for_project_to_load": "Please wait for the project to load before proceeding."
   },
   "draft_preview_books": {
     "add_to_project": "Add to project",

From fa1219963cfd70d9ea03238f77afd40d9d05e095 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 14 Jan 2026 14:59:52 +1300
Subject: [PATCH 13/40] SF-3633 Work on the storybook, and fixes found when
 using it

---
 .../draft-import-wizard-component.spec.ts     |  67 ++++++++
 .../draft-import-wizard.component.html        |   9 +-
 .../draft-import-wizard.component.ts          |   2 -
 .../draft-import-wizard.stories.ts            | 153 ++++++++++++++++++
 4 files changed, 227 insertions(+), 4 deletions(-)
 create mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
 create mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
new file mode 100644
index 0000000000..b1bc3002ce
--- /dev/null
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
@@ -0,0 +1,67 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { provideNoopAnimations } from '@angular/platform-browser/animations';
+import { mock } from 'ts-mockito';
+import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { I18nService } from 'xforge-common/i18n.service';
+import { OnlineStatusService } from 'xforge-common/online-status.service';
+import { provideTestOnlineStatus } from 'xforge-common/test-online-status-providers';
+import { TestOnlineStatusService } from 'xforge-common/test-online-status.service';
+import { configureTestingModule, getTestTranslocoModule } from 'xforge-common/test-utils';
+import { ParatextService } from '../../../core/paratext.service';
+import { ProjectNotificationService } from '../../../core/project-notification.service';
+import { SFProjectService } from '../../../core/sf-project.service';
+import { TextDocService } from '../../../core/text-doc.service';
+import { BuildDto } from '../../../machine-api/build-dto';
+import { DraftImportWizardComponent } from './draft-import-wizard.component';
+
+const mockI18nService = mock(I18nService);
+const mockMatDialogRef = mock(MatDialogRef<DraftImportWizardComponent, boolean>);
+const mockParatextService = mock(ParatextService);
+const mockProjectNotificationService = mock(ProjectNotificationService);
+const mockProjectService = mock(SFProjectService);
+const mockTextDocService = mock(TextDocService);
+const mockActivatedProjectService = mock(ActivatedProjectService);
+
+describe('DraftImportWizardComponent', () => {
+  let env: TestEnvironment;
+  const buildDto: BuildDto = {
+    additionalInfo: { dateFinished: '2026-01-14T15:16:17.18+00:00' }
+  } as BuildDto;
+
+  configureTestingModule(() => ({
+    imports: [getTestTranslocoModule()],
+    providers: [
+      provideTestOnlineStatus(),
+      { provide: I18nService, useMock: mockI18nService },
+      { provide: MatDialogRef, useMock: mockMatDialogRef },
+      { provide: MAT_DIALOG_DATA, useValue: buildDto },
+      { provide: ParatextService, useMock: mockParatextService },
+      { provide: ProjectNotificationService, useMock: mockProjectNotificationService },
+      { provide: SFProjectService, useMock: mockProjectService },
+      { provide: TextDocService, useMock: mockTextDocService },
+      { provide: OnlineStatusService, useClass: TestOnlineStatusService },
+      { provide: ActivatedProjectService, useMock: mockActivatedProjectService },
+      provideNoopAnimations()
+    ]
+  }));
+
+  beforeEach(async () => {
+    env = new TestEnvironment();
+  });
+
+  it('shows step 1', () => {
+    expect(env.fixture.nativeElement).not.toBeNull();
+  });
+});
+
+class TestEnvironment {
+  component: DraftImportWizardComponent;
+  fixture: ComponentFixture<DraftImportWizardComponent>;
+
+  constructor() {
+    this.fixture = TestBed.createComponent(DraftImportWizardComponent);
+    this.component = this.fixture.componentInstance;
+    this.fixture.detectChanges();
+  }
+}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index fdf6e73c82..e44cf5aa0a 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -58,7 +58,7 @@ <h1>{{ t("select_project") }}</h1>
           </app-notice>
         }
 
-        @if (bookCreationError != null) {
+        @if (bookCreationError != null && bookCreationError.length > 0) {
           <app-notice type="error">{{ bookCreationError }}</app-notice>
         }
 
@@ -74,7 +74,12 @@ <h1>{{ t("select_project") }}</h1>
           <mat-icon>close</mat-icon>
           {{ t("cancel") }}
         </button>
-        <button matButton="filled" color="primary" (click)="advanceFromProjectSelection()">
+        <button
+          matButton="filled"
+          color="primary"
+          (click)="advanceFromProjectSelection()"
+          [disabled]="!isAppOnline || noDraftsAvailable || projectLoadingFailed"
+        >
           {{ needsConnection || showBookSelection || showOverwriteConfirmation ? t("next") : t("import") }}
           <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
         </button>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index f10156774d..dc55370375 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -594,8 +594,6 @@ export class DraftImportWizardComponent implements OnInit {
       !this.isConnecting &&
       !this.isImporting &&
       !this.isLoadingProject &&
-      !this.noDraftsAvailable &&
-      !this.projectLoadingFailed &&
       !this.booksMissingWithoutPermission
     );
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
new file mode 100644
index 0000000000..e0b23d756f
--- /dev/null
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
@@ -0,0 +1,153 @@
+import { AfterViewInit, Component, DestroyRef, Input, OnChanges, ViewChild } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Meta, moduleMetadata, StoryObj } from '@storybook/angular';
+import { defaultTranslocoMarkupTranspilers } from 'ngx-transloco-markup';
+import { of } from 'rxjs';
+import { instance, mock, when } from 'ts-mockito';
+import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { I18nService } from 'xforge-common/i18n.service';
+import { OnlineStatusService } from 'xforge-common/online-status.service';
+import { ParatextService } from '../../../core/paratext.service';
+import { ProjectNotificationService } from '../../../core/project-notification.service';
+import { SFProjectService } from '../../../core/sf-project.service';
+import { TextDocService } from '../../../core/text-doc.service';
+import { BuildDto } from '../../../machine-api/build-dto';
+import { DraftImportWizardComponent } from './draft-import-wizard.component';
+
+const mockDestroyRef = mock(DestroyRef);
+const mockI18nService = mock(I18nService);
+const mockMatDialogRef = mock(MatDialogRef<DraftImportWizardComponent, boolean>);
+const mockParatextService = mock(ParatextService);
+const mockProjectNotificationService = mock(ProjectNotificationService);
+const mockProjectService = mock(SFProjectService);
+const mockTextDocService = mock(TextDocService);
+const mockActivatedProjectService = mock(ActivatedProjectService);
+const mockOnlineStatusService = mock(OnlineStatusService);
+
+@Component({
+  selector: 'app-draft-import-wizard-wrapper',
+  standalone: true,
+  imports: [DraftImportWizardComponent],
+  template: `<app-draft-import-wizard></app-draft-import-wizard>`
+})
+class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
+  @ViewChild(DraftImportWizardComponent) component!: DraftImportWizardComponent;
+  @Input() online: boolean = false;
+  @Input() isLoadingProject: boolean = false;
+  @Input() isLoadingProjects: boolean = false;
+  @Input() noDraftsAvailable: boolean = false;
+  @Input() projectLoadingFailed: boolean = false;
+  @Input() bookCreationError?: string;
+  @Input() step: number = 0;
+
+  ngAfterViewInit(): void {
+    this.updateComponent();
+  }
+
+  ngOnChanges(): void {
+    this.updateComponent();
+  }
+
+  private updateComponent(): void {
+    if (!this.component) return;
+    setTimeout(() => {
+      this.component.isLoadingProject = this.isLoadingProject;
+      this.component.isLoadingProjects = this.isLoadingProjects;
+      this.component.noDraftsAvailable = this.noDraftsAvailable;
+      this.component.projectLoadingFailed = this.projectLoadingFailed;
+      this.component.bookCreationError = this.bookCreationError;
+      if (this.component.stepper && this.component.stepper.selectedIndex !== this.step) {
+        this.component.stepper.selectedIndex = this.step;
+      }
+    });
+  }
+}
+
+interface DraftImportWizardComponentState {
+  online: boolean;
+  step: number;
+  isLoadingProject: boolean;
+  isLoadingProjects: boolean;
+  noDraftsAvailable: boolean;
+  projectLoadingFailed: boolean;
+  bookCreationError?: string;
+}
+
+const defaultArgs: DraftImportWizardComponentState = {
+  online: true,
+  step: 0,
+  isLoadingProject: false,
+  isLoadingProjects: false,
+  noDraftsAvailable: false,
+  projectLoadingFailed: false,
+  bookCreationError: undefined
+};
+
+const buildDto: BuildDto = {
+  additionalInfo: { dateFinished: '2026-01-14T15:16:17.18+00:00' }
+} as BuildDto;
+
+export default {
+  title: 'Draft/Draft Import Wizard Dialog',
+  component: DraftImportWizardComponent,
+  decorators: [
+    moduleMetadata({
+      providers: [
+        { provide: DestroyRef, useValue: instance(mockDestroyRef) },
+        { provide: MAT_DIALOG_DATA, useValue: instance(buildDto) },
+        { provide: I18nService, useValue: instance(mockI18nService) },
+        { provide: MatDialogRef, useValue: instance(mockMatDialogRef) },
+        { provide: ParatextService, useValue: instance(mockParatextService) },
+        { provide: ProjectNotificationService, useValue: instance(mockProjectNotificationService) },
+        { provide: SFProjectService, useValue: instance(mockProjectService) },
+        { provide: TextDocService, useValue: instance(mockTextDocService) },
+        { provide: OnlineStatusService, useValue: instance(mockOnlineStatusService) },
+        { provide: ActivatedProjectService, useValue: instance(mockActivatedProjectService) },
+        defaultTranslocoMarkupTranspilers()
+      ]
+    })
+  ],
+  render: args => {
+    setUpMocks(args);
+    return {
+      component: DraftImportWizardWrapperComponent,
+      props: args
+    };
+  },
+  args: defaultArgs,
+  parameters: {
+    controls: {
+      include: Object.keys(defaultArgs)
+    }
+  },
+  argTypes: {
+    online: { control: 'boolean' },
+    isLoadingProject: { control: 'boolean' },
+    isLoadingProjects: { control: 'boolean' },
+    noDraftsAvailable: { control: 'boolean' },
+    projectLoadingFailed: { control: 'boolean' },
+    bookCreationError: { control: 'text' },
+    step: { control: 'number' }
+  }
+} as Meta<DraftImportWizardComponentState>;
+
+type Story = StoryObj<DraftImportWizardComponentState>;
+
+const Template: Story = {};
+
+export const StepOne: Story = {
+  ...Template
+};
+
+function setUpMocks(args: DraftImportWizardComponentState): void {
+  when(mockOnlineStatusService.onlineStatus$).thenReturn(of(args.online));
+  when(mockOnlineStatusService.isOnline).thenReturn(args.online);
+  when(mockOnlineStatusService.online).thenReturn(
+    new Promise(resolve => {
+      if (args.online) resolve();
+      // Else, never resolve.
+    })
+  );
+  when(mockI18nService.forwardDirectionWord).thenReturn('right');
+  when(mockI18nService.backwardDirectionWord).thenReturn('left');
+}

From b2e2f72b1f0988d935f35970814dccf2d0004609 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 19 Jan 2026 14:37:43 +1300
Subject: [PATCH 14/40] SF-3633 Adding all of the steps to the storybook

---
 .../draft-import-wizard.component.html        |  12 +-
 .../draft-import-wizard.component.ts          |  19 +-
 .../draft-import-wizard.stories.ts            | 285 +++++++++++++++++-
 3 files changed, 293 insertions(+), 23 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index e44cf5aa0a..20e613fb19 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -107,7 +107,7 @@ <h1>{{ t("connect_to_project") }}</h1>
           ></p>
         }
 
-        @if (connectionError != null) {
+        @if (connectionError != null && connectionError.length > 0) {
           <app-notice type="error">{{ connectionError }}</app-notice>
         }
 
@@ -120,7 +120,7 @@ <h1>{{ t("connect_to_project") }}</h1>
             matButton="filled"
             color="primary"
             (click)="connectToProject()"
-            [disabled]="isConnecting || isImporting || connectionError != null"
+            [disabled]="isConnecting || isImporting || (connectionError != null && connectionError.length > 0)"
           >
             {{ t("connect") }}
             <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -145,7 +145,7 @@ <h1>{{ t("connecting_to_project") }}</h1>
           }
         }
 
-        @if (connectionError != null) {
+        @if (connectionError != null && connectionError.length > 0) {
           <h1>{{ t("connection_failed") }}</h1>
           <app-notice type="error">{{ connectionError }}</app-notice>
           <div class="button-strip">
@@ -292,7 +292,7 @@ <h1>{{ t("overwrite_books_question") }}</h1>
 
       <h1>{{ t("importing_draft") }}</h1>
 
-      @if (isImporting || importComplete || importError != null) {
+      @if (isImporting || importComplete || (importError != null && importError.length > 0)) {
         @for (progress of importProgress; track progress.bookNum) {
           <div class="book-progress">
             <p>{{ progress.bookName }}</p>
@@ -303,7 +303,7 @@ <h1>{{ t("importing_draft") }}</h1>
             <span class="progress-text">
               {{ progress.completedChapters.length }} / {{ progress.totalChapters }} {{ t("chapters") }}
             </span>
-            @if (progress.failedChapters.length > 0 && !isImporting) {
+            @if (progress.failedChapters.length > 0) {
               <div class="failed-chapters">
                 <mat-icon class="error-icon">error</mat-icon>
                 <span>Failed: {{ getFailedChapters(progress) }}</span>
@@ -313,7 +313,7 @@ <h1>{{ t("importing_draft") }}</h1>
         }
       }
 
-      @if (importError != null) {
+      @if (importError != null && importError.length > 0) {
         <app-notice type="error">{{ importError }}</app-notice>
         <div class="button-strip">
           <button matButton="outlined" matStepperPrevious [disabled]="isConnecting || isImporting">
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index dc55370375..14a81b8c2b 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -41,7 +41,7 @@ import { SyncProgressComponent } from '../../../sync/sync-progress/sync-progress
 /**
  * Represents a book available for import with its draft chapters.
  */
-interface BookForImport {
+export interface BookForImport {
   number: number; // Alias for bookNum to match Book interface
   bookNum: number;
   bookId: string;
@@ -49,10 +49,19 @@ interface BookForImport {
   selected: boolean;
 }
 
+/**
+ * A book that the user will be prompted to overwrite.
+ */
+export interface BookWithExistingText {
+  bookNum: number;
+  bookName: string;
+  chaptersWithText: number[];
+}
+
 /**
  * Tracks the progress of importing drafts.
  */
-interface ImportProgress {
+export interface ImportProgress {
   bookNum: number;
   bookId: string;
   bookName: string;
@@ -130,7 +139,7 @@ export class DraftImportWizardComponent implements OnInit {
   missingBookNames: string[] = [];
   bookCreationError?: string;
   projectLoadingFailed = false;
-  private sourceProjectId?: string;
+  sourceProjectId?: string;
   noDraftsAvailable = false;
   cannotAdvanceFromProjectSelection = false;
 
@@ -269,7 +278,7 @@ export class DraftImportWizardComponent implements OnInit {
   overwriteForm = new FormGroup({
     confirmOverwrite: new FormControl(false, Validators.requiredTrue)
   });
-  booksWithExistingText: { bookNum: number; bookName: string; chaptersWithText: number[] }[] = [];
+  booksWithExistingText: BookWithExistingText[] = [];
 
   // Step 6: Import progress
   private _isImporting = false;
@@ -284,7 +293,7 @@ export class DraftImportWizardComponent implements OnInit {
   importProgress: ImportProgress[] = [];
   importError?: string;
   importComplete = false;
-  private importStepTriggered = false;
+  importStepTriggered = false;
 
   // Step 7: Sync confirmation and completion
   showSyncConfirmation = false;
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
index e0b23d756f..96bf92c796 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
@@ -1,23 +1,31 @@
 import { AfterViewInit, Component, DestroyRef, Input, OnChanges, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Canon } from '@sillsdev/scripture';
 import { Meta, moduleMetadata, StoryObj } from '@storybook/angular';
 import { defaultTranslocoMarkupTranspilers } from 'ngx-transloco-markup';
 import { of } from 'rxjs';
 import { instance, mock, when } from 'ts-mockito';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
-import { I18nService } from 'xforge-common/i18n.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
+import { ParatextProject } from '../../../core/models/paratext-project';
+import { SFProjectDoc } from '../../../core/models/sf-project-doc';
 import { ParatextService } from '../../../core/paratext.service';
 import { ProjectNotificationService } from '../../../core/project-notification.service';
 import { SFProjectService } from '../../../core/sf-project.service';
 import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
-import { DraftImportWizardComponent } from './draft-import-wizard.component';
+import { ProgressService, TextProgress } from '../../../shared/progress-service/progress.service';
+import {
+  BookForImport,
+  BookWithExistingText,
+  DraftImportWizardComponent,
+  ImportProgress
+} from './draft-import-wizard.component';
 
 const mockDestroyRef = mock(DestroyRef);
-const mockI18nService = mock(I18nService);
 const mockMatDialogRef = mock(MatDialogRef<DraftImportWizardComponent, boolean>);
 const mockParatextService = mock(ParatextService);
+const mockProgressService = mock(ProgressService);
 const mockProjectNotificationService = mock(ProjectNotificationService);
 const mockProjectService = mock(SFProjectService);
 const mockTextDocService = mock(TextDocService);
@@ -33,11 +41,28 @@ const mockOnlineStatusService = mock(OnlineStatusService);
 class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
   @ViewChild(DraftImportWizardComponent) component!: DraftImportWizardComponent;
   @Input() online: boolean = false;
+  @Input() importComplete: boolean = false;
+  @Input() importStepTriggered: boolean = false;
+  @Input() isConnecting: boolean = false;
+  @Input() isImporting: boolean = false;
   @Input() isLoadingProject: boolean = false;
   @Input() isLoadingProjects: boolean = false;
+  @Input() isSyncing: boolean = false;
+  @Input() needsConnection: boolean = false;
   @Input() noDraftsAvailable: boolean = false;
   @Input() projectLoadingFailed: boolean = false;
+  @Input() showBookSelection: boolean = false;
+  @Input() showOverwriteConfirmation: boolean = false;
+  @Input() skipSync: boolean = false;
+  @Input() syncComplete: boolean = false;
   @Input() bookCreationError?: string;
+  @Input() connectionError?: string;
+  @Input() importError?: string;
+  @Input() targetProjectId?: string;
+  @Input() selectedParatextProject?: ParatextProject;
+  @Input() availableBooksForImport: BookForImport[] = [];
+  @Input() booksWithExistingText: BookWithExistingText[] = [];
+  @Input() importProgress: ImportProgress[] = [];
   @Input() step: number = 0;
 
   ngAfterViewInit(): void {
@@ -51,13 +76,41 @@ class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
   private updateComponent(): void {
     if (!this.component) return;
     setTimeout(() => {
+      // Set the story specific arguments
+      this.component.importComplete = this.importComplete;
+      this.component.importStepTriggered = this.importStepTriggered;
+      this.component.isConnecting = this.isConnecting;
+      this.component.isImporting = this.isImporting;
       this.component.isLoadingProject = this.isLoadingProject;
       this.component.isLoadingProjects = this.isLoadingProjects;
+      this.component.isSyncing = this.isSyncing;
+      this.component.needsConnection = this.needsConnection;
       this.component.noDraftsAvailable = this.noDraftsAvailable;
       this.component.projectLoadingFailed = this.projectLoadingFailed;
+      this.component.showBookSelection = this.showBookSelection;
+      this.component.showOverwriteConfirmation = this.showOverwriteConfirmation;
+      this.component.skipSync = this.skipSync;
+      this.component.syncComplete = this.syncComplete;
       this.component.bookCreationError = this.bookCreationError;
+      this.component.connectionError = this.connectionError;
+      this.component.importError = this.importError;
+      this.component.targetProjectId = this.targetProjectId;
+      if (this.targetProjectId != null) {
+        this.component.targetProjectDoc$.next({ id: this.targetProjectId } as SFProjectDoc);
+      }
+      this.component.selectedParatextProject = this.selectedParatextProject;
+      this.component.availableBooksForImport = this.availableBooksForImport;
+      this.component.booksWithExistingText = this.booksWithExistingText;
+      this.component.importProgress = this.importProgress;
+
+      // Move the stepper to the specified step
       if (this.component.stepper && this.component.stepper.selectedIndex !== this.step) {
-        this.component.stepper.selectedIndex = this.step;
+        this.component.stepper.reset();
+        for (let i = 0; i < this.step - 1; i++) {
+          const step = this.component.stepper.steps.get(i);
+          if (step != null) step.completed = true;
+          this.component.stepper.next();
+        }
       }
     });
   }
@@ -66,36 +119,73 @@ class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
 interface DraftImportWizardComponentState {
   online: boolean;
   step: number;
+  importComplete: boolean;
+  importStepTriggered: boolean;
+  isConnecting: boolean;
+  isImporting: boolean;
   isLoadingProject: boolean;
   isLoadingProjects: boolean;
+  isSyncing: boolean;
+  needsConnection: boolean;
   noDraftsAvailable: boolean;
   projectLoadingFailed: boolean;
+  showBookSelection: boolean;
+  showOverwriteConfirmation: boolean;
+  skipSync: boolean;
+  syncComplete: boolean;
   bookCreationError?: string;
+  connectionError?: string;
+  importError?: string;
+  targetProjectId?: string;
+  selectedParatextProject?: ParatextProject;
+  availableBooksForImport: BookForImport[];
+  booksWithExistingText: BookWithExistingText[];
+  importProgress: ImportProgress[];
 }
 
 const defaultArgs: DraftImportWizardComponentState = {
   online: true,
   step: 0,
+  importComplete: false,
+  importStepTriggered: false,
+  isConnecting: false,
+  isImporting: false,
   isLoadingProject: false,
   isLoadingProjects: false,
+  isSyncing: false,
+  needsConnection: false,
   noDraftsAvailable: false,
   projectLoadingFailed: false,
-  bookCreationError: undefined
+  showBookSelection: false,
+  showOverwriteConfirmation: false,
+  skipSync: false,
+  syncComplete: false,
+  bookCreationError: undefined,
+  connectionError: undefined,
+  importError: undefined,
+  targetProjectId: undefined,
+  selectedParatextProject: undefined,
+  availableBooksForImport: [],
+  booksWithExistingText: [],
+  importProgress: []
 };
 
 const buildDto: BuildDto = {
-  additionalInfo: { dateFinished: '2026-01-14T15:16:17.18+00:00' }
+  additionalInfo: {
+    dateFinished: '2026-01-14T15:16:17.18+00:00',
+    translationScriptureRanges: [{ projectId: 'P02', scriptureRange: 'GEN;EXO;LEV;NUM;DEU' }]
+  }
 } as BuildDto;
 
 export default {
   title: 'Draft/Draft Import Wizard Dialog',
-  component: DraftImportWizardComponent,
+  component: DraftImportWizardWrapperComponent,
   decorators: [
     moduleMetadata({
+      imports: [DraftImportWizardComponent, DraftImportWizardWrapperComponent],
       providers: [
         { provide: DestroyRef, useValue: instance(mockDestroyRef) },
-        { provide: MAT_DIALOG_DATA, useValue: instance(buildDto) },
-        { provide: I18nService, useValue: instance(mockI18nService) },
+        { provide: MAT_DIALOG_DATA, useValue: buildDto },
         { provide: MatDialogRef, useValue: instance(mockMatDialogRef) },
         { provide: ParatextService, useValue: instance(mockParatextService) },
         { provide: ProjectNotificationService, useValue: instance(mockProjectNotificationService) },
@@ -103,6 +193,7 @@ export default {
         { provide: TextDocService, useValue: instance(mockTextDocService) },
         { provide: OnlineStatusService, useValue: instance(mockOnlineStatusService) },
         { provide: ActivatedProjectService, useValue: instance(mockActivatedProjectService) },
+        { provide: ProgressService, useValue: instance(mockProgressService) },
         defaultTranslocoMarkupTranspilers()
       ]
     })
@@ -122,16 +213,33 @@ export default {
   },
   argTypes: {
     online: { control: 'boolean' },
+    importComplete: { control: 'boolean' },
+    importStepTriggered: { control: 'boolean' },
+    isConnecting: { control: 'boolean' },
+    isImporting: { control: 'boolean' },
     isLoadingProject: { control: 'boolean' },
     isLoadingProjects: { control: 'boolean' },
+    isSyncing: { control: 'boolean' },
+    needsConnection: { control: 'boolean' },
     noDraftsAvailable: { control: 'boolean' },
     projectLoadingFailed: { control: 'boolean' },
+    showBookSelection: { control: 'boolean' },
+    showOverwriteConfirmation: { control: 'boolean' },
+    skipSync: { control: 'boolean' },
+    syncComplete: { control: 'boolean' },
     bookCreationError: { control: 'text' },
+    connectionError: { control: 'text' },
+    importError: { control: 'text' },
+    targetProjectId: { control: 'text' },
+    selectedParatextProject: { control: 'object' },
+    availableBooksForImport: { control: 'object' },
+    booksWithExistingText: { control: 'object' },
+    importProgress: { control: 'object' },
     step: { control: 'number' }
   }
 } as Meta<DraftImportWizardComponentState>;
 
-type Story = StoryObj<DraftImportWizardComponentState>;
+type Story = StoryObj<DraftImportWizardWrapperComponent>;
 
 const Template: Story = {};
 
@@ -139,7 +247,154 @@ export const StepOne: Story = {
   ...Template
 };
 
+export const StepTwo: Story = {
+  ...Template,
+  args: {
+    ...defaultArgs,
+    needsConnection: true,
+    step: 2,
+    selectedParatextProject: { shortName: 'P01', name: 'Project 01' } as ParatextProject
+  }
+};
+
+export const StepThree: Story = {
+  ...Template,
+  args: {
+    ...defaultArgs,
+    isConnecting: true,
+    needsConnection: true,
+    step: 3,
+    selectedParatextProject: { shortName: 'P01', name: 'Project 01' } as ParatextProject
+  }
+};
+
+export const StepFour: Story = {
+  ...Template,
+  args: {
+    ...defaultArgs,
+    needsConnection: true,
+    showBookSelection: true,
+    step: 4,
+    selectedParatextProject: { shortName: 'P01', name: 'Project 01' } as ParatextProject,
+    availableBooksForImport: [
+      getBookForImport(1, true),
+      getBookForImport(2, true),
+      getBookForImport(3, true),
+      getBookForImport(4, true),
+      getBookForImport(5, false)
+    ]
+  }
+};
+
+export const StepFive: Story = {
+  ...Template,
+  args: {
+    ...defaultArgs,
+    isConnecting: false,
+    needsConnection: true,
+    showBookSelection: true,
+    showOverwriteConfirmation: true,
+    step: 5,
+    selectedParatextProject: { shortName: 'P01', name: 'Project 01' } as ParatextProject,
+    booksWithExistingText: [
+      getBookWithExistingText(1, 3),
+      getBookWithExistingText(2, 4),
+      getBookWithExistingText(3, 7),
+      getBookWithExistingText(4, 5),
+      getBookWithExistingText(5, 2)
+    ]
+  }
+};
+
+export const StepSix: Story = {
+  ...Template,
+  args: {
+    ...defaultArgs,
+    importStepTriggered: true,
+    isConnecting: false,
+    isImporting: true,
+    needsConnection: true,
+    showBookSelection: true,
+    // Skip the Overwrite Confirmation (step 5)
+    step: 5,
+    targetProjectId: 'P01',
+    selectedParatextProject: { shortName: 'P01', name: 'Project 01' } as ParatextProject,
+    // availableBooksForImport is used if importStepTriggered is false
+    availableBooksForImport: [
+      getBookForImport(1, true),
+      getBookForImport(2, true),
+      getBookForImport(3, true),
+      getBookForImport(4, true),
+      getBookForImport(5, false)
+    ],
+    // importProgress is used if importStepTriggered is true
+    importProgress: [
+      getImportProgress(1, 3, 3, 0),
+      getImportProgress(2, 4, 3, 1),
+      getImportProgress(3, 7, 3, 0),
+      getImportProgress(4, 5, 0, 0)
+    ]
+  }
+};
+
+export const StepSeven: Story = {
+  ...Template,
+  args: {
+    ...defaultArgs,
+    importComplete: true,
+    importStepTriggered: true,
+    isConnecting: false,
+    isImporting: false,
+    needsConnection: false,
+    showBookSelection: false,
+    // Skipping steps 2, 3, 5
+    step: 4,
+    targetProjectId: 'P01',
+    selectedParatextProject: { shortName: 'P01', name: 'Project 01' } as ParatextProject
+  }
+};
+
+function getBookForImport(bookNum: number, selected: boolean): BookForImport {
+  return {
+    bookId: Canon.bookNumberToId(bookNum),
+    bookNum: bookNum,
+    bookName: Canon.bookNumberToEnglishName(bookNum),
+    number: bookNum,
+    selected: selected
+  };
+}
+
+function getBookWithExistingText(bookNum: number, numberOfChaptersWithText: number): BookWithExistingText {
+  return {
+    bookNum: bookNum,
+    bookName: Canon.bookNumberToEnglishName(bookNum),
+    chaptersWithText: new Array(numberOfChaptersWithText).fill(null).map((_, i) => i + 1)
+  };
+}
+
+function getImportProgress(
+  bookNum: number,
+  totalChapters: number,
+  numberOfCompletedChapters: number,
+  numberOfFailedChapters: number
+): ImportProgress {
+  return {
+    bookNum: bookNum,
+    bookId: Canon.bookNumberToId(bookNum),
+    bookName: Canon.bookNumberToEnglishName(bookNum),
+    totalChapters: totalChapters,
+    completedChapters: new Array(numberOfCompletedChapters).fill(null).map((_, i) => i + 1),
+    failedChapters: new Array(numberOfFailedChapters)
+      .fill(null)
+      .map((_, i) => i + 1)
+      .map(i => ({
+        chapterNum: i
+      }))
+  };
+}
+
 function setUpMocks(args: DraftImportWizardComponentState): void {
+  when(mockActivatedProjectService.projectId).thenReturn('P02');
   when(mockOnlineStatusService.onlineStatus$).thenReturn(of(args.online));
   when(mockOnlineStatusService.isOnline).thenReturn(args.online);
   when(mockOnlineStatusService.online).thenReturn(
@@ -148,6 +403,12 @@ function setUpMocks(args: DraftImportWizardComponentState): void {
       // Else, never resolve.
     })
   );
-  when(mockI18nService.forwardDirectionWord).thenReturn('right');
-  when(mockI18nService.backwardDirectionWord).thenReturn('left');
+  when(mockProgressService.isLoaded$).thenReturn(of(true));
+  when(mockProgressService.texts).thenReturn([
+    { text: { bookNum: 1 } } as TextProgress,
+    { text: { bookNum: 2 } } as TextProgress,
+    { text: { bookNum: 3 } } as TextProgress,
+    { text: { bookNum: 4 } } as TextProgress,
+    { text: { bookNum: 5 } } as TextProgress
+  ]);
 }

From 3e6160750e7a7ee426238ea119f4f5a20aa04666 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 20 Jan 2026 12:22:33 +1300
Subject: [PATCH 15/40] SF-3633 Adding unit tests to cover the basic wizard
 workflows

---
 .../draft-import-wizard-component.spec.ts     | 352 +++++++++++++++++-
 .../draft-import-wizard.component.html        |  43 ++-
 .../draft-import-wizard.component.ts          |   4 +-
 3 files changed, 378 insertions(+), 21 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
index b1bc3002ce..8bd30e758e 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
@@ -1,42 +1,58 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement } from '@angular/core';
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MatStepper } from '@angular/material/stepper';
+import { By } from '@angular/platform-browser';
 import { provideNoopAnimations } from '@angular/platform-browser/animations';
-import { mock } from 'ts-mockito';
+import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project';
+import { createTestProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-test-data';
+import { of } from 'rxjs';
+import { anything, mock, verify, when } from 'ts-mockito';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
-import { I18nService } from 'xforge-common/i18n.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { provideTestOnlineStatus } from 'xforge-common/test-online-status-providers';
 import { TestOnlineStatusService } from 'xforge-common/test-online-status.service';
+import { provideTestRealtime } from 'xforge-common/test-realtime-providers';
+import { TestRealtimeService } from 'xforge-common/test-realtime.service';
 import { configureTestingModule, getTestTranslocoModule } from 'xforge-common/test-utils';
+import { ParatextProject } from '../../../core/models/paratext-project';
+import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
+import { SF_TYPE_REGISTRY } from '../../../core/models/sf-type-registry';
+import { TextDoc } from '../../../core/models/text-doc';
 import { ParatextService } from '../../../core/paratext.service';
 import { ProjectNotificationService } from '../../../core/project-notification.service';
 import { SFProjectService } from '../../../core/sf-project.service';
 import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
-import { DraftImportWizardComponent } from './draft-import-wizard.component';
+import { ProjectSelectComponent } from '../../../project-select/project-select.component';
+import { ProgressService, TextProgress } from '../../../shared/progress-service/progress.service';
+import { DraftApplyState, DraftApplyStatus, DraftImportWizardComponent } from './draft-import-wizard.component';
 
-const mockI18nService = mock(I18nService);
 const mockMatDialogRef = mock(MatDialogRef<DraftImportWizardComponent, boolean>);
 const mockParatextService = mock(ParatextService);
+const mockProgressService = mock(ProgressService);
 const mockProjectNotificationService = mock(ProjectNotificationService);
 const mockProjectService = mock(SFProjectService);
 const mockTextDocService = mock(TextDocService);
 const mockActivatedProjectService = mock(ActivatedProjectService);
 
 describe('DraftImportWizardComponent', () => {
-  let env: TestEnvironment;
   const buildDto: BuildDto = {
-    additionalInfo: { dateFinished: '2026-01-14T15:16:17.18+00:00' }
+    additionalInfo: {
+      dateFinished: '2026-01-14T15:16:17.18+00:00',
+      translationScriptureRanges: [{ projectId: 'P01', scriptureRange: 'GEN;EXO;LEV;NUM;DEU' }]
+    }
   } as BuildDto;
 
   configureTestingModule(() => ({
     imports: [getTestTranslocoModule()],
     providers: [
       provideTestOnlineStatus(),
-      { provide: I18nService, useMock: mockI18nService },
+      provideTestRealtime(SF_TYPE_REGISTRY),
       { provide: MatDialogRef, useMock: mockMatDialogRef },
       { provide: MAT_DIALOG_DATA, useValue: buildDto },
       { provide: ParatextService, useMock: mockParatextService },
+      { provide: ProgressService, useMock: mockProgressService },
       { provide: ProjectNotificationService, useMock: mockProjectNotificationService },
       { provide: SFProjectService, useMock: mockProjectService },
       { provide: TextDocService, useMock: mockTextDocService },
@@ -46,22 +62,330 @@ describe('DraftImportWizardComponent', () => {
     ]
   }));
 
-  beforeEach(async () => {
-    env = new TestEnvironment();
-  });
+  it('applies drafts to projects that are not connected', fakeAsync(() => {
+    // Setup test environment
+    const env = new TestEnvironment();
+    env.wait();
 
-  it('shows step 1', () => {
-    expect(env.fixture.nativeElement).not.toBeNull();
-  });
+    // Step 1
+    env.selectProject('paratext02');
+    env.clickNextButton(1);
+
+    // Step 2
+    env.clickNextButton(2);
+
+    // Step 3
+
+    // Connect to the target project
+    env.syncTargetProject();
+
+    // Step 4
+    env.clickNextButton(4);
+
+    // Step 5
+    env.clickOverwriteCheckbox();
+    env.clickNextButton(5);
+
+    // Step 6
+    env.importDraft();
+    env.clickNextButton(6);
+
+    // Step 7
+    env.clickNextButton(7, 'sync');
+
+    // Sync the source project
+    env.syncSourceProject();
+
+    // Close the dialog and verify it closed
+    env.clickNextButton(7, 'done');
+    verify(mockMatDialogRef.close(true)).once();
+  }));
+
+  it('applies drafts to projects that are already connected which do not have the books', fakeAsync(() => {
+    // Setup test environment
+    const env = new TestEnvironment();
+    env.wait();
+
+    // Step 1
+    env.selectProject('paratext03');
+    env.clickNextButton(1);
+
+    // Step 4
+    env.clickNextButton(4);
+
+    // Step 6
+    env.importDraft();
+    env.clickNextButton(6);
+
+    // Step 7
+    env.clickNextButton(7, 'skip');
+
+    // Close the dialog and verify it closed
+    env.clickNextButton(7, 'done');
+    verify(mockMatDialogRef.close(true)).once();
+  }));
+
+  it('applies drafts to projects that are already connected which have the books', fakeAsync(() => {
+    // Setup test environment
+    const env = new TestEnvironment();
+    env.wait();
+
+    // Step 1
+    env.selectProject('paratext04');
+    env.clickNextButton(1);
+
+    // Step 4
+    env.clickNextButton(4);
+
+    // Step 5
+    env.clickOverwriteCheckbox();
+    env.clickNextButton(5);
+
+    // Step 6
+    env.importDraft();
+    env.clickNextButton(6);
+
+    // Step 7
+    env.clickNextButton(7, 'skip');
+
+    // Close the dialog and verify it closed
+    env.clickNextButton(7, 'done');
+    verify(mockMatDialogRef.close(true)).once();
+  }));
+
+  it('applies a single book draft to projects that are already connected which do not have the books', fakeAsync(() => {
+    // Configure draft to be just one book
+    configureDraftForOneBook();
+
+    // Setup test environment
+    const env = new TestEnvironment();
+    env.wait();
+
+    // Step 1
+    env.selectProject('paratext03');
+    env.clickNextButton(1);
+
+    // Step 6
+    env.importDraft();
+    env.clickNextButton(6);
+
+    // Step 7
+    env.clickNextButton(7, 'skip');
+
+    // Close the dialog and verify it closed
+    env.clickNextButton(7, 'done');
+    verify(mockMatDialogRef.close(true)).once();
+  }));
+
+  it('applies a single book draft to projects that are already connected which have the books', fakeAsync(() => {
+    // Configure draft to be just one book
+    configureDraftForOneBook();
+
+    // Setup test environment
+    const env = new TestEnvironment();
+    env.wait();
+
+    // Step 1
+    env.selectProject('paratext04');
+    env.clickNextButton(1);
+
+    // Step 5
+    env.clickOverwriteCheckbox();
+    env.clickNextButton(5);
+
+    // Step 6
+    env.importDraft();
+    env.clickNextButton(6);
+
+    // Step 7
+    env.clickNextButton(7, 'skip');
+
+    // Close the dialog and verify it closed
+    env.clickNextButton(7, 'done');
+    verify(mockMatDialogRef.close(true)).once();
+  }));
 });
 
 class TestEnvironment {
   component: DraftImportWizardComponent;
   fixture: ComponentFixture<DraftImportWizardComponent>;
 
+  private readonly realtimeService: TestRealtimeService = TestBed.inject<TestRealtimeService>(TestRealtimeService);
+
   constructor() {
     this.fixture = TestBed.createComponent(DraftImportWizardComponent);
     this.component = this.fixture.componentInstance;
+
+    when(mockActivatedProjectService.projectId).thenReturn('project01');
+    when(mockParatextService.getProjects()).thenResolve([
+      // Source project
+      {
+        paratextId: 'paratext01',
+        name: 'Project 01',
+        shortName: 'P01',
+        projectId: 'project01',
+        isConnected: true
+      } as ParatextProject,
+      // Target project that is not yet on Scripture Forge
+      {
+        paratextId: 'paratext02',
+        name: 'Project 02',
+        shortName: 'P02',
+        isConnectable: true
+      } as ParatextProject,
+      // Target project that is on Scripture Forge and does not have the books
+      {
+        paratextId: 'paratext03',
+        name: 'Project 03',
+        shortName: 'P03',
+        projectId: 'project03',
+        isConnected: true
+      } as ParatextProject,
+      // Target project that is on Scripture Forge and has the books
+      {
+        paratextId: 'paratext04',
+        name: 'Project 04',
+        shortName: 'P04',
+        projectId: 'project04',
+        isConnected: true
+      } as ParatextProject
+    ]);
+
+    this.realtimeService.addSnapshot<SFProjectProfile>(SFProjectProfileDoc.COLLECTION, {
+      id: 'project02',
+      data: createTestProjectProfile({}, 2)
+    });
+    this.realtimeService.addSnapshot<SFProjectProfile>(SFProjectProfileDoc.COLLECTION, {
+      id: 'project03',
+      data: createTestProjectProfile({}, 3)
+    });
+    this.realtimeService.addSnapshot<SFProjectProfile>(SFProjectProfileDoc.COLLECTION, {
+      id: 'project04',
+      data: createTestProjectProfile(
+        {
+          texts: [
+            { bookNum: 1, chapters: [{ number: 1 }] },
+            { bookNum: 2, chapters: [{ number: 1 }] },
+            { bookNum: 3, chapters: [{ number: 1 }] },
+            { bookNum: 4, chapters: [{ number: 1 }] }
+          ]
+        },
+        4
+      )
+    });
+
+    when(mockProgressService.isLoaded$).thenReturn(of(true));
+    when(mockProgressService.texts).thenReturn([
+      { text: { bookNum: 1 } } as TextProgress,
+      { text: { bookNum: 2 } } as TextProgress,
+      { text: { bookNum: 3 } } as TextProgress,
+      { text: { bookNum: 4 } } as TextProgress,
+      { text: { bookNum: 5 } } as TextProgress
+    ]);
+    when(mockProjectService.getText(anything())).thenResolve({
+      getNonEmptyVerses: (): string[] => ['verse_1_1']
+    } as TextDoc);
+    when(mockProjectService.onlineCreate(anything())).thenResolve('project02');
+    when(mockProjectService.getProfile(anything())).thenCall(id =>
+      this.realtimeService.subscribe(SFProjectProfileDoc.COLLECTION, id)
+    );
+    when(mockTextDocService.userHasGeneralEditRight(anything())).thenReturn(true);
+
     this.fixture.detectChanges();
   }
+
+  clickNextButton(step: number, suffix: string = 'next'): void {
+    this.isStepVisible(step);
+    const nextButton: DebugElement = this.fixture.debugElement.query(
+      By.css(`.button-strip button[data-test-id="step-${step}-${suffix}"]`)
+    );
+
+    // Verify the button is present and clickable
+    expect(nextButton).not.toBeNull();
+    expect(nextButton.nativeElement.disabled).toBe(false);
+
+    // Click the button
+    nextButton.nativeElement.click();
+    this.wait();
+  }
+
+  isStepVisible(step: number): void {
+    const stepperDebug = this.fixture.debugElement.query(By.directive(MatStepper));
+    const stepperInstance = stepperDebug.componentInstance;
+
+    // Remove skipped steps
+    if (step >= 5 && !this.component.showOverwriteConfirmation) --step;
+    if (step >= 4 && !this.component.showBookSelection) --step;
+    if (step >= 3 && !this.component.needsConnection) --step;
+    if (step >= 2 && !this.component.needsConnection) --step;
+
+    expect(stepperInstance.selectedIndex).toBe(step - 1);
+  }
+
+  clickOverwriteCheckbox(): void {
+    const overwriteCheckbox: DebugElement = this.fixture.debugElement.query(By.css('mat-checkbox input'));
+
+    // Verify the overwrite checkbox is present
+    expect(overwriteCheckbox).not.toBeNull();
+
+    // Click the checkbox
+    overwriteCheckbox.nativeElement.click();
+    this.wait();
+  }
+
+  importDraft(): void {
+    // Ensure that the draft import was started
+    verify(
+      mockProjectService.onlineApplyPreTranslationToProject('project01', anything(), anything(), anything())
+    ).once();
+
+    // Have the backend notify that the draft is imported
+    this.component.updateDraftApplyState('project01', {
+      bookNum: 0,
+      chapterNum: 0,
+      status: DraftApplyStatus.Successful,
+      totalChapters: 0
+    } as DraftApplyState);
+    this.wait();
+  }
+
+  selectProject(paratextId: string): void {
+    const projectSelect: DebugElement = this.fixture.debugElement.query(By.css('app-project-select'));
+
+    // Verify the project selector is present and clickable
+    expect(projectSelect).not.toBeNull();
+    const projectSelectComponent = projectSelect.componentInstance as ProjectSelectComponent;
+    expect(projectSelectComponent.projects?.length ?? 0).toBeGreaterThan(0);
+
+    // Set the selected project
+    projectSelectComponent.value = paratextId;
+    this.wait();
+  }
+
+  syncSourceProject(): void {
+    this.component.isSyncing = false;
+    this.component.syncComplete = true;
+    this.wait();
+  }
+
+  syncTargetProject(): void {
+    this.component.isConnecting = false;
+    this.wait();
+  }
+
+  wait(): void {
+    tick();
+    this.fixture.detectChanges();
+  }
+}
+
+function configureDraftForOneBook(): void {
+  // Configure draft to be just one book
+  const buildDto: BuildDto = {
+    additionalInfo: {
+      dateFinished: '2026-01-14T15:16:17.18+00:00',
+      translationScriptureRanges: [{ projectId: 'P01', scriptureRange: 'GEN' }]
+    }
+  } as BuildDto;
+  TestBed.overrideProvider(MAT_DIALOG_DATA, { useValue: buildDto });
 }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 20e613fb19..28c680f29c 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -77,6 +77,7 @@ <h1>{{ t("select_project") }}</h1>
         <button
           matButton="filled"
           color="primary"
+          data-test-id="step-1-next"
           (click)="advanceFromProjectSelection()"
           [disabled]="!isAppOnline || noDraftsAvailable || projectLoadingFailed"
         >
@@ -119,6 +120,7 @@ <h1>{{ t("connect_to_project") }}</h1>
           <button
             matButton="filled"
             color="primary"
+            data-test-id="step-2-next"
             (click)="connectToProject()"
             [disabled]="isConnecting || isImporting || (connectionError != null && connectionError.length > 0)"
           >
@@ -170,7 +172,13 @@ <h1>{{ t("connected_to_project") }}</h1>
               <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
               {{ t("back") }}
             </button>
-            <button matButton="filled" matStepperNext color="primary" [disabled]="isImporting">
+            <button
+              matButton="filled"
+              matStepperNext
+              color="primary"
+              data-test-id="step-3-next"
+              [disabled]="isImporting"
+            >
               {{ showBookSelection || showOverwriteConfirmation ? t("next") : t("import") }}
               <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
             </button>
@@ -202,6 +210,7 @@ <h1>{{ t("select_books_to_import") }}</h1>
             matButton="filled"
             color="primary"
             matStepperNext
+            data-test-id="step-4-next"
             [disabled]="selectedBooks.length === 0 || isConnecting || isImporting || noDraftsAvailable"
           >
             {{ showOverwriteConfirmation ? t("next") : t("import") }}
@@ -273,6 +282,7 @@ <h1>{{ t("overwrite_books_question") }}</h1>
             matButton="filled"
             color="primary"
             matStepperNext
+            data-test-id="step-5-next"
             [disabled]="!overwriteForm.valid || isConnecting || isImporting"
           >
             {{ t("import") }}
@@ -330,7 +340,13 @@ <h1>{{ t("importing_draft") }}</h1>
       @if (importComplete) {
         <app-notice [icon]="'check_circle'" type="success">{{ t("import_complete") }}</app-notice>
         <div class="button-strip align-end">
-          <button matButton="filled" color="primary" matStepperNext [disabled]="isConnecting || isImporting">
+          <button
+            matButton="filled"
+            color="primary"
+            matStepperNext
+            data-test-id="step-6-next"
+            [disabled]="isConnecting || isImporting"
+          >
             {{ t("next") }}
             <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
           </button>
@@ -354,10 +370,21 @@ <h1>{{ t("sync_project_question") }}</h1>
         ></p>
 
         <div class="button-strip">
-          <button matButton="outlined" (click)="selectSkipSync()" [disabled]="isSyncing || isImporting">
+          <button
+            matButton="outlined"
+            data-test-id="step-7-skip"
+            (click)="selectSkipSync()"
+            [disabled]="isSyncing || isImporting"
+          >
             {{ t("skip_sync") }}
           </button>
-          <button matButton="filled" color="primary" (click)="selectSync()" [disabled]="isSyncing || isImporting">
+          <button
+            matButton="filled"
+            color="primary"
+            data-test-id="step-7-sync"
+            (click)="selectSync()"
+            [disabled]="isSyncing || isImporting"
+          >
             {{ t("sync") }}
             <mat-icon iconPositionEnd>sync</mat-icon>
           </button>
@@ -414,7 +441,13 @@ <h1>{{ t("complete") }}</h1>
         }
 
         <div class="button-strip align-end">
-          <button matButton="filled" color="primary" (click)="close()" [disabled]="isImporting || isSyncing">
+          <button
+            matButton="filled"
+            color="primary"
+            data-test-id="step-7-done"
+            (click)="close()"
+            [disabled]="isImporting || isSyncing"
+          >
             {{ t("done") }}
           </button>
         </div>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 14a81b8c2b..0b5b2364c8 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -70,7 +70,7 @@ export interface ImportProgress {
   failedChapters: { chapterNum: number; message?: string }[];
 }
 
-interface DraftApplyState {
+export interface DraftApplyState {
   bookNum: number;
   chapterNum: number;
   totalChapters: number;
@@ -78,7 +78,7 @@ interface DraftApplyState {
   status: DraftApplyStatus;
 }
 
-enum DraftApplyStatus {
+export enum DraftApplyStatus {
   None = 0,
   InProgress = 1,
   Successful = 2,

From 4674c0d8d07516f62725dd432824763a62310ab8 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 26 Jan 2026 16:09:52 +1300
Subject: [PATCH 16/40] SF-3633 Fix unit tests and storybook stories

---
 .../draft-import-wizard-component.spec.ts     | 20 +++++++++---------
 .../draft-import-wizard.stories.ts            | 21 ++++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
index 8bd30e758e..f38af60c86 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
@@ -6,7 +6,6 @@ import { By } from '@angular/platform-browser';
 import { provideNoopAnimations } from '@angular/platform-browser/animations';
 import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project';
 import { createTestProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-test-data';
-import { of } from 'rxjs';
 import { anything, mock, verify, when } from 'ts-mockito';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
@@ -25,7 +24,7 @@ import { SFProjectService } from '../../../core/sf-project.service';
 import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
 import { ProjectSelectComponent } from '../../../project-select/project-select.component';
-import { ProgressService, TextProgress } from '../../../shared/progress-service/progress.service';
+import { ProgressService, ProjectProgress } from '../../../shared/progress-service/progress.service';
 import { DraftApplyState, DraftApplyStatus, DraftImportWizardComponent } from './draft-import-wizard.component';
 
 const mockMatDialogRef = mock(MatDialogRef<DraftImportWizardComponent, boolean>);
@@ -274,14 +273,15 @@ class TestEnvironment {
       )
     });
 
-    when(mockProgressService.isLoaded$).thenReturn(of(true));
-    when(mockProgressService.texts).thenReturn([
-      { text: { bookNum: 1 } } as TextProgress,
-      { text: { bookNum: 2 } } as TextProgress,
-      { text: { bookNum: 3 } } as TextProgress,
-      { text: { bookNum: 4 } } as TextProgress,
-      { text: { bookNum: 5 } } as TextProgress
-    ]);
+    when(mockProgressService.getProgress(anything(), anything())).thenResolve(
+      new ProjectProgress([
+        { bookId: 'GEN', verseSegments: 100, blankVerseSegments: 0 },
+        { bookId: 'EXO', verseSegments: 100, blankVerseSegments: 0 },
+        { bookId: 'LEV', verseSegments: 100, blankVerseSegments: 100 },
+        { bookId: 'NUM', verseSegments: 22, blankVerseSegments: 2 },
+        { bookId: 'DEU', verseSegments: 0, blankVerseSegments: 0 }
+      ])
+    );
     when(mockProjectService.getText(anything())).thenResolve({
       getNonEmptyVerses: (): string[] => ['verse_1_1']
     } as TextDoc);
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
index 96bf92c796..0ac10f313d 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
@@ -4,7 +4,7 @@ import { Canon } from '@sillsdev/scripture';
 import { Meta, moduleMetadata, StoryObj } from '@storybook/angular';
 import { defaultTranslocoMarkupTranspilers } from 'ngx-transloco-markup';
 import { of } from 'rxjs';
-import { instance, mock, when } from 'ts-mockito';
+import { anything, instance, mock, when } from 'ts-mockito';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { ParatextProject } from '../../../core/models/paratext-project';
@@ -14,7 +14,7 @@ import { ProjectNotificationService } from '../../../core/project-notification.s
 import { SFProjectService } from '../../../core/sf-project.service';
 import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
-import { ProgressService, TextProgress } from '../../../shared/progress-service/progress.service';
+import { ProgressService, ProjectProgress } from '../../../shared/progress-service/progress.service';
 import {
   BookForImport,
   BookWithExistingText,
@@ -403,12 +403,13 @@ function setUpMocks(args: DraftImportWizardComponentState): void {
       // Else, never resolve.
     })
   );
-  when(mockProgressService.isLoaded$).thenReturn(of(true));
-  when(mockProgressService.texts).thenReturn([
-    { text: { bookNum: 1 } } as TextProgress,
-    { text: { bookNum: 2 } } as TextProgress,
-    { text: { bookNum: 3 } } as TextProgress,
-    { text: { bookNum: 4 } } as TextProgress,
-    { text: { bookNum: 5 } } as TextProgress
-  ]);
+  when(mockProgressService.getProgress(anything(), anything())).thenResolve(
+    new ProjectProgress([
+      { bookId: 'GEN', verseSegments: 100, blankVerseSegments: 0 },
+      { bookId: 'EXO', verseSegments: 100, blankVerseSegments: 0 },
+      { bookId: 'LEV', verseSegments: 100, blankVerseSegments: 100 },
+      { bookId: 'NUM', verseSegments: 22, blankVerseSegments: 2 },
+      { bookId: 'DEU', verseSegments: 0, blankVerseSegments: 0 }
+    ])
+  );
 }

From c1e83da8ae5253289b4982c1e894799688525e07 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 26 Jan 2026 16:32:33 +1300
Subject: [PATCH 17/40] SF-3633 Fix issues raised with the draft wizard

---
 .../draft-history-entry.component.ts          |  3 +-
 .../_draft-import-wizard-theme.scss           | 14 ++++++++
 .../draft-import-wizard.component.html        | 36 ++++---------------
 .../draft-import-wizard.component.scss        |  9 ++---
 .../draft-import-wizard.component.ts          | 35 +++++++-----------
 .../src/assets/i18n/non_checking_en.json      |  2 --
 .../ClientApp/src/material-styles.scss        |  2 ++
 7 files changed, 40 insertions(+), 61 deletions(-)
 create mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/_draft-import-wizard-theme.scss

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
index b3a757279d..b87d84900c 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
@@ -366,7 +366,8 @@ export class DraftHistoryEntryComponent {
       data: this._entry,
       width: '800px',
       maxWidth: '90vw',
-      disableClose: false
+      disableClose: false,
+      panelClass: 'use-application-text-color'
     });
   }
 }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/_draft-import-wizard-theme.scss b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/_draft-import-wizard-theme.scss
new file mode 100644
index 0000000000..f63543e028
--- /dev/null
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/_draft-import-wizard-theme.scss
@@ -0,0 +1,14 @@
+@use '@angular/material' as mat;
+
+@mixin theme($theme) {
+  .use-application-text-color {
+    .mat-mdc-dialog-container {
+      /* Use the same text color as the main application body, not the lighter dialog text color */
+      @include mat.dialog-overrides(
+        (
+          supporting-text-color: var(--mat-sys-on-surface)
+        )
+      );
+    }
+  }
+}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 28c680f29c..c3ffa2d1cd 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -4,11 +4,7 @@
     <ng-template matStepperIcon="edit" let-index="index">{{ index + 1 }}</ng-template>
 
     <!-- Step 1: Project Selection -->
-    <mat-step
-      [stepControl]="projectSelectionForm"
-      [completed]="projectSelectionForm.valid"
-      [editable]="!isConnecting && !isImporting"
-    >
+    <mat-step [stepControl]="projectSelectionForm" [completed]="projectSelectionForm.valid">
       <ng-template matStepLabel>{{ t("select_project") }}</ng-template>
 
       <h1>{{ t("select_project") }}</h1>
@@ -89,10 +85,7 @@ <h1>{{ t("select_project") }}</h1>
 
     <!-- Step 2: Connect Confirmation (conditional) -->
     @if (needsConnection) {
-      <mat-step
-        [completed]="!needsConnection || isConnecting || connectionError == null"
-        [editable]="!isConnecting && !isImporting"
-      >
+      <mat-step [completed]="!needsConnection || isConnecting || connectionError == null">
         <ng-template matStepLabel>{{ t("connect_project") }}</ng-template>
 
         <h1>{{ t("connect_to_project") }}</h1>
@@ -131,7 +124,7 @@ <h1>{{ t("connect_to_project") }}</h1>
       </mat-step>
 
       <!-- Step 3: Connecting (conditional) -->
-      <mat-step [completed]="!isConnecting && connectionError == null" [editable]="!isConnecting && !isImporting">
+      <mat-step [completed]="!isConnecting && connectionError == null">
         <ng-template matStepLabel>{{ t("connecting") }}</ng-template>
 
         @if (isConnecting) {
@@ -189,7 +182,7 @@ <h1>{{ t("connected_to_project") }}</h1>
 
     <!-- Step 4: Book Selection (conditional - only if multiple books) -->
     @if (showBookSelection) {
-      <mat-step [completed]="selectedBooks.length > 0" [editable]="!isConnecting && !isImporting">
+      <mat-step [completed]="selectedBooks.length > 0">
         <ng-template matStepLabel>{{ t("select_books") }}</ng-template>
 
         <h1>{{ t("select_books_to_import") }}</h1>
@@ -222,11 +215,7 @@ <h1>{{ t("select_books_to_import") }}</h1>
 
     <!-- Step 5: Overwrite Confirmation (conditional - shows appropriate variant) -->
     @if (showOverwriteConfirmation) {
-      <mat-step
-        [stepControl]="overwriteForm"
-        [completed]="overwriteForm.valid"
-        [editable]="!isConnecting && !isImporting"
-      >
+      <mat-step [stepControl]="overwriteForm" [completed]="overwriteForm.valid">
         <ng-template matStepLabel>{{ t("confirm_overwrite") }}</ng-template>
 
         @if (booksWithExistingText.length === 1) {
@@ -260,13 +249,6 @@ <h1>{{ t("overwrite_books_question") }}</h1>
           </ul>
         }
 
-        @if (isConnecting || isImporting) {
-          <app-notice type="info">
-            {{ isConnecting ? t("waiting_for_connection_to_finish") : t("waiting_for_import_to_finish") }}
-          </app-notice>
-          <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
-        }
-
         <form [formGroup]="overwriteForm">
           <mat-checkbox formControlName="confirmOverwrite">
             {{ t("i_understand_overwrite_content") }}
@@ -293,11 +275,7 @@ <h1>{{ t("overwrite_books_question") }}</h1>
     }
 
     <!-- Step 6: Import Progress -->
-    <mat-step
-      #importStep
-      [completed]="importComplete"
-      [editable]="!isConnecting && !isImporting && (!showOverwriteConfirmation || overwriteForm.valid)"
-    >
+    <mat-step #importStep [completed]="importComplete">
       <ng-template matStepLabel>{{ t("importing") }}</ng-template>
 
       <h1>{{ t("importing_draft") }}</h1>
@@ -355,7 +333,7 @@ <h1>{{ t("importing_draft") }}</h1>
     </mat-step>
 
     <!-- Step 7: Sync Confirmation and Completion -->
-    <mat-step [completed]="syncComplete || skipSync" [editable]="!isConnecting && !isImporting && !isSyncing">
+    <mat-step [completed]="syncComplete || skipSync">
       <ng-template matStepLabel>{{ t("complete") }}</ng-template>
 
       @if (!isSyncing && !syncComplete && !skipSync) {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
index b58a465fef..d734deebb4 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.scss
@@ -33,7 +33,7 @@
 
   .progress-text {
     font-size: 0.875rem;
-    color: var(--mdc-theme-text-secondary-on-background, rgba(0, 0, 0, 0.6));
+    color: var(--mat-sys-on-surface-variant);
   }
 
   .failed-chapters {
@@ -41,7 +41,7 @@
     align-items: center;
     column-gap: 0.35rem;
     margin-top: 0.35rem;
-    color: var(--mdc-theme-error, #b00020);
+    color: var(--mat-sys-error);
 
     .error-icon {
       font-size: 1.1rem;
@@ -77,11 +77,6 @@ app-sync-progress {
 }
 
 ::ng-deep {
-  mat-dialog-content {
-    /* Use the same text color as the main application body, not the lighter dialog text color */
-    color: var(--mat-sidenav-content-text-color, var(--mat-sys-on-background)) !important;
-  }
-
   /* Hide the wizard headings at the top of the dialog */
   mat-stepper .mat-horizontal-stepper-header-container {
     display: none;
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 0b5b2364c8..dbefbae243 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -190,14 +190,10 @@ export class DraftImportWizardComponent implements OnInit {
         const projectDoc = await this.projectService.get(this.targetProjectId);
         this.targetProjectDoc$.next(projectDoc);
         if (projectDoc.data != null) {
-          await this.analyzeTargetProject(projectDoc.data, paratextProject.isConnected);
+          await this.loadTargetProjectAndValidate(projectDoc.data, paratextProject.isConnected);
         }
 
-        try {
-          await this.analyzeBooksForOverwrite();
-        } catch (analysisError) {
-          console.error('Failed to analyze books for overwrite', analysisError);
-        }
+        await this.determineBooksAndChaptersWithText();
 
         this.isConnecting = false;
         this.stepper?.next();
@@ -212,10 +208,8 @@ export class DraftImportWizardComponent implements OnInit {
         // updateConnectStatus() will handle the sync finishing and move to the next step after "connecting"
         this.stepper?.next();
 
-        if (this.targetProjectId != null) {
-          const projectDoc = await this.projectService.get(this.targetProjectId);
-          this.targetProjectDoc$.next(projectDoc);
-        }
+        const projectDoc = await this.projectService.get(this.targetProjectId);
+        this.targetProjectDoc$.next(projectDoc);
       }
     } catch (error) {
       this.connectionError =
@@ -238,13 +232,9 @@ export class DraftImportWizardComponent implements OnInit {
         return;
       }
 
-      void this.analyzeTargetProject(projectDoc.data, false)
+      void this.loadTargetProjectAndValidate(projectDoc.data, false)
         .then(async () => {
-          try {
-            return await this.analyzeBooksForOverwrite();
-          } catch (analysisError) {
-            console.error('Failed to analyze books for overwrite', analysisError);
-          }
+          return await this.determineBooksAndChaptersWithText();
         })
         .finally(() => {
           this.isConnecting = false;
@@ -467,11 +457,11 @@ export class DraftImportWizardComponent implements OnInit {
       try {
         const projectDoc = await this.projectService.getProfile(this.targetProjectId);
         if (projectDoc.data != null) {
-          await this.analyzeTargetProject(projectDoc.data, paratextProject.isConnected);
+          await this.loadTargetProjectAndValidate(projectDoc.data, paratextProject.isConnected);
         }
 
         // Analyze books for overwrite confirmation
-        await this.analyzeBooksForOverwrite();
+        await this.determineBooksAndChaptersWithText();
       } finally {
         this.isLoadingProject = false;
       }
@@ -491,7 +481,7 @@ export class DraftImportWizardComponent implements OnInit {
     }
   }
 
-  private async analyzeTargetProject(project: SFProjectProfile, isConnected: boolean): Promise<void> {
+  private async loadTargetProjectAndValidate(project: SFProjectProfile, isConnected: boolean): Promise<void> {
     // Check permissions for all books
     this.canEditProject = this.textDocService.userHasGeneralEditRight(project);
 
@@ -565,6 +555,7 @@ export class DraftImportWizardComponent implements OnInit {
 
   private async validateProject(): Promise<void> {
     await new Promise<void>(resolve => {
+      // setTimeout prevents a "changed after checked" exception (may be removable after SF-3014)
       setTimeout(() => {
         this.projectSelect?.customValidate(SFValidators.customValidator(this.getCustomErrorState()));
         resolve();
@@ -593,7 +584,7 @@ export class DraftImportWizardComponent implements OnInit {
     this.booksMissingWithoutPermission = false;
     this.bookCreationError = undefined;
     this.missingBookNames = [];
-    void this.analyzeBooksForOverwrite();
+    void this.determineBooksAndChaptersWithText();
     void this.validateProject();
   }
 
@@ -634,13 +625,13 @@ export class DraftImportWizardComponent implements OnInit {
     }
 
     // Analyze books for overwrite confirmation
-    await this.analyzeBooksForOverwrite();
+    await this.determineBooksAndChaptersWithText();
 
     this.stepper?.next();
     this.isLoadingProject = false;
   }
 
-  private async analyzeBooksForOverwrite(): Promise<void> {
+  private async determineBooksAndChaptersWithText(): Promise<void> {
     if (this.targetProjectId == null) return;
 
     this.booksWithExistingText = [];
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
index 62e7700492..25cb95accf 100644
--- 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
@@ -365,8 +365,6 @@
     "sync_project_question": "Sync project now?",
     "sync": "Sync",
     "syncing_project": "Syncing project",
-    "waiting_for_connection_to_finish": "Please wait while the project finishes connecting.",
-    "waiting_for_import_to_finish": "Please wait until the current import finishes.",
     "waiting_for_project_to_load": "Please wait for the project to load before proceeding."
   },
   "draft_preview_books": {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/material-styles.scss b/src/SIL.XForge.Scripture/ClientApp/src/material-styles.scss
index 34593d5047..086205ed85 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/material-styles.scss
+++ b/src/SIL.XForge.Scripture/ClientApp/src/material-styles.scss
@@ -24,6 +24,7 @@
 @use 'src/app/translate/draft-generation/draft-signup-form/draft-onboarding-form-theme' as sf-draft-onboarding-form;
 @use 'src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry-theme' as
   sf-draft-history-entry;
+@use 'src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-theme' as sf-draft-import-wizard;
 @use 'src/app/translate/draft-generation/draft-usfm-format/draft-usfm-format-theme' as sf-draft-usfm-format;
 @use 'src/app/translate/draft-generation/training-data/training-data-upload-dialog-theme' as
   sf-training-data-upload-dialog;
@@ -64,6 +65,7 @@
   @include sf-confirm-sources.theme($theme);
   @include sf-draft-generation-steps.theme($theme);
   @include sf-draft-history-entry.theme($theme);
+  @include sf-draft-import-wizard.theme($theme);
   @include sf-draft-sources.theme($theme);
   @include sf-draft-onboarding-form.theme($theme);
   @include sf-draft-usfm-format.theme($theme);

From 35fb4adffed2c340f3680eaecb074edfa1bc1345 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 27 Jan 2026 14:06:06 +1300
Subject: [PATCH 18/40] SF-3633 Fix issues raised in code review feedback

---
 .../draft-import-wizard.component.ts          | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index dbefbae243..89d8906a6a 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -135,6 +135,10 @@ export class DraftImportWizardComponent implements OnInit {
   targetProject$ = new BehaviorSubject<SFProjectProfile | undefined>(undefined);
   targetProjectDoc$ = new BehaviorSubject<SFProjectDoc | undefined>(undefined);
   canEditProject = true;
+  /**
+   * If true, text is to be imported to books in the target project which do not exist,
+   * and which the user does not have permission to create those books.
+   */
   booksMissingWithoutPermission = false;
   missingBookNames: string[] = [];
   bookCreationError?: string;
@@ -232,7 +236,7 @@ export class DraftImportWizardComponent implements OnInit {
         return;
       }
 
-      void this.loadTargetProjectAndValidate(projectDoc.data, false)
+      void this.loadTargetProjectAndValidate(projectDoc.data, true)
         .then(async () => {
           return await this.determineBooksAndChaptersWithText();
         })
@@ -352,7 +356,7 @@ export class DraftImportWizardComponent implements OnInit {
     this.setupInvalidMessageMapper();
     void this.loadProjects();
     this.initializeAvailableBooks();
-    void this.loadSourceProjectContext();
+    this.sourceProjectId = this.activatedProjectService.projectId;
   }
 
   private setupInvalidMessageMapper(): void {
@@ -410,14 +414,6 @@ export class DraftImportWizardComponent implements OnInit {
     this.showBookSelection = this.availableBooksForImport.length > 1;
   }
 
-  private async loadSourceProjectContext(): Promise<void> {
-    this.sourceProjectId = this.activatedProjectService.projectId;
-    if (this.sourceProjectId == null) {
-      this.noDraftsAvailable = this.availableBooksForImport.length === 0;
-      return;
-    }
-  }
-
   async projectSelected(paratextId: string): Promise<void> {
     if (paratextId == null) {
       this.targetProject$.next(undefined);
@@ -509,12 +505,11 @@ export class DraftImportWizardComponent implements OnInit {
     let project = this.targetProject$.value;
     if (project == null) {
       const profileDoc = await this.projectService.getProfile(this.targetProjectId);
-      project = profileDoc.data ?? undefined;
-      if (project != null) {
-        this.targetProject$.next(project);
-      } else {
+      project = profileDoc.data;
+      if (project == null) {
         return false;
       }
+      this.targetProject$.next(project);
     }
 
     const booksToImport = this.getBooksToImport();
@@ -533,7 +528,7 @@ export class DraftImportWizardComponent implements OnInit {
     const canCreateBooks = this.textDocService.userHasGeneralEditRight(project);
     if (!canCreateBooks) {
       this.booksMissingWithoutPermission = true;
-      const booksDescription = this.missingBookNames.length > 0 ? ` (${this.missingBookNames.join(', ')})` : '';
+      const booksDescription = ` (${this.missingBookNames.join(', ')})`;
       this.bookCreationError = this.i18n.translateStatic('draft_import_wizard.books_missing_no_permission', {
         booksDescription
       });

From 36a427024cae1babed9e4eec92ed3f4a01abef05 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 27 Jan 2026 15:34:51 +1300
Subject: [PATCH 19/40] SF-3633 Pruning unused translation strings

---
 .../ClientApp/src/assets/i18n/non_checking_en.json        | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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
index 25cb95accf..421c3247fd 100644
--- 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
@@ -313,7 +313,6 @@
     "previously_generated_drafts": "Previously generated drafts"
   },
   "draft_import_wizard": {
-    "add_to_project": "Add to project",
     "book_does_not_exist": "One or more selected books do not exist in this project, and you do not have permission to create them",
     "books_missing_no_permission": "The selected books{{ booksDescription }} do not exist in this project, and you do not have permission to create them. Choose another project or contact a project administrator for access.",
     "back": "Back",
@@ -331,7 +330,6 @@
     "connecting_to_project": "Connecting to project",
     "connecting": "Connecting",
     "connection_failed": "Connection failed",
-    "create_missing_chapters": "Create missing chapters in the project",
     "done": "Done",
     "failed_to_connect_project": "Something went wrong while connecting. Please try again.",
     "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again.",
@@ -368,11 +366,7 @@
     "waiting_for_project_to_load": "Please wait for the project to load before proceeding."
   },
   "draft_preview_books": {
-    "add_to_project": "Add to project",
-    "add_to_different_project": "Add to a different project",
-    "no_books_have_drafts": "No books have any drafts.",
-    "no_permission_to_edit_book": "You do not have permission to write to this book. Contact your project administrator to get permission.",
-    "readd_to_project": "Re-add to project"
+    "no_books_have_drafts": "No books have any drafts."
   },
   "draft_sources": {
     "add_another_reference_project": "Add another reference project",

From a8443db6c50060396a7094e7594596f6498af0a1 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 27 Jan 2026 16:15:16 +1300
Subject: [PATCH 20/40] SF-3633 Fixed chapter plurality bug

---
 .../draft-import-wizard/draft-import-wizard.component.html   | 5 ++++-
 .../draft-import-wizard/draft-import-wizard.stories.ts       | 4 ++--
 .../ClientApp/src/assets/i18n/non_checking_en.json           | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index c3ffa2d1cd..3f27f7f2a1 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -244,7 +244,10 @@ <h1>{{ t("overwrite_books_question") }}</h1>
           ></p>
           <ul>
             @for (book of booksWithExistingText; track book.bookNum) {
-              <li>{{ book.bookName }}: {{ t("num_chapters", { count: book.chaptersWithText.length }) }}</li>
+              <li>
+                {{ book.bookName }}: {{ book.chaptersWithText.length }}
+                {{ book.chaptersWithText.length === 1 ? t("chapter") : t("chapters") }}
+              </li>
             }
           </ul>
         }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
index 0ac10f313d..628fce12fe 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
@@ -297,7 +297,7 @@ export const StepFive: Story = {
     step: 5,
     selectedParatextProject: { shortName: 'P01', name: 'Project 01' } as ParatextProject,
     booksWithExistingText: [
-      getBookWithExistingText(1, 3),
+      getBookWithExistingText(1, 1),
       getBookWithExistingText(2, 4),
       getBookWithExistingText(3, 7),
       getBookWithExistingText(4, 5),
@@ -329,7 +329,7 @@ export const StepSix: Story = {
     ],
     // importProgress is used if importStepTriggered is true
     importProgress: [
-      getImportProgress(1, 3, 3, 0),
+      getImportProgress(1, 1, 1, 0),
       getImportProgress(2, 4, 3, 1),
       getImportProgress(3, 7, 3, 0),
       getImportProgress(4, 5, 0, 0)
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
index 421c3247fd..a608b988a5 100644
--- 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
@@ -317,6 +317,7 @@
     "books_missing_no_permission": "The selected books{{ booksDescription }} do not exist in this project, and you do not have permission to create them. Choose another project or contact a project administrator for access.",
     "back": "Back",
     "cancel": "Cancel",
+    "chapter": "chapter",
     "chapters": "chapters",
     "choose_project": "Choose a project",
     "complete": "Complete",
@@ -344,7 +345,6 @@
     "next": "Next",
     "no_books_ready_for_import": "No draft chapters are ready for import. Generate a draft and try again.",
     "no_write_permissions": "You do not have write permissions for the selected book(s)",
-    "num_chapters": "{{ count }} chapters",
     "overwrite_book_description": "{{ bookName }} in {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} has {{ numChapters }} chapters with existing text that will be overwritten.",
     "overwrite_book_question": "Overwrite {{ bookName }}?",
     "overwrite_books_description": "The following books in {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} have chapters with existing text that will be overwritten:",

From f95e6aa0a4f3035fbf0a31c337c257ad778903fd Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 2 Feb 2026 11:56:57 +1300
Subject: [PATCH 21/40] SF-3633 Removed the old draft apply dialog and progress

---
 .../draft-apply-dialog.component.html         |  68 ---
 .../draft-apply-dialog.component.scss         |  34 --
 .../draft-apply-dialog.component.spec.ts      | 403 ------------------
 .../draft-apply-dialog.component.ts           | 285 -------------
 .../draft-apply-dialog.stories.ts             |  54 ---
 ...draft-apply-progress-dialog.component.html |  38 --
 ...draft-apply-progress-dialog.component.scss |  61 ---
 ...ft-apply-progress-dialog.component.spec.ts |  82 ----
 .../draft-apply-progress-dialog.component.ts  |  59 ---
 .../draft-generation.component.scss           |   4 -
 .../draft-preview-books.component.spec.ts     |   2 -
 11 files changed, 1090 deletions(-)
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.html
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.scss
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.spec.ts
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.ts
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.stories.ts
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.html
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.scss
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.spec.ts
 delete mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.ts

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.html
deleted file mode 100644
index 796bc38b0c..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.html
+++ /dev/null
@@ -1,68 +0,0 @@
-@if (isLoading) {
-  <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
-}
-
-<ng-container *transloco="let t; read: 'draft_apply_dialog'">
-  <h2 mat-dialog-title>{{ t("select_alternate_project") }}</h2>
-  <div mat-dialog-content>
-    <form [formGroup]="addToProjectForm">
-      @if (!isLoading) {
-        <app-project-select
-          [projects]="projects"
-          [placeholder]="t('choose_project')"
-          [isDisabled]="projects.length === 0"
-          [required]="true"
-          [validators]="[projectSelectCustomValidator]"
-          [errorMessageMapper]="errorMessageMapper"
-          (projectSelect)="projectSelected($event.paratextId)"
-          formControlName="targetParatextId"
-        ></app-project-select>
-      }
-      @if (!isAppOnline) {
-        <mat-error class="offline-message">{{ t("connect_to_the_internet") }}</mat-error>
-      }
-      @if (isValid) {
-        <div class="target-project-content">
-          @if (targetChapters$ | async; as chapters) {
-            <app-notice icon="warning" type="warning">
-              {{
-                i18n.getPluralRule(chapters) !== "one"
-                  ? t("project_has_text_in_chapters", { bookName, numChapters: chapters, projectName })
-                  : t("project_has_text_in_one_chapter", { bookName, projectName })
-              }}
-            </app-notice>
-          } @else {
-            <app-notice [icon]="'verified'">{{ t("book_is_empty", { bookName, projectName }) }}</app-notice>
-          }
-        </div>
-        <mat-checkbox class="overwrite-content" formControlName="overwrite">
-          {{ t("i_understand_overwrite_book", { projectName, bookName }) }}
-        </mat-checkbox>
-        @if (addToProjectClicked && !overwriteConfirmed) {
-          <mat-error class="form-error overwrite-content-error"> {{ t("confirm_overwrite") }} </mat-error>
-        }
-        @if (projectHasMissingChapters()) {
-          <mat-checkbox class="create-chapters" formControlName="createChapters">
-            {{ t("i_understand_missing_chapters_are_created", { projectName, bookName }) }}
-          </mat-checkbox>
-          @if (addToProjectClicked && !confirmCreateChapters) {
-            <mat-error class="form-error create-chapters-error"> {{ t("confirm_create_chapters") }} </mat-error>
-          }
-        }
-      }
-    </form>
-    <div class="unlisted-project-message">
-      <a
-        [appRouterLink]="['projects']"
-        (click)="close()"
-        [innerHtml]="i18n.translateAndInsertTags('draft_apply_dialog.looking_for_unlisted_project')"
-      ></a>
-    </div>
-  </div>
-  <div mat-dialog-actions>
-    <button mat-button class="cancel-button" [mat-dialog-close]="false">{{ t("cancel") }}</button>
-    <button mat-flat-button class="add-button" color="primary" (click)="addToProject()">
-      {{ t("add_to_project") }}
-    </button>
-  </div>
-</ng-container>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.scss b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.scss
deleted file mode 100644
index 91007167c1..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use 'src/variables';
-
-.mat-mdc-dialog-actions {
-  justify-content: flex-end;
-}
-
-.target-project-content {
-  display: flex;
-  align-items: center;
-  column-gap: 12px;
-  padding: 8px 0;
-}
-
-.unlisted-project-message {
-  margin-top: 1em;
-}
-
-a {
-  text-decoration: none;
-  color: initial;
-  cursor: initial;
-
-  ::ng-deep u {
-    cursor: pointer;
-    &:hover {
-      color: variables.$theme-secondary;
-    }
-  }
-}
-
-.overwrite-content,
-.create-chapters {
-  inset-inline-start: -8px;
-}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.spec.ts
deleted file mode 100644
index 292a87ebf1..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.spec.ts
+++ /dev/null
@@ -1,403 +0,0 @@
-import { OverlayContainer } from '@angular/cdk/overlay';
-import { HarnessLoader } from '@angular/cdk/testing';
-import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
-import { Component } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, tick } from '@angular/core/testing';
-import { MatAutocompleteHarness } from '@angular/material/autocomplete/testing';
-import { MatCheckboxHarness } from '@angular/material/checkbox/testing';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { provideNoopAnimations } from '@angular/platform-browser/animations';
-import { provideRouter, Route } from '@angular/router';
-import { SFProjectRole } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-role';
-import { createTestProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-test-data';
-import { TextInfoPermission } from 'realtime-server/lib/esm/scriptureforge/models/text-info-permission';
-import { of } from 'rxjs';
-import { anything, mock, verify, when } from 'ts-mockito';
-import { OnlineStatusService } from 'xforge-common/online-status.service';
-import { provideTestOnlineStatus } from 'xforge-common/test-online-status-providers';
-import { TestOnlineStatusService } from 'xforge-common/test-online-status.service';
-import { configureTestingModule, getTestTranslocoModule } from 'xforge-common/test-utils';
-import { SFUserProjectsService } from 'xforge-common/user-projects.service';
-import { UserService } from 'xforge-common/user.service';
-import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
-import { TextDoc } from '../../../core/models/text-doc';
-import { SFProjectService } from '../../../core/sf-project.service';
-import { TextDocService } from '../../../core/text-doc.service';
-import { projectLabel } from '../../../shared/utils';
-import { DraftApplyDialogComponent } from './draft-apply-dialog.component';
-
-const mockedUserProjectsService = mock(SFUserProjectsService);
-const mockedProjectService = mock(SFProjectService);
-const mockedUserService = mock(UserService);
-const mockedDialogRef = mock(MatDialogRef);
-const mockedTextDocService = mock(TextDocService);
-
-@Component({
-  template: `<div>Mock</div>`
-})
-class MockComponent {}
-
-const ROUTES: Route[] = [{ path: 'projects', component: MockComponent }];
-
-let env: TestEnvironment;
-
-describe('DraftApplyDialogComponent', () => {
-  configureTestingModule(() => ({
-    imports: [getTestTranslocoModule()],
-    providers: [
-      provideRouter(ROUTES),
-      provideTestOnlineStatus(),
-      provideNoopAnimations(),
-      { provide: SFUserProjectsService, useMock: mockedUserProjectsService },
-      { provide: SFProjectService, useMock: mockedProjectService },
-      { provide: UserService, useMock: mockedUserService },
-      { provide: TextDocService, useMock: mockedTextDocService },
-      { provide: OnlineStatusService, useClass: TestOnlineStatusService },
-      { provide: MatDialogRef, useMock: mockedDialogRef },
-      { provide: MAT_DIALOG_DATA, useValue: { bookNum: 1, chapters: [1, 2] } }
-    ]
-  }));
-
-  beforeEach(async () => {
-    env = new TestEnvironment();
-  });
-
-  it('can get projects', fakeAsync(() => {
-    expect(env.cancelButton).toBeTruthy();
-    expect(env.component.projects.map(p => p.paratextId)).toEqual(['paratextId1', 'paratextId2']);
-    env.cancelButton.click();
-    tick();
-    env.fixture.detectChanges();
-  }));
-
-  it('shows additional information to users', fakeAsync(() => {
-    expect(env.unlistedProjectMessage).not.toBeNull();
-    expect(env.overwriteContentMessage).toBeNull();
-    expect(env.targetProjectContent).toBeNull();
-  }));
-
-  it('add button does not work until form is valid', fakeAsync(async () => {
-    expect(env.addButton).toBeTruthy();
-    await env.selectParatextProject('paratextId1');
-    expect(env.matErrorMessage).toBeNull();
-    env.addButton.click();
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogRef.close()).never();
-    expect(env.matErrorMessage).toBe('Please confirm you want to overwrite the book.');
-    const harness = await env.overwriteCheckboxHarness();
-    harness.check();
-    tick();
-    env.fixture.detectChanges();
-    expect(env.matErrorMessage).toBeNull();
-    env.addButton.click();
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogRef.close(anything())).once();
-  }));
-
-  it('can add draft to project when project selected', fakeAsync(async () => {
-    await env.selectParatextProject('paratextId1');
-    const harness = await env.overwriteCheckboxHarness();
-    harness.check();
-    tick();
-    env.fixture.detectChanges();
-    expect(env.addButton.attributes['disabled']).toBeUndefined();
-    env.component.addToProject();
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogRef.close(anything())).once();
-  }));
-
-  it('checks if the user has edit permissions', fakeAsync(async () => {
-    await env.selectParatextProject('paratextId1');
-    const harness = await env.overwriteCheckboxHarness();
-    harness.check();
-    tick();
-    env.fixture.detectChanges();
-    expect(env.targetProjectContent).not.toBeNull();
-    expect(env.component['targetProjectId']).toBe('project01');
-    verify(mockedTextDocService.userHasGeneralEditRight(anything())).twice();
-    tick();
-    env.fixture.detectChanges();
-    expect(env.component.isValid).toBeTrue();
-    expect(env.matErrorMessage).toBeNull();
-  }));
-
-  // Skipped
-  xit('notifies user if no edit permissions', fakeAsync(async () => {
-    await env.selectParatextProject('paratextId2');
-    expect(env.component['targetProjectId']).toBe('project02');
-    verify(mockedTextDocService.userHasGeneralEditRight(anything())).twice();
-    // Broken
-    expect(env.component.isValid).toBeFalse();
-    expect(env.matErrorMessage).toBe(
-      "You do not have permission to write to this book on this project. Contact the project's administrator to get permission."
-    );
-    // hides the message when an invalid project is selected
-    await env.selectParatextProject('');
-    tick();
-    env.fixture.detectChanges();
-    expect(env.matErrorMessage).toBe('Please select a valid project or resource');
-    expect(env.component.isValid).toBeFalse();
-  }));
-
-  it('user must confirm create chapters if book has missing chapters', fakeAsync(async () => {
-    const projectDoc = {
-      id: 'project03',
-      data: createTestProjectProfile(
-        {
-          paratextId: 'paratextId3',
-          userRoles: { user01: SFProjectRole.ParatextAdministrator },
-          texts: [
-            {
-              bookNum: 1,
-              chapters: [{ number: 1, permissions: { user01: TextInfoPermission.Write }, lastVerse: 31 }],
-              permissions: { user01: TextInfoPermission.Write }
-            }
-          ]
-        },
-        3
-      )
-    } as SFProjectProfileDoc;
-    env = new TestEnvironment({ projectDoc });
-    await env.selectParatextProject('paratextId3');
-    expect(env.component['targetProjectId']).toBe('project03');
-    tick();
-    env.fixture.detectChanges();
-    expect(env.component.projectHasMissingChapters()).toBe(true);
-    const overwriteHarness = await env.overwriteCheckboxHarness();
-    await overwriteHarness.check();
-    const createChapters = await env.createChaptersCheckboxHarnessAsync();
-    expect(createChapters).not.toBeNull();
-    env.component.addToProject();
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogRef.close(anything())).never();
-
-    // check the checkbox
-    await createChapters.check();
-    tick();
-    env.fixture.detectChanges();
-    env.component.addToProject();
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogRef.close(anything())).once();
-  }));
-
-  it('user must confirm create chapters if book is empty', fakeAsync(async () => {
-    const projectDoc = {
-      id: 'project03',
-      data: createTestProjectProfile(
-        {
-          paratextId: 'paratextId3',
-          userRoles: { user01: SFProjectRole.ParatextAdministrator },
-          texts: [
-            {
-              bookNum: 1,
-              chapters: [{ number: 1, permissions: { user01: TextInfoPermission.Write }, lastVerse: 0 }],
-              permissions: { user01: TextInfoPermission.Write }
-            }
-          ]
-        },
-        3
-      )
-    } as SFProjectProfileDoc;
-    env = new TestEnvironment({ projectDoc });
-    await env.selectParatextProject('paratextId3');
-    expect(env.component['targetProjectId']).toBe('project03');
-    tick();
-    env.fixture.detectChanges();
-    expect(env.component.projectHasMissingChapters()).toBe(true);
-    const overwriteHarness = await env.overwriteCheckboxHarness();
-    await overwriteHarness.check();
-    const createChapters = await env.createChaptersCheckboxHarnessAsync();
-    expect(createChapters).not.toBeNull();
-    env.component.addToProject();
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogRef.close(anything())).never();
-
-    // select a valid project
-    await env.selectParatextProject('paratextId1');
-    expect(env.component['targetProjectId']).toBe('project01');
-    tick();
-    env.fixture.detectChanges();
-    expect(env.component.projectHasMissingChapters()).toBe(false);
-    env.component.addToProject();
-    tick();
-    env.fixture.detectChanges();
-    verify(mockedDialogRef.close(anything())).once();
-  }));
-
-  // Skipped
-  xit('updates the target project info when updating the project in the selector', fakeAsync(async () => {
-    await env.selectParatextProject('paratextId1');
-    expect(env.targetProjectContent.textContent).toContain('Test project 1');
-    // the user does not have permission to edit 'paratextId2' so the info section is hidden
-    await env.selectParatextProject('paratextId2');
-    tick();
-    flush();
-    env.fixture.detectChanges();
-    // Broken
-    expect(env.targetProjectContent).toBeNull();
-  }));
-
-  it('notifies user if offline', fakeAsync(async () => {
-    await env.selectParatextProject('paratextId1');
-    expect(env.offlineWarning).toBeNull();
-    const harness = await env.overwriteCheckboxHarness();
-    harness.check();
-    tick();
-    env.fixture.detectChanges();
-    env.onlineStatus = false;
-    tick();
-    env.fixture.detectChanges();
-    expect(env.offlineWarning).not.toBeNull();
-  }));
-});
-
-// Helper harness that wires the component under test with mocked services and DOM helpers.
-class TestEnvironment {
-  component: DraftApplyDialogComponent;
-  fixture: ComponentFixture<DraftApplyDialogComponent>;
-  loader: HarnessLoader;
-
-  onlineStatusService = TestBed.inject(OnlineStatusService) as TestOnlineStatusService;
-  private readonly overlayContainer = TestBed.inject(OverlayContainer);
-
-  constructor(args: { projectDoc?: SFProjectProfileDoc } = {}) {
-    when(mockedUserService.currentUserId).thenReturn('user01');
-    this.setupProject(args.projectDoc);
-    this.fixture = TestBed.createComponent(DraftApplyDialogComponent);
-    this.loader = TestbedHarnessEnvironment.loader(this.fixture);
-    this.component = this.fixture.componentInstance;
-    this.fixture.detectChanges();
-  }
-
-  get addButton(): HTMLElement {
-    return this.fixture.nativeElement.querySelector('.add-button');
-  }
-
-  get cancelButton(): HTMLElement {
-    return this.fixture.nativeElement.querySelector('.cancel-button');
-  }
-
-  get targetProjectContent(): HTMLElement {
-    return this.fixture.nativeElement.querySelector('.target-project-content');
-  }
-
-  get overwriteContentMessage(): HTMLElement {
-    return this.fixture.nativeElement.querySelector('.overwrite-content');
-  }
-
-  get unlistedProjectMessage(): HTMLElement {
-    return this.fixture.nativeElement.querySelector('.unlisted-project-message');
-  }
-
-  get offlineWarning(): HTMLElement {
-    return this.fixture.nativeElement.querySelector('.offline-message');
-  }
-
-  get matErrorMessage(): string | null {
-    const matErrors: HTMLElement[] = Array.from(this.fixture.nativeElement.querySelectorAll('mat-error'));
-    if (matErrors.length === 0) return null;
-    expect(matErrors.length).toBe(1);
-    return matErrors[0].textContent!.trim();
-  }
-
-  set onlineStatus(online: boolean) {
-    this.onlineStatusService.setIsOnline(online);
-    tick();
-    this.fixture.detectChanges();
-  }
-
-  async overwriteCheckboxHarness(): Promise<MatCheckboxHarness> {
-    return await this.loader.getHarness(MatCheckboxHarness.with({ selector: '.overwrite-content' }));
-  }
-
-  async createChaptersCheckboxHarnessAsync(): Promise<MatCheckboxHarness> {
-    return await this.loader.getHarness(MatCheckboxHarness.with({ selector: '.create-chapters' }));
-  }
-
-  async selectParatextProject(paratextId: string): Promise<void> {
-    const autocomplete = await this.loader.getHarness(MatAutocompleteHarness);
-    await autocomplete.focus();
-
-    if (paratextId === '') {
-      await autocomplete.clear();
-      await autocomplete.blur();
-      await this.stabilizeFormAsync();
-      return;
-    }
-
-    const project = this.component.projects.find(p => p.paratextId === paratextId);
-    expect(project).withContext(`Missing project for ${paratextId}`).toBeDefined();
-    if (project == null) {
-      return;
-    }
-
-    const searchText = project.shortName ?? project.name ?? paratextId;
-    await autocomplete.clear();
-    await autocomplete.enterText(searchText);
-    await autocomplete.selectOption({ text: projectLabel(project) });
-    await autocomplete.blur();
-    await this.stabilizeFormAsync();
-  }
-
-  private async stabilizeFormAsync(): Promise<void> {
-    await this.fixture.whenStable();
-    tick();
-    this.fixture.detectChanges();
-    this.clearOverlayContainer();
-  }
-
-  private clearOverlayContainer(): void {
-    const container = this.overlayContainer.getContainerElement();
-    if (container.childElementCount > 0) {
-      container.innerHTML = '';
-    }
-  }
-
-  private setupProject(projectDoc?: SFProjectProfileDoc): void {
-    const projectPermissions = [
-      { id: 'project01', permission: TextInfoPermission.Write },
-      { id: 'project02', permission: TextInfoPermission.Read },
-      { id: 'resource03', permission: TextInfoPermission.Read }
-    ];
-    const mockProjectDocs: SFProjectProfileDoc[] = [];
-    let projectNum = 1;
-    for (const { id, permission } of projectPermissions) {
-      const mockedProject = {
-        id,
-        data: createTestProjectProfile(
-          {
-            paratextId: id.startsWith('resource') ? `resource16char0${projectNum}` : `paratextId${projectNum}`,
-            userRoles: { user01: SFProjectRole.ParatextAdministrator },
-            texts: [
-              {
-                bookNum: 1,
-                chapters: [
-                  { number: 1, permissions: { user01: permission }, lastVerse: 31 },
-                  { number: 2, permissions: { user01: permission }, lastVerse: 25 }
-                ],
-                permissions: { user01: permission }
-              }
-            ]
-          },
-          projectNum++
-        )
-      } as SFProjectProfileDoc;
-      mockProjectDocs.push(mockedProject);
-    }
-    if (projectDoc != null) {
-      mockProjectDocs.push(projectDoc);
-    }
-    when(mockedUserProjectsService.projectDocs$).thenReturn(of(mockProjectDocs));
-    const mockedTextDoc = {
-      getNonEmptyVerses: (): string[] => ['verse_1_1', 'verse_1_2', 'verse_1_3']
-    } as TextDoc;
-    when(mockedProjectService.getText(anything())).thenResolve(mockedTextDoc);
-    when(mockedTextDocService.userHasGeneralEditRight(anything())).thenReturn(true);
-  }
-}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.ts
deleted file mode 100644
index 0c3f933fa3..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.component.ts
+++ /dev/null
@@ -1,285 +0,0 @@
-import { AsyncPipe } from '@angular/common';
-import { Component, Inject, OnInit } from '@angular/core';
-import {
-  AbstractControl,
-  FormControl,
-  FormGroup,
-  FormsModule,
-  ReactiveFormsModule,
-  ValidationErrors,
-  Validators
-} from '@angular/forms';
-import { MatButton } from '@angular/material/button';
-import { MatCheckbox } from '@angular/material/checkbox';
-import {
-  MAT_DIALOG_DATA,
-  MatDialogActions,
-  MatDialogClose,
-  MatDialogContent,
-  MatDialogRef,
-  MatDialogTitle
-} from '@angular/material/dialog';
-import { MatError } from '@angular/material/form-field';
-import { MatProgressBar } from '@angular/material/progress-bar';
-import { TranslocoModule } from '@ngneat/transloco';
-import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project';
-import { Chapter, TextInfo } from 'realtime-server/lib/esm/scriptureforge/models/text-info';
-import { TextInfoPermission } from 'realtime-server/lib/esm/scriptureforge/models/text-info-permission';
-import { BehaviorSubject, map } from 'rxjs';
-import { I18nService } from 'xforge-common/i18n.service';
-import { OnlineStatusService } from 'xforge-common/online-status.service';
-import { RouterLinkDirective } from 'xforge-common/router-link.directive';
-import { SFUserProjectsService } from 'xforge-common/user-projects.service';
-import { UserService } from 'xforge-common/user.service';
-import { filterNullish } from 'xforge-common/util/rxjs-util';
-import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
-import { TextDoc, TextDocId } from '../../../core/models/text-doc';
-import { ParatextService } from '../../../core/paratext.service';
-import { SFProjectService } from '../../../core/sf-project.service';
-import { TextDocService } from '../../../core/text-doc.service';
-import { ProjectSelectComponent } from '../../../project-select/project-select.component';
-import { NoticeComponent } from '../../../shared/notice/notice.component';
-import { compareProjectsForSorting } from '../../../shared/utils';
-
-export interface DraftApplyDialogResult {
-  projectId: string;
-}
-
-export interface DraftApplyDialogConfig {
-  initialParatextId?: string;
-  bookNum: number;
-  chapters: number[];
-}
-
-@Component({
-  selector: 'app-draft-apply-dialog',
-  imports: [
-    RouterLinkDirective,
-    MatButton,
-    MatCheckbox,
-    MatProgressBar,
-    MatDialogContent,
-    MatDialogClose,
-    MatDialogActions,
-    MatDialogTitle,
-    MatError,
-    FormsModule,
-    ReactiveFormsModule,
-    TranslocoModule,
-    AsyncPipe,
-    NoticeComponent,
-    ProjectSelectComponent
-  ],
-  templateUrl: './draft-apply-dialog.component.html',
-  styleUrl: './draft-apply-dialog.component.scss'
-})
-export class DraftApplyDialogComponent implements OnInit {
-  /** An observable that emits the target project profile if the user has permission to write to the book. */
-  targetProject$: BehaviorSubject<SFProjectProfile | undefined> = new BehaviorSubject<SFProjectProfile | undefined>(
-    undefined
-  );
-
-  _projects?: SFProjectProfile[];
-  protected isLoading: boolean = true;
-  addToProjectForm = new FormGroup({
-    targetParatextId: new FormControl<string | undefined>(this.data.initialParatextId, Validators.required),
-    overwrite: new FormControl(false, Validators.requiredTrue),
-    createChapters: new FormControl(false, control =>
-      !this.projectHasMissingChapters() || control.value ? null : { mustConfirmCreateChapters: true }
-    )
-  });
-  /** An observable that emits the number of chapters in the target project that have some text. */
-  targetChapters$: BehaviorSubject<number> = new BehaviorSubject<number>(0);
-  addToProjectClicked: boolean = false;
-
-  // the project id to add the draft to
-  private targetProjectId?: string;
-  private paratextIdToProjectId: Map<string, string> = new Map<string, string>();
-
-  constructor(
-    @Inject(MAT_DIALOG_DATA) private data: DraftApplyDialogConfig,
-    @Inject(MatDialogRef) private dialogRef: MatDialogRef<DraftApplyDialogComponent, DraftApplyDialogResult>,
-    private readonly userProjectsService: SFUserProjectsService,
-    private readonly projectService: SFProjectService,
-    private readonly textDocService: TextDocService,
-    readonly i18n: I18nService,
-    private readonly userService: UserService,
-    private readonly onlineStatusService: OnlineStatusService
-  ) {
-    this.targetProject$.pipe(filterNullish()).subscribe(async project => {
-      const chapters: number = await this.chaptersWithTextAsync(project);
-      this.targetChapters$.next(chapters);
-    });
-  }
-
-  get isValid(): boolean {
-    return this.addToProjectForm.controls.targetParatextId.valid;
-  }
-
-  get projects(): SFProjectProfile[] {
-    return this._projects ?? [];
-  }
-
-  get bookName(): string {
-    return this.i18n.localizeBook(this.data.bookNum);
-  }
-
-  get isFormValid(): boolean {
-    return this.addToProjectForm.valid;
-  }
-
-  get overwriteConfirmed(): boolean {
-    return !!this.addToProjectForm.controls.overwrite.value;
-  }
-
-  get createChaptersControl(): FormControl {
-    return this.addToProjectForm.controls.createChapters;
-  }
-
-  get confirmCreateChapters(): boolean {
-    return !!this.createChaptersControl.value;
-  }
-
-  get projectSelectValid(): boolean {
-    return this.addToProjectForm.controls.targetParatextId.valid;
-  }
-
-  get projectName(): string {
-    return this.targetProject$.value?.name ?? '';
-  }
-
-  get isAppOnline(): boolean {
-    return this.onlineStatusService.isOnline;
-  }
-
-  ngOnInit(): void {
-    this.userProjectsService.projectDocs$
-      .pipe(
-        filterNullish(),
-        map(resourceAndProjectDocs => {
-          const projects: SFProjectProfile[] = [];
-          const userProjectDocs: SFProjectProfileDoc[] = resourceAndProjectDocs.filter(
-            p => p.data != null && !ParatextService.isResource(p.data.paratextId)
-          );
-          for (const projectDoc of userProjectDocs) {
-            if (projectDoc.data != null) {
-              projects.push(projectDoc.data);
-              this.paratextIdToProjectId.set(projectDoc.data.paratextId, projectDoc.id);
-            }
-          }
-          return projects.sort(compareProjectsForSorting);
-        })
-      )
-      .subscribe(projects => {
-        this._projects = projects;
-        this.isLoading = false;
-      });
-  }
-
-  async addToProject(): Promise<void> {
-    this.addToProjectClicked = true;
-    this.addToProjectForm.controls.createChapters.updateValueAndValidity();
-    const project = this.targetProject$.getValue();
-    if (
-      !this.isAppOnline ||
-      !this.isFormValid ||
-      this.targetProjectId == null ||
-      project == null ||
-      !this.canEditProject(project)
-    ) {
-      return;
-    }
-    this.dialogRef.close({ projectId: this.targetProjectId });
-  }
-
-  projectSelected(paratextId: string): void {
-    if (paratextId == null) {
-      this.targetProject$.next(undefined);
-      return;
-    }
-
-    const project: SFProjectProfile | undefined = this.projects.find(p => p.paratextId === paratextId);
-    this.createChaptersControl.updateValueAndValidity();
-
-    if (project == null) {
-      this.targetProject$.next(undefined);
-      return;
-    }
-
-    this.targetProjectId = this.paratextIdToProjectId.get(paratextId);
-
-    // emit the project profile document
-    if (this.canEditProject(project)) {
-      this.targetProject$.next(project);
-    } else {
-      this.targetProject$.next(undefined);
-    }
-  }
-
-  projectHasMissingChapters(): boolean {
-    const project = this.targetProject$.getValue();
-    const targetBook: TextInfo | undefined = project?.texts.find(t => t.bookNum === this.data.bookNum);
-    const bookIsEmpty: boolean = targetBook?.chapters.length === 1 && targetBook?.chapters[0].lastVerse < 1;
-    const targetBookChapters: number[] = targetBook?.chapters.map(c => c.number) ?? [];
-    return bookIsEmpty || this.data.chapters.filter(c => !targetBookChapters.includes(c)).length > 0;
-  }
-
-  targetBookExists(project: SFProjectProfile): boolean {
-    const targetBook: TextInfo | undefined = project.texts.find(t => t.bookNum === this.data.bookNum);
-    return targetBook != null;
-  }
-
-  canEditProject(project: SFProjectProfile): boolean {
-    const targetBook: TextInfo | undefined = project.texts.find(t => t.bookNum === this.data.bookNum);
-
-    return (
-      this.textDocService.userHasGeneralEditRight(project) &&
-      targetBook?.permissions[this.userService.currentUserId] === TextInfoPermission.Write
-    );
-  }
-
-  close(): void {
-    this.dialogRef.close();
-  }
-
-  private async chaptersWithTextAsync(project: SFProjectProfile): Promise<number> {
-    if (this.targetProjectId == null) return 0;
-    const chapters: Chapter[] | undefined = project.texts.find(t => t.bookNum === this.data.bookNum)?.chapters;
-    if (chapters == null) return 0;
-    const textPromises: Promise<boolean>[] = [];
-    for (const chapter of chapters) {
-      const textDocId = new TextDocId(this.targetProjectId, this.data.bookNum, chapter.number);
-      textPromises.push(this.isNotEmpty(textDocId));
-    }
-    return (await Promise.all(textPromises)).filter(hasText => hasText).length;
-  }
-
-  private async isNotEmpty(textDocId: TextDocId): Promise<boolean> {
-    const textDoc: TextDoc = await this.projectService.getText(textDocId);
-    return textDoc.getNonEmptyVerses().length > 0;
-  }
-
-  private _projectSelectCustomValidator(control: AbstractControl): ValidationErrors | null {
-    const project = control.value as SFProjectProfile | string | null;
-    if (project == null || typeof project === 'string') return null;
-
-    const errors: { [key: string]: boolean } = {};
-    if (!this.targetBookExists(project)) errors.bookNotFound = true;
-    if (!this.canEditProject(project)) errors.noWritePermissions = true;
-    return Object.keys(errors).length > 0 ? errors : null;
-  }
-
-  projectSelectCustomValidator = this._projectSelectCustomValidator.bind(this);
-
-  private _errorMessageMapper(errors: ValidationErrors): string | null {
-    if (errors.bookNotFound) {
-      return this.i18n.translateStatic('draft_apply_dialog.book_does_not_exist', { bookName: this.bookName });
-    }
-    if (errors.noWritePermissions) {
-      return this.i18n.translateStatic('draft_apply_dialog.no_write_permissions');
-    }
-    return null;
-  }
-
-  errorMessageMapper = this._errorMessageMapper.bind(this);
-}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.stories.ts
deleted file mode 100644
index bfcf4893da..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-dialog/draft-apply-dialog.stories.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { MatDialogRef } from '@angular/material/dialog';
-import { ActivatedRoute } from '@angular/router';
-import { Meta } from '@storybook/angular';
-import { createTestProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-test-data';
-import { BehaviorSubject } from 'rxjs';
-import { anything, instance, mock, when } from 'ts-mockito';
-import { I18nService } from 'xforge-common/i18n.service';
-import { SFUserProjectsService } from 'xforge-common/user-projects.service';
-import { UserService } from 'xforge-common/user.service';
-import { MatDialogLaunchComponent, matDialogStory } from '../../../../../.storybook/util/mat-dialog-launch';
-import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
-import { SFProjectService } from '../../../core/sf-project.service';
-import { TextDocService } from '../../../core/text-doc.service';
-import { DraftApplyDialogComponent } from './draft-apply-dialog.component';
-
-const mockedUserProjectService = mock(SFUserProjectsService);
-const mockedI18nService = mock(I18nService);
-const mockedDialogRef = mock(MatDialogRef);
-const mockedProjectService = mock(SFProjectService);
-const mockedTextDocService = mock(TextDocService);
-const mockedUserService = mock(UserService);
-const mockActivatedRoute = mock(ActivatedRoute);
-const projectDoc = {
-  id: 'project01',
-  data: createTestProjectProfile()
-} as SFProjectProfileDoc;
-const projectDocs$: BehaviorSubject<SFProjectProfileDoc[] | undefined> = new BehaviorSubject<
-  SFProjectProfileDoc[] | undefined
->([projectDoc]);
-
-when(mockedUserProjectService.projectDocs$).thenReturn(projectDocs$);
-when(mockedI18nService.translateAndInsertTags(anything())).thenReturn(
-  'Looking for a project that is not listed? Connect it on <u>the projects page</u> first.'
-);
-
-const meta: Meta = {
-  title: 'Misc/Dialogs/Draft Apply Dialog',
-  component: MatDialogLaunchComponent
-};
-export default meta;
-
-export const DraftApplyDialog = matDialogStory(DraftApplyDialogComponent, {
-  providers: [
-    { provide: ActivatedRoute, useValue: instance(mockActivatedRoute) },
-    { provide: SFUserProjectsService, useValue: instance(mockedUserProjectService) },
-    { provide: I18nService, useValue: instance(mockedI18nService) },
-    { provide: MatDialogRef, useValue: instance(mockedDialogRef) },
-    { provide: SFProjectService, useValue: instance(mockedProjectService) },
-    { provide: TextDocService, useValue: instance(mockedTextDocService) },
-    { provide: UserService, useValue: instance(mockedUserService) }
-  ]
-});
-DraftApplyDialog.args = { data: { bookNum: 1 } };
-DraftApplyDialog.parameters = { chromatic: { disableSnapshot: true } };
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.html
deleted file mode 100644
index 665e90b73d..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<ng-container *transloco="let t; read: 'draft_apply_progress-dialog'">
-  <mat-dialog-content class="hide-scroll">
-    <div class="progress-content">
-      @if (draftApplyProgress?.completed !== true) {
-        <div class="progress-container">
-          <mat-progress-bar mode="determinate" color="primary" [value]="progress"></mat-progress-bar>
-          <p>{{ t("add_draft_to_book", { bookName }) }}</p>
-        </div>
-      } @else {
-        <div class="result-container">
-          @if (failedToApplyChapters != null && failedToApplyChapters.length > 0) {
-            <div class="error-result">
-              <h2 class="failed-message">
-                <mat-icon>warning</mat-icon>
-                <span>{{ t("some_chapters_not_applied", { bookName }) }}</span>
-              </h2>
-              <div class="error-content">
-                <span>{{ t("failed_to_apply_chapters") }}</span>
-                @for (message of draftApplyProgress?.errorMessages; track $index) {
-                  <span class="failed-chapters">{{ message }}</span>
-                }
-              </div>
-            </div>
-          } @else {
-            <h2>
-              <span>{{ t("successfully_applied_all_chapters", { bookName }) }}</span>
-            </h2>
-          }
-        </div>
-      }
-    </div>
-  </mat-dialog-content>
-  <mat-dialog-actions>
-    @if (draftApplyProgress?.completed === true) {
-      <button mat-flat-button (click)="close()">{{ t("close") }}</button>
-    }
-  </mat-dialog-actions>
-</ng-container>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.scss b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.scss
deleted file mode 100644
index edd68e4c27..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-.progress-content {
-  min-width: 240px;
-  max-width: 500px;
-  display: flex;
-  flex-direction: column;
-  min-height: 0;
-
-  .progress-container {
-    width: 100%;
-    flex-direction: column;
-    align-items: center;
-
-    mat-progress-bar {
-      margin-top: 1em;
-    }
-  }
-
-  .result-container {
-    display: flex;
-    flex-direction: column;
-    min-height: 0;
-  }
-
-  .error-result {
-    display: flex;
-    flex-direction: column;
-    min-height: 0;
-
-    .mat-icon {
-      flex-shrink: 0;
-    }
-
-    .failed-chapters {
-      text-indent: 1em;
-      margin-top: 0.5em;
-      line-height: 1.2em;
-    }
-
-    .error-content {
-      overflow-y: auto;
-      display: flex;
-      flex-direction: column;
-    }
-  }
-
-  .failed-message {
-    display: flex;
-    column-gap: 8px;
-    align-items: center;
-  }
-}
-
-.hide-scroll {
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-}
-
-.mat-mdc-dialog-actions {
-  justify-content: flex-end;
-}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.spec.ts
deleted file mode 100644
index a6bad1158a..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.spec.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { BehaviorSubject } from 'rxjs';
-import { anything, mock, when } from 'ts-mockito';
-import { I18nService } from 'xforge-common/i18n.service';
-import { configureTestingModule, getTestTranslocoModule } from 'xforge-common/test-utils';
-import { DraftApplyProgress, DraftApplyProgressDialogComponent } from './draft-apply-progress-dialog.component';
-
-const mockI18nService = mock(I18nService);
-const mockMatDialogRef = mock(MatDialogRef);
-
-describe('DraftApplyProgressDialogComponent', () => {
-  let env: TestEnvironment;
-  const progress$: BehaviorSubject<DraftApplyProgress> = new BehaviorSubject<DraftApplyProgress>({
-    bookNum: 1,
-    completed: false,
-    chapters: [1, 2, 3],
-    chaptersApplied: [],
-    errorMessages: []
-  });
-
-  configureTestingModule(() => ({
-    imports: [getTestTranslocoModule()],
-    providers: [
-      { provide: I18nService, useMock: mockI18nService },
-      { provide: MatDialogRef, useMock: mockMatDialogRef },
-      { provide: MAT_DIALOG_DATA, useValue: { draftApplyProgress$: progress$ } }
-    ]
-  }));
-
-  beforeEach(async () => {
-    env = new TestEnvironment();
-  });
-
-  it('shows progress', () => {
-    progress$.next({ bookNum: 1, chapters: [1, 2], chaptersApplied: [1], completed: false, errorMessages: [] });
-    env.fixture.detectChanges();
-    expect(env.progressContainer).not.toBeNull();
-    expect(env.resultContainer).toBeNull();
-    expect(env.component.progress).toBe(50);
-  });
-
-  it('shows apply draft completed', () => {
-    progress$.next({ bookNum: 1, chapters: [1, 2], chaptersApplied: [1, 2], completed: true, errorMessages: [] });
-    env.fixture.detectChanges();
-    expect(env.progressContainer).toBeNull();
-    expect(env.resultContainer).not.toBeNull();
-    expect(env.component.failedToApplyChapters).toBeUndefined();
-    expect(env.resultContainer.textContent).toContain('Successfully applied all chapters');
-  });
-
-  it('shows chapters that failed to be applied', () => {
-    progress$.next({ bookNum: 1, chapters: [1, 2], chaptersApplied: [1], completed: true, errorMessages: ['error'] });
-    env.fixture.detectChanges();
-    expect(env.progressContainer).toBeNull();
-    expect(env.resultContainer).not.toBeNull();
-    expect(env.component.failedToApplyChapters).toEqual('2');
-    expect(env.resultContainer.textContent).toContain('warning');
-    expect(env.component.draftApplyProgress?.errorMessages).toContain('error');
-  });
-});
-
-class TestEnvironment {
-  component: DraftApplyProgressDialogComponent;
-  fixture: ComponentFixture<DraftApplyProgressDialogComponent>;
-
-  constructor() {
-    this.fixture = TestBed.createComponent(DraftApplyProgressDialogComponent);
-    this.component = this.fixture.componentInstance;
-    this.fixture.detectChanges();
-    when(mockI18nService.enumerateList(anything())).thenCall((items: string[]) => items.join(', '));
-  }
-
-  get progressContainer(): HTMLElement {
-    return this.fixture.nativeElement.querySelector('.progress-container');
-  }
-
-  get resultContainer(): HTMLElement {
-    return this.fixture.nativeElement.querySelector('.result-container');
-  }
-}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.ts
deleted file mode 100644
index d4adb94c79..0000000000
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-apply-progress-dialog/draft-apply-progress-dialog.component.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Component, DestroyRef, Inject } from '@angular/core';
-import { MatButton } from '@angular/material/button';
-import { MAT_DIALOG_DATA, MatDialogActions, MatDialogContent, MatDialogRef } from '@angular/material/dialog';
-import { MatIcon } from '@angular/material/icon';
-import { MatProgressBar } from '@angular/material/progress-bar';
-import { TranslocoModule } from '@ngneat/transloco';
-import { Observable } from 'rxjs';
-import { I18nService } from 'xforge-common/i18n.service';
-import { quietTakeUntilDestroyed } from 'xforge-common/util/rxjs-util';
-export interface DraftApplyProgress {
-  bookNum: number;
-  chapters: number[];
-  chaptersApplied: number[];
-  completed: boolean;
-  errorMessages: string[];
-}
-
-@Component({
-  selector: 'app-draft-apply-progress',
-  imports: [MatButton, MatIcon, MatProgressBar, MatDialogContent, MatDialogActions, TranslocoModule],
-  templateUrl: './draft-apply-progress-dialog.component.html',
-  styleUrl: './draft-apply-progress-dialog.component.scss'
-})
-export class DraftApplyProgressDialogComponent {
-  draftApplyProgress?: DraftApplyProgress;
-
-  constructor(
-    @Inject(MatDialogRef) private readonly dialogRef: MatDialogRef<DraftApplyProgressDialogComponent>,
-    @Inject(MAT_DIALOG_DATA) data: { draftApplyProgress$: Observable<DraftApplyProgress | undefined> },
-    private readonly i18n: I18nService,
-    destroyRef: DestroyRef
-  ) {
-    data.draftApplyProgress$
-      .pipe(quietTakeUntilDestroyed(destroyRef))
-      .subscribe(progress => (this.draftApplyProgress = progress));
-  }
-
-  get progress(): number | undefined {
-    if (this.draftApplyProgress == null) return undefined;
-    return (this.draftApplyProgress.chaptersApplied.length / this.draftApplyProgress.chapters.length) * 100;
-  }
-
-  get bookName(): string {
-    if (this.draftApplyProgress == null) return '';
-    return this.i18n.localizeBook(this.draftApplyProgress.bookNum);
-  }
-
-  get failedToApplyChapters(): string | undefined {
-    if (this.draftApplyProgress == null || !this.draftApplyProgress.completed) return undefined;
-    const chapters: string[] = this.draftApplyProgress.chapters
-      .filter(c => !this.draftApplyProgress?.chaptersApplied.includes(c))
-      .map(c => c.toString());
-    return chapters.length > 0 ? this.i18n.enumerateList(chapters) : undefined;
-  }
-
-  close(): void {
-    this.dialogRef.close();
-  }
-}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.scss b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.scss
index 5cf23bf7a1..3c6119d242 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.scss
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.scss
@@ -83,10 +83,6 @@ mat-divider.mat-divider-inset {
     flex-shrink: 0;
   }
 
-  app-draft-apply-progress {
-    width: 100%;
-  }
-
   h2 {
     font-weight: 500;
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.spec.ts
index 89ad64f2bf..7160c38d7e 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-preview-books/draft-preview-books.component.spec.ts
@@ -15,7 +15,6 @@ import { UserService } from 'xforge-common/user.service';
 import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
 import { SFProjectService } from '../../../core/sf-project.service';
 import { BuildDto } from '../../../machine-api/build-dto';
-import { DraftApplyProgress } from '../draft-apply-progress-dialog/draft-apply-progress-dialog.component';
 import { BookWithDraft, DraftPreviewBooksComponent } from './draft-preview-books.component';
 
 const mockedActivatedProjectService = mock(ActivatedProjectService);
@@ -72,7 +71,6 @@ describe('DraftPreviewBooks', () => {
 class TestEnvironment {
   component: DraftPreviewBooksComponent;
   fixture: ComponentFixture<DraftPreviewBooksComponent>;
-  draftApplyProgress?: DraftApplyProgress;
   progressSubscription?: Subscription;
   loader: HarnessLoader;
   readonly paratextId = 'pt01';

From 56cde0b301cdd97b08fc2300a107df7c8a87390f Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 26 Jan 2026 15:16:11 +1300
Subject: [PATCH 22/40] SF-3633 Release SignalR notification handlers

---
 .../src/app/core/project-notification.service.ts      |  4 ++++
 .../draft-import-wizard.component.ts                  | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
index 97f231bddf..0d26c13346 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
@@ -32,6 +32,10 @@ export class ProjectNotificationService {
     return this.onlineService.isOnline && this.onlineService.isBrowserOnline;
   }
 
+  removeNotifyDraftApplyProgressHandler(handler: any): void {
+    this.connection.off('notifyDraftApplyProgress', handler);
+  }
+
   removeNotifyBuildProgressHandler(handler: any): void {
     this.connection.off('notifyBuildProgress', handler);
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 89d8906a6a..c1bc6ba153 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -298,6 +298,10 @@ export class DraftImportWizardComponent implements OnInit {
 
   invalidMessageMapper: { [key: string]: string } = {};
 
+  private readonly notifyDraftApplyProgressHandler = (projectId: string, draftApplyState: DraftApplyState): void => {
+    this.updateDraftApplyState(projectId, draftApplyState);
+  };
+
   constructor(
     @Inject(MAT_DIALOG_DATA) readonly data: BuildDto,
     @Inject(MatDialogRef) private readonly dialogRef: MatDialogRef<DraftImportWizardComponent, boolean>,
@@ -310,14 +314,11 @@ export class DraftImportWizardComponent implements OnInit {
     private readonly onlineStatusService: OnlineStatusService,
     private readonly activatedProjectService: ActivatedProjectService
   ) {
-    this.projectNotificationService.setNotifyDraftApplyProgressHandler(
-      (projectId: string, draftApplyState: DraftApplyState) => {
-        this.updateDraftApplyState(projectId, draftApplyState);
-      }
-    );
+    this.projectNotificationService.setNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
     destroyRef.onDestroy(async () => {
       // Stop the SignalR connection when the component is destroyed
       await projectNotificationService.stop();
+      this.projectNotificationService.removeNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
     });
   }
 

From 07a09c42365e4ca8d3d7433170eb36ca6cac217e Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 2 Feb 2026 10:38:47 +1300
Subject: [PATCH 23/40] SF-3633 Removed dependency on custom validators

---
 .../draft-import-wizard.component.html        |  13 +-
 .../draft-import-wizard.component.ts          | 138 +++++-------------
 .../draft-import-wizard.stories.ts            |  10 +-
 .../src/assets/i18n/non_checking_en.json      |   5 +-
 4 files changed, 46 insertions(+), 120 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 3f27f7f2a1..3a738d942d 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -20,7 +20,6 @@ <h1>{{ t("select_project") }}</h1>
             [projects]="projects"
             [placeholder]="t('choose_project')"
             [isDisabled]="projects.length === 0 || isImporting || projectLoadingFailed"
-            [invalidMessageMapper]="invalidMessageMapper"
             (projectSelect)="projectSelected($event.paratextId)"
             formControlName="targetParatextId"
           ></app-project-select>
@@ -44,6 +43,10 @@ <h1>{{ t("select_project") }}</h1>
           <mat-error class="offline-message">{{ t("connect_to_the_internet") }}</mat-error>
         }
 
+        @if (!canEditProject) {
+          <app-notice type="error">{{ t("cannot_edit_project") }}</app-notice>
+        }
+
         @if (noDraftsAvailable) {
           <app-notice type="warning">{{ t("no_books_ready_for_import") }}</app-notice>
         }
@@ -54,10 +57,6 @@ <h1>{{ t("select_project") }}</h1>
           </app-notice>
         }
 
-        @if (bookCreationError != null && bookCreationError.length > 0) {
-          <app-notice type="error">{{ bookCreationError }}</app-notice>
-        }
-
         @if (cannotAdvanceFromProjectSelection && !projectReadyToImport) {
           <app-notice type="error" icon="error">{{
             !projectSelectionForm.valid ? t("select_project_description") : t("waiting_for_project_to_load")
@@ -75,7 +74,7 @@ <h1>{{ t("select_project") }}</h1>
           color="primary"
           data-test-id="step-1-next"
           (click)="advanceFromProjectSelection()"
-          [disabled]="!isAppOnline || noDraftsAvailable || projectLoadingFailed"
+          [disabled]="!isAppOnline || noDraftsAvailable || projectLoadingFailed || !canEditProject"
         >
           {{ needsConnection || showBookSelection || showOverwriteConfirmation ? t("next") : t("import") }}
           <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -297,7 +296,7 @@ <h1>{{ t("importing_draft") }}</h1>
             @if (progress.failedChapters.length > 0) {
               <div class="failed-chapters">
                 <mat-icon class="error-icon">error</mat-icon>
-                <span>Failed: {{ getFailedChapters(progress) }}</span>
+                <span>{{ t("failed") }} {{ getFailedChapters(progress) }}</span>
               </div>
             }
           </div>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index c1bc6ba153..2478a66068 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -34,7 +34,6 @@ import { BuildDto } from '../../../machine-api/build-dto';
 import { ProjectSelectComponent } from '../../../project-select/project-select.component';
 import { BookMultiSelectComponent } from '../../../shared/book-multi-select/book-multi-select.component';
 import { NoticeComponent } from '../../../shared/notice/notice.component';
-import { CustomValidatorState as CustomErrorState, SFValidators } from '../../../shared/sfvalidators';
 import { booksFromScriptureRange } from '../../../shared/utils';
 import { SyncProgressComponent } from '../../../sync/sync-progress/sync-progress.component';
 
@@ -120,7 +119,6 @@ export enum DraftApplyStatus {
 })
 export class DraftImportWizardComponent implements OnInit {
   @ViewChild(MatStepper) stepper?: MatStepper;
-  @ViewChild(ProjectSelectComponent) projectSelect?: ProjectSelectComponent;
   @ViewChild('importStep') importStep?: MatStep;
 
   // Step 1: Project selection
@@ -135,13 +133,6 @@ export class DraftImportWizardComponent implements OnInit {
   targetProject$ = new BehaviorSubject<SFProjectProfile | undefined>(undefined);
   targetProjectDoc$ = new BehaviorSubject<SFProjectDoc | undefined>(undefined);
   canEditProject = true;
-  /**
-   * If true, text is to be imported to books in the target project which do not exist,
-   * and which the user does not have permission to create those books.
-   */
-  booksMissingWithoutPermission = false;
-  missingBookNames: string[] = [];
-  bookCreationError?: string;
   projectLoadingFailed = false;
   sourceProjectId?: string;
   noDraftsAvailable = false;
@@ -296,8 +287,6 @@ export class DraftImportWizardComponent implements OnInit {
   syncComplete = false;
   skipSync = false;
 
-  invalidMessageMapper: { [key: string]: string } = {};
-
   private readonly notifyDraftApplyProgressHandler = (projectId: string, draftApplyState: DraftApplyState): void => {
     this.updateDraftApplyState(projectId, draftApplyState);
   };
@@ -354,20 +343,11 @@ export class DraftImportWizardComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.setupInvalidMessageMapper();
     void this.loadProjects();
     this.initializeAvailableBooks();
     this.sourceProjectId = this.activatedProjectService.projectId;
   }
 
-  private setupInvalidMessageMapper(): void {
-    this.invalidMessageMapper = {
-      invalidProject: this.i18n.translateStatic('draft_import_wizard.please_select_valid_project'),
-      bookNotFound: this.i18n.translateStatic('draft_import_wizard.book_does_not_exist'),
-      noWritePermissions: this.i18n.translateStatic('draft_import_wizard.no_write_permissions')
-    };
-  }
-
   private async loadProjects(): Promise<void> {
     try {
       const allProjects = await this.paratextService.getProjects();
@@ -428,13 +408,9 @@ export class DraftImportWizardComponent implements OnInit {
     const paratextProject = this.projects.find(p => p.paratextId === paratextId);
     if (paratextProject == null) {
       this.canEditProject = false;
-      this.booksMissingWithoutPermission = false;
-      this.bookCreationError = undefined;
-      this.missingBookNames = [];
       this.targetProject$.next(undefined);
       this.targetProjectDoc$.next(undefined);
       this.selectedParatextProject = undefined;
-      await this.validateProject();
       this.resetImportState();
       return;
     }
@@ -449,18 +425,21 @@ export class DraftImportWizardComponent implements OnInit {
       this.targetProjectId = paratextProject.projectId;
       this.needsConnection = !paratextProject.isConnected;
 
-      // Get the project profile to analyze
-      this.isLoadingProject = true;
-      try {
-        const projectDoc = await this.projectService.getProfile(this.targetProjectId);
-        if (projectDoc.data != null) {
-          await this.loadTargetProjectAndValidate(projectDoc.data, paratextProject.isConnected);
-        }
+      // If the project still needs connection, we will analyze after connecting
+      if (!this.needsConnection) {
+        // Get the project profile to analyze
+        this.isLoadingProject = true;
+        try {
+          const projectDoc = await this.projectService.getProfile(this.targetProjectId);
+          if (projectDoc.data != null) {
+            await this.loadTargetProjectAndValidate(projectDoc.data, paratextProject.isConnected);
+          }
 
-        // Analyze books for overwrite confirmation
-        await this.determineBooksAndChaptersWithText();
-      } finally {
-        this.isLoadingProject = false;
+          // Analyze books for overwrite confirmation
+          await this.determineBooksAndChaptersWithText();
+        } finally {
+          this.isLoadingProject = false;
+        }
       }
     } else {
       // Need to create SF project - this will happen after connection step
@@ -471,7 +450,6 @@ export class DraftImportWizardComponent implements OnInit {
         this.canEditProject = paratextProject.isConnectable;
         this.targetProject$.next(undefined);
         this.targetProjectDoc$.next(undefined);
-        await this.validateProject();
       } finally {
         this.isLoadingProject = false;
       }
@@ -494,11 +472,9 @@ export class DraftImportWizardComponent implements OnInit {
       this.targetProject$.next(undefined);
       this.targetProjectDoc$.next(undefined);
     }
-
-    await this.validateProject();
   }
 
-  private async ensureSelectedBooksExist(): Promise<boolean> {
+  private async ensureProjectExists(): Promise<boolean> {
     if (this.targetProjectId == null) {
       return false;
     }
@@ -513,63 +489,11 @@ export class DraftImportWizardComponent implements OnInit {
       this.targetProject$.next(project);
     }
 
-    const booksToImport = this.getBooksToImport();
-    const missingBooks: BookForImport[] = booksToImport.filter(book =>
-      project.texts.every(text => text.bookNum !== book.bookNum)
-    );
-
-    this.missingBookNames = missingBooks.map(book => book.bookName);
-
-    if (missingBooks.length === 0) {
-      this.booksMissingWithoutPermission = false;
-      this.bookCreationError = undefined;
-      return true;
-    }
-
-    const canCreateBooks = this.textDocService.userHasGeneralEditRight(project);
-    if (!canCreateBooks) {
-      this.booksMissingWithoutPermission = true;
-      const booksDescription = ` (${this.missingBookNames.join(', ')})`;
-      this.bookCreationError = this.i18n.translateStatic('draft_import_wizard.books_missing_no_permission', {
-        booksDescription
-      });
-      await this.validateProject();
-      return false;
-    }
-
-    this.booksMissingWithoutPermission = false;
-    this.bookCreationError = undefined;
     return true;
   }
 
   private resetProjectValidation(): void {
     this.canEditProject = true;
-    this.booksMissingWithoutPermission = false;
-    this.bookCreationError = undefined;
-    this.missingBookNames = [];
-  }
-
-  private async validateProject(): Promise<void> {
-    await new Promise<void>(resolve => {
-      // setTimeout prevents a "changed after checked" exception (may be removable after SF-3014)
-      setTimeout(() => {
-        this.projectSelect?.customValidate(SFValidators.customValidator(this.getCustomErrorState()));
-        resolve();
-      });
-    });
-  }
-
-  private getCustomErrorState(): CustomErrorState {
-    if (!this.projectSelectionForm.controls.targetParatextId.valid) {
-      return CustomErrorState.InvalidProject;
-    }
-    if (this.booksMissingWithoutPermission) {
-      return CustomErrorState.BookNotFound;
-    }
-    if (!this.canEditProject) {
-      return CustomErrorState.NoWritePermissions;
-    }
-    return CustomErrorState.None;
   }
 
   onBookSelect(selectedBooks: number[]): void {
@@ -577,21 +501,11 @@ export class DraftImportWizardComponent implements OnInit {
       book.selected = selectedBooks.includes(book.bookNum);
     }
     this.resetImportState();
-    this.booksMissingWithoutPermission = false;
-    this.bookCreationError = undefined;
-    this.missingBookNames = [];
     void this.determineBooksAndChaptersWithText();
-    void this.validateProject();
   }
 
   get projectReadyToImport(): boolean {
-    return (
-      this.projectSelectionForm.valid &&
-      !this.isConnecting &&
-      !this.isImporting &&
-      !this.isLoadingProject &&
-      !this.booksMissingWithoutPermission
-    );
+    return this.projectSelectionForm.valid && !this.isConnecting && !this.isImporting && !this.isLoadingProject;
   }
 
   async advanceFromProjectSelection(): Promise<void> {
@@ -614,8 +528,8 @@ export class DraftImportWizardComponent implements OnInit {
     }
 
     this.isLoadingProject = true;
-    const booksReady = await this.ensureSelectedBooksExist();
-    if (!booksReady) {
+    const projectExists = await this.ensureProjectExists();
+    if (!projectExists) {
       this.isLoadingProject = false;
       return;
     }
@@ -761,6 +675,10 @@ export class DraftImportWizardComponent implements OnInit {
         });
         this.isImporting = false;
         this.importError = draftApplyState.message;
+        const totalFailures = this.importProgress.reduce((sum, p) => sum + p.failedChapters.length, 0);
+        if (totalFailures > 0 && (this.importError == null || this.importError.length === 0)) {
+          this.importError = `Failed to import ${totalFailures} chapter(s). See details above.`;
+        }
       }
     } else if (draftApplyState.bookNum > 0) {
       // Handle the in-progress states
@@ -829,7 +747,17 @@ export class DraftImportWizardComponent implements OnInit {
   }
 
   getFailedChapters(progress: ImportProgress): string {
-    return progress.failedChapters.map(f => f.chapterNum).join(', ');
+    const failedChapters: number[] = progress.failedChapters.filter(f => f.chapterNum !== 0).map(f => f.chapterNum);
+    if (!progress.failedChapters.some(f => f.chapterNum === 0)) {
+      // A subset of chapters failed
+      return failedChapters.join(', ');
+    } else if (progress.totalChapters > 1) {
+      // All chapters failed, so display as a range
+      return `1-${progress.totalChapters}`;
+    } else {
+      // The only chapter in the book failed
+      return `${progress.totalChapters}`;
+    }
   }
 
   private resetImportState(): void {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
index 628fce12fe..c13f58f733 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
@@ -41,6 +41,7 @@ const mockOnlineStatusService = mock(OnlineStatusService);
 class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
   @ViewChild(DraftImportWizardComponent) component!: DraftImportWizardComponent;
   @Input() online: boolean = false;
+  @Input() canEditProject: boolean = true;
   @Input() importComplete: boolean = false;
   @Input() importStepTriggered: boolean = false;
   @Input() isConnecting: boolean = false;
@@ -55,7 +56,6 @@ class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
   @Input() showOverwriteConfirmation: boolean = false;
   @Input() skipSync: boolean = false;
   @Input() syncComplete: boolean = false;
-  @Input() bookCreationError?: string;
   @Input() connectionError?: string;
   @Input() importError?: string;
   @Input() targetProjectId?: string;
@@ -77,6 +77,7 @@ class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
     if (!this.component) return;
     setTimeout(() => {
       // Set the story specific arguments
+      this.component.canEditProject = this.canEditProject;
       this.component.importComplete = this.importComplete;
       this.component.importStepTriggered = this.importStepTriggered;
       this.component.isConnecting = this.isConnecting;
@@ -91,7 +92,6 @@ class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
       this.component.showOverwriteConfirmation = this.showOverwriteConfirmation;
       this.component.skipSync = this.skipSync;
       this.component.syncComplete = this.syncComplete;
-      this.component.bookCreationError = this.bookCreationError;
       this.component.connectionError = this.connectionError;
       this.component.importError = this.importError;
       this.component.targetProjectId = this.targetProjectId;
@@ -119,6 +119,7 @@ class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
 interface DraftImportWizardComponentState {
   online: boolean;
   step: number;
+  canEditProject: boolean;
   importComplete: boolean;
   importStepTriggered: boolean;
   isConnecting: boolean;
@@ -133,7 +134,6 @@ interface DraftImportWizardComponentState {
   showOverwriteConfirmation: boolean;
   skipSync: boolean;
   syncComplete: boolean;
-  bookCreationError?: string;
   connectionError?: string;
   importError?: string;
   targetProjectId?: string;
@@ -146,6 +146,7 @@ interface DraftImportWizardComponentState {
 const defaultArgs: DraftImportWizardComponentState = {
   online: true,
   step: 0,
+  canEditProject: true,
   importComplete: false,
   importStepTriggered: false,
   isConnecting: false,
@@ -160,7 +161,6 @@ const defaultArgs: DraftImportWizardComponentState = {
   showOverwriteConfirmation: false,
   skipSync: false,
   syncComplete: false,
-  bookCreationError: undefined,
   connectionError: undefined,
   importError: undefined,
   targetProjectId: undefined,
@@ -213,6 +213,7 @@ export default {
   },
   argTypes: {
     online: { control: 'boolean' },
+    canEditProject: { control: 'boolean' },
     importComplete: { control: 'boolean' },
     importStepTriggered: { control: 'boolean' },
     isConnecting: { control: 'boolean' },
@@ -227,7 +228,6 @@ export default {
     showOverwriteConfirmation: { control: 'boolean' },
     skipSync: { control: 'boolean' },
     syncComplete: { control: 'boolean' },
-    bookCreationError: { control: 'text' },
     connectionError: { control: 'text' },
     importError: { control: 'text' },
     targetProjectId: { control: 'text' },
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
index a608b988a5..ae7764508b 100644
--- 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
@@ -313,10 +313,9 @@
     "previously_generated_drafts": "Previously generated drafts"
   },
   "draft_import_wizard": {
-    "book_does_not_exist": "One or more selected books do not exist in this project, and you do not have permission to create them",
-    "books_missing_no_permission": "The selected books{{ booksDescription }} do not exist in this project, and you do not have permission to create them. Choose another project or contact a project administrator for access.",
     "back": "Back",
     "cancel": "Cancel",
+    "cannot_edit_project": "You do not have permission to edit this project",
     "chapter": "chapter",
     "chapters": "chapters",
     "choose_project": "Choose a project",
@@ -332,6 +331,7 @@
     "connecting": "Connecting",
     "connection_failed": "Connection failed",
     "done": "Done",
+    "failed": "Failed:",
     "failed_to_connect_project": "Something went wrong while connecting. Please try again.",
     "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again.",
     "i_understand_overwrite_content": "I understand that existing content will be overwritten",
@@ -344,7 +344,6 @@
     "importing": "Importing",
     "next": "Next",
     "no_books_ready_for_import": "No draft chapters are ready for import. Generate a draft and try again.",
-    "no_write_permissions": "You do not have write permissions for the selected book(s)",
     "overwrite_book_description": "{{ bookName }} in {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} has {{ numChapters }} chapters with existing text that will be overwritten.",
     "overwrite_book_question": "Overwrite {{ bookName }}?",
     "overwrite_books_description": "The following books in {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} have chapters with existing text that will be overwritten:",

From 26ef360f307135169553c0349271b28042cd5f29 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 2 Feb 2026 10:02:13 +1300
Subject: [PATCH 24/40] SF-3633 Updates based on code review feedback

---
 .../draft-import-wizard-component.spec.ts     |  2 +-
 .../draft-import-wizard.component.html        | 38 +++++-----
 .../draft-import-wizard.component.ts          | 72 ++++++-------------
 .../draft-import-wizard.stories.ts            |  5 --
 .../src/assets/i18n/non_checking_en.json      |  6 +-
 5 files changed, 43 insertions(+), 80 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
index f38af60c86..ba90e4cab3 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
@@ -286,7 +286,7 @@ class TestEnvironment {
       getNonEmptyVerses: (): string[] => ['verse_1_1']
     } as TextDoc);
     when(mockProjectService.onlineCreate(anything())).thenResolve('project02');
-    when(mockProjectService.getProfile(anything())).thenCall(id =>
+    when(mockProjectService.get(anything())).thenCall(id =>
       this.realtimeService.subscribe(SFProjectProfileDoc.COLLECTION, id)
     );
     when(mockTextDocService.userHasGeneralEditRight(anything())).thenReturn(true);
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 3a738d942d..d06c016cb4 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -47,13 +47,14 @@ <h1>{{ t("select_project") }}</h1>
           <app-notice type="error">{{ t("cannot_edit_project") }}</app-notice>
         }
 
-        @if (noDraftsAvailable) {
-          <app-notice type="warning">{{ t("no_books_ready_for_import") }}</app-notice>
-        }
-
-        @if (projectSelectionForm.valid && !isLoadingProject && (targetProject$ | async); as project) {
+        @if (projectSelectionForm.valid && !isLoadingProject && (targetProjectDoc$ | async); as project) {
           <app-notice [icon]="'verified'">
-            {{ t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name }) }}
+            {{
+              t("ready_to_import", {
+                projectShortName: project?.data?.shortName,
+                projectName: project?.data?.name
+              })
+            }}
           </app-notice>
         }
 
@@ -74,7 +75,7 @@ <h1>{{ t("select_project") }}</h1>
           color="primary"
           data-test-id="step-1-next"
           (click)="advanceFromProjectSelection()"
-          [disabled]="!isAppOnline || noDraftsAvailable || projectLoadingFailed || !canEditProject"
+          [disabled]="!isAppOnline || projectLoadingFailed || !canEditProject"
         >
           {{ needsConnection || showBookSelection || showOverwriteConfirmation ? t("next") : t("import") }}
           <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -129,10 +130,7 @@ <h1>{{ t("connect_to_project") }}</h1>
         @if (isConnecting) {
           <h1>{{ t("connecting_to_project") }}</h1>
           @if (targetProjectDoc$ | async; as projectDoc) {
-            <app-sync-progress
-              [projectDoc]="$any(projectDoc)"
-              (inProgress)="updateConnectStatus($event)"
-            ></app-sync-progress>
+            <app-sync-progress [projectDoc]="projectDoc" (inProgress)="updateConnectStatus($event)"></app-sync-progress>
           } @else {
             <p>{{ t("setting_up_project", { projectName: selectedParatextProject?.name }) }}</p>
             <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
@@ -154,9 +152,14 @@ <h1>{{ t("connection_failed") }}</h1>
           </div>
         } @else if (!isConnecting) {
           <h1>{{ t("connected_to_project") }}</h1>
-          @if (targetProject$ | async; as project) {
+          @if (targetProjectDoc$ | async; as projectDoc) {
             <app-notice [icon]="'verified'">
-              {{ t("ready_to_import", { projectShortName: $any(project).shortName, projectName: $any(project).name }) }}
+              {{
+                t("ready_to_import", {
+                  projectShortName: projectDoc?.data?.shortName,
+                  projectName: projectDoc?.data?.name
+                })
+              }}
             </app-notice>
           }
           <div class="button-strip">
@@ -189,7 +192,7 @@ <h1>{{ t("select_books_to_import") }}</h1>
           [availableBooks]="availableBooksForImport"
           [selectedBooks]="selectedBooks"
           [basicMode]="true"
-          [readonly]="isImporting || noDraftsAvailable"
+          [readonly]="isImporting"
           (bookSelect)="onBookSelect($event)"
         ></app-book-multi-select>
 
@@ -203,7 +206,7 @@ <h1>{{ t("select_books_to_import") }}</h1>
             color="primary"
             matStepperNext
             data-test-id="step-4-next"
-            [disabled]="selectedBooks.length === 0 || isConnecting || isImporting || noDraftsAvailable"
+            [disabled]="selectedBooks.length === 0 || isConnecting || isImporting"
           >
             {{ showOverwriteConfirmation ? t("next") : t("import") }}
             <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -374,10 +377,7 @@ <h1>{{ t("sync_project_question") }}</h1>
       @if (isSyncing) {
         <h1>{{ t("syncing_project") }}</h1>
         @if (targetProjectDoc$ | async; as projectDoc) {
-          <app-sync-progress
-            [projectDoc]="$any(projectDoc)"
-            (inProgress)="updateSyncStatus($event)"
-          ></app-sync-progress>
+          <app-sync-progress [projectDoc]="projectDoc" (inProgress)="updateSyncStatus($event)"></app-sync-progress>
         }
       }
 
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 2478a66068..041173e13b 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -18,7 +18,6 @@ import {
 } from '@angular/material/stepper';
 import { TranslocoModule } from '@ngneat/transloco';
 import { Canon } from '@sillsdev/scripture';
-import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project';
 import { BehaviorSubject } from 'rxjs';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
 import { I18nService } from 'xforge-common/i18n.service';
@@ -130,12 +129,10 @@ export class DraftImportWizardComponent implements OnInit {
   isLoadingProjects = true;
   targetProjectId?: string;
   selectedParatextProject?: ParatextProject;
-  targetProject$ = new BehaviorSubject<SFProjectProfile | undefined>(undefined);
   targetProjectDoc$ = new BehaviorSubject<SFProjectDoc | undefined>(undefined);
   canEditProject = true;
   projectLoadingFailed = false;
   sourceProjectId?: string;
-  noDraftsAvailable = false;
   cannotAdvanceFromProjectSelection = false;
 
   // Step 2-3: Project connection (conditional)
@@ -183,12 +180,7 @@ export class DraftImportWizardComponent implements OnInit {
 
         // Reload project data after connection
         const projectDoc = await this.projectService.get(this.targetProjectId);
-        this.targetProjectDoc$.next(projectDoc);
-        if (projectDoc.data != null) {
-          await this.loadTargetProjectAndValidate(projectDoc.data, paratextProject.isConnected);
-        }
-
-        await this.determineBooksAndChaptersWithText();
+        await this.loadTargetProjectAndValidate(projectDoc);
 
         this.isConnecting = false;
         this.stepper?.next();
@@ -226,14 +218,9 @@ export class DraftImportWizardComponent implements OnInit {
         this.isConnecting = false;
         return;
       }
-
-      void this.loadTargetProjectAndValidate(projectDoc.data, true)
-        .then(async () => {
-          return await this.determineBooksAndChaptersWithText();
-        })
-        .finally(() => {
-          this.isConnecting = false;
-        });
+      void this.loadTargetProjectAndValidate(projectDoc).finally(() => {
+        this.isConnecting = false;
+      });
     }
   }
 
@@ -246,9 +233,6 @@ export class DraftImportWizardComponent implements OnInit {
 
   onStepSelectionChange(event: StepperSelectionEvent): void {
     if (event.selectedStep === this.importStep && !this.importStepTriggered) {
-      if (this.noDraftsAvailable) {
-        return;
-      }
       this.importStepTriggered = true;
       void this.startImport();
     }
@@ -397,7 +381,6 @@ export class DraftImportWizardComponent implements OnInit {
 
   async projectSelected(paratextId: string): Promise<void> {
     if (paratextId == null) {
-      this.targetProject$.next(undefined);
       this.targetProjectDoc$.next(undefined);
       this.selectedParatextProject = undefined;
       this.resetProjectValidation();
@@ -408,7 +391,6 @@ export class DraftImportWizardComponent implements OnInit {
     const paratextProject = this.projects.find(p => p.paratextId === paratextId);
     if (paratextProject == null) {
       this.canEditProject = false;
-      this.targetProject$.next(undefined);
       this.targetProjectDoc$.next(undefined);
       this.selectedParatextProject = undefined;
       this.resetImportState();
@@ -430,13 +412,8 @@ export class DraftImportWizardComponent implements OnInit {
         // Get the project profile to analyze
         this.isLoadingProject = true;
         try {
-          const projectDoc = await this.projectService.getProfile(this.targetProjectId);
-          if (projectDoc.data != null) {
-            await this.loadTargetProjectAndValidate(projectDoc.data, paratextProject.isConnected);
-          }
-
-          // Analyze books for overwrite confirmation
-          await this.determineBooksAndChaptersWithText();
+          const projectDoc = await this.projectService.get(this.targetProjectId);
+          await this.loadTargetProjectAndValidate(projectDoc);
         } finally {
           this.isLoadingProject = false;
         }
@@ -448,7 +425,6 @@ export class DraftImportWizardComponent implements OnInit {
         this.targetProjectId = undefined;
         this.needsConnection = true;
         this.canEditProject = paratextProject.isConnectable;
-        this.targetProject$.next(undefined);
         this.targetProjectDoc$.next(undefined);
       } finally {
         this.isLoadingProject = false;
@@ -456,22 +432,16 @@ export class DraftImportWizardComponent implements OnInit {
     }
   }
 
-  private async loadTargetProjectAndValidate(project: SFProjectProfile, isConnected: boolean): Promise<void> {
+  private async loadTargetProjectAndValidate(projectDoc: SFProjectDoc): Promise<void> {
     // Check permissions for all books
-    this.canEditProject = this.textDocService.userHasGeneralEditRight(project);
-
-    // Connection status comes from ParatextProject
-    this.needsConnection = !isConnected && this.canEditProject;
-
-    if (this.canEditProject && this.targetProjectId != null) {
-      this.targetProject$.next(project);
-      // Load the full project doc for sync component
-      const projectDoc = await this.projectService.get(this.targetProjectId);
+    this.canEditProject = this.textDocService.userHasGeneralEditRight(projectDoc?.data);
+    if (this.canEditProject) {
       this.targetProjectDoc$.next(projectDoc);
     } else {
-      this.targetProject$.next(undefined);
       this.targetProjectDoc$.next(undefined);
     }
+
+    await this.analyzeBooksForOverwriteConfirmation();
   }
 
   private async ensureProjectExists(): Promise<boolean> {
@@ -479,14 +449,12 @@ export class DraftImportWizardComponent implements OnInit {
       return false;
     }
 
-    let project = this.targetProject$.value;
-    if (project == null) {
-      const profileDoc = await this.projectService.getProfile(this.targetProjectId);
-      project = profileDoc.data;
-      if (project == null) {
+    if (this.targetProjectDoc$.value?.data == null) {
+      const profileDoc = await this.projectService.get(this.targetProjectId);
+      if (profileDoc?.data == null) {
         return false;
       }
-      this.targetProject$.next(project);
+      this.targetProjectDoc$.next(profileDoc);
     }
 
     return true;
@@ -501,7 +469,7 @@ export class DraftImportWizardComponent implements OnInit {
       book.selected = selectedBooks.includes(book.bookNum);
     }
     this.resetImportState();
-    void this.determineBooksAndChaptersWithText();
+    void this.analyzeBooksForOverwriteConfirmation();
   }
 
   get projectReadyToImport(): boolean {
@@ -524,6 +492,7 @@ export class DraftImportWizardComponent implements OnInit {
 
     // For connected projects, ensure we have a targetProjectId before proceeding
     if (this.targetProjectId == null) {
+      this.cannotAdvanceFromProjectSelection = true;
       return;
     }
 
@@ -534,14 +503,13 @@ export class DraftImportWizardComponent implements OnInit {
       return;
     }
 
-    // Analyze books for overwrite confirmation
-    await this.determineBooksAndChaptersWithText();
+    await this.analyzeBooksForOverwriteConfirmation();
 
     this.stepper?.next();
     this.isLoadingProject = false;
   }
 
-  private async determineBooksAndChaptersWithText(): Promise<void> {
+  private async analyzeBooksForOverwriteConfirmation(): Promise<void> {
     if (this.targetProjectId == null) return;
 
     this.booksWithExistingText = [];
@@ -564,7 +532,7 @@ export class DraftImportWizardComponent implements OnInit {
   private async getChaptersWithText(bookNum: number): Promise<number[]> {
     if (this.targetProjectId == null) return [];
 
-    const project = this.targetProject$.value;
+    const project = this.targetProjectDoc$.value?.data;
     if (project == null) return [];
 
     const targetBook = project.texts.find(t => t.bookNum === bookNum);
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
index c13f58f733..49ebb52184 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
@@ -50,7 +50,6 @@ class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
   @Input() isLoadingProjects: boolean = false;
   @Input() isSyncing: boolean = false;
   @Input() needsConnection: boolean = false;
-  @Input() noDraftsAvailable: boolean = false;
   @Input() projectLoadingFailed: boolean = false;
   @Input() showBookSelection: boolean = false;
   @Input() showOverwriteConfirmation: boolean = false;
@@ -86,7 +85,6 @@ class DraftImportWizardWrapperComponent implements AfterViewInit, OnChanges {
       this.component.isLoadingProjects = this.isLoadingProjects;
       this.component.isSyncing = this.isSyncing;
       this.component.needsConnection = this.needsConnection;
-      this.component.noDraftsAvailable = this.noDraftsAvailable;
       this.component.projectLoadingFailed = this.projectLoadingFailed;
       this.component.showBookSelection = this.showBookSelection;
       this.component.showOverwriteConfirmation = this.showOverwriteConfirmation;
@@ -128,7 +126,6 @@ interface DraftImportWizardComponentState {
   isLoadingProjects: boolean;
   isSyncing: boolean;
   needsConnection: boolean;
-  noDraftsAvailable: boolean;
   projectLoadingFailed: boolean;
   showBookSelection: boolean;
   showOverwriteConfirmation: boolean;
@@ -155,7 +152,6 @@ const defaultArgs: DraftImportWizardComponentState = {
   isLoadingProjects: false,
   isSyncing: false,
   needsConnection: false,
-  noDraftsAvailable: false,
   projectLoadingFailed: false,
   showBookSelection: false,
   showOverwriteConfirmation: false,
@@ -222,7 +218,6 @@ export default {
     isLoadingProjects: { control: 'boolean' },
     isSyncing: { control: 'boolean' },
     needsConnection: { control: 'boolean' },
-    noDraftsAvailable: { control: 'boolean' },
     projectLoadingFailed: { control: 'boolean' },
     showBookSelection: { control: 'boolean' },
     showOverwriteConfirmation: { control: 'boolean' },
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
index ae7764508b..2d18ba19ae 100644
--- 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
@@ -336,7 +336,7 @@
     "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again.",
     "i_understand_overwrite_content": "I understand that existing content will be overwritten",
     "import": "Import",
-    "import_and_sync_complete": "The draft has been imported to {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} with Paratext and synced with Paratext.",
+    "import_and_sync_complete": "The draft has been imported into {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} and synced with Paratext.",
     "import_and_sync_complete_reminder": "Please remember to do a Send/Receive in Paratext to see the draft.",
     "import_complete_no_sync": "Make sure to sync {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} in Scripture Forge, then do a Send/Receive in Paratext to make the draft available in Paratext.",
     "import_complete": "Import complete",
@@ -349,10 +349,10 @@
     "overwrite_books_description": "The following books in {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} have chapters with existing text that will be overwritten:",
     "overwrite_books_question": "Overwrite books?",
     "please_select_valid_project": "Please select a valid project",
-    "project_context_unavailable": "Project context unavailable. Please close the wizard and try again.",
+    "project_context_unavailable": "Project context unavailable. Please close the dialog and try again.",
     "ready_to_import": "Ready to import draft to “{{ projectShortName }} - {{ projectName }}”",
     "retry": "Retry",
-    "setting_up_project": "Setting up {{ projectName }}...",
+    "setting_up_project": "Setting up {{ projectName }} ...",
     "select_books_to_import": "Select books to import",
     "select_books": "Select books",
     "select_project": "Select project",

From 3315e6c7cdec34c4c845b2aac1dbad7c1a32b7da Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 10 Feb 2026 14:03:36 +1300
Subject: [PATCH 25/40] SF-3633 Fixed issues found in testing on 4 Feb

---
 .../src/app/project-select/project-select.component.ts    | 8 ++++----
 .../draft-import-wizard.component.html                    | 6 ++++--
 .../editor/lynx/insights/lynx-workspace.service.ts        | 3 ++-
 .../ClientApp/src/assets/i18n/non_checking_en.json        | 3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
index 9b78165e32..47e92c8e1b 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
@@ -172,16 +172,16 @@ export class ProjectSelectComponent implements ControlValueAccessor, OnDestroy {
   @Input()
   errorMessageMapper?: null | ((errors: ValidationErrors) => string | null) = null;
 
-  private externalValidators: ValidatorFn[] = [];
+  private externalValidators: ValidatorFn[] | 'disabled' = [];
   @Input()
-  set validators(value: ValidatorFn[]) {
+  set validators(value: ValidatorFn[] | 'disabled') {
     this.externalValidators = value;
-    const validators = [this.validateProject.bind(this)].concat(value);
+    const validators = value === 'disabled' ? [] : [this.validateProject.bind(this)].concat(value);
     for (const validator of validators)
       if (typeof validator !== 'function') throw new Error(`The validator is not a function: ${validator}`);
     this.paratextIdControl.setValidators(validators);
   }
-  get validators(): ValidatorFn[] {
+  get validators(): ValidatorFn[] | 'disabled' {
     return this.externalValidators;
   }
 
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index d06c016cb4..5a8b1989c1 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -1,4 +1,4 @@
-<mat-dialog-content *transloco="let t; read: 'draft_import_wizard'">
+<mat-dialog-content *transloco="let t; read: 'draft_import_wizard'" [dir]="i18n.direction">
   <mat-stepper linear [disableRipple]="true" labelPosition="bottom" (selectionChange)="onStepSelectionChange($event)">
     <!-- Icon overrides -->
     <ng-template matStepperIcon="edit" let-index="index">{{ index + 1 }}</ng-template>
@@ -22,6 +22,7 @@ <h1>{{ t("select_project") }}</h1>
             [isDisabled]="projects.length === 0 || isImporting || projectLoadingFailed"
             (projectSelect)="projectSelected($event.paratextId)"
             formControlName="targetParatextId"
+            validators="disabled"
           ></app-project-select>
 
           @if (isLoadingProject) {
@@ -187,7 +188,8 @@ <h1>{{ t("connected_to_project") }}</h1>
       <mat-step [completed]="selectedBooks.length > 0">
         <ng-template matStepLabel>{{ t("select_books") }}</ng-template>
 
-        <h1>{{ t("select_books_to_import") }}</h1>
+        <h1>{{ t("confirm_books_to_import") }}</h1>
+        <p>{{ t("confirm_books_to_import_description") }}</p>
         <app-book-multi-select
           [availableBooks]="availableBooksForImport"
           [selectedBooks]="selectedBooks"
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/lynx/insights/lynx-workspace.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/lynx/insights/lynx-workspace.service.ts
index 8a82459550..206ada740a 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/lynx/insights/lynx-workspace.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/lynx/insights/lynx-workspace.service.ts
@@ -541,8 +541,9 @@ export class TextDocReader implements DocumentReader<Delta> {
     return Promise.resolve([...this.textDocIds]);
   }
 
-  async read(uri: string): Promise<DocumentData<Delta>> {
+  async read(uri: string): Promise<DocumentData<Delta> | undefined> {
     const textDoc = await this.projectService.getText(uri);
+    if (textDoc.data == null) return undefined;
     return {
       format: 'scripture-delta',
       content: textDoc.data as Delta,
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
index 2d18ba19ae..96d5e3fcca 100644
--- 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
@@ -320,6 +320,8 @@
     "chapters": "chapters",
     "choose_project": "Choose a project",
     "complete": "Complete",
+    "confirm_books_to_import": "Confirm books to import",
+    "confirm_books_to_import_description": "The following books will be imported. Please click on a book to deselect it and not import it.",
     "confirm_overwrite": "Confirm overwrite",
     "connect_project_description": "The selected project {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} has not yet been connected in Scripture Forge. Do you want to connect it so you can import the draft to it?",
     "connect_project": "Connect project",
@@ -353,7 +355,6 @@
     "ready_to_import": "Ready to import draft to “{{ projectShortName }} - {{ projectName }}”",
     "retry": "Retry",
     "setting_up_project": "Setting up {{ projectName }} ...",
-    "select_books_to_import": "Select books to import",
     "select_books": "Select books",
     "select_project": "Select project",
     "select_project_description": "Please select the project you want to add the draft to.",

From c900881cb333f49e480a590083aeaaafe47a873d Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 11 Feb 2026 12:17:48 +1300
Subject: [PATCH 26/40] SF-3633 Fixed issues found in testing on 5 Feb

---
 .../draft-generation.component.html           |  6 ++--
 .../draft-import-wizard-component.spec.ts     |  3 ++
 .../draft-import-wizard.component.html        | 31 ++++++++++++-------
 .../draft-import-wizard.component.ts          | 14 +++++++--
 .../draft-import-wizard.stories.ts            |  3 ++
 .../src/assets/i18n/non_checking_en.json      |  2 +-
 6 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html
index 2f90e23ef4..18b9c91485 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html
@@ -420,9 +420,9 @@ <h3>{{ t("draft_finishing_header") }}</h3>
       }
     </section>
 
-    @if (isOnline && featureFlags.newDraftHistory.enabled) {
-      <app-draft-history-list />
-      @if (isServalAdmin()) {
+    @if (featureFlags.newDraftHistory.enabled) {
+      <app-draft-history-list [style.display]="isOnline ? 'block' : 'none'"></app-draft-history-list>
+      @if (isOnline && isServalAdmin()) {
         <h2>Further information</h2>
       }
     }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
index ba90e4cab3..7fbb672fe9 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
@@ -8,6 +8,7 @@ import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/
 import { createTestProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-test-data';
 import { anything, mock, verify, when } from 'ts-mockito';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { AuthService } from 'xforge-common/auth.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { provideTestOnlineStatus } from 'xforge-common/test-online-status-providers';
 import { TestOnlineStatusService } from 'xforge-common/test-online-status.service';
@@ -34,6 +35,7 @@ const mockProjectNotificationService = mock(ProjectNotificationService);
 const mockProjectService = mock(SFProjectService);
 const mockTextDocService = mock(TextDocService);
 const mockActivatedProjectService = mock(ActivatedProjectService);
+const mockAuthService = mock(AuthService);
 
 describe('DraftImportWizardComponent', () => {
   const buildDto: BuildDto = {
@@ -57,6 +59,7 @@ describe('DraftImportWizardComponent', () => {
       { provide: TextDocService, useMock: mockTextDocService },
       { provide: OnlineStatusService, useClass: TestOnlineStatusService },
       { provide: ActivatedProjectService, useMock: mockActivatedProjectService },
+      { provide: AuthService, useMock: mockAuthService },
       provideNoopAnimations()
     ]
   }));
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 5a8b1989c1..76d20952fc 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -19,7 +19,7 @@ <h1>{{ t("select_project") }}</h1>
           <app-project-select
             [projects]="projects"
             [placeholder]="t('choose_project')"
-            [isDisabled]="projects.length === 0 || isImporting || projectLoadingFailed"
+            [isDisabled]="!isAppOnline || projects.length === 0 || isImporting || projectLoadingFailed"
             (projectSelect)="projectSelected($event.paratextId)"
             formControlName="targetParatextId"
             validators="disabled"
@@ -30,7 +30,7 @@ <h1>{{ t("select_project") }}</h1>
           }
         }
 
-        @if (projectLoadingFailed) {
+        @if (projectLoadingFailed && isAppOnline) {
           <app-notice type="error">{{ t("failed_to_load_projects") }}</app-notice>
           <div class="project-retry-row">
             <button matButton="outlined" color="primary" (click)="reloadProjects()" [disabled]="isLoadingProjects">
@@ -41,7 +41,7 @@ <h1>{{ t("select_project") }}</h1>
         }
 
         @if (!isAppOnline) {
-          <mat-error class="offline-message">{{ t("connect_to_the_internet") }}</mat-error>
+          <app-notice type="error">{{ t("connect_to_the_internet") }}</app-notice>
         }
 
         @if (!canEditProject) {
@@ -116,7 +116,9 @@ <h1>{{ t("connect_to_project") }}</h1>
             color="primary"
             data-test-id="step-2-next"
             (click)="connectToProject()"
-            [disabled]="isConnecting || isImporting || (connectionError != null && connectionError.length > 0)"
+            [disabled]="
+              !isAppOnline || isConnecting || isImporting || (connectionError != null && connectionError.length > 0)
+            "
           >
             {{ t("connect") }}
             <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -146,7 +148,12 @@ <h1>{{ t("connection_failed") }}</h1>
               <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
               {{ t("back") }}
             </button>
-            <button matButton="filled" color="primary" (click)="retryProjectConnection()" [disabled]="isImporting">
+            <button
+              matButton="filled"
+              color="primary"
+              (click)="retryProjectConnection()"
+              [disabled]="!isAppOnline && isImporting"
+            >
               <mat-icon>refresh</mat-icon>
               {{ t("retry") }}
             </button>
@@ -173,7 +180,7 @@ <h1>{{ t("connected_to_project") }}</h1>
               matStepperNext
               color="primary"
               data-test-id="step-3-next"
-              [disabled]="isImporting"
+              [disabled]="!isAppOnline || isImporting"
             >
               {{ showBookSelection || showOverwriteConfirmation ? t("next") : t("import") }}
               <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -208,7 +215,7 @@ <h1>{{ t("confirm_books_to_import") }}</h1>
             color="primary"
             matStepperNext
             data-test-id="step-4-next"
-            [disabled]="selectedBooks.length === 0 || isConnecting || isImporting"
+            [disabled]="!isAppOnline || selectedBooks.length === 0 || isConnecting || isImporting"
           >
             {{ showOverwriteConfirmation ? t("next") : t("import") }}
             <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -272,7 +279,7 @@ <h1>{{ t("overwrite_books_question") }}</h1>
             color="primary"
             matStepperNext
             data-test-id="step-5-next"
-            [disabled]="!overwriteForm.valid || isConnecting || isImporting"
+            [disabled]="!overwriteForm.valid || isConnecting || isImporting || !isAppOnline"
           >
             {{ t("import") }}
             <mat-icon iconPositionEnd>chevron_{{ i18n.forwardDirectionWord }}</mat-icon>
@@ -311,11 +318,11 @@ <h1>{{ t("importing_draft") }}</h1>
       @if (importError != null && importError.length > 0) {
         <app-notice type="error">{{ importError }}</app-notice>
         <div class="button-strip">
-          <button matButton="outlined" matStepperPrevious [disabled]="isConnecting || isImporting">
+          <button matButton="outlined" (click)="clearImport()" [disabled]="isConnecting || isImporting">
             <mat-icon>chevron_{{ i18n.backwardDirectionWord }}</mat-icon>
             {{ t("back") }}
           </button>
-          <button matButton="outlined" (click)="retryImport()" [disabled]="isImporting">
+          <button matButton="outlined" (click)="retryImport()" [disabled]="isImporting || !isAppOnline">
             <mat-icon>refresh</mat-icon>
             {{ t("retry") }}
           </button>
@@ -368,7 +375,7 @@ <h1>{{ t("sync_project_question") }}</h1>
             color="primary"
             data-test-id="step-7-sync"
             (click)="selectSync()"
-            [disabled]="isSyncing || isImporting"
+            [disabled]="isSyncing || isImporting || !isAppOnline"
           >
             {{ t("sync") }}
             <mat-icon iconPositionEnd>sync</mat-icon>
@@ -390,7 +397,7 @@ <h1>{{ t("sync") }}</h1>
           <button matButton="outlined" (click)="selectSkipSync()" [disabled]="isImporting">
             {{ t("skip_sync") }}
           </button>
-          <button matButton="filled" color="primary" (click)="retrySync()" [disabled]="isImporting">
+          <button matButton="filled" color="primary" (click)="retrySync()" [disabled]="isImporting || !isAppOnline">
             <mat-icon>refresh</mat-icon>
             {{ t("retry") }}
           </button>
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 041173e13b..9bf89a820b 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -1,5 +1,6 @@
 import { StepperSelectionEvent } from '@angular/cdk/stepper';
 import { AsyncPipe } from '@angular/common';
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component, DestroyRef, Inject, OnInit, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
@@ -20,6 +21,7 @@ import { TranslocoModule } from '@ngneat/transloco';
 import { Canon } from '@sillsdev/scripture';
 import { BehaviorSubject } from 'rxjs';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { AuthService } from 'xforge-common/auth.service';
 import { I18nService } from 'xforge-common/i18n.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { ParatextProject } from '../../../core/models/paratext-project';
@@ -285,7 +287,8 @@ export class DraftImportWizardComponent implements OnInit {
     private readonly textDocService: TextDocService,
     readonly i18n: I18nService,
     private readonly onlineStatusService: OnlineStatusService,
-    private readonly activatedProjectService: ActivatedProjectService
+    private readonly activatedProjectService: ActivatedProjectService,
+    private readonly authService: AuthService
   ) {
     this.projectNotificationService.setNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
     destroyRef.onDestroy(async () => {
@@ -341,7 +344,9 @@ export class DraftImportWizardComponent implements OnInit {
     } catch (error) {
       this.projectLoadingFailed = true;
       this.projects = [];
-      console.error('Failed to load projects:', error);
+      if (error instanceof HttpErrorResponse && error.status === 401) {
+        this.authService.requestParatextCredentialUpdate();
+      }
     } finally {
       this.isLoadingProjects = false;
     }
@@ -671,6 +676,11 @@ export class DraftImportWizardComponent implements OnInit {
     }
   }
 
+  clearImport(): void {
+    this.resetImportState();
+    this.stepper?.previous();
+  }
+
   retryImport(): void {
     this.resetImportState();
     void this.startImport();
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
index 49ebb52184..77f00c186d 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
@@ -6,6 +6,7 @@ import { defaultTranslocoMarkupTranspilers } from 'ngx-transloco-markup';
 import { of } from 'rxjs';
 import { anything, instance, mock, when } from 'ts-mockito';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
+import { AuthService } from 'xforge-common/auth.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { ParatextProject } from '../../../core/models/paratext-project';
 import { SFProjectDoc } from '../../../core/models/sf-project-doc';
@@ -30,6 +31,7 @@ const mockProjectNotificationService = mock(ProjectNotificationService);
 const mockProjectService = mock(SFProjectService);
 const mockTextDocService = mock(TextDocService);
 const mockActivatedProjectService = mock(ActivatedProjectService);
+const mockAuthService = mock(AuthService);
 const mockOnlineStatusService = mock(OnlineStatusService);
 
 @Component({
@@ -190,6 +192,7 @@ export default {
         { provide: OnlineStatusService, useValue: instance(mockOnlineStatusService) },
         { provide: ActivatedProjectService, useValue: instance(mockActivatedProjectService) },
         { provide: ProgressService, useValue: instance(mockProgressService) },
+        { provide: AuthService, useValue: instance(mockAuthService) },
         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
index 96d5e3fcca..72ea398616 100644
--- 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
@@ -335,7 +335,7 @@
     "done": "Done",
     "failed": "Failed:",
     "failed_to_connect_project": "Something went wrong while connecting. Please try again.",
-    "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again.",
+    "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again, or log out then log back in again.",
     "i_understand_overwrite_content": "I understand that existing content will be overwritten",
     "import": "Import",
     "import_and_sync_complete": "The draft has been imported into {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} and synced with Paratext.",

From f01ffbb8c4a7d79cb50820ee0fca9582705c41cb Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Thu, 12 Feb 2026 09:00:47 +1300
Subject: [PATCH 27/40] SF-3633 Remove redundant code

---
 .../src/app/core/sf-project.service.spec.ts   |   9 -
 .../src/app/core/sf-project.service.ts        |   4 -
 .../src/app/core/text-doc.service.spec.ts     |  19 --
 .../src/app/core/text-doc.service.ts          |  17 +-
 .../draft-handling.service.spec.ts            | 183 +-----------------
 .../draft-handling.service.ts                 |  53 +----
 .../draft-import-wizard.component.ts          |   2 -
 7 files changed, 3 insertions(+), 284 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/sf-project.service.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/sf-project.service.spec.ts
index fc44c5dc63..f0f15c1ba4 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/sf-project.service.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/sf-project.service.spec.ts
@@ -119,15 +119,6 @@ describe('SFProjectService', () => {
     }));
   });
 
-  describe('onlineAddChapters', () => {
-    it('should invoke the command service', fakeAsync(async () => {
-      const env = new TestEnvironment();
-      await env.service.onlineAddChapters('project01', 1, [2, 3]);
-      verify(mockedCommandService.onlineInvoke(anything(), 'addChapters', anything())).once();
-      expect().nothing();
-    }));
-  });
-
   describe('onlineSetDraftApplied', () => {
     it('should invoke the command service', fakeAsync(async () => {
       const env = new TestEnvironment();
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/sf-project.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/sf-project.service.ts
index d1b3c56174..23589a7d6a 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/sf-project.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/sf-project.service.ts
@@ -236,10 +236,6 @@ export class SFProjectService extends ProjectService<SFProject, SFProjectDoc> {
     });
   }
 
-  onlineAddChapters(projectId: string, book: number, chapters: number[]): Promise<void> {
-    return this.onlineInvoke<void>('addChapters', { projectId, book, chapters });
-  }
-
   onlineUpdateSettings(id: string, settings: SFProjectSettings): Promise<void> {
     return this.onlineInvoke('updateSettings', { projectId: id, settings });
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/text-doc.service.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/text-doc.service.spec.ts
index 72b9819a4f..8822e79a1c 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/text-doc.service.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/text-doc.service.spec.ts
@@ -183,25 +183,6 @@ describe('TextDocService', () => {
     });
   });
 
-  describe('createTextDoc', () => {
-    it('should throw error if text doc already exists', fakeAsync(() => {
-      const env = new TestEnvironment();
-      expect(() => {
-        env.textDocService.createTextDoc(env.textDocId, getTextDoc(env.textDocId));
-        tick();
-      }).toThrowError();
-    }));
-
-    it('creates the text doc if it does not already exist', fakeAsync(async () => {
-      const env = new TestEnvironment();
-      const textDocId = new TextDocId('project01', 40, 2);
-      const textDoc = await env.textDocService.createTextDoc(textDocId, getTextDoc(textDocId));
-      tick();
-
-      expect(textDoc.data).toBeDefined();
-    }));
-  });
-
   describe('isDataInSync', () => {
     it('should return true if the project is undefined', () => {
       const env = new TestEnvironment();
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/text-doc.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/text-doc.service.ts
index 2a56ec96d9..edb30060a1 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/text-doc.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/text-doc.service.ts
@@ -6,9 +6,7 @@ import { SF_PROJECT_RIGHTS, SFProjectDomain } from 'realtime-server/lib/esm/scri
 import { TextData } from 'realtime-server/lib/esm/scriptureforge/models/text-data';
 import { Chapter, TextInfo } from 'realtime-server/lib/esm/scriptureforge/models/text-info';
 import { TextInfoPermission } from 'realtime-server/lib/esm/scriptureforge/models/text-info-permission';
-import { type } from 'rich-text';
 import { Observable, Subject } from 'rxjs';
-import { RealtimeService } from 'xforge-common/realtime.service';
 import { UserService } from 'xforge-common/user.service';
 import { TextDoc, TextDocId, TextDocSource } from './models/text-doc';
 import { SFProjectService } from './sf-project.service';
@@ -21,8 +19,7 @@ export class TextDocService {
 
   constructor(
     private readonly projectService: SFProjectService,
-    private readonly userService: UserService,
-    private readonly realtimeService: RealtimeService
+    private readonly userService: UserService
   ) {}
 
   /**
@@ -81,18 +78,6 @@ export class TextDocService {
     );
   }
 
-  async createTextDoc(textDocId: TextDocId, data?: TextData): Promise<TextDoc> {
-    let textDoc: TextDoc = await this.projectService.getText(textDocId);
-
-    if (textDoc?.data != null) {
-      throw new Error(`Text Doc already exists for ${textDocId}`);
-    }
-
-    data ??= { ops: [] };
-    textDoc = await this.realtimeService.create(TextDoc.COLLECTION, textDocId.toString(), data, type.uri);
-    return textDoc;
-  }
-
   /**
    * Determines if the data is in sync for the project.
    *
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-handling.service.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-handling.service.spec.ts
index d8c6037427..ad8de419b7 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-handling.service.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-handling.service.spec.ts
@@ -4,10 +4,7 @@ import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/
 import { DeltaOperation } from 'rich-text';
 import { of, throwError } from 'rxjs';
 import { anything, instance, mock, verify, when } from 'ts-mockito';
-import { ErrorReportingService } from 'xforge-common/error-reporting.service';
-import { I18nService } from 'xforge-common/i18n.service';
 import { configureTestingModule } from 'xforge-common/test-utils';
-import { SFProjectProfileDoc } from '../../core/models/sf-project-profile-doc';
 import { TextDocId } from '../../core/models/text-doc';
 import { SFProjectService } from '../../core/sf-project.service';
 import { TextDocService } from '../../core/text-doc.service';
@@ -18,9 +15,6 @@ import { DraftHandlingService } from './draft-handling.service';
 const mockedProjectService = mock(SFProjectService);
 const mockedTextDocService = mock(TextDocService);
 const mockedDraftGenerationService = mock(DraftGenerationService);
-const mockedSFProject = mock(SFProjectProfileDoc);
-const mockedErrorReportingService = mock(ErrorReportingService);
-const mockedI18nService = mock(I18nService);
 
 describe('DraftHandlingService', () => {
   let service: DraftHandlingService;
@@ -29,9 +23,7 @@ describe('DraftHandlingService', () => {
     providers: [
       { provide: SFProjectService, useMock: mockedProjectService },
       { provide: TextDocService, useMock: mockedTextDocService },
-      { provide: DraftGenerationService, useMock: mockedDraftGenerationService },
-      { provide: ErrorReportingService, useMock: mockedErrorReportingService },
-      { provide: I18nService, useMock: mockedI18nService }
+      { provide: DraftGenerationService, useMock: mockedDraftGenerationService }
     ]
   }));
 
@@ -445,179 +437,6 @@ describe('DraftHandlingService', () => {
     });
   });
 
-  describe('getAndApplyDraftAsync', () => {
-    it('should get and apply draft', async () => {
-      const textDocId = new TextDocId('project01', 1, 1);
-      const draft: DeltaOperation[] = [
-        { insert: { verse: { number: 1 } } },
-        { insert: 'In the beginning', attributes: { segment: 'verse_1_1' } }
-      ];
-      when(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations(
-          anything(),
-          anything(),
-          anything(),
-          anything(),
-          anything()
-        )
-      ).thenReturn(of(draft));
-      when(mockedTextDocService.canRestore(anything(), 1, 1)).thenReturn(true);
-      const result: string | undefined = await service.getAndApplyDraftAsync(
-        mockedSFProject.data!,
-        textDocId,
-        textDocId,
-        undefined
-      );
-      expect(result).toBe(undefined);
-      verify(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations('project01', 1, 1, undefined, undefined)
-      ).once();
-      verify(mockedTextDocService.overwrite(textDocId, anything(), 'Draft')).once();
-      verify(
-        mockedProjectService.onlineSetDraftApplied(
-          textDocId.projectId,
-          textDocId.bookNum,
-          textDocId.chapterNum,
-          true,
-          1
-        )
-      ).once();
-      verify(
-        mockedProjectService.onlineSetIsValid(textDocId.projectId, textDocId.bookNum, textDocId.chapterNum, true)
-      ).once();
-    });
-
-    it('should not apply if user does not have permission', async () => {
-      const textDocId = new TextDocId('project01', 1, 1);
-      const draft: DeltaOperation[] = [{ insert: 'In the beginning', attributes: { segment: 'verse_1_1' } }];
-      when(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations(
-          anything(),
-          anything(),
-          anything(),
-          anything(),
-          anything()
-        )
-      ).thenReturn(of(draft));
-      when(mockedTextDocService.canRestore(anything(), 1, 1)).thenReturn(false);
-      const result: string | undefined = await service.getAndApplyDraftAsync(
-        mockedSFProject.data!,
-        textDocId,
-        textDocId,
-        undefined
-      );
-      expect(result).not.toBe(undefined);
-      verify(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations('project01', 1, 1, undefined, undefined)
-      ).never();
-      verify(mockedTextDocService.overwrite(textDocId, anything(), 'Draft')).never();
-    });
-
-    it('should not apply legacy USFM draft', async () => {
-      const textDocId = new TextDocId('project01', 1, 1);
-      const draft: DraftSegmentMap = { verse_1_1: 'In the beginning' };
-      when(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations(
-          anything(),
-          anything(),
-          anything(),
-          anything(),
-          anything()
-        )
-      ).thenReturn(throwError(() => ({ status: 405 })));
-      when(mockedDraftGenerationService.getGeneratedDraft(anything(), anything(), anything())).thenReturn(of(draft));
-      when(mockedTextDocService.canRestore(anything(), 1, 1)).thenReturn(true);
-      const result: string | undefined = await service.getAndApplyDraftAsync(
-        mockedSFProject.data!,
-        textDocId,
-        textDocId,
-        undefined
-      );
-      expect(result).not.toBe(undefined);
-      verify(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations('project01', 1, 1, undefined, undefined)
-      ).once();
-      verify(mockedDraftGenerationService.getGeneratedDraft('project01', 1, 1)).once();
-      verify(mockedTextDocService.overwrite(textDocId, anything(), 'Draft')).never();
-    });
-
-    it('should return false if applying a draft fails', async () => {
-      const textDocId = new TextDocId('project01', 1, 1);
-      const draft: DeltaOperation[] = [
-        { insert: { verse: { number: 1 } } },
-        { insert: 'In the beginning', attributes: { segment: 'verse_1_1' } }
-      ];
-      when(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations(
-          anything(),
-          anything(),
-          anything(),
-          anything(),
-          anything()
-        )
-      ).thenReturn(of(draft));
-      when(mockedTextDocService.canRestore(anything(), 1, 1)).thenReturn(true);
-      when(
-        mockedProjectService.onlineSetDraftApplied(anything(), anything(), anything(), anything(), anything())
-      ).thenReturn(Promise.reject(new Error('Failed')));
-      const result: string | undefined = await service.getAndApplyDraftAsync(
-        mockedSFProject.data!,
-        textDocId,
-        textDocId,
-        undefined
-      );
-      expect(result).not.toBe(undefined);
-      verify(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations('project01', 1, 1, undefined, undefined)
-      ).once();
-      verify(mockedErrorReportingService.silentError(anything(), anything())).once();
-      verify(mockedTextDocService.overwrite(textDocId, anything(), anything())).never();
-      verify(
-        mockedProjectService.onlineSetDraftApplied(
-          textDocId.projectId,
-          textDocId.bookNum,
-          textDocId.chapterNum,
-          true,
-          1
-        )
-      ).once();
-    });
-
-    it('should return false if applying a draft fails at getting the draft', async () => {
-      const textDocId = new TextDocId('project01', 1, 1);
-      when(mockedTextDocService.canRestore(anything(), 1, 1)).thenReturn(true);
-      when(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations(
-          anything(),
-          anything(),
-          anything(),
-          anything(),
-          anything()
-        )
-      ).thenReturn(throwError(() => ({ message: 'Getting draft failed', status: 404 })));
-      const result: string | undefined = await service.getAndApplyDraftAsync(
-        mockedSFProject.data!,
-        textDocId,
-        textDocId,
-        undefined
-      );
-      expect(result).not.toBe(undefined);
-      verify(
-        mockedDraftGenerationService.getGeneratedDraftDeltaOperations('project01', 1, 1, undefined, undefined)
-      ).once();
-      verify(mockedErrorReportingService.silentError(anything(), anything())).once();
-      verify(
-        mockedProjectService.onlineSetDraftApplied(
-          textDocId.projectId,
-          textDocId.bookNum,
-          textDocId.chapterNum,
-          true,
-          anything()
-        )
-      ).never();
-    });
-  });
-
   describe('opsHaveContent', () => {
     it('should return false if all ops are blank', () => {
       const ops: DeltaOperation[] = [{ insert: {} }, { insert: {} }];
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-handling.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-handling.service.ts
index 06ca1fa62a..3ac931484f 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-handling.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-handling.service.ts
@@ -5,8 +5,6 @@ import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/
 import { DraftUsfmConfig } from 'realtime-server/lib/esm/scriptureforge/models/translate-config';
 import { DeltaOperation } from 'rich-text';
 import { catchError, Observable, throwError } from 'rxjs';
-import { ErrorReportingService } from 'xforge-common/error-reporting.service';
-import { I18nService } from 'xforge-common/i18n.service';
 import { isString } from '../../../type-utils';
 import { TextDocId } from '../../core/models/text-doc';
 import { SFProjectService } from '../../core/sf-project.service';
@@ -34,9 +32,7 @@ export class DraftHandlingService {
   constructor(
     private readonly projectService: SFProjectService,
     private readonly textDocService: TextDocService,
-    private readonly draftGenerationService: DraftGenerationService,
-    private readonly errorReportingService: ErrorReportingService,
-    private readonly i18n: I18nService
+    private readonly draftGenerationService: DraftGenerationService
   ) {}
 
   /**
@@ -228,53 +224,6 @@ export class DraftHandlingService {
     await this.textDocService.overwrite(textDocId, draftDelta, 'Draft');
   }
 
-  /**
-   * Retrieves and applies the draft to the text document.
-   * @param targetProject The project profile.
-   * @param draftTextDocId The text doc identifier of the draft of a chapter.
-   * @param targetTextDocId The text doc identifier to apply the draft to.
-   * @returns True if the draft was successfully applied, false if the draft was not applied i.e. the draft
-   * was in the legacy USFM format.
-   */
-  async getAndApplyDraftAsync(
-    targetProject: SFProjectProfile,
-    draftTextDocId: TextDocId,
-    targetTextDocId: TextDocId,
-    timestamp?: Date
-  ): Promise<string | undefined> {
-    if (!this.textDocService.canRestore(targetProject, targetTextDocId.bookNum, targetTextDocId.chapterNum)) {
-      return this.i18n.translateStatic('draft_apply_progress-dialog.fail_cannot_edit');
-    }
-
-    return await new Promise<string | undefined>(resolve => {
-      this.getDraft(draftTextDocId, { isDraftLegacy: false, timestamp }).subscribe({
-        next: async draft => {
-          let ops: DeltaOperation[] = [];
-          if (this.isDraftSegmentMap(draft)) {
-            // Do not support applying drafts for the legacy segment map format.
-            // This can be applied chapter by chapter.
-            resolve(this.i18n.translateStatic('draft_apply_progress-dialog.fail_legacy_format'));
-            return;
-          } else {
-            ops = draft;
-          }
-          const draftDelta: Delta = new Delta(ops);
-          await this.applyChapterDraftAsync(targetTextDocId, draftDelta).catch(err => {
-            // report the error to bugsnag
-            this.errorReportingService.silentError('Error applying a draft', ErrorReportingService.normalizeError(err));
-            resolve(this.i18n.translateStatic('draft_apply_progress-dialog.fail_unknown'));
-          });
-          resolve(undefined);
-        },
-        error: err => {
-          // report the error to bugsnag
-          this.errorReportingService.silentError('Error applying a draft', ErrorReportingService.normalizeError(err));
-          resolve(this.i18n.translateStatic('draft_apply_progress-dialog.fail_unknown'));
-        }
-      });
-    });
-  }
-
   /**
    * Checks whether the ops have any content (text) in them. This is defined as any op having text content (verse
    * numbers and other format markers do not count as "content"). If the final op is a newline, it is not counted as
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 9bf89a820b..6acad85170 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -6,7 +6,6 @@ import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators }
 import { MatButton } from '@angular/material/button';
 import { MatCheckbox } from '@angular/material/checkbox';
 import { MAT_DIALOG_DATA, MatDialogContent, MatDialogRef } from '@angular/material/dialog';
-import { MatError } from '@angular/material/form-field';
 import { MatIcon } from '@angular/material/icon';
 import { MatProgressBar } from '@angular/material/progress-bar';
 import {
@@ -100,7 +99,6 @@ export enum DraftApplyStatus {
     MatButton,
     MatCheckbox,
     MatDialogContent,
-    MatError,
     MatIcon,
     MatProgressBar,
     MatStep,

From 6eaf22dbee51bbe2fa5a864e40a7ed183757004f Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 16 Feb 2026 14:21:37 +1300
Subject: [PATCH 28/40] SF-3633 Create draft notification service with stateful
 reconnection

---
 .../app/core/project-notification.service.ts  |  8 --
 .../draft-import-wizard-component.spec.ts     |  3 +
 .../draft-import-wizard.component.ts          | 14 ++--
 .../draft-import-wizard.stories.ts            |  3 +
 .../draft-notification.service.ts             | 74 +++++++++++++++++++
 .../Services/DraftNotificationHub.cs          | 29 ++++++++
 .../Services/IDraftNotifier.cs                | 10 +++
 .../Services/INotifier.cs                     |  1 -
 .../Services/MachineApiService.cs             | 33 +++++----
 .../Services/NotificationHub.cs               |  9 ---
 .../Services/NotificationHubExtensions.cs     |  2 +-
 src/SIL.XForge.Scripture/Startup.cs           |  4 +
 src/SIL.XForge/Controllers/UrlConstants.cs    |  1 +
 .../AuthServiceCollectionExtensions.cs        |  9 ++-
 .../Services/MachineApiServiceTests.cs        |  2 +
 15 files changed, 158 insertions(+), 44 deletions(-)
 create mode 100644 src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-notification.service.ts
 create mode 100644 src/SIL.XForge.Scripture/Services/DraftNotificationHub.cs
 create mode 100644 src/SIL.XForge.Scripture/Services/IDraftNotifier.cs

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
index 0d26c13346..bfaaf77e22 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
@@ -32,10 +32,6 @@ export class ProjectNotificationService {
     return this.onlineService.isOnline && this.onlineService.isBrowserOnline;
   }
 
-  removeNotifyDraftApplyProgressHandler(handler: any): void {
-    this.connection.off('notifyDraftApplyProgress', handler);
-  }
-
   removeNotifyBuildProgressHandler(handler: any): void {
     this.connection.off('notifyBuildProgress', handler);
   }
@@ -44,10 +40,6 @@ export class ProjectNotificationService {
     this.connection.off('notifySyncProgress', handler);
   }
 
-  setNotifyDraftApplyProgressHandler(handler: any): void {
-    this.connection.on('notifyDraftApplyProgress', handler);
-  }
-
   setNotifyBuildProgressHandler(handler: any): void {
     this.connection.on('notifyBuildProgress', handler);
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
index 7fbb672fe9..3477b68bdb 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
@@ -26,11 +26,13 @@ import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
 import { ProjectSelectComponent } from '../../../project-select/project-select.component';
 import { ProgressService, ProjectProgress } from '../../../shared/progress-service/progress.service';
+import { DraftNotificationService } from '../draft-notification.service';
 import { DraftApplyState, DraftApplyStatus, DraftImportWizardComponent } from './draft-import-wizard.component';
 
 const mockMatDialogRef = mock(MatDialogRef<DraftImportWizardComponent, boolean>);
 const mockParatextService = mock(ParatextService);
 const mockProgressService = mock(ProgressService);
+const mockDraftNotificationService = mock(DraftNotificationService);
 const mockProjectNotificationService = mock(ProjectNotificationService);
 const mockProjectService = mock(SFProjectService);
 const mockTextDocService = mock(TextDocService);
@@ -54,6 +56,7 @@ describe('DraftImportWizardComponent', () => {
       { provide: MAT_DIALOG_DATA, useValue: buildDto },
       { provide: ParatextService, useMock: mockParatextService },
       { provide: ProgressService, useMock: mockProgressService },
+      { provide: DraftNotificationService, useMock: mockDraftNotificationService },
       { provide: ProjectNotificationService, useMock: mockProjectNotificationService },
       { provide: SFProjectService, useMock: mockProjectService },
       { provide: TextDocService, useMock: mockTextDocService },
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 6acad85170..c280e5b953 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -27,7 +27,6 @@ import { ParatextProject } from '../../../core/models/paratext-project';
 import { SFProjectDoc } from '../../../core/models/sf-project-doc';
 import { TextDoc, TextDocId } from '../../../core/models/text-doc';
 import { ParatextService } from '../../../core/paratext.service';
-import { ProjectNotificationService } from '../../../core/project-notification.service';
 import { SFProjectService } from '../../../core/sf-project.service';
 import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
@@ -36,6 +35,7 @@ import { BookMultiSelectComponent } from '../../../shared/book-multi-select/book
 import { NoticeComponent } from '../../../shared/notice/notice.component';
 import { booksFromScriptureRange } from '../../../shared/utils';
 import { SyncProgressComponent } from '../../../sync/sync-progress/sync-progress.component';
+import { DraftNotificationService } from '../draft-notification.service';
 
 /**
  * Represents a book available for import with its draft chapters.
@@ -280,7 +280,7 @@ export class DraftImportWizardComponent implements OnInit {
     @Inject(MatDialogRef) private readonly dialogRef: MatDialogRef<DraftImportWizardComponent, boolean>,
     readonly destroyRef: DestroyRef,
     private readonly paratextService: ParatextService,
-    private readonly projectNotificationService: ProjectNotificationService,
+    private readonly draftNotificationService: DraftNotificationService,
     private readonly projectService: SFProjectService,
     private readonly textDocService: TextDocService,
     readonly i18n: I18nService,
@@ -288,11 +288,11 @@ export class DraftImportWizardComponent implements OnInit {
     private readonly activatedProjectService: ActivatedProjectService,
     private readonly authService: AuthService
   ) {
-    this.projectNotificationService.setNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
+    this.draftNotificationService.setNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
     destroyRef.onDestroy(async () => {
       // Stop the SignalR connection when the component is destroyed
-      await projectNotificationService.stop();
-      this.projectNotificationService.removeNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
+      await draftNotificationService.stop();
+      this.draftNotificationService.removeNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
     });
   }
 
@@ -601,8 +601,8 @@ export class DraftImportWizardComponent implements OnInit {
     }
 
     // Subscribe to SignalR updates
-    await this.projectNotificationService.start();
-    await this.projectNotificationService.subscribeToProject(this.sourceProjectId);
+    await this.draftNotificationService.start();
+    await this.draftNotificationService.subscribeToProject(this.sourceProjectId);
 
     // Build a scripture range and timestamp to import
     const scriptureRange = books.map(b => b.bookId).join(';');
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
index 77f00c186d..5f5d7afce2 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.stories.ts
@@ -16,6 +16,7 @@ import { SFProjectService } from '../../../core/sf-project.service';
 import { TextDocService } from '../../../core/text-doc.service';
 import { BuildDto } from '../../../machine-api/build-dto';
 import { ProgressService, ProjectProgress } from '../../../shared/progress-service/progress.service';
+import { DraftNotificationService } from '../draft-notification.service';
 import {
   BookForImport,
   BookWithExistingText,
@@ -27,6 +28,7 @@ const mockDestroyRef = mock(DestroyRef);
 const mockMatDialogRef = mock(MatDialogRef<DraftImportWizardComponent, boolean>);
 const mockParatextService = mock(ParatextService);
 const mockProgressService = mock(ProgressService);
+const mockDraftNotificationService = mock(DraftNotificationService);
 const mockProjectNotificationService = mock(ProjectNotificationService);
 const mockProjectService = mock(SFProjectService);
 const mockTextDocService = mock(TextDocService);
@@ -186,6 +188,7 @@ export default {
         { provide: MAT_DIALOG_DATA, useValue: buildDto },
         { provide: MatDialogRef, useValue: instance(mockMatDialogRef) },
         { provide: ParatextService, useValue: instance(mockParatextService) },
+        { provide: DraftNotificationService, useValue: instance(mockDraftNotificationService) },
         { provide: ProjectNotificationService, useValue: instance(mockProjectNotificationService) },
         { provide: SFProjectService, useValue: instance(mockProjectService) },
         { provide: TextDocService, useValue: instance(mockTextDocService) },
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-notification.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-notification.service.ts
new file mode 100644
index 0000000000..2ab9ca7cda
--- /dev/null
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-notification.service.ts
@@ -0,0 +1,74 @@
+import { Injectable } from '@angular/core';
+import {
+  AbortError,
+  HubConnection,
+  HubConnectionBuilder,
+  HubConnectionState,
+  IHttpConnectionOptions
+} from '@microsoft/signalr';
+import { AuthService } from 'xforge-common/auth.service';
+import { OnlineStatusService } from 'xforge-common/online-status.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DraftNotificationService {
+  private connection: HubConnection;
+  private options: IHttpConnectionOptions = {
+    accessTokenFactory: async () => (await this.authService.getAccessToken()) ?? ''
+  };
+
+  constructor(
+    private authService: AuthService,
+    private readonly onlineService: OnlineStatusService
+  ) {
+    this.connection = new HubConnectionBuilder()
+      .withUrl('/draft-notifications', this.options)
+      .withAutomaticReconnect()
+      .withStatefulReconnect()
+      .build();
+  }
+
+  get appOnline(): boolean {
+    return this.onlineService.isOnline && this.onlineService.isBrowserOnline;
+  }
+
+  removeNotifyDraftApplyProgressHandler(handler: any): void {
+    this.connection.off('notifyDraftApplyProgress', handler);
+  }
+
+  setNotifyDraftApplyProgressHandler(handler: any): void {
+    this.connection.on('notifyDraftApplyProgress', handler);
+  }
+
+  async start(): Promise<void> {
+    if (this.connection.state !== HubConnectionState.Disconnected) {
+      await this.connection.stop();
+    }
+    await this.connection.start().catch(err => {
+      // Suppress AbortErrors, as they are not caused by server error, but the SignalR connection state
+      // These will be thrown if a user navigates away quickly after
+      // starting the sync or the app loses internet connection
+      if (err instanceof AbortError || !this.appOnline) {
+        return;
+      } else {
+        throw err;
+      }
+    });
+  }
+
+  async stop(): Promise<void> {
+    await this.connection.stop();
+  }
+
+  async subscribeToProject(projectId: string): Promise<void> {
+    await this.connection.send('subscribeToProject', projectId).catch(err => {
+      // This error is thrown when a user navigates away quickly after starting the sync
+      if (err.message === "Cannot send data if the connection is not in the 'Connected' State.") {
+        return;
+      } else {
+        throw err;
+      }
+    });
+  }
+}
diff --git a/src/SIL.XForge.Scripture/Services/DraftNotificationHub.cs b/src/SIL.XForge.Scripture/Services/DraftNotificationHub.cs
new file mode 100644
index 0000000000..a0d65311ef
--- /dev/null
+++ b/src/SIL.XForge.Scripture/Services/DraftNotificationHub.cs
@@ -0,0 +1,29 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.SignalR;
+using SIL.XForge.Scripture.Models;
+
+namespace SIL.XForge.Scripture.Services;
+
+[Authorize]
+public class DraftNotificationHub : Hub<IDraftNotifier>, IDraftNotifier
+{
+    /// <summary>
+    /// Notifies subscribers to a project of draft application progress.
+    /// </summary>
+    /// <param name="projectId">The Scripture Forge project identifier.</param>
+    /// <param name="draftApplyState">The state of the draft being applied.</param>
+    /// <returns>The asynchronous task.</returns>
+    public async Task NotifyDraftApplyProgress(string projectId, DraftApplyState draftApplyState) =>
+        await Clients.Group(projectId).NotifyDraftApplyProgress(projectId, draftApplyState);
+
+    /// <summary>
+    /// Subscribe to notifications for a project.
+    ///
+    /// This is called from the frontend via <c>project-notification.service.ts</c>.
+    /// </summary>
+    /// <param name="projectId">The Scripture Forge project identifier.</param>
+    /// <returns>The asynchronous task.</returns>
+    public async Task SubscribeToProject(string projectId) =>
+        await Groups.AddToGroupAsync(Context.ConnectionId, projectId);
+}
diff --git a/src/SIL.XForge.Scripture/Services/IDraftNotifier.cs b/src/SIL.XForge.Scripture/Services/IDraftNotifier.cs
new file mode 100644
index 0000000000..e3fd1b43ac
--- /dev/null
+++ b/src/SIL.XForge.Scripture/Services/IDraftNotifier.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using SIL.XForge.Scripture.Models;
+
+namespace SIL.XForge.Scripture.Services;
+
+public interface IDraftNotifier
+{
+    Task NotifyDraftApplyProgress(string sfProjectId, DraftApplyState draftApplyState);
+    Task SubscribeToProject(string projectId);
+}
diff --git a/src/SIL.XForge.Scripture/Services/INotifier.cs b/src/SIL.XForge.Scripture/Services/INotifier.cs
index 7b421df877..e3b45da2b8 100644
--- a/src/SIL.XForge.Scripture/Services/INotifier.cs
+++ b/src/SIL.XForge.Scripture/Services/INotifier.cs
@@ -6,7 +6,6 @@ namespace SIL.XForge.Scripture.Services;
 public interface INotifier
 {
     Task NotifyBuildProgress(string sfProjectId, ServalBuildState buildState);
-    Task NotifyDraftApplyProgress(string sfProjectId, DraftApplyState draftApplyState);
     Task NotifySyncProgress(string sfProjectId, ProgressState progressState);
     Task SubscribeToProject(string projectId);
 }
diff --git a/src/SIL.XForge.Scripture/Services/MachineApiService.cs b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
index 171281357f..b0565dff75 100644
--- a/src/SIL.XForge.Scripture/Services/MachineApiService.cs
+++ b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
@@ -46,6 +46,7 @@ public class MachineApiService(
     IExceptionHandler exceptionHandler,
     IHttpRequestAccessor httpRequestAccessor,
     IHubContext<NotificationHub, INotifier> hubContext,
+    IHubContext<DraftNotificationHub, IDraftNotifier> draftHubContext,
     ILogger<MachineApiService> logger,
     IMachineProjectService machineProjectService,
     IParatextService paratextService,
@@ -169,7 +170,7 @@ CancellationToken cancellationToken
                         + $" while the target project ({targetProjectDoc.Data.ShortName.Sanitize()}) has {targetLastChapter} chapters.";
                     logger.LogWarning(message);
                     result.Log += $"{message}\n";
-                    await hubContext.NotifyDraftApplyProgress(
+                    await draftHubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
@@ -189,7 +190,7 @@ await hubContext.NotifyDraftApplyProgress(
                 {
                     chapters = [.. Enumerable.Range(1, lastChapter)];
                 }
-                await hubContext.NotifyDraftApplyProgress(
+                await draftHubContext.NotifyDraftApplyProgress(
                     sfProjectId,
                     new DraftApplyState
                     {
@@ -236,7 +237,7 @@ await hubContext.NotifyDraftApplyProgress(
                             if (string.IsNullOrWhiteSpace(usfm))
                             {
                                 result.Failures.Add(book);
-                                await hubContext.NotifyDraftApplyProgress(
+                                await draftHubContext.NotifyDraftApplyProgress(
                                     sfProjectId,
                                     new DraftApplyState
                                     {
@@ -253,7 +254,7 @@ await hubContext.NotifyDraftApplyProgress(
                             if (DeltaUsxMapper.ExtractBookId(usfm) != book)
                             {
                                 result.Failures.Add(book);
-                                await hubContext.NotifyDraftApplyProgress(
+                                await draftHubContext.NotifyDraftApplyProgress(
                                     sfProjectId,
                                     new DraftApplyState
                                     {
@@ -290,7 +291,7 @@ .. paratextService.GetChaptersAsUsj(userSecret, project.ParatextId, bookNum, usf
                         {
                             // A blank chapter from Serval
                             result.Failures.Add($"{Canon.BookNumberToId(bookNum)} {chapterNum}");
-                            await hubContext.NotifyDraftApplyProgress(
+                            await draftHubContext.NotifyDraftApplyProgress(
                                 sfProjectId,
                                 new DraftApplyState
                                 {
@@ -313,7 +314,7 @@ await hubContext.NotifyDraftApplyProgress(
                     {
                         // Likely a blank draft in the database
                         result.Failures.Add($"{Canon.BookNumberToId(bookNum)} {chapterNum}");
-                        await hubContext.NotifyDraftApplyProgress(
+                        await draftHubContext.NotifyDraftApplyProgress(
                             sfProjectId,
                             new DraftApplyState
                             {
@@ -340,7 +341,7 @@ await hubContext.NotifyDraftApplyProgress(
                     }
                 }
 
-                await hubContext.NotifyDraftApplyProgress(
+                await draftHubContext.NotifyDraftApplyProgress(
                     sfProjectId,
                     new DraftApplyState
                     {
@@ -362,7 +363,7 @@ await hubContext.NotifyDraftApplyProgress(
             exceptionHandler.ReportException(e);
             result.Log += $"{message}\n";
             result.Log += $"{e}\n";
-            await hubContext.NotifyDraftApplyProgress(
+            await draftHubContext.NotifyDraftApplyProgress(
                 sfProjectId,
                 new DraftApplyState
                 {
@@ -445,7 +446,7 @@ await targetProjectDoc.SubmitJson0OpAsync(op =>
             // Update the permissions
             if (chapterDeltas.Count > 0)
             {
-                await hubContext.NotifyDraftApplyProgress(
+                await draftHubContext.NotifyDraftApplyProgress(
                     sfProjectId,
                     new DraftApplyState
                     {
@@ -489,7 +490,7 @@ await paratextService.UpdateParatextPermissionsForNewBooksAsync(
                     if (result.Failures.Add(bookId))
                     {
                         // Only notify the book failure once per book
-                        await hubContext.NotifyDraftApplyProgress(
+                        await draftHubContext.NotifyDraftApplyProgress(
                             sfProjectId,
                             new DraftApplyState
                             {
@@ -519,7 +520,7 @@ await hubContext.NotifyDraftApplyProgress(
                     if (result.Failures.Add(bookId))
                     {
                         // Only notify the book failure once per book
-                        await hubContext.NotifyDraftApplyProgress(
+                        await draftHubContext.NotifyDraftApplyProgress(
                             sfProjectId,
                             new DraftApplyState
                             {
@@ -541,7 +542,7 @@ await hubContext.NotifyDraftApplyProgress(
                 if (chapterIndex == -1)
                 {
                     result.Failures.Add($"{Canon.BookNumberToId(bookNum)} {chapterDelta.Number}");
-                    await hubContext.NotifyDraftApplyProgress(
+                    await draftHubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
@@ -575,7 +576,7 @@ await targetProjectDoc.SubmitJson0OpAsync(op =>
                     }
 
                     result.Failures.Add($"{Canon.BookNumberToId(bookNum)} {chapterDelta.Number}");
-                    await hubContext.NotifyDraftApplyProgress(
+                    await draftHubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
@@ -602,7 +603,7 @@ await hubContext.NotifyDraftApplyProgress(
                     {
                         await textDataDoc.SubmitOpAsync(diffDelta, OpSource.Draft);
                     }
-                    await hubContext.NotifyDraftApplyProgress(
+                    await draftHubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
@@ -617,7 +618,7 @@ await hubContext.NotifyDraftApplyProgress(
                 {
                     // Create a new text data document
                     await textDataDoc.CreateAsync(newTextData);
-                    await hubContext.NotifyDraftApplyProgress(
+                    await draftHubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
                         {
@@ -657,7 +658,7 @@ await hubContext.NotifyDraftApplyProgress(
                 connection.RollbackTransaction();
             }
 
-            await hubContext.NotifyDraftApplyProgress(
+            await draftHubContext.NotifyDraftApplyProgress(
                 sfProjectId,
                 new DraftApplyState
                 {
diff --git a/src/SIL.XForge.Scripture/Services/NotificationHub.cs b/src/SIL.XForge.Scripture/Services/NotificationHub.cs
index 462dd51aeb..8f17d103ab 100644
--- a/src/SIL.XForge.Scripture/Services/NotificationHub.cs
+++ b/src/SIL.XForge.Scripture/Services/NotificationHub.cs
@@ -21,15 +21,6 @@ public class NotificationHub : Hub<INotifier>, INotifier
     public async Task NotifyBuildProgress(string projectId, ServalBuildState buildState) =>
         await Clients.Group(projectId).NotifyBuildProgress(projectId, buildState);
 
-    /// <summary>
-    /// Notifies subscribers to a project of draft application progress.
-    /// </summary>
-    /// <param name="projectId">The Scripture Forge project identifier.</param>
-    /// <param name="draftApplyState">The state of the draft being applied.</param>
-    /// <returns>The asynchronous task.</returns>
-    public async Task NotifyDraftApplyProgress(string projectId, DraftApplyState draftApplyState) =>
-        await Clients.Group(projectId).NotifyDraftApplyProgress(projectId, draftApplyState);
-
     /// <summary>
     /// Notifies subscribers to a project of sync progress.
     /// </summary>
diff --git a/src/SIL.XForge.Scripture/Services/NotificationHubExtensions.cs b/src/SIL.XForge.Scripture/Services/NotificationHubExtensions.cs
index 8d4747e782..3af78a79a0 100644
--- a/src/SIL.XForge.Scripture/Services/NotificationHubExtensions.cs
+++ b/src/SIL.XForge.Scripture/Services/NotificationHubExtensions.cs
@@ -13,7 +13,7 @@ ServalBuildState buildState
     ) => hubContext.Clients.Groups(projectId).NotifyBuildProgress(projectId, buildState);
 
     public static Task NotifyDraftApplyProgress(
-        this IHubContext<NotificationHub, INotifier> hubContext,
+        this IHubContext<DraftNotificationHub, IDraftNotifier> hubContext,
         string projectId,
         DraftApplyState draftApplyState
     ) => hubContext.Clients.Groups(projectId).NotifyDraftApplyProgress(projectId, draftApplyState);
diff --git a/src/SIL.XForge.Scripture/Startup.cs b/src/SIL.XForge.Scripture/Startup.cs
index a05f61a7e6..bcf7e422f1 100644
--- a/src/SIL.XForge.Scripture/Startup.cs
+++ b/src/SIL.XForge.Scripture/Startup.cs
@@ -293,6 +293,10 @@ IExceptionHandler exceptionHandler
                 pattern: $"/{UrlConstants.ProjectNotifications}",
                 options => options.AllowStatefulReconnects = false
             );
+            endpoints.MapHub<DraftNotificationHub>(
+                pattern: $"/{UrlConstants.DraftNotifications}",
+                options => options.AllowStatefulReconnects = true
+            );
             var authOptions = Configuration.GetOptions<AuthOptions>();
             endpoints.MapHangfireDashboard(
                 new DashboardOptions
diff --git a/src/SIL.XForge/Controllers/UrlConstants.cs b/src/SIL.XForge/Controllers/UrlConstants.cs
index 231a650d09..d3fa82b0a6 100644
--- a/src/SIL.XForge/Controllers/UrlConstants.cs
+++ b/src/SIL.XForge/Controllers/UrlConstants.cs
@@ -6,6 +6,7 @@ public static class UrlConstants
     public const string CommandApiNamespace = "command-api";
     public const string Users = "users";
     public const string Projects = "projects";
+    public const string DraftNotifications = "draft-notifications";
     public const string ProjectNotifications = "project-notifications";
     public const string OnboardingRequests = "onboarding-requests";
 }
diff --git a/src/SIL.XForge/Services/AuthServiceCollectionExtensions.cs b/src/SIL.XForge/Services/AuthServiceCollectionExtensions.cs
index e31cdd69ae..8cbf094672 100644
--- a/src/SIL.XForge/Services/AuthServiceCollectionExtensions.cs
+++ b/src/SIL.XForge/Services/AuthServiceCollectionExtensions.cs
@@ -32,8 +32,13 @@ public static IServiceCollection AddXFAuthentication(this IServiceCollection ser
                         string? accessToken = context.Request.Query["access_token"];
                         if (
                             !string.IsNullOrEmpty(accessToken)
-                            && context.HttpContext.Request.Path.StartsWithSegments(
-                                $"/{UrlConstants.ProjectNotifications}"
+                            && (
+                                context.HttpContext.Request.Path.StartsWithSegments(
+                                    $"/{UrlConstants.ProjectNotifications}"
+                                )
+                                || context.HttpContext.Request.Path.StartsWithSegments(
+                                    $"/{UrlConstants.DraftNotifications}"
+                                )
                             )
                         )
                         {
diff --git a/test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs b/test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs
index 51dc8b4962..1565860599 100644
--- a/test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs
+++ b/test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs
@@ -4791,6 +4791,7 @@ public TestEnvironment()
             HttpRequestAccessor = Substitute.For<IHttpRequestAccessor>();
             HttpRequestAccessor.SiteRoot.Returns(new Uri("https://scriptureforge.org", UriKind.Absolute));
             var hubContext = Substitute.For<IHubContext<NotificationHub, INotifier>>();
+            var draftHubContext = Substitute.For<IHubContext<DraftNotificationHub, IDraftNotifier>>();
             MachineProjectService = Substitute.For<IMachineProjectService>();
             MockLogger = new MockLogger<MachineApiService>();
             ParatextService = Substitute.For<IParatextService>();
@@ -4928,6 +4929,7 @@ public TestEnvironment()
                 ExceptionHandler,
                 HttpRequestAccessor,
                 hubContext,
+                draftHubContext,
                 MockLogger,
                 MachineProjectService,
                 ParatextService,

From 0f2e7cc7086316f06757a29f86a4bb9d44a0cdb9 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 17 Feb 2026 11:15:19 +1300
Subject: [PATCH 29/40] SF-3633 Record source when creating ShareDB documents

---
 src/RealtimeServer/common/index.ts            | 15 ++++++++--
 .../common/utils/sharedb-utils.ts             | 10 +++++--
 src/RealtimeServer/common/utils/test-utils.ts | 15 ++++++++--
 .../services/text-service.spec.ts             | 17 +++++++++++
 .../Services/MachineApiService.cs             |  4 +--
 .../Services/ParatextSyncRunner.cs            |  7 +++--
 .../Services/SFProjectService.cs              | 10 ++++---
 src/SIL.XForge/Realtime/Connection.cs         | 15 ++++++++--
 src/SIL.XForge/Realtime/Document.cs           |  8 ++---
 src/SIL.XForge/Realtime/IConnection.cs        |  2 +-
 src/SIL.XForge/Realtime/IDocument.cs          |  4 +--
 src/SIL.XForge/Realtime/IRealtimeServer.cs    |  9 +++++-
 src/SIL.XForge/Realtime/MemoryConnection.cs   |  9 ++++--
 src/SIL.XForge/Realtime/MemoryDocument.cs     |  6 ++--
 src/SIL.XForge/Realtime/RealtimeExtensions.cs | 13 +++++---
 src/SIL.XForge/Realtime/RealtimeServer.cs     | 10 +++++--
 src/SIL.XForge/Services/UserService.cs        |  3 +-
 .../Realtime/ConnectionTests.cs               | 30 +++++++++++++++----
 .../Realtime/DocumentTests.cs                 | 16 +++++-----
 .../Realtime/RealtimeServerTests.cs           |  2 +-
 20 files changed, 152 insertions(+), 53 deletions(-)

diff --git a/src/RealtimeServer/common/index.ts b/src/RealtimeServer/common/index.ts
index 0960de95d4..55f1bf966f 100644
--- a/src/RealtimeServer/common/index.ts
+++ b/src/RealtimeServer/common/index.ts
@@ -210,7 +210,8 @@ export = {
     collection: string,
     id: string,
     data: any,
-    typeName: OTType
+    typeName: OTType,
+    source: string | undefined
   ): void => {
     if (server == null) {
       callback(new Error('Server not started.'));
@@ -221,7 +222,17 @@ export = {
       callback(new Error('Connection not found.'));
       return;
     }
-    doc.create(data, typeName, err => callback(err, createSnapshot(doc)));
+    const options: any = {};
+    doc.submitSource = source != null;
+    if (source != null) {
+      options.source = source;
+    }
+    doc.create(data, typeName, options, err => {
+      if (source != null) {
+        doc.submitSource = false;
+      }
+      callback(err, createSnapshot(doc));
+    });
   },
 
   fetchDoc: (callback: InteropCallback, handle: number, collection: string, id: string): void => {
diff --git a/src/RealtimeServer/common/utils/sharedb-utils.ts b/src/RealtimeServer/common/utils/sharedb-utils.ts
index 176896d728..1d41695a10 100644
--- a/src/RealtimeServer/common/utils/sharedb-utils.ts
+++ b/src/RealtimeServer/common/utils/sharedb-utils.ts
@@ -13,9 +13,15 @@ export function docFetch(doc: Doc): Promise<void> {
   });
 }
 
-export function docCreate(doc: Doc, data: any, type?: OTType): Promise<void> {
+export function docCreate(
+  doc: Doc,
+  data: any,
+  type?: OTType,
+  source: boolean | any | undefined = undefined
+): Promise<void> {
+  const options: ShareDBSourceOptions = source != null ? { source } : {};
   return new Promise<void>((resolve, reject) => {
-    doc.create(data, type, err => {
+    doc.create(data, type, options, err => {
       if (err != null) {
         reject(err);
       } else {
diff --git a/src/RealtimeServer/common/utils/test-utils.ts b/src/RealtimeServer/common/utils/test-utils.ts
index fddf41b311..34811299ac 100644
--- a/src/RealtimeServer/common/utils/test-utils.ts
+++ b/src/RealtimeServer/common/utils/test-utils.ts
@@ -20,8 +20,19 @@ export async function hasDoc(conn: Connection, collection: string, id: string):
   return doc.data != null;
 }
 
-export function createDoc<T>(conn: Connection, collection: string, id: string, data: T, type?: OTType): Promise<void> {
-  return docCreate(conn.get(collection, id), data, type);
+export function createDoc<T>(
+  conn: Connection,
+  collection: string,
+  id: string,
+  data: T,
+  type?: OTType,
+  source: boolean | any | undefined = undefined
+): Promise<void> {
+  const doc = conn.get(collection, id);
+  if (source != null) {
+    doc.submitSource = true;
+  }
+  return docCreate(doc, data, type, source);
 }
 
 export async function submitOp(
diff --git a/src/RealtimeServer/scriptureforge/services/text-service.spec.ts b/src/RealtimeServer/scriptureforge/services/text-service.spec.ts
index 34fb7cd669..034ba53a76 100644
--- a/src/RealtimeServer/scriptureforge/services/text-service.spec.ts
+++ b/src/RealtimeServer/scriptureforge/services/text-service.spec.ts
@@ -75,6 +75,23 @@ describe('TextService', () => {
       });
     });
   });
+
+  it('writes the op source to the database on create', async () => {
+    const env = new TestEnvironment();
+    await env.createData();
+
+    const conn = clientConnect(env.server, 'administrator');
+    const id: string = getTextDocId('project01', 40, 2);
+    const source: string = 'history';
+    await createDoc<TextData>(conn, TEXTS_COLLECTION, id, new Delta(), 'rich-text', source);
+    await new Promise<void>(resolve => {
+      env.db.getOps(TEXTS_COLLECTION, id, 0, null, { metadata: true }, (_, ops) => {
+        console.log(JSON.stringify(ops));
+        expect(ops[0].m.source).toBe(source);
+        resolve();
+      });
+    });
+  });
 });
 
 class TestEnvironment {
diff --git a/src/SIL.XForge.Scripture/Services/MachineApiService.cs b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
index b0565dff75..d777b9a5d6 100644
--- a/src/SIL.XForge.Scripture/Services/MachineApiService.cs
+++ b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
@@ -617,7 +617,7 @@ await draftHubContext.NotifyDraftApplyProgress(
                 else
                 {
                     // Create a new text data document
-                    await textDataDoc.CreateAsync(newTextData);
+                    await textDataDoc.CreateAsync(newTextData, OpSource.Draft);
                     await draftHubContext.NotifyDraftApplyProgress(
                         sfProjectId,
                         new DraftApplyState
@@ -2614,7 +2614,7 @@ private static async Task SaveTextDocumentAsync(IDocument<TextDocument> textDocu
         // Create or update the text document
         if (!textDocument.IsLoaded)
         {
-            await textDocument.CreateAsync(chapterTextDocument);
+            await textDocument.CreateAsync(chapterTextDocument, OpSource.Draft);
         }
         else
         {
diff --git a/src/SIL.XForge.Scripture/Services/ParatextSyncRunner.cs b/src/SIL.XForge.Scripture/Services/ParatextSyncRunner.cs
index ab5619e680..8f3ebbe288 100644
--- a/src/SIL.XForge.Scripture/Services/ParatextSyncRunner.cs
+++ b/src/SIL.XForge.Scripture/Services/ParatextSyncRunner.cs
@@ -754,7 +754,7 @@ await _projectDoc.SubmitJson0OpAsync(op =>
                 biblicalTerm.ProjectRef = _projectDoc.Id;
                 IDocument<BiblicalTerm> newBiblicalTermDoc = GetBiblicalTermDoc(biblicalTerm.DataId);
                 async Task CreateBiblicalTermAsync(BiblicalTerm newBiblicalTerm) =>
-                    await newBiblicalTermDoc.CreateAsync(newBiblicalTerm);
+                    await newBiblicalTermDoc.CreateAsync(newBiblicalTerm, OpSource.Paratext);
                 tasks.Add(CreateBiblicalTermAsync(biblicalTerm));
                 _syncMetrics.BiblicalTerms.Added++;
             }
@@ -1307,7 +1307,7 @@ async Task CreateText(Delta delta)
                     await textDataDoc.FetchAsync();
                     if (textDataDoc.IsLoaded)
                         await textDataDoc.DeleteAsync();
-                    await textDataDoc.CreateAsync(new TextData(delta));
+                    await textDataDoc.CreateAsync(new TextData(delta), OpSource.Paratext);
                 }
                 tasks.Add(CreateText(kvp.Value.Delta));
                 _syncMetrics.TextDocs.Added++;
@@ -1401,7 +1401,8 @@ await doc.CreateAsync(
                             Assignment = change.Assignment,
                             BiblicalTermId = change.BiblicalTermId,
                             ExtraHeadingInfo = change.ExtraHeadingInfo,
-                        }
+                        },
+                        OpSource.Paratext
                     );
                     await SubmitChangesOnNoteThreadDocAsync(doc, change);
                 }
diff --git a/src/SIL.XForge.Scripture/Services/SFProjectService.cs b/src/SIL.XForge.Scripture/Services/SFProjectService.cs
index 8868e091b3..eac8a29984 100644
--- a/src/SIL.XForge.Scripture/Services/SFProjectService.cs
+++ b/src/SIL.XForge.Scripture/Services/SFProjectService.cs
@@ -157,7 +157,7 @@ public async Task<string> CreateProjectAsync(string curUserId, SFProjectCreateSe
             {
                 throw new InvalidOperationException(ErrorAlreadyConnectedKey);
             }
-            IDocument<SFProject> projectDoc = await conn.CreateAsync<SFProject>(projectId, project);
+            IDocument<SFProject> projectDoc = await conn.CreateAsync<SFProject>(projectId, project, source: null);
             await ProjectSecrets.InsertAsync(new SFProjectSecret { Id = projectDoc.Id });
 
             IDocument<User> userDoc = await conn.FetchAsync<User>(curUserId);
@@ -1142,7 +1142,8 @@ string audioUrl
                     ProjectRef = projectId,
                     // TODO (scripture audio) Should the ID be set here? How does the DataId differ from the document ID?
                     DataId = textAudioId,
-                }
+                },
+            source: null
         );
 
         await textAudioDoc.SubmitJson0OpAsync(op =>
@@ -1275,7 +1276,8 @@ protected override async Task AddUserToProjectAsync(
         {
             await conn.CreateAsync(
                 SFProjectUserConfig.GetDocId(projectDoc.Id, userDoc.Id),
-                new SFProjectUserConfig { ProjectRef = projectDoc.Id, OwnerRef = userDoc.Id }
+                new SFProjectUserConfig { ProjectRef = projectDoc.Id, OwnerRef = userDoc.Id },
+                source: null
             );
         }
         // Listeners can now assume the ProjectUserConfig is ready when the user is added.
@@ -2067,7 +2069,7 @@ private async Task<string> CreateResourceProjectInternalAsync(IConnection conn,
             throw new InvalidOperationException(ErrorAlreadyConnectedKey);
         }
 
-        IDocument<SFProject> projectDoc = await conn.CreateAsync(projectId, project);
+        IDocument<SFProject> projectDoc = await conn.CreateAsync(projectId, project, source: null);
         await ProjectSecrets.InsertAsync(new SFProjectSecret { Id = projectDoc.Id });
 
         // Resource projects do not have administrators, so users are added as needed
diff --git a/src/SIL.XForge/Realtime/Connection.cs b/src/SIL.XForge/Realtime/Connection.cs
index c29836e7d6..970bb5ac4d 100644
--- a/src/SIL.XForge/Realtime/Connection.cs
+++ b/src/SIL.XForge/Realtime/Connection.cs
@@ -128,7 +128,8 @@ await _realtimeServer.CreateDocAsync(
                             queuedOperation.Collection,
                             queuedOperation.Id,
                             queuedOperation.Data,
-                            queuedOperation.OtTypeName
+                            queuedOperation.OtTypeName,
+                            queuedOperation.Source
                         );
                         break;
                     case QueuedAction.Delete:
@@ -178,10 +179,17 @@ await _realtimeServer.ReplaceDocAsync(
     /// <param name="id">The identifier.</param>
     /// <param name="data">The data.</param>
     /// <param name="otTypeName">Name of the OT type.</param>
+    /// <param name="source">The source of the op. This is currently only used by text documents.</param>
     /// <returns>
     /// A snapshot of the created document from the realtime server.
     /// </returns>
-    public async Task<Snapshot<T>> CreateDocAsync<T>(string collection, string id, T data, string otTypeName)
+    public async Task<Snapshot<T>> CreateDocAsync<T>(
+        string collection,
+        string id,
+        T data,
+        string otTypeName,
+        OpSource? source
+    )
     {
         if (_isTransaction)
         {
@@ -195,6 +203,7 @@ public async Task<Snapshot<T>> CreateDocAsync<T>(string collection, string id, T
                     Handle = _handle,
                     Id = id,
                     OtTypeName = otTypeName,
+                    Source = source,
                 }
             );
 
@@ -203,7 +212,7 @@ public async Task<Snapshot<T>> CreateDocAsync<T>(string collection, string id, T
         }
         else
         {
-            return await _realtimeServer.CreateDocAsync(_handle, collection, id, data, otTypeName);
+            return await _realtimeServer.CreateDocAsync(_handle, collection, id, data, otTypeName, source);
         }
     }
 
diff --git a/src/SIL.XForge/Realtime/Document.cs b/src/SIL.XForge/Realtime/Document.cs
index 067022fdc5..0f27781a6c 100644
--- a/src/SIL.XForge/Realtime/Document.cs
+++ b/src/SIL.XForge/Realtime/Document.cs
@@ -38,12 +38,12 @@ internal Document(IConnection connection, string otTypeName, string collection,
 
     public bool IsLoaded => Data != null;
 
-    public async Task CreateAsync(T data)
+    public async Task CreateAsync(T data, OpSource? source)
     {
         await _lock.WaitAsync();
         try
         {
-            Snapshot<T> snapshot = await _connection.CreateDocAsync(Collection, Id, data, OTTypeName);
+            Snapshot<T> snapshot = await _connection.CreateDocAsync(Collection, Id, data, OTTypeName, source);
             UpdateFromSnapshot(snapshot);
         }
         finally
@@ -66,14 +66,14 @@ public async Task FetchAsync()
         }
     }
 
-    public async Task FetchOrCreateAsync(Func<T> createData)
+    public async Task FetchOrCreateAsync(Func<T> createData, OpSource? source)
     {
         await _lock.WaitAsync();
         try
         {
             Snapshot<T> snapshot = await _connection.FetchDocAsync<T>(Collection, Id);
             if (snapshot.Data == null)
-                snapshot = await _connection.CreateDocAsync(Collection, Id, createData(), OTTypeName);
+                snapshot = await _connection.CreateDocAsync(Collection, Id, createData(), OTTypeName, source);
             UpdateFromSnapshot(snapshot);
         }
         finally
diff --git a/src/SIL.XForge/Realtime/IConnection.cs b/src/SIL.XForge/Realtime/IConnection.cs
index 8dd9df3cb5..72ecf150c3 100644
--- a/src/SIL.XForge/Realtime/IConnection.cs
+++ b/src/SIL.XForge/Realtime/IConnection.cs
@@ -10,7 +10,7 @@ public interface IConnection : IDisposable, IAsyncDisposable
 {
     void BeginTransaction();
     Task CommitTransactionAsync();
-    Task<Snapshot<T>> CreateDocAsync<T>(string collection, string id, T data, string otTypeName);
+    Task<Snapshot<T>> CreateDocAsync<T>(string collection, string id, T data, string otTypeName, OpSource? source);
     Task DeleteDocAsync(string collection, string id);
     void ExcludePropertyFromTransaction<T>(Expression<Func<T, object>> field);
     Task<Snapshot<T>> FetchDocAsync<T>(string collection, string id);
diff --git a/src/SIL.XForge/Realtime/IDocument.cs b/src/SIL.XForge/Realtime/IDocument.cs
index 635662b759..3cc33840df 100644
--- a/src/SIL.XForge/Realtime/IDocument.cs
+++ b/src/SIL.XForge/Realtime/IDocument.cs
@@ -14,11 +14,11 @@ public interface IDocument<T>
     T Data { get; }
     bool IsLoaded { get; }
 
-    Task CreateAsync(T data);
+    Task CreateAsync(T data, OpSource? source);
 
     Task FetchAsync();
 
-    Task FetchOrCreateAsync(Func<T> createData);
+    Task FetchOrCreateAsync(Func<T> createData, OpSource? source);
 
     Task SubmitOpAsync(object op, OpSource? source);
 
diff --git a/src/SIL.XForge/Realtime/IRealtimeServer.cs b/src/SIL.XForge/Realtime/IRealtimeServer.cs
index 89c3a6d018..32cd5a7a36 100644
--- a/src/SIL.XForge/Realtime/IRealtimeServer.cs
+++ b/src/SIL.XForge/Realtime/IRealtimeServer.cs
@@ -8,7 +8,14 @@ public interface IRealtimeServer
 {
     Task<T> ApplyOpAsync<T>(string otTypeName, T data, object op);
     Task<int> ConnectAsync(string userId = null);
-    Task<Snapshot<T>> CreateDocAsync<T>(int handle, string collection, string id, T data, string otTypeName);
+    Task<Snapshot<T>> CreateDocAsync<T>(
+        int handle,
+        string collection,
+        string id,
+        T data,
+        string otTypeName,
+        OpSource? source
+    );
     Task DeleteDocAsync(int handle, string collection, string id);
     void Disconnect(int handle);
     Task DisconnectAsync(int handle);
diff --git a/src/SIL.XForge/Realtime/MemoryConnection.cs b/src/SIL.XForge/Realtime/MemoryConnection.cs
index 9d4fe8a630..8768afddf8 100644
--- a/src/SIL.XForge/Realtime/MemoryConnection.cs
+++ b/src/SIL.XForge/Realtime/MemoryConnection.cs
@@ -45,8 +45,13 @@ public void BeginTransaction() { }
     /// <exception cref="NotImplementedException">
     /// This is not supported by a <see cref="MemoryConnection" />.
     /// </exception>
-    public Task<Snapshot<T>> CreateDocAsync<T>(string collection, string id, T data, string otTypeName) =>
-        throw new NotImplementedException();
+    public Task<Snapshot<T>> CreateDocAsync<T>(
+        string collection,
+        string id,
+        T data,
+        string otTypeName,
+        OpSource? source
+    ) => throw new NotImplementedException();
 
     /// <summary>
     /// Deletes a document asynchronously.
diff --git a/src/SIL.XForge/Realtime/MemoryDocument.cs b/src/SIL.XForge/Realtime/MemoryDocument.cs
index af87e0a1e4..f9c842a3de 100644
--- a/src/SIL.XForge/Realtime/MemoryDocument.cs
+++ b/src/SIL.XForge/Realtime/MemoryDocument.cs
@@ -23,7 +23,7 @@ public class MemoryDocument<T>(MemoryRepository<T> repo, string otTypeName, stri
 
     public bool IsLoaded => Data != null;
 
-    public async Task CreateAsync(T data)
+    public async Task CreateAsync(T data, OpSource? source)
     {
         if (IsLoaded)
             throw new InvalidOperationException("The doc already exists.");
@@ -57,11 +57,11 @@ public async Task FetchAsync()
         }
     }
 
-    public async Task FetchOrCreateAsync(Func<T> createData)
+    public async Task FetchOrCreateAsync(Func<T> createData, OpSource? source)
     {
         await FetchAsync();
         if (!IsLoaded)
-            await CreateAsync(createData());
+            await CreateAsync(createData(), source);
     }
 
     public async Task SubmitOpAsync(object op, OpSource? source)
diff --git a/src/SIL.XForge/Realtime/RealtimeExtensions.cs b/src/SIL.XForge/Realtime/RealtimeExtensions.cs
index 27e884a095..469dd6b834 100644
--- a/src/SIL.XForge/Realtime/RealtimeExtensions.cs
+++ b/src/SIL.XForge/Realtime/RealtimeExtensions.cs
@@ -41,19 +41,24 @@ public static async Task<IDocument<T>> FetchAsync<T>(this IConnection conn, stri
         return doc;
     }
 
-    public static async Task<IDocument<T>> CreateAsync<T>(this IConnection conn, string id, T data)
+    public static async Task<IDocument<T>> CreateAsync<T>(this IConnection conn, string id, T data, OpSource? source)
         where T : IIdentifiable
     {
         IDocument<T> doc = conn.Get<T>(id);
-        await doc.CreateAsync(data);
+        await doc.CreateAsync(data, source);
         return doc;
     }
 
-    public static async Task<IDocument<T>> FetchOrCreateAsync<T>(this IConnection conn, string id, Func<T> createData)
+    public static async Task<IDocument<T>> FetchOrCreateAsync<T>(
+        this IConnection conn,
+        string id,
+        Func<T> createData,
+        OpSource? source
+    )
         where T : IIdentifiable
     {
         IDocument<T> doc = conn.Get<T>(id);
-        await doc.FetchOrCreateAsync(createData);
+        await doc.FetchOrCreateAsync(createData, source);
         return doc;
     }
 }
diff --git a/src/SIL.XForge/Realtime/RealtimeServer.cs b/src/SIL.XForge/Realtime/RealtimeServer.cs
index c07978f5b1..1d5a754703 100644
--- a/src/SIL.XForge/Realtime/RealtimeServer.cs
+++ b/src/SIL.XForge/Realtime/RealtimeServer.cs
@@ -66,8 +66,14 @@ public Task<int> ConnectAsync(string? userId = null)
         return InvokeExportAsync<int>("connect");
     }
 
-    public Task<Snapshot<T>> CreateDocAsync<T>(int handle, string collection, string id, T data, string otTypeName) =>
-        InvokeExportAsync<Snapshot<T>>("createDoc", handle, collection, id, data, otTypeName);
+    public Task<Snapshot<T>> CreateDocAsync<T>(
+        int handle,
+        string collection,
+        string id,
+        T data,
+        string otTypeName,
+        OpSource? source
+    ) => InvokeExportAsync<Snapshot<T>>("createDoc", handle, collection, id, data, otTypeName, source);
 
     public Task<Snapshot<T>> FetchDocAsync<T>(int handle, string collection, string id) =>
         InvokeExportAsync<Snapshot<T>>("fetchDoc", handle, collection, id);
diff --git a/src/SIL.XForge/Services/UserService.cs b/src/SIL.XForge/Services/UserService.cs
index 2d3460facd..e7d5820ca7 100644
--- a/src/SIL.XForge/Services/UserService.cs
+++ b/src/SIL.XForge/Services/UserService.cs
@@ -75,7 +75,8 @@ public async Task UpdateUserFromProfileAsync(string curUserId, string userProfil
                                 ? (string)userProfile["nickname"]
                                 : name,
                         IsDisplayNameConfirmed = displayNameSetAtSignup,
-                    }
+                    },
+                source: null
             );
             await userDoc.SubmitJson0OpAsync(op =>
             {
diff --git a/test/SIL.XForge.Tests/Realtime/ConnectionTests.cs b/test/SIL.XForge.Tests/Realtime/ConnectionTests.cs
index c4d6e7a826..6be88bed76 100644
--- a/test/SIL.XForge.Tests/Realtime/ConnectionTests.cs
+++ b/test/SIL.XForge.Tests/Realtime/ConnectionTests.cs
@@ -78,7 +78,7 @@ public async Task CommitTransactionAsync_UsesUnderlyingRealtimeServerOnCommit()
 
         // Setup Queue
         env.Service.BeginTransaction();
-        await env.Service.CreateDocAsync(collection, id, snapshot.Data, otTypeName);
+        await env.Service.CreateDocAsync(collection, id, snapshot.Data, otTypeName, source: null);
         await env.Service.SubmitOpAsync(collection, id, op, snapshot.Data, snapshot.Version, source: null);
         await env.Service.ReplaceDocAsync(collection, id, data, snapshot.Version, source: null);
         await env.Service.DeleteDocAsync(collection, id);
@@ -95,7 +95,14 @@ public async Task CommitTransactionAsync_UsesUnderlyingRealtimeServerOnCommit()
         // Verify Submit Operations
         await env
             .RealtimeService.Server.Received(1)
-            .CreateDocAsync(Arg.Any<int>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<object>(), Arg.Any<string>());
+            .CreateDocAsync(
+                Arg.Any<int>(),
+                Arg.Any<string>(),
+                Arg.Any<string>(),
+                Arg.Any<object>(),
+                Arg.Any<string>(),
+                Arg.Any<OpSource?>()
+            );
         await env
             .RealtimeService.Server.Received(1)
             .DeleteDocAsync(Arg.Any<int>(), Arg.Any<string>(), Arg.Any<string>());
@@ -128,10 +135,11 @@ public async Task CreateDocAsync_QueuesAction()
         string id = "id1";
         var data = new TestProject { Id = id, Name = "Test Project 1" };
         string otTypeName = OTType.Json0;
+        OpSource? source = OpSource.Draft;
 
         // SUT
         env.Service.BeginTransaction();
-        var result = await env.Service.CreateDocAsync(collection, id, data, otTypeName);
+        var result = await env.Service.CreateDocAsync(collection, id, data, otTypeName, source);
 
         // Verify result
         Assert.AreEqual(result.Version, 1);
@@ -145,11 +153,19 @@ public async Task CreateDocAsync_QueuesAction()
         Assert.AreEqual(queuedOperation.Data, data);
         Assert.AreEqual(queuedOperation.Id, id);
         Assert.AreEqual(queuedOperation.OtTypeName, otTypeName);
+        Assert.AreEqual(queuedOperation.Source, source);
 
         // Verify that the call was not passed to the underlying realtime server
         await env
             .RealtimeService.Server.Received(0)
-            .CreateDocAsync(Arg.Any<int>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<object>(), Arg.Any<string>());
+            .CreateDocAsync(
+                Arg.Any<int>(),
+                Arg.Any<string>(),
+                Arg.Any<string>(),
+                Arg.Any<object>(),
+                Arg.Any<string>(),
+                Arg.Any<OpSource?>()
+            );
     }
 
     [Test]
@@ -161,9 +177,10 @@ public async Task CreateDocAsync_UsesUnderlyingRealtimeServerOutsideOfATransacti
         string id = "id1";
         var data = new TestProject { Id = id, Name = "Test Project 1" };
         string otTypeName = OTType.Json0;
+        OpSource? source = OpSource.Draft;
 
         // SUT
-        await env.Service.CreateDocAsync(collection, id, data, otTypeName);
+        await env.Service.CreateDocAsync(collection, id, data, otTypeName, source);
 
         // Verify queue is empty
         Assert.AreEqual(env.Service.QueuedOperations.Count, 0);
@@ -176,7 +193,8 @@ await env
                 Arg.Any<string>(),
                 Arg.Any<string>(),
                 Arg.Any<TestProject>(),
-                Arg.Any<string>()
+                Arg.Any<string>(),
+                Arg.Any<OpSource?>()
             );
     }
 
diff --git a/test/SIL.XForge.Tests/Realtime/DocumentTests.cs b/test/SIL.XForge.Tests/Realtime/DocumentTests.cs
index c82a357689..3e661e0fd6 100644
--- a/test/SIL.XForge.Tests/Realtime/DocumentTests.cs
+++ b/test/SIL.XForge.Tests/Realtime/DocumentTests.cs
@@ -27,12 +27,12 @@ public class DocumentTests
     public async Task CreateAsync_Success()
     {
         var env = new TestEnvironment();
-        env.Connection.CreateDocAsync(Collection, Id, _data, OtTypeName).Returns(Task.FromResult(_snapshot));
+        env.Connection.CreateDocAsync(Collection, Id, _data, OtTypeName, Source).Returns(Task.FromResult(_snapshot));
 
         // SUT
-        await env.Document.CreateAsync(_data);
+        await env.Document.CreateAsync(_data, Source);
 
-        await env.Connection.Received(1).CreateDocAsync(Collection, Id, _data, OtTypeName);
+        await env.Connection.Received(1).CreateDocAsync(Collection, Id, _data, OtTypeName, Source);
     }
 
     [Test]
@@ -62,15 +62,15 @@ public async Task FetchAsync_Success()
     public async Task FetchAsyncOrCreate_Creates()
     {
         var env = new TestEnvironment();
-        env.Connection.CreateDocAsync(Collection, Id, _data, OtTypeName).Returns(Task.FromResult(_snapshot));
+        env.Connection.CreateDocAsync(Collection, Id, _data, OtTypeName, Source).Returns(Task.FromResult(_snapshot));
         env.Connection.FetchDocAsync<Json0Snapshot>(Collection, Id)
             .Returns(Task.FromResult(new Snapshot<Json0Snapshot>()));
 
         // SUT
-        await env.Document.FetchOrCreateAsync(() => _data);
+        await env.Document.FetchOrCreateAsync(() => _data, Source);
 
         await env.Connection.Received(1).FetchDocAsync<Json0Snapshot>(Collection, Id);
-        await env.Connection.Received(1).CreateDocAsync(Collection, Id, _data, OtTypeName);
+        await env.Connection.Received(1).CreateDocAsync(Collection, Id, _data, OtTypeName, Source);
     }
 
     [Test]
@@ -80,10 +80,10 @@ public async Task FetchAsyncOrCreate_Fetches()
         env.Connection.FetchDocAsync<Json0Snapshot>(Collection, Id).Returns(Task.FromResult(_snapshot));
 
         // SUT
-        await env.Document.FetchOrCreateAsync(() => _data);
+        await env.Document.FetchOrCreateAsync(() => _data, Source);
 
         await env.Connection.Received(1).FetchDocAsync<Json0Snapshot>(Collection, Id);
-        await env.Connection.Received(0).CreateDocAsync(Collection, Id, _data, OtTypeName);
+        await env.Connection.Received(0).CreateDocAsync(Collection, Id, _data, OtTypeName, Source);
     }
 
     [Test]
diff --git a/test/SIL.XForge.Tests/Realtime/RealtimeServerTests.cs b/test/SIL.XForge.Tests/Realtime/RealtimeServerTests.cs
index 0f515ad24c..edb9711b81 100644
--- a/test/SIL.XForge.Tests/Realtime/RealtimeServerTests.cs
+++ b/test/SIL.XForge.Tests/Realtime/RealtimeServerTests.cs
@@ -31,7 +31,7 @@ public async Task CreateDocAsync_Success()
         object data = new { };
 
         // SUT
-        await env.Service.CreateDocAsync(0, string.Empty, string.Empty, data, OTType.Json0);
+        await env.Service.CreateDocAsync(0, string.Empty, string.Empty, data, OTType.Json0, source: null);
 
         await env
             .NodeJsProcess.Received(1)

From e00c2f7f4904182566164af2daa11ef37ac9585e Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 17 Feb 2026 12:39:22 +1300
Subject: [PATCH 30/40] SF-3633 Update the history tab a draft is applied

---
 .../app/core/project-notification.service.ts  |   8 ++
 .../editor-history.component.spec.ts          |   3 +
 .../history-chooser.component.spec.ts         |   3 +
 .../history-chooser.component.ts              | 101 ++++++++++++++----
 .../Services/DraftNotificationHub.cs          |   9 ++
 .../Services/INotifier.cs                     |   1 +
 .../Services/MachineApiService.cs             |  20 ++++
 .../Services/NotificationHub.cs               |  13 +++
 .../Services/NotificationHubExtensions.cs     |   8 +-
 9 files changed, 144 insertions(+), 22 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
index bfaaf77e22..1c50836ebf 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
@@ -36,6 +36,10 @@ export class ProjectNotificationService {
     this.connection.off('notifyBuildProgress', handler);
   }
 
+  removeNotifyDraftApplyProgressHandler(handler: any): void {
+    this.connection.off('notifyDraftApplyProgress', handler);
+  }
+
   removeNotifySyncProgressHandler(handler: any): void {
     this.connection.off('notifySyncProgress', handler);
   }
@@ -44,6 +48,10 @@ export class ProjectNotificationService {
     this.connection.on('notifyBuildProgress', handler);
   }
 
+  setNotifyDraftApplyProgressHandler(handler: any): void {
+    this.connection.on('notifyDraftApplyProgress', handler);
+  }
+
   setNotifySyncProgressHandler(handler: any): void {
     this.connection.on('notifySyncProgress', handler);
   }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/editor-history.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/editor-history.component.spec.ts
index 1ced70d8e4..9e7853db39 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/editor-history.component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/editor-history.component.spec.ts
@@ -17,6 +17,7 @@ import { TypeRegistry } from 'xforge-common/type-registry';
 import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
 import { TextDoc, TextDocId } from '../../../core/models/text-doc';
 import { Revision } from '../../../core/paratext.service';
+import { ProjectNotificationService } from '../../../core/project-notification.service';
 import { SFProjectService } from '../../../core/sf-project.service';
 import { TextComponent } from '../../../shared/text/text.component';
 import { EditorHistoryComponent } from './editor-history.component';
@@ -28,6 +29,7 @@ describe('EditorHistoryComponent', () => {
   const mockSFProjectService = mock(SFProjectService);
   const mockI18nService = mock(I18nService);
   const mockHistoryChooserComponent = mock(HistoryChooserComponent);
+  const mockProjectNotificationService = mock(ProjectNotificationService);
 
   const revisionSelect$ = new Subject<RevisionSelectEvent>();
   const showDiffChange$ = new Subject<boolean>();
@@ -39,6 +41,7 @@ describe('EditorHistoryComponent', () => {
       provideTestRealtime(new TypeRegistry([TextDoc], [FileType.Audio], [])),
       provideTestOnlineStatus(),
       { provide: OnlineStatusService, useClass: TestOnlineStatusService },
+      { provide: ProjectNotificationService, useMock: mockProjectNotificationService },
       { provide: SFProjectService, useMock: mockSFProjectService },
       { provide: I18nService, useMock: mockI18nService }
     ]
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.spec.ts
index 64db6e6b94..72bde280f0 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.spec.ts
@@ -18,6 +18,7 @@ import { configureTestingModule, getTestTranslocoModule } from 'xforge-common/te
 import { SFProjectProfileDoc } from '../../../../core/models/sf-project-profile-doc';
 import { SF_TYPE_REGISTRY } from '../../../../core/models/sf-type-registry';
 import { ParatextService } from '../../../../core/paratext.service';
+import { ProjectNotificationService } from '../../../../core/project-notification.service';
 import { SFProjectService } from '../../../../core/sf-project.service';
 import { TextDocService } from '../../../../core/text-doc.service';
 import { HistoryChooserComponent } from './history-chooser.component';
@@ -26,6 +27,7 @@ import { HistoryRevisionFormatPipe } from './history-revision-format.pipe';
 const mockedDialogService = mock(DialogService);
 const mockedNoticeService = mock(NoticeService);
 const mockedParatextService = mock(ParatextService);
+const mockedProjectNotificationService = mock(ProjectNotificationService);
 const mockedProjectService = mock(SFProjectService);
 const mockedTextDocService = mock(TextDocService);
 const mockedErrorReportingService = mock(ErrorReportingService);
@@ -43,6 +45,7 @@ describe('HistoryChooserComponent', () => {
       { provide: SFProjectService, useMock: mockedProjectService },
       { provide: TextDocService, useMock: mockedTextDocService },
       { provide: ErrorReportingService, useMock: mockedErrorReportingService },
+      { provide: ProjectNotificationService, useMock: mockedProjectNotificationService },
       provideNoopAnimations()
     ]
   }));
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.ts
index e2a9af5877..2725d7c255 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.ts
@@ -1,5 +1,14 @@
 import { AsyncPipe, NgClass } from '@angular/common';
-import { AfterViewInit, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import {
+  AfterViewInit,
+  Component,
+  DestroyRef,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges
+} from '@angular/core';
 import { MatOption } from '@angular/material/autocomplete';
 import { MatButton } from '@angular/material/button';
 import { MatFormField } from '@angular/material/form-field';
@@ -19,6 +28,7 @@ import {
   observeOn,
   startWith,
   Subject,
+  take,
   tap
 } from 'rxjs';
 import { BlurOnClickDirective } from 'xforge-common/blur-on-click.directive';
@@ -30,11 +40,17 @@ import { Snapshot } from 'xforge-common/models/snapshot';
 import { TextSnapshot } from 'xforge-common/models/textsnapshot';
 import { NoticeService } from 'xforge-common/notice.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
+import { filterNullish, quietTakeUntilDestroyed } from 'xforge-common/util/rxjs-util';
 import { SFProjectProfileDoc } from '../../../../core/models/sf-project-profile-doc';
 import { TextDocId } from '../../../../core/models/text-doc';
 import { ParatextService, Revision } from '../../../../core/paratext.service';
+import { ProjectNotificationService } from '../../../../core/project-notification.service';
 import { SFProjectService } from '../../../../core/sf-project.service';
 import { TextDocService } from '../../../../core/text-doc.service';
+import {
+  DraftApplyState,
+  DraftApplyStatus
+} from '../../../draft-generation/draft-import-wizard/draft-import-wizard.component';
 import { HistoryRevisionFormatPipe } from './history-revision-format.pipe';
 
 export interface RevisionSelectEvent {
@@ -62,7 +78,19 @@ export interface RevisionSelectEvent {
   ]
 })
 export class HistoryChooserComponent implements AfterViewInit, OnChanges {
-  @Input() projectId?: string;
+  private _projectId?: string;
+  private projectId$: Subject<string> = new Subject<string>();
+  @Input() set projectId(id: string | undefined) {
+    if (id == null) {
+      return;
+    }
+    this._projectId = id;
+    this.projectId$.next(id);
+  }
+  get projectId(): string | undefined {
+    return this._projectId;
+  }
+
   @Input() bookNum?: number;
   @Input() chapter?: number;
   @Input() showDiff = true;
@@ -73,6 +101,18 @@ export class HistoryChooserComponent implements AfterViewInit, OnChanges {
   selectedRevision: Revision | undefined;
   selectedSnapshot: TextSnapshot | undefined;
 
+  private readonly notifyDraftApplyProgressHandler = (projectId: string, draftApplyState: DraftApplyState): void => {
+    if (
+      draftApplyState.bookNum === this.bookNum &&
+      draftApplyState.chapterNum === this.chapter &&
+      draftApplyState.status === DraftApplyStatus.Successful
+    ) {
+      // Clear then reload the history revisions
+      this.historyRevisions = [];
+      void this.loadHistory();
+    }
+  };
+
   // 'asyncScheduler' prevents ExpressionChangedAfterItHasBeenCheckedError
   private loading$ = new BehaviorSubject<boolean>(false);
   isLoading$: Observable<boolean> = this.loading$.pipe(observeOn(asyncScheduler));
@@ -87,15 +127,32 @@ export class HistoryChooserComponent implements AfterViewInit, OnChanges {
   private projectDoc: SFProjectProfileDoc | undefined;
 
   constructor(
+    destroyRef: DestroyRef,
     private readonly dialogService: DialogService,
     private readonly onlineStatusService: OnlineStatusService,
     private readonly noticeService: NoticeService,
     private readonly paratextService: ParatextService,
+    projectNotificationService: ProjectNotificationService,
     private readonly projectService: SFProjectService,
     private readonly textDocService: TextDocService,
     private readonly errorReportingService: ErrorReportingService,
     private readonly i18n: I18nService
-  ) {}
+  ) {
+    this.projectId$.pipe(quietTakeUntilDestroyed(destroyRef), filterNullish(), take(1)).subscribe(async projectId => {
+      // Start the connection to SignalR
+      await projectNotificationService.start();
+      // Subscribe to notifications for this project
+      await projectNotificationService.subscribeToProject(projectId);
+      // When build notifications are received, reload the build history
+      // NOTE: We do not need the build state, so just ignore it.
+      projectNotificationService.setNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
+    });
+    destroyRef.onDestroy(async () => {
+      // Stop the SignalR connection when the component is destroyed
+      await projectNotificationService.stop();
+      projectNotificationService.setNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
+    });
+  }
 
   get canRestoreSnapshot(): boolean {
     return (
@@ -117,10 +174,6 @@ export class HistoryChooserComponent implements AfterViewInit, OnChanges {
   }
 
   ngAfterViewInit(): void {
-    this.loadHistory();
-  }
-
-  loadHistory(): void {
     combineLatest([
       this.onlineStatusService.onlineStatus$,
       this.inputChanged$.pipe(
@@ -133,23 +186,29 @@ export class HistoryChooserComponent implements AfterViewInit, OnChanges {
         })
       )
     ]).subscribe(async ([isOnline]) => {
-      if (isOnline && this.projectId != null && this.bookNum != null && this.chapter != null) {
-        this.loading$.next(true);
-        try {
-          this.projectDoc = await this.projectService.getProfile(this.projectId);
-          if (this.historyRevisions.length === 0) {
-            this.historyRevisions =
-              (await this.paratextService.getRevisions(this.projectId, this.bookId, this.chapter)) ?? [];
-
-            if (this.historyRevisions.length > 0) {
-              await this.selectRevision(this.historyRevisions[0]);
-            }
+      if (isOnline) {
+        await this.loadHistory();
+      }
+    });
+  }
+
+  async loadHistory(): Promise<void> {
+    if (this.projectId != null && this.bookNum != null && this.chapter != null) {
+      this.loading$.next(true);
+      try {
+        this.projectDoc = await this.projectService.getProfile(this.projectId);
+        if (this.historyRevisions.length === 0) {
+          this.historyRevisions =
+            (await this.paratextService.getRevisions(this.projectId, this.bookId, this.chapter)) ?? [];
+
+          if (this.historyRevisions.length > 0) {
+            await this.selectRevision(this.historyRevisions[0]);
           }
-        } finally {
-          this.loading$.next(false);
         }
+      } finally {
+        this.loading$.next(false);
       }
-    });
+    }
   }
 
   async onSelectionChanged(e: MatSelectChange): Promise<void> {
diff --git a/src/SIL.XForge.Scripture/Services/DraftNotificationHub.cs b/src/SIL.XForge.Scripture/Services/DraftNotificationHub.cs
index a0d65311ef..6e12fe357a 100644
--- a/src/SIL.XForge.Scripture/Services/DraftNotificationHub.cs
+++ b/src/SIL.XForge.Scripture/Services/DraftNotificationHub.cs
@@ -14,6 +14,15 @@ public class DraftNotificationHub : Hub<IDraftNotifier>, IDraftNotifier
     /// <param name="projectId">The Scripture Forge project identifier.</param>
     /// <param name="draftApplyState">The state of the draft being applied.</param>
     /// <returns>The asynchronous task.</returns>
+    /// <remarks>
+    /// This differs from the implementation in <see cref="NotificationHub"/> in that this version
+    /// does have stateful reconnection, and so there is a guarantee that it is received by clients.
+    ///
+    /// This is a blocking operation if the stateful reconnection buffer is full, so it should only
+    /// be subscribed to by the user performing the draft import. Using <see cref="NotificationHub"/>
+    /// is sufficient for all other users to subscribe to, although they will not receive all draft
+    /// progress notifications, only the final success message.
+    /// </remarks>
     public async Task NotifyDraftApplyProgress(string projectId, DraftApplyState draftApplyState) =>
         await Clients.Group(projectId).NotifyDraftApplyProgress(projectId, draftApplyState);
 
diff --git a/src/SIL.XForge.Scripture/Services/INotifier.cs b/src/SIL.XForge.Scripture/Services/INotifier.cs
index e3b45da2b8..7b421df877 100644
--- a/src/SIL.XForge.Scripture/Services/INotifier.cs
+++ b/src/SIL.XForge.Scripture/Services/INotifier.cs
@@ -6,6 +6,7 @@ namespace SIL.XForge.Scripture.Services;
 public interface INotifier
 {
     Task NotifyBuildProgress(string sfProjectId, ServalBuildState buildState);
+    Task NotifyDraftApplyProgress(string sfProjectId, DraftApplyState draftApplyState);
     Task NotifySyncProgress(string sfProjectId, ProgressState progressState);
     Task SubscribeToProject(string projectId);
 }
diff --git a/src/SIL.XForge.Scripture/Services/MachineApiService.cs b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
index d777b9a5d6..7ef09f71cb 100644
--- a/src/SIL.XForge.Scripture/Services/MachineApiService.cs
+++ b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
@@ -132,6 +132,7 @@ CancellationToken cancellationToken
         IDocument<SFProject> targetProjectDoc;
         List<int> createdBooks = [];
         Dictionary<int, List<int>> createdChapters = [];
+        List<(int bookNum, int chapterNum)> chaptersToNotify = [];
         List<(ChapterDelta chapterDelta, int bookNum)> chapterDeltas = [];
         try
         {
@@ -631,6 +632,7 @@ await draftHubContext.NotifyDraftApplyProgress(
                 }
 
                 // A draft has been applied
+                chaptersToNotify.Add((bookNum, chapterDelta.Number));
                 successful = true;
             }
         }
@@ -669,6 +671,24 @@ await draftHubContext.NotifyDraftApplyProgress(
                 }
             );
 
+            // Notify any listening users for each chapter that was updated in the target project
+            if (successful)
+            {
+                foreach ((int bookNum, int chapterNum) in chaptersToNotify)
+                {
+                    // Use the non-blocking hub context which does not have stateful reconnect enabled
+                    await hubContext.NotifyDraftApplyProgress(
+                        targetProjectId,
+                        new DraftApplyState
+                        {
+                            BookNum = bookNum,
+                            ChapterNum = chapterNum,
+                            Status = DraftApplyStatus.Successful,
+                        }
+                    );
+                }
+            }
+
             result.ChangesSaved = successful;
         }
 
diff --git a/src/SIL.XForge.Scripture/Services/NotificationHub.cs b/src/SIL.XForge.Scripture/Services/NotificationHub.cs
index 8f17d103ab..20cf61035e 100644
--- a/src/SIL.XForge.Scripture/Services/NotificationHub.cs
+++ b/src/SIL.XForge.Scripture/Services/NotificationHub.cs
@@ -21,6 +21,19 @@ public class NotificationHub : Hub<INotifier>, INotifier
     public async Task NotifyBuildProgress(string projectId, ServalBuildState buildState) =>
         await Clients.Group(projectId).NotifyBuildProgress(projectId, buildState);
 
+    /// <summary>
+    /// Notifies subscribers to a project of draft application progress.
+    /// </summary>
+    /// <param name="projectId">The Scripture Forge project identifier.</param>
+    /// <param name="draftApplyState">The state of the draft being applied.</param>
+    /// <returns>The asynchronous task.</returns>
+    /// <remarks>
+    /// This differs from the implementation in <see cref="DraftNotificationHub"/> in that this version
+    /// does not have stateful reconnection, and so there is no guarantee that the message is received.
+    /// </remarks>
+    public async Task NotifyDraftApplyProgress(string projectId, DraftApplyState draftApplyState) =>
+        await Clients.Group(projectId).NotifyDraftApplyProgress(projectId, draftApplyState);
+
     /// <summary>
     /// Notifies subscribers to a project of sync progress.
     /// </summary>
diff --git a/src/SIL.XForge.Scripture/Services/NotificationHubExtensions.cs b/src/SIL.XForge.Scripture/Services/NotificationHubExtensions.cs
index 3af78a79a0..0c29a7f78a 100644
--- a/src/SIL.XForge.Scripture/Services/NotificationHubExtensions.cs
+++ b/src/SIL.XForge.Scripture/Services/NotificationHubExtensions.cs
@@ -6,6 +6,12 @@ namespace SIL.XForge.Scripture.Services;
 
 public static class NotificationHubExtensions
 {
+    public static Task NotifyDraftApplyProgress(
+        this IHubContext<DraftNotificationHub, IDraftNotifier> hubContext,
+        string projectId,
+        DraftApplyState draftApplyState
+    ) => hubContext.Clients.Groups(projectId).NotifyDraftApplyProgress(projectId, draftApplyState);
+
     public static Task NotifyBuildProgress(
         this IHubContext<NotificationHub, INotifier> hubContext,
         string projectId,
@@ -13,7 +19,7 @@ ServalBuildState buildState
     ) => hubContext.Clients.Groups(projectId).NotifyBuildProgress(projectId, buildState);
 
     public static Task NotifyDraftApplyProgress(
-        this IHubContext<DraftNotificationHub, IDraftNotifier> hubContext,
+        this IHubContext<NotificationHub, INotifier> hubContext,
         string projectId,
         DraftApplyState draftApplyState
     ) => hubContext.Clients.Groups(projectId).NotifyDraftApplyProgress(projectId, draftApplyState);

From 478a7a17d365810350f96364e92095e162267778 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 17 Feb 2026 12:41:49 +1300
Subject: [PATCH 31/40] SF-3633 Fix two test warnings noticed in testing

---
 .../draft-generation/training-data/training-data.service.spec.ts | 1 +
 src/SIL.XForge.Scripture/ClientApp/src/karma.conf.js             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/training-data/training-data.service.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/training-data/training-data.service.spec.ts
index d026643476..9c85c5399b 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/training-data/training-data.service.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/training-data/training-data.service.spec.ts
@@ -104,6 +104,7 @@ describe('TrainingDataService', () => {
         deepEqual({ projectId: 'project01', dataId: 'data01' })
       )
     ).once();
+    expect().nothing();
   }));
 
   it('should query training data docs', fakeAsync(async () => {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/karma.conf.js b/src/SIL.XForge.Scripture/ClientApp/src/karma.conf.js
index 0ff1e46280..8ec00b489f 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/karma.conf.js
+++ b/src/SIL.XForge.Scripture/ClientApp/src/karma.conf.js
@@ -49,6 +49,7 @@ module.exports = function (config) {
     },
     files: [],
     proxies: {
+      '/assets/icons/TagIcons/circle01.png': '',
       '/assets/icons/TagIcons/defaultIcon.png': '',
       '/assets/icons/TagIcons/flag01.png': '',
       '/assets/icons/TagIcons/flag04.png': '',

From 48da70f75f8e43d551e132b0bcb4d7c86b710974 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 17 Feb 2026 14:18:18 +1300
Subject: [PATCH 32/40] SF-3633 Fix unhandled errors when the project has been
 deleted

---
 .../draft-import-wizard.component.html        |  6 ++--
 .../draft-import-wizard.component.ts          | 28 ++++++++++++-----
 .../src/assets/i18n/non_checking_en.json      |  2 ++
 .../Controllers/SFProjectsRpcController.cs    |  9 +++++-
 .../SFProjectsRpcControllerTests.cs           | 30 +++++++++++++++++--
 5 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 76d20952fc..74ead57928 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -350,7 +350,7 @@ <h1>{{ t("importing_draft") }}</h1>
     <mat-step [completed]="syncComplete || skipSync">
       <ng-template matStepLabel>{{ t("complete") }}</ng-template>
 
-      @if (!isSyncing && !syncComplete && !skipSync) {
+      @if (!isSyncing && !syncComplete && !skipSync && syncError == null) {
         <h1>{{ t("sync_project_question") }}</h1>
         <p
           [innerHtml]="
@@ -390,8 +390,8 @@ <h1>{{ t("syncing_project") }}</h1>
         }
       }
 
-      @if (syncError != null) {
-        <h1>{{ t("sync") }}</h1>
+      @if (syncError != null && !syncComplete && !skipSync) {
+        <h1>{{ t("sync_failed") }}</h1>
         <app-notice type="error">{{ syncError }}</app-notice>
         <div class="button-strip">
           <button matButton="outlined" (click)="selectSkipSync()" [disabled]="isImporting">
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index c280e5b953..25cc642a42 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -21,6 +21,7 @@ import { Canon } from '@sillsdev/scripture';
 import { BehaviorSubject } from 'rxjs';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
 import { AuthService } from 'xforge-common/auth.service';
+import { CommandError, CommandErrorCode } from 'xforge-common/command.service';
 import { I18nService } from 'xforge-common/i18n.service';
 import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { ParatextProject } from '../../../core/models/paratext-project';
@@ -610,12 +611,21 @@ export class DraftImportWizardComponent implements OnInit {
       this.data.additionalInfo?.dateGenerated != null ? new Date(this.data.additionalInfo.dateGenerated) : new Date();
 
     // Apply the pre-translation draft to the project
-    await this.projectService.onlineApplyPreTranslationToProject(
-      this.sourceProjectId,
-      scriptureRange,
-      this.targetProjectId,
-      timestamp
-    );
+    try {
+      await this.projectService.onlineApplyPreTranslationToProject(
+        this.sourceProjectId,
+        scriptureRange,
+        this.targetProjectId,
+        timestamp
+      );
+    } catch (error) {
+      if (error instanceof CommandError && error.code === CommandErrorCode.NotFound) {
+        this.importError = this.i18n.translateStatic('draft_import_wizard.project_deleted');
+      } else {
+        this.importError = error instanceof Error ? error.message : 'Unknown error occurred';
+      }
+      this.isImporting = false;
+    }
   }
 
   /**
@@ -704,7 +714,11 @@ export class DraftImportWizardComponent implements OnInit {
       await this.projectService.onlineSync(this.targetProjectId);
       this.isSyncing = true;
     } catch (error) {
-      this.syncError = error instanceof Error ? error.message : 'Sync failed';
+      if (error instanceof CommandError && error.code === CommandErrorCode.NotFound) {
+        this.syncError = this.i18n.translateStatic('draft_import_wizard.project_deleted');
+      } else {
+        this.syncError = error instanceof Error ? error.message : 'Sync failed';
+      }
       this.isSyncing = false;
     }
   }
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
index 72ea398616..56c7809463 100644
--- 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
@@ -352,6 +352,7 @@
     "overwrite_books_question": "Overwrite books?",
     "please_select_valid_project": "Please select a valid project",
     "project_context_unavailable": "Project context unavailable. Please close the dialog and try again.",
+    "project_deleted": "This project has been deleted. Please contact your project administrator.",
     "ready_to_import": "Ready to import draft to “{{ projectShortName }} - {{ projectName }}”",
     "retry": "Retry",
     "setting_up_project": "Setting up {{ projectName }} ...",
@@ -362,6 +363,7 @@
     "sync_project_description": "It is recommended to sync {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} to save your changes to Paratext.",
     "sync_project_question": "Sync project now?",
     "sync": "Sync",
+    "sync_failed": "Sync failed",
     "syncing_project": "Syncing project",
     "waiting_for_project_to_load": "Please wait for the project to load before proceeding."
   },
diff --git a/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs b/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs
index 6937be73ce..14305e88b5 100644
--- a/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs
+++ b/src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs
@@ -35,7 +35,7 @@ IUserAccessor userAccessor
     // Keep a reference in this class to prevent duplicate allocation (Warning CS9107)
     private readonly IExceptionHandler _exceptionHandler = exceptionHandler;
 
-    public IRpcMethodResult ApplyPreTranslationToProject(
+    public async Task<IRpcMethodResult> ApplyPreTranslationToProject(
         string projectId,
         string scriptureRange,
         string targetProjectId,
@@ -44,6 +44,9 @@ DateTime timestamp
     {
         try
         {
+            // Ensure the target project exists
+            _ = await projectService.GetProjectAsync(targetProjectId);
+
             // Run the background job
             string jobId = backgroundJobClient.Enqueue<IMachineApiService>(r =>
                 r.ApplyPreTranslationToProjectAsync(
@@ -57,6 +60,10 @@ DateTime timestamp
             );
             return Ok(jobId);
         }
+        catch (DataNotFoundException dnfe)
+        {
+            return NotFoundError(dnfe.Message);
+        }
         catch (Exception)
         {
             _exceptionHandler.RecordEndpointInfoForException(
diff --git a/test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs b/test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs
index dd5fd054b6..1c852e195e 100644
--- a/test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs
+++ b/test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs
@@ -40,16 +40,40 @@ public class SFProjectsRpcControllerTests
     private static readonly Uri WebsiteUrl = new Uri("https://scriptureforge.org", UriKind.Absolute);
 
     [Test]
-    public void ApplyPreTranslationToProject_Success()
+    public async Task ApplyPreTranslationToProject_Success()
     {
         var env = new TestEnvironment();
 
         // SUT
-        var result = env.Controller.ApplyPreTranslationToProject(Project01, "GEN-EXO", Project01, DateTime.UtcNow);
+        var result = await env.Controller.ApplyPreTranslationToProject(
+            Project01,
+            "GEN-EXO",
+            Project01,
+            DateTime.UtcNow
+        );
         Assert.IsInstanceOf<RpcMethodSuccessResult>(result);
         env.BackgroundJobClient.Received().Create(Arg.Any<Job>(), Arg.Any<IState>());
     }
 
+    [Test]
+    public async Task ApplyPreTranslationToProject_NotFound()
+    {
+        var env = new TestEnvironment();
+        const string errorMessage = "Project Not Found";
+        env.SFProjectService.GetProjectAsync(Project01).Throws(new DataNotFoundException(errorMessage));
+
+        var result = await env.Controller.ApplyPreTranslationToProject(
+            Project01,
+            "GEN-EXO",
+            Project01,
+            DateTime.UtcNow
+        );
+
+        Assert.IsInstanceOf<RpcMethodErrorResult>(result);
+        Assert.AreEqual(errorMessage, (result as RpcMethodErrorResult)!.Message);
+        Assert.AreEqual(RpcControllerBase.NotFoundErrorCode, (result as RpcMethodErrorResult)!.ErrorCode);
+    }
+
     [Test]
     public void ApplyPreTranslationToProject_UnknownError()
     {
@@ -57,7 +81,7 @@ public void ApplyPreTranslationToProject_UnknownError()
         env.BackgroundJobClient.Create(Arg.Any<Job>(), Arg.Any<IState>()).Throws(new ArgumentNullException());
 
         // SUT
-        Assert.Throws<ArgumentNullException>(() =>
+        Assert.ThrowsAsync<ArgumentNullException>(() =>
             env.Controller.ApplyPreTranslationToProject(Project01, "GEN-EXO", Project01, DateTime.UtcNow)
         );
         env.ExceptionHandler.Received().RecordEndpointInfoForException(Arg.Any<Dictionary<string, string>>());

From 21929f42d3553d832cc17adb12c70dce1266593c Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 18 Feb 2026 14:40:32 +1300
Subject: [PATCH 33/40] SF-3633 Fix issues raised by Nathaniel

---
 .../draft-generation/draft-generation.component.html         | 2 +-
 .../draft-history-entry/draft-history-entry.component.html   | 5 ++++-
 .../draft-history-entry/draft-history-entry.component.ts     | 4 +++-
 .../draft-import-wizard/draft-import-wizard.component.ts     | 2 +-
 .../ClientApp/src/assets/i18n/non_checking_en.json           | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html
index 18b9c91485..f4e5169876 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html
@@ -421,7 +421,7 @@ <h3>{{ t("draft_finishing_header") }}</h3>
     </section>
 
     @if (featureFlags.newDraftHistory.enabled) {
-      <app-draft-history-list [style.display]="isOnline ? 'block' : 'none'"></app-draft-history-list>
+      <app-draft-history-list [style.display]="isOnline ? 'flex' : 'none'"></app-draft-history-list>
       @if (isOnline && isServalAdmin()) {
         <h2>Further information</h2>
       }
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
index 20fef98d8f..99b0642018 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.html
@@ -43,10 +43,13 @@
           </div>
         } @else {
           @if (draftIsAvailable) {
-            <p>{{ t("click_book_to_preview") }}</p>
+            <p>{{ t("click_book_to_preview_draft") }}</p>
             <p class="book-buttons">
               <app-draft-preview-books [build]="entry" />
             </p>
+            <p>
+              <transloco key="draft_history_entry.click_add_to_project"></transloco>
+            </p>
             <div class="draft-options">
               <button matButton="filled" class="add-to-project" (click)="openImportWizard()">
                 <mat-icon>input</mat-icon> {{ t("add_to_project") }}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
index b87d84900c..8b7f2f44bb 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-history-list/draft-history-entry/draft-history-entry.component.ts
@@ -23,6 +23,7 @@ import {
 } from '@angular/material/table';
 import { RouterLink } from '@angular/router';
 import { TranslocoModule } from '@ngneat/transloco';
+import { TranslocoMarkupModule } from 'ngx-transloco-markup';
 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';
@@ -85,8 +86,9 @@ interface TrainingConfigurationRow {
     MatHeaderRowDef,
     MatRow,
     MatRowDef,
+    RouterLink,
     TranslocoModule,
-    RouterLink
+    TranslocoMarkupModule
   ],
   templateUrl: './draft-history-entry.component.html',
   styleUrl: './draft-history-entry.component.scss'
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 25cc642a42..07159d85a0 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -583,7 +583,7 @@ export class DraftImportWizardComponent implements OnInit {
       bookNum: book.bookNum,
       bookId: book.bookId,
       bookName: book.bookName,
-      totalChapters: 0,
+      totalChapters: this.booksWithExistingText.find(b => b.bookNum === book.bookNum)?.chaptersWithText.length ?? 0,
       completedChapters: [],
       failedChapters: []
     }));
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
index 56c7809463..21de16f6d3 100644
--- 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
@@ -281,7 +281,8 @@
   },
   "draft_history_entry": {
     "add_to_project": "Add to project",
-    "click_book_to_preview": "Click a book below to preview the draft and add it to your project",
+    "click_add_to_project": "Click [b]Add to project[/b] to save the draft to a project of your choosing.",
+    "click_book_to_preview_draft": "Click a book below to preview the draft.",
     "download_zip": "Download draft as ZIP file",
     "draft_active": "Running",
     "draft_canceled": "Canceled",

From c8b8597b6ec00e56f9a715495e003bbe8a333f42 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 18 Feb 2026 14:57:50 +1300
Subject: [PATCH 34/40] SF-3633 Fixed issues found in testing on 11 Feb

---
 .../draft-import-wizard.component.ts          | 40 +++++++++++++------
 .../src/assets/i18n/non_checking_en.json      |  2 +-
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 07159d85a0..4add050590 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -177,7 +177,17 @@ export class DraftImportWizardComponent implements OnInit {
     try {
       if (this.targetProjectId != null) {
         // SF project exists, just add user to it
-        await this.projectService.onlineAddCurrentUser(this.targetProjectId);
+        try {
+          await this.projectService.onlineAddCurrentUser(this.targetProjectId);
+        } catch (error) {
+          if (error instanceof CommandError && error.code === CommandErrorCode.NotFound) {
+            // The project was deleted, so just connect to it
+            await this.connectToNewProject(paratextId);
+            return;
+          } else {
+            throw error;
+          }
+        }
 
         // Reload project data after connection
         const projectDoc = await this.projectService.get(this.targetProjectId);
@@ -186,18 +196,7 @@ export class DraftImportWizardComponent implements OnInit {
         this.isConnecting = false;
         this.stepper?.next();
       } else {
-        // Create SF project for this Paratext project
-        this.targetProjectId = await this.projectService.onlineCreate({
-          paratextId: paratextId,
-          sourceParatextId: null,
-          checkingEnabled: false
-        });
-
-        // updateConnectStatus() will handle the sync finishing and move to the next step after "connecting"
-        this.stepper?.next();
-
-        const projectDoc = await this.projectService.get(this.targetProjectId);
-        this.targetProjectDoc$.next(projectDoc);
+        await this.connectToNewProject(paratextId);
       }
     } catch (error) {
       this.connectionError =
@@ -208,6 +207,21 @@ export class DraftImportWizardComponent implements OnInit {
     }
   }
 
+  async connectToNewProject(paratextId: string): Promise<void> {
+    // Create SF project for this Paratext project
+    this.targetProjectId = await this.projectService.onlineCreate({
+      paratextId: paratextId,
+      sourceParatextId: null,
+      checkingEnabled: false
+    });
+
+    // updateConnectStatus() will handle the sync finishing and move to the next step after "connecting"
+    this.stepper?.next();
+
+    const projectDoc = await this.projectService.get(this.targetProjectId);
+    this.targetProjectDoc$.next(projectDoc);
+  }
+
   retryProjectConnection(): void {
     void this.connectToProject(true);
   }
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
index 21de16f6d3..4a51355bde 100644
--- 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
@@ -316,7 +316,7 @@
   "draft_import_wizard": {
     "back": "Back",
     "cancel": "Cancel",
-    "cannot_edit_project": "You do not have permission to edit this project",
+    "cannot_edit_project": "You do not have permission to edit this project, or it has been deleted. Please contact your project administrator",
     "chapter": "chapter",
     "chapters": "chapters",
     "choose_project": "Choose a project",

From 6772a2c483b04b61e025b021ec64cddecdfa7507 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 23 Feb 2026 07:40:54 +1300
Subject: [PATCH 35/40] SF-3633 Fix issues raised in code review

---
 .../scriptureforge/services/text-service.spec.ts      |  1 -
 .../app/project-select/project-select.component.ts    | 11 +++++++----
 .../draft-import-wizard.component.html                |  2 +-
 .../history-chooser/history-chooser.component.ts      |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/RealtimeServer/scriptureforge/services/text-service.spec.ts b/src/RealtimeServer/scriptureforge/services/text-service.spec.ts
index 034ba53a76..967ecc6fb7 100644
--- a/src/RealtimeServer/scriptureforge/services/text-service.spec.ts
+++ b/src/RealtimeServer/scriptureforge/services/text-service.spec.ts
@@ -86,7 +86,6 @@ describe('TextService', () => {
     await createDoc<TextData>(conn, TEXTS_COLLECTION, id, new Delta(), 'rich-text', source);
     await new Promise<void>(resolve => {
       env.db.getOps(TEXTS_COLLECTION, id, 0, null, { metadata: true }, (_, ops) => {
-        console.log(JSON.stringify(ops));
         expect(ops[0].m.source).toBe(source);
         resolve();
       });
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
index 47e92c8e1b..2f96890430 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
@@ -187,16 +187,19 @@ export class ProjectSelectComponent implements ControlValueAccessor, OnDestroy {
 
   get error(): string | null {
     const errorStates = this.paratextIdControl.errors;
-    if (errorStates == null) return null;
-    else if (errorStates.invalidSelection === true) {
+    if (errorStates == null) {
+      return null;
+    } else if (errorStates.invalidSelection === true) {
       return translate('project_select.please_select_valid_project_or_resource');
-    } else if (this.externalValidators.length > 0) {
+    } else if (this.externalValidators !== 'disabled' && this.externalValidators.length > 0) {
       const errorMessageMapper = this.errorMessageMapper;
       if (errorMessageMapper == null) {
         throw new Error('ProjectSelectComponent requires `errorMessageMapper` when `validators` are provided.');
       }
       return errorMessageMapper(errorStates);
-    } else return null;
+    } else {
+      return null;
+    }
   }
 
   writeValue(value: any): void {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 74ead57928..138e467149 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -152,7 +152,7 @@ <h1>{{ t("connection_failed") }}</h1>
               matButton="filled"
               color="primary"
               (click)="retryProjectConnection()"
-              [disabled]="!isAppOnline && isImporting"
+              [disabled]="!isAppOnline || isImporting"
             >
               <mat-icon>refresh</mat-icon>
               {{ t("retry") }}
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.ts
index 2725d7c255..0844f36212 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor-history/history-chooser/history-chooser.component.ts
@@ -150,7 +150,7 @@ export class HistoryChooserComponent implements AfterViewInit, OnChanges {
     destroyRef.onDestroy(async () => {
       // Stop the SignalR connection when the component is destroyed
       await projectNotificationService.stop();
-      projectNotificationService.setNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
+      projectNotificationService.removeNotifyDraftApplyProgressHandler(this.notifyDraftApplyProgressHandler);
     });
   }
 

From 256f3f7ad0d598a4df5a7b45a44167901d77f6b5 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Mon, 23 Feb 2026 11:54:40 +1300
Subject: [PATCH 36/40] SF-3633 Fixed issues found in testing on 18 Feb

---
 .../project-select.component.ts               |  8 ++--
 .../draft-import-wizard.component.html        | 38 ++++++++++---------
 .../draft-import-wizard.component.ts          | 20 ++++++++--
 .../Services/ParatextService.cs               |  6 +++
 4 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
index 2f96890430..79c4b08fe7 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/project-select/project-select.component.ts
@@ -49,7 +49,8 @@ const PROJECT_SELECT_VALUE_ACCESSOR: any = {
   ]
 })
 export class ProjectSelectComponent implements ControlValueAccessor, OnDestroy {
-  @Output() valueChange: EventEmitter<string | undefined> = new EventEmitter<string | undefined>(true);
+  // Firefox will not in a timely way emit this asynchronously, so we must emit the valueChange event synchronously
+  @Output() valueChange: EventEmitter<string | undefined> = new EventEmitter<string | undefined>();
   @Output() projectSelect = new EventEmitter<SelectableProject>();
 
   @Input() placeholder = '';
@@ -176,9 +177,10 @@ export class ProjectSelectComponent implements ControlValueAccessor, OnDestroy {
   @Input()
   set validators(value: ValidatorFn[] | 'disabled') {
     this.externalValidators = value;
-    const validators = value === 'disabled' ? [] : [this.validateProject.bind(this)].concat(value);
-    for (const validator of validators)
+    const validators = value === 'disabled' ? null : [this.validateProject.bind(this)].concat(value);
+    for (const validator of validators ?? []) {
       if (typeof validator !== 'function') throw new Error(`The validator is not a function: ${validator}`);
+    }
     this.paratextIdControl.setValidators(validators);
   }
   get validators(): ValidatorFn[] | 'disabled' {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
index 138e467149..188527d0da 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.html
@@ -48,15 +48,17 @@ <h1>{{ t("select_project") }}</h1>
           <app-notice type="error">{{ t("cannot_edit_project") }}</app-notice>
         }
 
-        @if (projectSelectionForm.valid && !isLoadingProject && (targetProjectDoc$ | async); as project) {
-          <app-notice [icon]="'verified'">
-            {{
-              t("ready_to_import", {
-                projectShortName: project?.data?.shortName,
-                projectName: project?.data?.name
-              })
-            }}
-          </app-notice>
+        @if (projectSelectionForm.valid && !isLoadingProject && (targetProjectDoc$ | async); as projectDoc) {
+          @if (projectDoc?.data != null) {
+            <app-notice [icon]="'verified'">
+              {{
+                t("ready_to_import", {
+                  projectShortName: projectDoc?.data?.shortName,
+                  projectName: projectDoc?.data?.name
+                })
+              }}
+            </app-notice>
+          }
         }
 
         @if (cannotAdvanceFromProjectSelection && !projectReadyToImport) {
@@ -161,14 +163,16 @@ <h1>{{ t("connection_failed") }}</h1>
         } @else if (!isConnecting) {
           <h1>{{ t("connected_to_project") }}</h1>
           @if (targetProjectDoc$ | async; as projectDoc) {
-            <app-notice [icon]="'verified'">
-              {{
-                t("ready_to_import", {
-                  projectShortName: projectDoc?.data?.shortName,
-                  projectName: projectDoc?.data?.name
-                })
-              }}
-            </app-notice>
+            @if (projectDoc?.data != null) {
+              <app-notice [icon]="'verified'">
+                {{
+                  t("ready_to_import", {
+                    projectShortName: projectDoc?.data?.shortName,
+                    projectName: projectDoc?.data?.name
+                  })
+                }}
+              </app-notice>
+            }
           }
           <div class="button-strip">
             <button matButton="outlined" matStepperPrevious [disabled]="isImporting">
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 4add050590..c3ebef7eea 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -435,6 +435,10 @@ export class DraftImportWizardComponent implements OnInit {
         } finally {
           this.isLoadingProject = false;
         }
+      } else {
+        // Need to connect to the project
+        this.canEditProject = paratextProject.isConnectable;
+        this.targetProjectDoc$.next(undefined);
       }
     } else {
       // Need to create SF project - this will happen after connection step
@@ -635,6 +639,8 @@ export class DraftImportWizardComponent implements OnInit {
     } catch (error) {
       if (error instanceof CommandError && error.code === CommandErrorCode.NotFound) {
         this.importError = this.i18n.translateStatic('draft_import_wizard.project_deleted');
+        // Reload the projects
+        void this.loadProjects();
       } else {
         this.importError = error instanceof Error ? error.message : 'Unknown error occurred';
       }
@@ -653,12 +659,19 @@ export class DraftImportWizardComponent implements OnInit {
 
     // Update based on book or chapter
     if (draftApplyState.bookNum === 0 && draftApplyState.chapterNum === 0) {
+      // Get the total number of failures
+      const totalFailures = this.importProgress.reduce(
+        (sum, p) => sum + (p.failedChapters.some(c => c.chapterNum === 0) ? p.totalChapters : p.failedChapters.length),
+        0
+      );
       // Handle the final states
       if (draftApplyState.status === DraftApplyStatus.Successful) {
         // Check if there were any failures
         this.isImporting = false;
-        const totalFailures = this.importProgress.reduce((sum, p) => sum + p.failedChapters.length, 0);
-        if (totalFailures > 0) {
+        const totalCompleted = this.importProgress.reduce((sum, p) => sum + p.completedChapters.length, 0);
+        if (totalFailures > 0 && totalCompleted > 0) {
+          this.importError = `Imported ${totalCompleted} chapter(s) successfully. Failed to import ${totalFailures} chapter(s). See details above.`;
+        } else if (totalFailures > 0) {
           this.importError = `Failed to import ${totalFailures} chapter(s). See details above.`;
         } else {
           this.importComplete = true;
@@ -670,7 +683,6 @@ export class DraftImportWizardComponent implements OnInit {
         });
         this.isImporting = false;
         this.importError = draftApplyState.message;
-        const totalFailures = this.importProgress.reduce((sum, p) => sum + p.failedChapters.length, 0);
         if (totalFailures > 0 && (this.importError == null || this.importError.length === 0)) {
           this.importError = `Failed to import ${totalFailures} chapter(s). See details above.`;
         }
@@ -730,6 +742,8 @@ export class DraftImportWizardComponent implements OnInit {
     } catch (error) {
       if (error instanceof CommandError && error.code === CommandErrorCode.NotFound) {
         this.syncError = this.i18n.translateStatic('draft_import_wizard.project_deleted');
+        // Reload the projects
+        void this.loadProjects();
       } else {
         this.syncError = error instanceof Error ? error.message : 'Sync failed';
       }
diff --git a/src/SIL.XForge.Scripture/Services/ParatextService.cs b/src/SIL.XForge.Scripture/Services/ParatextService.cs
index 2679635e60..00521b5f26 100644
--- a/src/SIL.XForge.Scripture/Services/ParatextService.cs
+++ b/src/SIL.XForge.Scripture/Services/ParatextService.cs
@@ -2228,11 +2228,17 @@ int chapter
         int milestoneOps = 0;
         for (int i = ops.Length - 1; i >= 0; i--)
         {
+            // Emit the op as a milestone if it is:
+            //  - Outside the current milestone period
+            //  - From a different source or user
+            //  - A draft applied or history restored, as these are user initiated actions
             Op op = ops[i];
             if (
                 op.Metadata.Timestamp < milestonePeriod.AddMinutes(0 - interval)
                 || op.Metadata.Source != documentRevision.Source
                 || op.Metadata.UserId != documentRevision.UserId
+                || op.Metadata.Source == OpSource.Draft
+                || op.Metadata.Source == OpSource.History
             )
             {
                 // If this is not the first op, emit the revision

From e214df90951c49de5238a77ebbb92c0d087e8697 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 24 Feb 2026 12:41:03 +1300
Subject: [PATCH 37/40] SF-3633 Fixed issues found in testing on 23 Feb

---
 .../Services/MachineApiService.cs             | 49 ++++++++++++++++---
 .../Services/MachineApiServiceTests.cs        |  2 +-
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/SIL.XForge.Scripture/Services/MachineApiService.cs b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
index 7ef09f71cb..0be7e6a66a 100644
--- a/src/SIL.XForge.Scripture/Services/MachineApiService.cs
+++ b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
@@ -131,6 +131,7 @@ CancellationToken cancellationToken
         var result = new DraftApplyResult();
         IDocument<SFProject> targetProjectDoc;
         List<int> createdBooks = [];
+        List<int> updatedBooks = [];
         Dictionary<int, List<int>> createdChapters = [];
         List<(int bookNum, int chapterNum)> chaptersToNotify = [];
         List<(ChapterDelta chapterDelta, int bookNum)> chapterDeltas = [];
@@ -416,10 +417,36 @@ await draftHubContext.NotifyDraftApplyProgress(
                         .Chapters.FindIndex(c => c.Number == chapterDelta.Number);
                     if (chapterIndex == -1)
                     {
-                        // Create a new chapter record
-                        await targetProjectDoc.SubmitJson0OpAsync(op =>
-                            op.Add(pd => pd.Texts[textIndex].Chapters, chapter)
-                        );
+                        // Get the index before and after
+                        int previousChapterIndex = targetProjectDoc
+                            .Data.Texts[textIndex]
+                            .Chapters.FindIndex(c => c.Number < chapterDelta.Number);
+                        int nextChapterIndex = targetProjectDoc
+                            .Data.Texts[textIndex]
+                            .Chapters.FindIndex(c => c.Number > chapterDelta.Number);
+
+                        // Insert the chapter at the correct position
+                        if (nextChapterIndex == -1)
+                        {
+                            // Add a new chapter record to the end of the array
+                            await targetProjectDoc.SubmitJson0OpAsync(op =>
+                                op.Add(pd => pd.Texts[textIndex].Chapters, chapter)
+                            );
+                        }
+                        else if (previousChapterIndex == -1)
+                        {
+                            // Insert before the next chapter
+                            await targetProjectDoc.SubmitJson0OpAsync(op =>
+                                op.Insert(pd => pd.Texts[textIndex].Chapters, 0, chapter)
+                            );
+                        }
+                        else
+                        {
+                            // Insert after the previous chapter
+                            await targetProjectDoc.SubmitJson0OpAsync(op =>
+                                op.Insert(pd => pd.Texts[textIndex].Chapters, nextChapterIndex, chapter)
+                            );
+                        }
 
                         // Record that the chapter was created
                         if (createdChapters.TryGetValue(bookNum, out List<int> chapters))
@@ -441,6 +468,9 @@ await targetProjectDoc.SubmitJson0OpAsync(op =>
                             op.Set(pd => pd.Texts[textIndex].Chapters[chapterIndex].LastVerse, chapter.LastVerse);
                         });
                     }
+
+                    // Record that the book was updated
+                    updatedBooks.Add(bookNum);
                 }
             }
 
@@ -457,18 +487,23 @@ await draftHubContext.NotifyDraftApplyProgress(
                         Message = "Loading permissions from Paratext.",
                     }
                 );
-                if (createdBooks.Count == 0)
+                if (updatedBooks.Count > 0)
                 {
                     // Update books for which chapters were added
                     await projectService.UpdatePermissionsAsync(
                         curUserId,
                         targetProjectDoc,
                         users: null,
-                        books: chapterDeltas.Select(c => c.bookNum).Distinct().ToList(),
+                        books: chapterDeltas
+                            .Where(c => updatedBooks.Contains(c.bookNum))
+                            .Select(c => c.bookNum)
+                            .Distinct()
+                            .ToList(),
                         cancellationToken
                     );
                 }
-                else
+
+                if (createdBooks.Count > 0)
                 {
                     // Update permissions for new books
                     await paratextService.UpdateParatextPermissionsForNewBooksAsync(
diff --git a/test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs b/test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs
index 1565860599..e53bba9421 100644
--- a/test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs
+++ b/test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs
@@ -4850,7 +4850,7 @@ public TestEnvironment()
                             new TextInfo
                             {
                                 BookNum = 1,
-                                Chapters = [new Chapter { Number = 1 }, new Chapter { Number = 2 }],
+                                Chapters = [new Chapter { Number = 3 }, new Chapter { Number = 4 }],
                             },
                         ],
                         UserRoles = new Dictionary<string, string> { { User01, SFProjectRole.Administrator } },

From a8c7d27b59e1820fbfd818a9da65ea8f1ca63841 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Tue, 24 Feb 2026 13:27:35 +1300
Subject: [PATCH 38/40] SF-3633 Fix issues raised in code review

---
 .../draft-import-wizard/draft-import-wizard-component.spec.ts   | 1 +
 .../draft-import-wizard/draft-import-wizard.component.ts        | 2 +-
 .../ClientApp/src/assets/i18n/non_checking_en.json              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
index 3477b68bdb..692b814cb2 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard-component.spec.ts
@@ -376,6 +376,7 @@ class TestEnvironment {
 
   syncTargetProject(): void {
     this.component.isConnecting = false;
+    this.component.showOverwriteConfirmation = true;
     this.wait();
   }
 
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index c3ebef7eea..961b058036 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -258,7 +258,7 @@ export class DraftImportWizardComponent implements OnInit {
   showBookSelection = false;
 
   // Step 5: Overwrite confirmation (conditional)
-  showOverwriteConfirmation = true;
+  showOverwriteConfirmation = false;
   overwriteForm = new FormGroup({
     confirmOverwrite: new FormControl(false, Validators.requiredTrue)
   });
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
index 4a51355bde..92fefeb17e 100644
--- 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
@@ -322,7 +322,7 @@
     "choose_project": "Choose a project",
     "complete": "Complete",
     "confirm_books_to_import": "Confirm books to import",
-    "confirm_books_to_import_description": "The following books will be imported. Please click on a book to deselect it and not import it.",
+    "confirm_books_to_import_description": "The following books will be imported. You may click a book to deselect and not import it.",
     "confirm_overwrite": "Confirm overwrite",
     "connect_project_description": "The selected project {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} has not yet been connected in Scripture Forge. Do you want to connect it so you can import the draft to it?",
     "connect_project": "Connect project",

From 55385242a2946fb6764e80b7c28500b34db95110 Mon Sep 17 00:00:00 2001
From: Nateowami <nathaniel_paulus@sil.org>
Date: Tue, 24 Feb 2026 15:19:19 -0500
Subject: [PATCH 39/40] Fix e2e tests for new draft import dialog (#3708)

---
 .../ClientApp/e2e/workflows/generate-draft.ts | 24 ++++++++++++-------
 .../e2e/workflows/localized-screenshots.ts    | 15 +++++-------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/e2e/workflows/generate-draft.ts b/src/SIL.XForge.Scripture/ClientApp/e2e/workflows/generate-draft.ts
index f6554dc62d..49bee545fe 100644
--- a/src/SIL.XForge.Scripture/ClientApp/e2e/workflows/generate-draft.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/e2e/workflows/generate-draft.ts
@@ -1,6 +1,6 @@
 import { expect } from 'npm:@playwright/test';
 import { Locator, Page } from 'npm:playwright';
-import { preset, ScreenshotContext } from '../e2e-globals.ts';
+import { E2E_SYNC_DEFAULT_TIMEOUT, preset, ScreenshotContext } from '../e2e-globals.ts';
 import {
   enableDeveloperMode,
   enableDraftingOnProjectAsServalAdmin,
@@ -203,21 +203,27 @@ export async function generateDraft(
   await user.click(page.getByRole('button', { name: 'Save' }));
 
   // Preview and apply chapter 1
-  await user.click(page.getByRole('radio', { name: bookToDraft }));
+  await user.click(page.getByRole('button', { name: bookToDraft, exact: true }));
   await user.click(page.getByRole('button', { name: 'Add to project' }));
   await user.click(page.getByRole('button', { name: 'Overwrite chapter' }));
   await user.click(page.locator('app-tab-header').filter({ hasText: DRAFT_PROJECT_SHORT_NAME }));
 
   // Go back to generate draft page and apply all chapters
   await user.click(page.getByRole('link', { name: 'Generate draft' }));
-  await user.click(page.locator('app-draft-preview-books mat-button-toggle:last-child button'));
-  await user.click(page.getByRole('menuitem', { name: 'Add to project' }));
-  await user.check(page.getByRole('checkbox', { name: /I understand the draft will overwrite .* in .* project/ }));
   await user.click(page.getByRole('button', { name: 'Add to project' }));
-  await expect(
-    page.getByRole('heading', { name: `Successfully applied all chapters to ${bookToDraft}` })
-  ).toBeVisible();
-  await user.click(page.getByRole('button', { name: 'Close' }));
+  await user.click(page.getByRole('combobox', { name: 'Choose a project' }));
+  await user.type(DRAFT_PROJECT_SHORT_NAME);
+  await user.click(page.getByRole('option', { name: `${DRAFT_PROJECT_SHORT_NAME} -` }));
+  await user.click(page.getByRole('button', { name: 'Next' }));
+  await user.check(page.getByRole('checkbox', { name: /I understand that existing content will be overwritten/ }));
+  await user.click(page.getByRole('button', { name: 'Import' }));
+  await expect(page.getByText('Import complete', { exact: true })).toBeVisible();
+  await user.click(page.getByRole('button', { name: 'Next' }));
+  await user.click(page.locator('[data-test-id="step-7-sync"]'));
+  await expect(page.getByText(`The draft has been imported into ${DRAFT_PROJECT_SHORT_NAME}`)).toBeVisible({
+    timeout: E2E_SYNC_DEFAULT_TIMEOUT
+  });
+  await user.click(page.getByRole('button', { name: 'Done' }));
 
   await screenshot(page, { pageName: 'generate_draft_add_to_project', ...context });
 
diff --git a/src/SIL.XForge.Scripture/ClientApp/e2e/workflows/localized-screenshots.ts b/src/SIL.XForge.Scripture/ClientApp/e2e/workflows/localized-screenshots.ts
index 17e99f2a9d..8654a78ec6 100644
--- a/src/SIL.XForge.Scripture/ClientApp/e2e/workflows/localized-screenshots.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/e2e/workflows/localized-screenshots.ts
@@ -432,11 +432,11 @@ export async function localizedScreenshots(
   await user.click(page.getByRole('button', { name: 'Save' }));
 
   await forEachLocale(async locale => {
-    await user.hover(page.getByRole('radio').first(), defaultArrowLocation);
+    await user.hover(page.getByRole('button', { name: 'Ruth', exact: true }), defaultArrowLocation);
     await screenshot(page, { ...context, pageName: 'draft_complete', locale });
   });
 
-  await page.getByRole('radio', { name: 'Ruth' }).first().click();
+  await user.click(page.getByRole('button', { name: 'Ruth', exact: true }));
 
   await expect(page.getByRole('button', { name: 'Add to project' })).toBeVisible({ timeout: 15_000 });
 
@@ -461,19 +461,16 @@ export async function localizedScreenshots(
   await expect(page.getByText('The draft is ready')).toBeVisible();
 
   await forEachLocale(async locale => {
-    await page.getByRole('radio').nth(1).click();
-    await user.hover(page.getByRole('menuitem').last(), defaultArrowLocation);
+    await user.hover(page.getByRole('button', { name: 'Add to project' }), defaultArrowLocation);
     await screenshot(page, { ...context, pageName: 'import_book', locale });
-    await page.keyboard.press('Escape');
   });
 
   await forEachLocale(async locale => {
-    await page.getByRole('radio').nth(1).click();
-    await page.getByRole('menuitem').last().click();
+    await user.click(page.getByRole('button', { name: 'Add to project' }));
+
     await page.getByRole('combobox').fill('seedsp2');
     await page.getByRole('option', { name: 'seedsp2 - ' }).click();
-    await page.getByRole('checkbox').check();
-    await user.hover(page.getByRole('button').last(), defaultArrowLocation);
+    await user.hover(page.getByRole('button', { name: 'next' }), defaultArrowLocation);
     await screenshotElements(
       page,
       [page.locator('mat-dialog-container')],

From cfcee87b6b9339fa0c6d14fa44ec9abcde1933c4 Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Wed, 25 Feb 2026 12:41:03 +1300
Subject: [PATCH 40/40] SF-3633 Addressed issues raised in code review

---
 .../app/core/project-notification.service.ts  | 34 ++++++++++++-------
 .../draft-import-wizard.component.ts          | 23 ++++++++-----
 .../draft-notification.service.ts             | 34 ++++++++++++-------
 .../src/assets/i18n/non_checking_en.json      |  2 ++
 .../Services/MachineApiService.cs             | 10 +++---
 5 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
index 1c50836ebf..7e91da306a 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/core/project-notification.service.ts
@@ -17,6 +17,7 @@ export class ProjectNotificationService {
   private options: IHttpConnectionOptions = {
     accessTokenFactory: async () => (await this.authService.getAccessToken()) ?? ''
   };
+  private openConnections: number = 0;
 
   constructor(
     private authService: AuthService,
@@ -57,23 +58,30 @@ export class ProjectNotificationService {
   }
 
   async start(): Promise<void> {
-    if (this.connection.state !== HubConnectionState.Disconnected) {
-      await this.connection.stop();
+    this.openConnections++;
+    if (
+      this.connection.state !== HubConnectionState.Connected &&
+      this.connection.state !== HubConnectionState.Connecting &&
+      this.connection.state !== HubConnectionState.Reconnecting
+    ) {
+      await this.connection.start().catch(err => {
+        // Suppress AbortErrors, as they are not caused by server error, but the SignalR connection state
+        // These will be thrown if a user navigates away quickly after
+        // starting the sync or the app loses internet connection
+        if (err instanceof AbortError || !this.appOnline) {
+          return;
+        } else {
+          throw err;
+        }
+      });
     }
-    await this.connection.start().catch(err => {
-      // Suppress AbortErrors, as they are not caused by server error, but the SignalR connection state
-      // These will be thrown if a user navigates away quickly after
-      // starting the sync or the app loses internet connection
-      if (err instanceof AbortError || !this.appOnline) {
-        return;
-      } else {
-        throw err;
-      }
-    });
   }
 
   async stop(): Promise<void> {
-    await this.connection.stop();
+    // Only stop the connection if this is the last open connection
+    if (--this.openConnections <= 0) {
+      await this.connection.stop();
+    }
   }
 
   async subscribeToProject(projectId: string): Promise<void> {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
index 961b058036..96f3467150 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-import-wizard/draft-import-wizard.component.ts
@@ -660,7 +660,7 @@ export class DraftImportWizardComponent implements OnInit {
     // Update based on book or chapter
     if (draftApplyState.bookNum === 0 && draftApplyState.chapterNum === 0) {
       // Get the total number of failures
-      const totalFailures = this.importProgress.reduce(
+      const failed = this.importProgress.reduce(
         (sum, p) => sum + (p.failedChapters.some(c => c.chapterNum === 0) ? p.totalChapters : p.failedChapters.length),
         0
       );
@@ -668,11 +668,16 @@ export class DraftImportWizardComponent implements OnInit {
       if (draftApplyState.status === DraftApplyStatus.Successful) {
         // Check if there were any failures
         this.isImporting = false;
-        const totalCompleted = this.importProgress.reduce((sum, p) => sum + p.completedChapters.length, 0);
-        if (totalFailures > 0 && totalCompleted > 0) {
-          this.importError = `Imported ${totalCompleted} chapter(s) successfully. Failed to import ${totalFailures} chapter(s). See details above.`;
-        } else if (totalFailures > 0) {
-          this.importError = `Failed to import ${totalFailures} chapter(s). See details above.`;
+        const successful = this.importProgress.reduce((sum, p) => sum + p.completedChapters.length, 0);
+        if (failed > 0 && successful > 0) {
+          this.importError = this.i18n.translateStatic('draft_import_wizard.import_some_chapters_failed', {
+            successful,
+            failed
+          });
+        } else if (failed > 0) {
+          this.importError = this.i18n.translateStatic('draft_import_wizard.import_all_chapters_failed', {
+            failed
+          });
         } else {
           this.importComplete = true;
         }
@@ -683,8 +688,10 @@ export class DraftImportWizardComponent implements OnInit {
         });
         this.isImporting = false;
         this.importError = draftApplyState.message;
-        if (totalFailures > 0 && (this.importError == null || this.importError.length === 0)) {
-          this.importError = `Failed to import ${totalFailures} chapter(s). See details above.`;
+        if (failed > 0 && (this.importError == null || this.importError.length === 0)) {
+          this.importError = this.i18n.translateStatic('draft_import_wizard.import_all_chapters_failed', {
+            failed
+          });
         }
       }
     } else if (draftApplyState.bookNum > 0) {
diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-notification.service.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-notification.service.ts
index 2ab9ca7cda..bdc7da4bde 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-notification.service.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-notification.service.ts
@@ -17,6 +17,7 @@ export class DraftNotificationService {
   private options: IHttpConnectionOptions = {
     accessTokenFactory: async () => (await this.authService.getAccessToken()) ?? ''
   };
+  private openConnections: number = 0;
 
   constructor(
     private authService: AuthService,
@@ -42,23 +43,30 @@ export class DraftNotificationService {
   }
 
   async start(): Promise<void> {
-    if (this.connection.state !== HubConnectionState.Disconnected) {
-      await this.connection.stop();
+    this.openConnections++;
+    if (
+      this.connection.state !== HubConnectionState.Connected &&
+      this.connection.state !== HubConnectionState.Connecting &&
+      this.connection.state !== HubConnectionState.Reconnecting
+    ) {
+      await this.connection.start().catch(err => {
+        // Suppress AbortErrors, as they are not caused by server error, but the SignalR connection state
+        // These will be thrown if a user navigates away quickly after
+        // starting the sync or the app loses internet connection
+        if (err instanceof AbortError || !this.appOnline) {
+          return;
+        } else {
+          throw err;
+        }
+      });
     }
-    await this.connection.start().catch(err => {
-      // Suppress AbortErrors, as they are not caused by server error, but the SignalR connection state
-      // These will be thrown if a user navigates away quickly after
-      // starting the sync or the app loses internet connection
-      if (err instanceof AbortError || !this.appOnline) {
-        return;
-      } else {
-        throw err;
-      }
-    });
   }
 
   async stop(): Promise<void> {
-    await this.connection.stop();
+    // Only stop the connection if this is the last open connection
+    if (--this.openConnections <= 0) {
+      await this.connection.stop();
+    }
   }
 
   async subscribeToProject(projectId: string): Promise<void> {
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
index 92fefeb17e..cadc629a7d 100644
--- 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
@@ -339,10 +339,12 @@
     "failed_to_load_projects": "We couldn't load your Paratext projects. Check your internet connection and try again, or log out then log back in again.",
     "i_understand_overwrite_content": "I understand that existing content will be overwritten",
     "import": "Import",
+    "import_all_chapters_failed": "Failed to import {{ failed }} chapter(s). See details above.",
     "import_and_sync_complete": "The draft has been imported into {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} and synced with Paratext.",
     "import_and_sync_complete_reminder": "Please remember to do a Send/Receive in Paratext to see the draft.",
     "import_complete_no_sync": "Make sure to sync {{ boldStart }}{{ projectShortName }} - {{ projectName }}{{ boldEnd }} in Scripture Forge, then do a Send/Receive in Paratext to make the draft available in Paratext.",
     "import_complete": "Import complete",
+    "import_some_chapters_failed": "Imported {{ successful }} chapter(s) successfully. Failed to import {{ failed }} chapter(s). See details above.",
     "importing_draft": "Importing draft",
     "importing": "Importing",
     "next": "Next",
diff --git a/src/SIL.XForge.Scripture/Services/MachineApiService.cs b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
index 0be7e6a66a..343a312bf6 100644
--- a/src/SIL.XForge.Scripture/Services/MachineApiService.cs
+++ b/src/SIL.XForge.Scripture/Services/MachineApiService.cs
@@ -418,9 +418,9 @@ await draftHubContext.NotifyDraftApplyProgress(
                     if (chapterIndex == -1)
                     {
                         // Get the index before and after
-                        int previousChapterIndex = targetProjectDoc
+                        bool hasPrecedingChapter = targetProjectDoc
                             .Data.Texts[textIndex]
-                            .Chapters.FindIndex(c => c.Number < chapterDelta.Number);
+                            .Chapters.Any(c => c.Number < chapterDelta.Number);
                         int nextChapterIndex = targetProjectDoc
                             .Data.Texts[textIndex]
                             .Chapters.FindIndex(c => c.Number > chapterDelta.Number);
@@ -433,16 +433,16 @@ await targetProjectDoc.SubmitJson0OpAsync(op =>
                                 op.Add(pd => pd.Texts[textIndex].Chapters, chapter)
                             );
                         }
-                        else if (previousChapterIndex == -1)
+                        else if (!hasPrecedingChapter)
                         {
-                            // Insert before the next chapter
+                            // Insert before other chapters
                             await targetProjectDoc.SubmitJson0OpAsync(op =>
                                 op.Insert(pd => pd.Texts[textIndex].Chapters, 0, chapter)
                             );
                         }
                         else
                         {
-                            // Insert after the previous chapter
+                            // Insert before the next chapter
                             await targetProjectDoc.SubmitJson0OpAsync(op =>
                                 op.Insert(pd => pd.Texts[textIndex].Chapters, nextChapterIndex, chapter)
                             );