diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 94c046d70..aec850a5d 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -93,33 +93,35 @@
- @if (savedViewService.loading || savedViewService.sidebarViews?.length > 0) {
+ @if (savedViewService.loading) {
+ } @else if (savedViewService.sidebarViews?.length > 0) {
+
+
+ @for (view of savedViewService.sidebarViews; track view.id) {
+ -
+
+ {{view.name}}
+
+ @if (settingsService.organizingSidebarSavedViews) {
+
+
+
+ }
+
+ }
+
}
-
- @for (view of savedViewService.sidebarViews; track view.id) {
- -
-
- {{view.name}}
-
- @if (settingsService.organizingSidebarSavedViews) {
-
-
-
- }
-
- }
-
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index 7d6c2531c..4d4968ea4 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -35,7 +35,6 @@ import {
} from '@angular/cdk/drag-drop'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component'
-import { ObjectWithId } from 'src/app/data/object-with-id'
@Component({
selector: 'pngx-app-frame',
diff --git a/src-ui/src/app/services/rest/saved-view.service.spec.ts b/src-ui/src/app/services/rest/saved-view.service.spec.ts
index fb9271362..44ee8c05c 100644
--- a/src-ui/src/app/services/rest/saved-view.service.spec.ts
+++ b/src-ui/src/app/services/rest/saved-view.service.spec.ts
@@ -69,6 +69,16 @@ describe(`Additional service tests for SavedViewService`, () => {
expect(service.sidebarViews).toHaveLength(3)
})
+ it('should gracefully handle errors', () => {
+ service.initialize()
+ const req = httpTestingController.expectOne(
+ `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+ )
+ req.error(new ErrorEvent('error'))
+ expect(service.loading).toBeFalsy()
+ expect(service.allViews).toHaveLength(0)
+ })
+
it('should support patchMany', () => {
subscription = service.patchMany(saved_views).subscribe()
saved_views.forEach((saved_view) => {
diff --git a/src-ui/src/app/services/rest/saved-view.service.ts b/src-ui/src/app/services/rest/saved-view.service.ts
index 2a716bff1..1b81f2054 100644
--- a/src-ui/src/app/services/rest/saved-view.service.ts
+++ b/src-ui/src/app/services/rest/saved-view.service.ts
@@ -3,7 +3,6 @@ import { Injectable } from '@angular/core'
import { combineLatest, Observable } from 'rxjs'
import { tap } from 'rxjs/operators'
import { SavedView } from 'src/app/data/saved-view'
-import { PermissionsService } from '../permissions.service'
import { AbstractPaperlessService } from './abstract-paperless-service'
import { SettingsService } from '../settings.service'
import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
@@ -12,11 +11,11 @@ import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
providedIn: 'root',
})
export class SavedViewService extends AbstractPaperlessService {
- loading: boolean
+ public loading: boolean = true
+ private savedViews: SavedView[] = []
constructor(
- http: HttpClient,
- permissionService: PermissionsService,
+ protected http: HttpClient,
private settingsService: SettingsService
) {
super(http, 'saved_views')
@@ -27,16 +26,19 @@ export class SavedViewService extends AbstractPaperlessService {
}
private reload() {
- this.loading = true
- this.listAll().subscribe((r) => {
- this.savedViews = r.results
- this.loading = false
- this.settingsService.dashboardIsEmpty = this.dashboardViews.length === 0
+ this.listAll().subscribe({
+ next: (r) => {
+ this.savedViews = r.results
+ this.loading = false
+ this.settingsService.dashboardIsEmpty = this.dashboardViews.length === 0
+ },
+ error: () => {
+ this.loading = false
+ this.settingsService.dashboardIsEmpty = true
+ },
})
}
- private savedViews: SavedView[] = []
-
get allViews() {
return this.savedViews
}