Merge pull request #765 from PermanentOrg/per-10298-clean

Create/edit/delete share links

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

@@ -4,6 +4,7 @@ import { Subject } from 'rxjs';
 import debug from 'debug';
 
 import { ApiService } from '@shared/services/api/api.service';
+import { ShareLinksApiService } from '@root/app/share-links/services/share-links-api.service';
 import { DataService } from '@shared/services/data/data.service';
 import { MessageService } from '@shared/services/message/message.service';
 
@@ -16,6 +17,8 @@ import {
 	ShareVO,
 } from '@root/app/models';
 
+import { ShareLink } from '@root/app/share-links/models/share-link';
+
 import {
 	FolderResponse,
 	RecordResponse,
@@ -124,6 +127,7 @@ export class EditService {
 
 	constructor(
 		private api: ApiService,
+		private shareApi: ShareLinksApiService,
 		private message: MessageService,
 		private folderPicker: FolderPickerService,
 		private dataService: DataService,
@@ -252,11 +256,14 @@ export class EditService {
 					const response: ShareResponse = await this.api.share.getShareLink(
 						items[0],
 					);
+					const newShareLink = await this.fetchShareLinkFromResponse(response);
+
 					actionDeferred.resolve();
 					this.dialog.open(SharingComponent, {
 						data: {
 							item: items[0],
 							link: response.getShareByUrlVO(),
+							newShare: newShareLink,
 						},
 					});
 					break;
@@ -416,7 +423,7 @@ export class EditService {
 				});
 			}
 
-			if (recordResponse) {
+			if (recordResponse && recordResponse.length > 0) {
 				const res = recordResponse[0];
 
 				const newData: RecordVOData = {
@@ -521,17 +528,26 @@ export class EditService {
 
 	async openShareDialog(item: ItemVO) {
 		const response = await this.api.share.getShareLink(item);
+		const newShareLink = await this.fetchShareLinkFromResponse(response);
 		if (this.device.isMobile()) {
 			try {
 				this.dialog.open(SharingComponent, {
 					panelClass: 'dialog',
-					data: { item, link: response.getShareByUrlVO() },
+					data: {
+						item,
+						link: response.getShareByUrlVO(),
+						newShare: newShareLink,
+					},
 				});
 			} catch (err) {}
 		} else {
 			try {
 				this.dialog.open(SharingDialogComponent, {
-					data: { item, link: response.getShareByUrlVO() },
+					data: {
+						item,
+						link: response.getShareByUrlVO(),
+						newShare: newShareLink,
+					},
 					width: '600px',
 					panelClass: 'dialog',
 				});
@@ -548,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 },