Change to a different archive when accepting a share

When a share is restricted, the user either needs to accept
the share or request access. In the process, the user can
also choose to which archive the share will be added. This
commit adds the share to the correct archive.

Issue: PER-10322

Author: aasandei-vsp

src/app/share-preview/components/share-preview/share-preview.component.spec.ts

@@ -25,6 +25,7 @@ import { ApiService } from '@shared/services/api/api.service';
 import { GoogleAnalyticsService } from '@shared/services/google-analytics/google-analytics.service';
 import { ShareResponse } from '@shared/services/api/share.repo';
 import { FilesystemService } from '@root/app/filesystem/filesystem.service';
+import { MessageService } from '@shared/services/message/message.service';
 import { CreateAccountDialogComponent } from '../create-account-dialog/create-account-dialog.component';
 import { SharePreviewComponent } from './share-preview.component';
 
@@ -77,6 +78,10 @@ const mockFilesystemService = {
 	getFolder: jasmine.createSpy().and.returnValue(Promise.resolve({})),
 };
 
+const mockMessageService = {
+	showMessage: jasmine.createSpy(),
+};
+
 describe('SharePreviewComponent', () => {
 	let component: SharePreviewComponent;
 	let fixture: ComponentFixture<SharePreviewComponent>;
@@ -133,6 +138,11 @@ describe('SharePreviewComponent', () => {
 			useValue: mockFilesystemService,
 		});
 
+		config.providers.push({
+			provide: MessageService,
+			useValue: mockMessageService,
+		});
+
 		await TestBed.configureTestingModule(config).compileComponents();
 
 		dialog = TestBed.inject(DialogCdkService);
@@ -334,4 +344,55 @@ describe('SharePreviewComponent', () => {
 		expect(component.hasRequested).toBeTrue();
 		expect(component.showCover).toBeFalse();
 	}));
+
+	it('should request access and show pending message when status is pending', fakeAsync(() => {
+		const mockResponse = {
+			getShareVO: () => ({ status: 'status.generic.pending' }),
+		};
+		spyOn(apiService.share, 'requestShareAccess').and.returnValue(
+			Promise.resolve(mockResponse as any),
+		);
+
+		component.shareToken = 'mock-token';
+		component.shareAccount = { fullName: 'Sharer Name' } as any;
+
+		component.requestShareAccess();
+		tick();
+
+		expect(apiService.share.requestShareAccess).toHaveBeenCalledWith(
+			'mock-token',
+		);
+
+		expect(mockMessageService.showMessage).toHaveBeenCalledWith({
+			message: 'Access requested. Sharer Name must approve your request.',
+			style: 'success',
+		});
+
+		expect(component.showCover).toBeFalse();
+		expect(component.hasRequested).toBeTrue();
+	}));
+
+	it('should show access granted message and navigate when status is not pending', fakeAsync(() => {
+		const mockResponse = {
+			getShareVO: () => ({ status: 'ok' }),
+		};
+		spyOn(apiService.share, 'requestShareAccess').and.returnValue(
+			Promise.resolve(mockResponse as any),
+		);
+		const routerSpy = spyOn(router, 'navigate');
+		component.shareToken = 'mock-token';
+		component.requestShareAccess();
+		tick();
+
+		expect(apiService.share.requestShareAccess).toHaveBeenCalledWith(
+			'mock-token',
+		);
+
+		expect(mockMessageService.showMessage).toHaveBeenCalledWith({
+			message: 'Access granted.',
+			style: 'success',
+		});
+
+		expect(routerSpy).toHaveBeenCalledWith(['/app', 'shares']);
+	}));
 });

src/app/share-preview/components/share-preview/share-preview.component.ts

@@ -468,29 +468,21 @@ export class SharePreviewComponent implements OnInit, OnDestroy {
 	}
 
 	async onRequestAccessClick() {
+		let dialogRef;
 		try {
 			this.waiting = true;
 			if (!this.archiveConfirmed) {
-				await this.accountService.promptForArchiveChange(
+				dialogRef = await this.accountService.promptForArchiveChange(
 					this.chooseArchiveText,
 				);
 				this.archiveConfirmed = true;
 			}
-			const response = await this.api.share.requestShareAccess(this.shareToken);
-			const shareVo = response.getShareVO();
-			if (shareVo.status === 'status.generic.pending') {
-				this.message.showMessage({
-					message: `Access requested. ${this.shareAccount.fullName} must approve your request.`,
-					style: 'success',
+			if (dialogRef) {
+				dialogRef.closed.subscribe(async () => {
+					await this.requestShareAccess();
 				});
-				this.showCover = false;
-				this.hasRequested = true;
 			} else {
-				this.message.showMessage({
-					message: 'Access granted.',
-					style: 'success',
-				});
-				this.router.navigate(['/app', 'shares']);
+				await this.requestShareAccess();
 			}
 		} catch (err) {
 			if (err instanceof ShareResponse) {
@@ -510,6 +502,25 @@ export class SharePreviewComponent implements OnInit, OnDestroy {
 		}
 	}
 
+	async requestShareAccess() {
+		const response = await this.api.share.requestShareAccess(this.shareToken);
+		const shareVo = response.getShareVO();
+		if (shareVo.status === 'status.generic.pending') {
+			this.message.showMessage({
+				message: `Access requested. ${this.shareAccount.fullName} must approve your request.`,
+				style: 'success',
+			});
+			this.showCover = false;
+			this.hasRequested = true;
+		} else {
+			this.message.showMessage({
+				message: 'Access granted.',
+				style: 'success',
+			});
+			this.router.navigate(['/app', 'shares']);
+		}
+	}
+
 	onSignupSubmit(formValue: any) {
 		this.waiting = true;