diff --git a/src-ui/src/app/components/admin/trash/trash.component.scss b/src-ui/src/app/components/admin/trash/trash.component.scss
index e69de29bb..648aa7f4d 100644
--- a/src-ui/src/app/components/admin/trash/trash.component.scss
+++ b/src-ui/src/app/components/admin/trash/trash.component.scss
@@ -0,0 +1,8 @@
+.data-row {
+ opacity: 0;
+ transition: opacity .2s;
+}
+
+.reveal {
+ opacity: 1;
+}
diff --git a/src-ui/src/app/components/admin/trash/trash.component.spec.ts b/src-ui/src/app/components/admin/trash/trash.component.spec.ts
index 9ac89d9a5..066311726 100644
--- a/src-ui/src/app/components/admin/trash/trash.component.spec.ts
+++ b/src-ui/src/app/components/admin/trash/trash.component.spec.ts
@@ -69,6 +69,7 @@ describe('TrashComponent', () => {
})
it('should call correct service method on reload', () => {
+ jest.useFakeTimers()
const trashSpy = jest.spyOn(trashService, 'getTrash')
trashSpy.mockReturnValue(
of({
@@ -78,6 +79,7 @@ describe('TrashComponent', () => {
})
)
component.reload()
+ jest.advanceTimersByTime(100)
expect(trashSpy).toHaveBeenCalled()
expect(component.documentsInTrash).toEqual(documentsInTrash)
})
diff --git a/src-ui/src/app/components/admin/trash/trash.component.ts b/src-ui/src/app/components/admin/trash/trash.component.ts
index 9364d4cce..055c5fa97 100644
--- a/src-ui/src/app/components/admin/trash/trash.component.ts
+++ b/src-ui/src/app/components/admin/trash/trash.component.ts
@@ -4,7 +4,7 @@ import { Document } from 'src/app/data/document'
import { ToastService } from 'src/app/services/toast.service'
import { TrashService } from 'src/app/services/trash.service'
import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
-import { Subject, takeUntil } from 'rxjs'
+import { delay, Subject, takeUntil, tap } from 'rxjs'
import { SettingsService } from 'src/app/services/settings.service'
import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
import { Router } from '@angular/router'
@@ -21,6 +21,7 @@ export class TrashComponent implements OnDestroy {
public page: number = 1
public totalDocuments: number
public isLoading: boolean = false
+ public reveal: boolean = false
unsubscribeNotifier: Subject = new Subject()
constructor(
@@ -40,12 +41,20 @@ export class TrashComponent implements OnDestroy {
reload() {
this.isLoading = true
- this.trashService.getTrash(this.page).subscribe((r) => {
- this.documentsInTrash = r.results
- this.totalDocuments = r.count
- this.isLoading = false
- this.selectedDocuments.clear()
- })
+ this.trashService
+ .getTrash(this.page)
+ .pipe(
+ tap((r) => {
+ this.documentsInTrash = r.results
+ this.totalDocuments = r.count
+ this.selectedDocuments.clear()
+ }),
+ delay(100)
+ )
+ .subscribe(() => {
+ this.reveal = true
+ this.isLoading = false
+ })
}
delete(document: Document) {
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 4b217f8c3..27f19475c 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -11,8 +11,19 @@
>
@if (savedViewService.loading) {
-
- Loading...
+
}
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
index 2846e0d04..2cce1a848 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
@@ -9,8 +9,9 @@
Show all
}
- @if (documents.length && displayMode === DisplayMode.TABLE) {
-
+
+
+
+
+
+
+
+
+
+
+