Fix arrow nav

Author: crisnicandrei

src/app/file-browser/components/file-list-item/file-list-item.component.ts

@@ -596,13 +596,16 @@ export class FileListItemComponent
       this.router.navigate(['/shares/record', this.item.archiveNbr]);
     } else {
       if (this.item.archiveNumber) {
+        console.log('here?');
         this.router.navigate(
           ['record', 'v2', (this.item as RecordVO).recordId],
           {
             relativeTo: this.route,
           },
         );
       } else if (this.item.archiveNbr) {
+        console.log('here?');
+
         this.router.navigate(['record', this.item.archiveNbr], {
           relativeTo: this.route,
         });
@@ -1144,7 +1147,7 @@ export class FileListItemComponent
 
   private showFolderIcon(): boolean {
     return (
-      this.item.isFolder &&
+      (this.item.isFolder || this.item.folderId) &&
       this.folderContentsType !== FolderContentsType.NORMAL
     );
   }

src/app/file-browser/components/file-list/file-list.component.ts

@@ -362,7 +362,6 @@ export class FileListComponent
   }
 
   ngOnDestroy() {
-    // this.dataService.setCurrentFolder();
     unsubscribeAll(this.subscriptions);
     if (this.unlistenMouseMove) {
       this.unlistenMouseMove();
@@ -439,8 +438,6 @@ export class FileListComponent
   }
 
   onItemClick(itemClick: ItemClickEvent) {
-    // this.itemClicked.emit(itemClick);
-
     if (!this.showSidebar || !itemClick.selectable) {
       return;
     }

src/app/file-browser/components/file-viewer-v2/file-viewer-v2.component.ts

@@ -405,9 +405,8 @@ export class FileViewerV2Component implements OnInit, OnDestroy {
 
   navigateToCurrentRecord(index = 0) {
     const record = this.records[index];
-    this.router.navigate(['../', record.archiveNumber], {
+    this.router.navigate(['../', record.recordId], {
       relativeTo: this.route,
-      queryParamsHandling: 'preserve',
     });
     this.loadingRecord = false;
   }

src/app/models/record-vo.ts

@@ -52,6 +52,7 @@ export class RecordVO
   public uploadFileName;
   public downloadName;
   public uploadAccountId;
+  public folderId;
   public size;
   public description;
   public displayDT;
@@ -207,6 +208,7 @@ export interface RecordVOData extends BaseVOData {
   thumbURL2000?: string;
   thumbnail256?: string;
   thumbnail256CloudPath?: string;
+  folderId?: any;
   thumbDT?: any;
   fileStatus?: any;
   status?: any;

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

@@ -56,6 +56,8 @@ export class SharePreviewComponent implements OnInit, OnDestroy, AfterViewInit {
   account: AccountVO = this.accountService.getAccount();
   archive: ArchiveVO = this.accountService.getArchive();
 
+  private isPrivateLink = false;
+
   sharePreviewVO =
     this.route.snapshot.data.sharePreviewVO ||
     this.route.snapshot.data.sharePreviewItem;
@@ -204,6 +206,12 @@ export class SharePreviewComponent implements OnInit, OnDestroy, AfterViewInit {
 
   async ngOnInit() {
     this.checkAccess();
+    if (
+      !this.account &&
+      this.sharePreviewVO.shareLinkResponse?.accessRestrictions === 'account'
+    ) {
+      this.isPrivateLink = true;
+    }
 
     if (!this.hasAccess) {
       this.sendGaEvent('previewed');
@@ -260,8 +268,6 @@ export class SharePreviewComponent implements OnInit, OnDestroy, AfterViewInit {
     this.account = this.accountService.getAccount();
     this.shareArchive = this.sharePreviewVO.ArchiveVO;
 
-    this.shareAccount = this.sharePreviewVO.AccountVO;
-
     if (this.isInvite) {
       this.hasAccess = this.sharePreviewVO.status.includes('accepted');
     }
@@ -689,10 +695,14 @@ export class SharePreviewComponent implements OnInit, OnDestroy, AfterViewInit {
 
     this.fileListClickListener = componentReference.itemClicked.subscribe(
       (item) => {
-        this.router.navigate(['record', 'v2', item.item.archiveNumber], {
-          relativeTo: this.route,
-          queryParamsHandling: 'preserve',
-        });
+        if (this.isPrivateLink) {
+          this.showCreateAccountDialog();
+        } else {
+          this.router.navigate(['record', 'v2', item.item.archiveNumber], {
+            relativeTo: this.route,
+            queryParamsHandling: 'preserve',
+          });
+        }
       },
     );
   }