Skip to content

Commit 20cebec

Browse files
authored
Merge pull request #855 from PermanentOrg/PER-10371-unlisted-share-preview-broken
[PER-10371] Unlisted share record preview fixes
2 parents 540ad06 + ed919db commit 20cebec

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ describe('SharePreviewComponent', () => {
9494
mockRoute.snapshot.data = {
9595
sharePreviewVO: {
9696
ArchiveVO: {},
97+
FolderVO: {},
9798
AccountVO: { fullName: 'Sharer Name' },
9899
ShareVO: { accessRole: 'viewer', status: 'pending' },
99100
status: 'pending',

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,15 @@ export class SharePreviewComponent implements OnInit, OnDestroy {
197197
this.isUnlistedShare = await this.shareLinksService.isUnlistedShare();
198198

199199
if (this.isUnlistedShare) {
200-
this.ephemeralFolder = await this.filesystemService.getFolder(
201-
this.route.snapshot.data.sharePreviewVO.FolderVO,
202-
);
200+
if (this.route.snapshot.data.sharePreviewVO?.FolderVO) {
201+
this.ephemeralFolder = await this.filesystemService.getFolder(
202+
this.route.snapshot.data.sharePreviewVO.FolderVO,
203+
);
204+
} else {
205+
this.ephemeralFolder = this.route.snapshot.data.currentFolder;
206+
this.ephemeralFolder.folderId =
207+
this.route.snapshot.data.sharePreviewVO?.RecordVO?.parentFolderId;
208+
}
203209
this.dataService.ephemeralFolder = this.ephemeralFolder;
204210
this.dataService.pushBreadcrumbFolder(this.ephemeralFolder);
205211
}

src/app/share-preview/resolves/preview-resolve.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ export class PreviewResolveService {
9191
if (!sharePreviewVO.previewToggle && !showPreview) {
9292
const dummy = dummyItems[0];
9393
record = cloneDeep(record);
94-
record.thumbURL200 = dummy.thumbURL200;
95-
record.thumbURL500 = dummy.thumbURL500;
96-
record.thumbURL1000 = dummy.thumbURL1000;
94+
record.thumbURL200 = record.thumbURL200 || dummy.thumbURL200;
95+
record.thumbURL500 = record.thumbURL500 || dummy.thumbURL500;
96+
record.thumbURL1000 = record.thumbURL1000 || dummy.thumbURL1000;
9797
record.archiveNbr = dummy.archiveNbr;
9898
}
9999

0 commit comments

Comments
 (0)