From 5828d5bcdc690c88d13ded20763d0341dcb4a680 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Thu, 30 Nov 2023 14:23:42 -0800
Subject: [PATCH] Revert "Fix loading indicator"

This reverts commit 014c24b8cf70c2e99d4efd6a619e258629ac90c5.
---
 .../document-detail/document-detail.component.html         | 3 ++-
 .../document-detail/document-detail.component.ts           | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 8d31f8f8e..9883bb39b 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -240,7 +240,7 @@
 </div>
 
 <ng-template #previewContent>
-    <div *ngIf="!metadata" class="w-100 h-100 d-flex align-items-center justify-content-center">
+    <div *ngIf="previewLoading" class="w-100 h-100 d-flex align-items-center justify-content-center">
         <div>
             <div class="spinner-border spinner-border-sm me-2" role="status"></div>
             <ng-container i18n>Loading...</ng-container>
@@ -255,6 +255,7 @@
                 [showBorders]="false"
                 [zoom]="previewZoomSetting"
                 (pagesLoaded)="onPagesLoaded($event)"
+                (pdfLoadingStarts)="onPdfLoadingStarts()"
                 (pdfLoadingFailed)="onPdfLoadingFailed($event)"
                 (beforePrint)="onBeforePrint()"
                 (afterPrint)="onAfterPrint()"
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 52655e733..6196911e1 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -157,6 +157,7 @@ export class DocumentDetailComponent
   previewCurrentPage: number = 1
   previewNumPages: number = 1
   previewZoomSetting: ZoomSetting = ZoomSetting.Width
+  previewLoading: boolean = true
 
   printLoadingModal: NgbModalRef
 
@@ -450,6 +451,8 @@ export class DocumentDetailComponent
       .subscribe({
         next: (result) => {
           this.metadata = result
+          if (this.getContentType() !== 'application/pdf')
+            this.previewLoading = false
         },
         error: (error) => {
           this.metadata = null
@@ -771,6 +774,10 @@ export class DocumentDetailComponent
       })
   }
 
+  onPdfLoadingStarts() {
+    this.previewLoading = false
+  }
+
   onPagesLoaded(event: PagesLoadedEvent) {
     this.previewNumPages = event.pagesCount
   }