PER-10480: Enable re-import

src/app/apps/components/family-search-import/family-search-import.component.html

@@ -11,13 +11,9 @@
 			<div class="family-member-list">
 				@for (family of familyMembers; track family) {
 					<div class="family-member">
-						<div class="select" [ngClass]="{ exists: family.permExists }">
+						<div class="select">
 							<label>
-								<input
-									type="checkbox"
-									[(ngModel)]="family.isSelected"
-									[disabled]="family.permExists"
-								/>
+								<input type="checkbox" [(ngModel)]="family.isSelected" />
 								@if (family.isSelected) {
 									<div class="select-active"></div>
 								}
@@ -31,7 +27,7 @@
 								<em>{{ family.display.lifespan }}</em>
 							}
 							@if (family.permExists) {
-								<em>Imported</em>
+								<em>Imported, select to re-import</em>
 							}
 						</div>
 					</div>
@@ -42,7 +38,7 @@
 			<button class="btn btn-secondary" (click)="cancel()">Cancel</button>
 			<button
 				class="btn btn-primary"
-				(click)="stage = 'memories'"
+				(click)="goToNextFromPeople()"
 				[disabled]="!getSelectedCount()"
 			>
 				Next

src/app/apps/components/family-search-import/family-search-import.component.scss

@@ -52,10 +52,6 @@ p {
 		visibility: hidden;
 	}
 
-	&.exists {
-		opacity: 0;
-	}
-
 	label {
 		display: block;
 		width: 100%;

src/app/apps/components/family-search-import/family-search-import.component.spec.ts

@@ -1,25 +1,184 @@
-// import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-// import { FamilySearchImportComponent } from './family-search-import.component';
-
-// describe('FamilySearchImportComponent', () => {
-//   let component: FamilySearchImportComponent;
-//   let fixture: ComponentFixture<FamilySearchImportComponent>;
-
-//   beforeEach(async(() => {
-//     TestBed.configureTestingModule({
-//       declarations: [ FamilySearchImportComponent ]
-//     })
-//     .compileComponents();
-//   }));
-
-//   beforeEach(() => {
-//     fixture = TestBed.createComponent(FamilySearchImportComponent);
-//     component = fixture.componentInstance;
-//     fixture.detectChanges();
-//   });
-
-//   it('should create', () => {
-//     expect(component).toBeTruthy();
-//   });
-// });
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
+import { ApiService } from '@shared/services/api/api.service';
+import { MessageService } from '@shared/services/message/message.service';
+import { GuidedTourService } from '@shared/services/guided-tour/guided-tour.service';
+import { PromptService } from '@shared/services/prompt/prompt.service';
+import { FamilySearchImportComponent } from './family-search-import.component';
+
+describe('FamilySearchImportComponent', () => {
+	let component: FamilySearchImportComponent;
+	let fixture: ComponentFixture<FamilySearchImportComponent>;
+
+	const mockDialogRef = { close: jasmine.createSpy('close') };
+
+	const mockApiService = {
+		archive: { create: jasmine.createSpy('create') },
+		connector: {
+			familysearchFactImportRequest: jasmine.createSpy(
+				'familysearchFactImportRequest',
+			),
+			familysearchMemoryImportRequest: jasmine.createSpy(
+				'familysearchMemoryImportRequest',
+			),
+		},
+	};
+
+	const mockMessageService = {
+		showMessage: jasmine.createSpy('showMessage'),
+		showError: jasmine.createSpy('showError'),
+	};
+
+	const mockGuidedTourService = {
+		isStepComplete: jasmine.createSpy('isStepComplete').and.returnValue(true),
+		startTour: jasmine.createSpy('startTour'),
+		emit: jasmine.createSpy('emit'),
+		markStepComplete: jasmine.createSpy('markStepComplete'),
+	};
+
+	const mockPromptService = {
+		promptButtons: jasmine
+			.createSpy('promptButtons')
+			.and.returnValue(Promise.resolve('go-back')),
+	};
+
+	const currentUserData = {
+		id: 'user-1',
+		display: { name: 'Test User', lifespan: '1900–1980', ascendancyNumber: 1 },
+	};
+
+	const makeDialogData = (treeData: object[]) => ({
+		currentUserData,
+		treeData: treeData.map((member) => ({ ...member })),
+	});
+
+	async function setup(treeData: object[]) {
+		await TestBed.configureTestingModule({
+			declarations: [FamilySearchImportComponent],
+			imports: [FormsModule],
+			providers: [
+				{ provide: DialogRef, useValue: mockDialogRef },
+				{ provide: DIALOG_DATA, useValue: makeDialogData(treeData) },
+				{ provide: ApiService, useValue: mockApiService },
+				{ provide: MessageService, useValue: mockMessageService },
+				{ provide: GuidedTourService, useValue: mockGuidedTourService },
+				{ provide: PromptService, useValue: mockPromptService },
+			],
+		}).compileComponents();
+
+		fixture = TestBed.createComponent(FamilySearchImportComponent);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	}
+
+	const newMember = {
+		id: 'person-2',
+		display: { name: 'Jane Doe', lifespan: '1930–2010', ascendancyNumber: 3 },
+		permExists: false,
+	};
+
+	const reimportMember = {
+		id: 'person-3',
+		display: { name: 'John Doe', lifespan: '1928–2005', ascendancyNumber: 2 },
+		permExists: true,
+	};
+
+	describe('goToNextFromPeople()', () => {
+		it('goes to memories stage when no selected member has permExists', async () => {
+			await setup([newMember]);
+			component.familyMembers[0].isSelected = true;
+
+			component.goToNextFromPeople();
+
+			expect(component.stage).toBe('memories');
+		});
+
+		it('shows a confirmation prompt when a selected member has permExists', async () => {
+			await setup([reimportMember]);
+			component.familyMembers[0].isSelected = true;
+
+			await component.goToNextFromPeople();
+
+			expect(mockPromptService.promptButtons).toHaveBeenCalledWith(
+				jasmine.arrayContaining([
+					jasmine.objectContaining({ buttonName: 'go-back' }),
+					jasmine.objectContaining({ buttonName: 'continue' }),
+				]),
+				'Continue with re-import?',
+				undefined,
+				jasmine.stringContaining('John Doe'),
+			);
+		});
+
+		it('shows a confirmation prompt when selection includes both new and previously imported members', async () => {
+			await setup([newMember, reimportMember]);
+			component.familyMembers[0].isSelected = true;
+			component.familyMembers[1].isSelected = true;
+
+			await component.goToNextFromPeople();
+
+			expect(mockPromptService.promptButtons).toHaveBeenCalled();
+		});
+
+		it('goes to memories stage when user confirms reimport', async () => {
+			await setup([reimportMember]);
+			component.familyMembers[0].isSelected = true;
+			mockPromptService.promptButtons.and.returnValue(
+				Promise.resolve('continue'),
+			);
+
+			await component.goToNextFromPeople();
+
+			expect(component.stage).toBe('memories');
+		});
+
+		it('stays on people stage when user dismisses reimport confirmation', async () => {
+			await setup([reimportMember]);
+			component.familyMembers[0].isSelected = true;
+			mockPromptService.promptButtons.and.returnValue(
+				Promise.resolve('go-back'),
+			);
+
+			await component.goToNextFromPeople();
+
+			expect(component.stage).toBe('people');
+		});
+
+		it('goes to memories stage when a member with permExists is not selected', async () => {
+			await setup([newMember, reimportMember]);
+			component.familyMembers[0].isSelected = true;
+			// reimportMember not selected
+
+			component.goToNextFromPeople();
+
+			expect(component.stage).toBe('memories');
+		});
+	});
+
+	describe('getSelectedMembers()', () => {
+		it('returns only selected members', async () => {
+			await setup([newMember, reimportMember]);
+			component.familyMembers[0].isSelected = true;
+
+			const selected = component.getSelectedMembers();
+
+			expect(selected.length).toBe(1);
+			expect(selected[0].display.name).toBe('Jane Doe');
+		});
+
+		it('returns all members when all are selected', async () => {
+			await setup([newMember, reimportMember]);
+			component.familyMembers[0].isSelected = true;
+			component.familyMembers[1].isSelected = true;
+
+			expect(component.getSelectedMembers().length).toBe(2);
+		});
+
+		it('returns empty array when no members are selected', async () => {
+			await setup([newMember, reimportMember]);
+
+			expect(component.getSelectedMembers().length).toBe(0);
+		});
+	});
+});

src/app/apps/components/family-search-import/family-search-import.component.ts

@@ -5,6 +5,7 @@ import { ArchiveVO } from '@models';
 import { ApiService } from '@shared/services/api/api.service';
 import { MessageService } from '@shared/services/message/message.service';
 import { GuidedTourService } from '@shared/services/guided-tour/guided-tour.service';
+import { PromptService } from '@shared/services/prompt/prompt.service';
 import { CreateArchivesComplete } from '@shared/services/guided-tour/tours/familysearch.tour';
 import { GuidedTourEvent } from '@shared/services/guided-tour/events';
 import { timeout } from '@shared/utilities/timeout';
@@ -40,6 +41,7 @@ export class FamilySearchImportComponent {
 		private api: ApiService,
 		private message: MessageService,
 		private guidedTour: GuidedTourService,
+		private promptService: PromptService,
 	) {
 		this.currentUser = data.currentUserData;
 		this.familyMembers = filter(
@@ -144,7 +146,52 @@ export class FamilySearchImportComponent {
 	}
 
 	getSelectedCount() {
-		return this.familyMembers.filter((person) => person.isSelected).length;
+		return this.getSelectedMembers().length;
+	}
+
+	getSelectedMembers() {
+		return this.familyMembers.filter((person) => person.isSelected);
+	}
+
+	getReimportedMembers() {
+		return this.getSelectedMembers().filter((person) => person.permExists);
+	}
+
+	async goToNextFromPeople() {
+		const reimported = this.getReimportedMembers();
+		if (!reimported.length) {
+			this.stage = 'memories';
+			return;
+		}
+
+		const membersList = reimported
+			.map((p) => `<li>${p.display.name}</li>`)
+			.join('');
+		const template = `<p>The following family members have been previously imported. Continuing will create a new archive for each of them, possibly resulting in duplicates.</p><ul>${membersList}</ul>`;
+
+		const result = await this.promptService
+			.promptButtons(
+				[
+					{
+						buttonName: 'go-back',
+						buttonText: 'Go Back',
+						class: 'btn-secondary',
+					},
+					{
+						buttonName: 'continue',
+						buttonText: 'Continue',
+						class: 'btn-primary',
+					},
+				],
+				'Continue with re-import?',
+				undefined,
+				template,
+			)
+			.catch(() => 'go-back');
+
+		if (result === 'continue') {
+			this.stage = 'memories';
+		}
 	}
 
 	getRelationshipFromAncestryNumber(ancestryNumber: number) {