Review responses and linting fixes

Better handling of access role / permission level in an enum, move
some data manipulation methods to mapping service, and fix the tests.

Author: cecilia-donnelly

src/app/core/services/edit/edit.service.spec.ts

@@ -9,6 +9,7 @@ import { AccountService } from '@shared/services/account/account.service';
 import { RecordRepo } from '@shared/services/api/record.repo';
 import { MessageService } from '@shared/services/message/message.service';
 import { DataService } from '@shared/services/data/data.service';
+import { ShareLinksApiService } from '@root/app/share-links/services/share-links-api.service';
 import { FolderPickerService } from '../folder-picker/folder-picker.service';
 
 const mockDataService = {
@@ -22,6 +23,7 @@ describe('EditService', () => {
 	let service: EditService;
 	let apiService: jasmine.SpyObj<ApiService>;
 	let accountService: jasmine.SpyObj<AccountService>;
+	let shareLinksApiService: jasmine.SpyObj<ShareLinksApiService>;
 	beforeEach(() => {
 		apiService = jasmine.createSpyObj('ApiService', ['record']);
 		apiService.record = {
@@ -32,6 +34,14 @@ describe('EditService', () => {
 		accountService.getArchive.and.returnValue(
 			new ArchiveVO({ archiveId: 123 }),
 		);
+
+		shareLinksApiService = jasmine.createSpyObj('ShareLinksApiService', [
+			'generateShareLink',
+			'getShareLinksById',
+			'updateShareLink',
+			'deleteShareLink',
+		]);
+
 		const config = cloneDeep(Testing.BASE_TEST_CONFIG);
 		config.imports.push(NgbTooltipModule);
 		TestBed.configureTestingModule({
@@ -42,6 +52,7 @@ describe('EditService', () => {
 				{ provide: DataService, useValue: mockDataService },
 				{ provide: ApiService, useValue: apiService },
 				{ provide: AccountService, useValue: accountService },
+				{ provide: ShareLinksApiService, useValue: shareLinksApiService },
 			],
 		});
 

src/app/core/services/edit/edit.service.ts

@@ -256,18 +256,14 @@ export class EditService {
 					const response: ShareResponse = await this.api.share.getShareLink(
 						items[0],
 					);
-					let newShareLink: ShareLink;
-					if (response.getShareByUrlVO()) {
-					const shareResponse = await this.shareApi.getShareLinksById([response.getShareByUrlVO().shareby_urlId]);
-					newShareLink = shareResponse[0];
-					}
+					const newShareLink = await this.fetchShareLinkFromResponse(response);
 
 					actionDeferred.resolve();
 					this.dialog.open(SharingComponent, {
 						data: {
 							item: items[0],
 							link: response.getShareByUrlVO(),
-							newShare: newShareLink
+							newShare: newShareLink,
 						},
 					});
 					break;
@@ -427,7 +423,7 @@ export class EditService {
 				});
 			}
 
-			if (recordResponse) {
+			if (recordResponse && recordResponse.length > 0) {
 				const res = recordResponse[0];
 
 				const newData: RecordVOData = {
@@ -532,22 +528,26 @@ export class EditService {
 
 	async openShareDialog(item: ItemVO) {
 		const response = await this.api.share.getShareLink(item);
-		let newShareLink: ShareLink;
-		if (response.getShareByUrlVO()) {
-			const shareResponse = await this.shareApi.getShareLinksById([response.getShareByUrlVO().shareby_urlId]);
-			newShareLink = shareResponse[0];
-		}
+		const newShareLink = await this.fetchShareLinkFromResponse(response);
 		if (this.device.isMobile()) {
 			try {
 				this.dialog.open(SharingComponent, {
 					panelClass: 'dialog',
-					data: { item, link: response.getShareByUrlVO(), newShare: newShareLink},
+					data: {
+						item,
+						link: response.getShareByUrlVO(),
+						newShare: newShareLink,
+					},
 				});
 			} catch (err) {}
 		} else {
 			try {
 				this.dialog.open(SharingDialogComponent, {
-					data: { item, link: response.getShareByUrlVO(), newShare: newShareLink},
+					data: {
+						item,
+						link: response.getShareByUrlVO(),
+						newShare: newShareLink,
+					},
 					width: '600px',
 					panelClass: 'dialog',
 				});
@@ -564,6 +564,18 @@ export class EditService {
 		});
 	}
 
+	private async fetchShareLinkFromResponse(
+		response: ShareResponse,
+	): Promise<ShareLink | undefined> {
+		if (response.getShareByUrlVO()) {
+			const shareResponse = await this.shareApi.getShareLinksById([
+				response.getShareByUrlVO().shareby_urlId,
+			]);
+			return shareResponse[0];
+		}
+		return undefined;
+	}
+
 	async openTagsDialog(item: ItemVO, type: string) {
 		this.dialog.open(EditTagsComponent, {
 			data: { item, type },

src/app/file-browser/components/share-link-dropdown/share-link-dropdown.component.spec.ts

@@ -1,12 +1,14 @@
 import { Subject } from 'rxjs';
 import { ArchiveVO, ShareByUrlVO } from '@models/index';
+import { ShareLink } from '@root/app/share-links/models/share-link';
+import { Expiration } from '@root/app/share-links/services/share-link-mapping.service';
 
 export class MockAccountService {
 	public archiveChange = new Subject();
 
 	public getArchive = () => new ArchiveVO({});
 }
-export class MockApiService {
+export class MockShareLinksApiService {
 	public static readonly initialData = {
 		defaultAccessRole: 'access.role.viewer',
 		createdDT: '2023-02-15T20:31:36',
@@ -15,24 +17,77 @@ export class MockApiService {
 		status: 'status.generic.ok',
 	};
 	public static shareByUrlVO: ShareByUrlVO = new ShareByUrlVO(
-		MockApiService.initialData,
+		MockShareLinksApiService.initialData,
 	);
 
+	public static mockShareLink: ShareLink = {
+		id: '1',
+		itemId: '1',
+		itemType: 'record',
+		token: 'example.com/test-token',
+		permissionsLevel: 'viewer',
+		accessRestrictions: 'none',
+		maxUses: null,
+		usesExpended: null,
+		expirationTimestamp: null,
+		createdAt: new Date('2023-02-15T20:31:36'),
+		updatedAt: new Date('2023-02-15T20:31:36'),
+	};
+
 	public share = {
 		generateShareLink: async () => ({
-			getShareByUrlVO: () => MockApiService.shareByUrlVO,
+			getShareByUrlVO: () => MockShareLinksApiService.shareByUrlVO,
 		}),
 		updateShareLink: async (shareLink: ShareByUrlVO) => {
-			MockApiService.shareByUrlVO = shareLink;
-			return MockApiService.shareByUrlVO;
+			MockShareLinksApiService.shareByUrlVO = shareLink;
+			return MockShareLinksApiService.shareByUrlVO;
 		},
 		removeShareLink: async (_shareLink: ShareByUrlVO) => {
-			MockApiService.reset();
+			MockShareLinksApiService.reset();
 		},
 	};
 
+	// Mock for ShareLinksApiService methods
+	public generateShareLink = async ({
+		itemId,
+		itemType,
+	}: {
+		itemId: string;
+		itemType: 'record' | 'folder';
+	}): Promise<ShareLink> => MockShareLinksApiService.mockShareLink;
+
+	public updateShareLink = async (
+		shareLinkId: string,
+		payload: Partial<ShareLink>,
+	): Promise<ShareLink> => {
+		MockShareLinksApiService.mockShareLink = {
+			...MockShareLinksApiService.mockShareLink,
+			...payload,
+		};
+		return MockShareLinksApiService.mockShareLink;
+	};
+
+	public deleteShareLink = async (shareLinkId: string): Promise<void> => {
+		MockShareLinksApiService.reset();
+	};
+
 	public static reset(): void {
-		MockApiService.shareByUrlVO = new ShareByUrlVO(MockApiService.initialData);
+		MockShareLinksApiService.shareByUrlVO = new ShareByUrlVO(
+			MockShareLinksApiService.initialData,
+		);
+		MockShareLinksApiService.mockShareLink = {
+			id: '1',
+			itemId: '1',
+			itemType: 'record',
+			token: 'example.com/test-token',
+			permissionsLevel: 'viewer',
+			accessRestrictions: 'none',
+			maxUses: null,
+			usesExpended: null,
+			expirationTimestamp: null,
+			createdAt: new Date('2023-02-15T20:31:36'),
+			updatedAt: new Date('2023-02-15T20:31:36'),
+		};
 	}
 }
 export class MockRelationshipService {
@@ -41,4 +96,43 @@ export class MockRelationshipService {
 export class MockPromptService {
 	public async confirm() {}
 }
+export class MockShareLinkMappingService {
+	public calculateAccessRestrictions = (
+		linkType: string,
+		autoApprove: number,
+	) => {
+		if (linkType === 'public') {
+			return 'none';
+		}
+		return 'restricted';
+	};
+
+	public getExpirationFromExpirationTimestamp = (
+		expirationTimestamp: Date,
+		createdAt: Date,
+	): Expiration => {
+		if (!expirationTimestamp) {
+			return Expiration.Never;
+		}
+		return Expiration.Never;
+	};
+
+	public getExpiresDTFromExpiration = (
+		expiration: Expiration,
+		createdAt: Date,
+	): string | null => {
+		if (expiration === Expiration.Never) {
+			return null;
+		}
+		return '2024-01-01T00:00:00';
+	};
+}
+export class MockFeatureFlagService {
+	public isEnabled = (flag: string): boolean => false;
+}
+export class MockGoogleAnalyticsService {
+	public sendEvent = (params: any): void => {
+		// No-op for tests
+	};
+}
 export class NullDependency {}