paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-23 10:39:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

dashboard loading indicator, remove duplicate call to saved views

Browse Source
This commit is contained in:
Michael Shamoon 2022-05-08 14:17:11 -07:00
parent 7f7ec625c8
commit b30c4275ef
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src-ui/src/app/components/dashboard/dashboard.component.html
View File

@ -21,9 +21,14 @@
<div class='row'> <div class='row'>
<div class="col-lg-8"> <div class="col-lg-8">
<app-welcome-widget *ngIf="savedViews.length == 0"></app-welcome-widget> <ng-container *ngIf="savedViewService.loading">
<div class="spinner-border spinner-border-sm me-2" role="status"></div>
<ng-container i18n>Loading...</ng-container>
</ng-container>
<ng-container *ngFor="let v of savedViews"> <app-welcome-widget *ngIf="!savedViewService.loading && savedViewService.dashboardViews.length == 0"></app-welcome-widget>
<ng-container *ngFor="let v of savedViewService.dashboardViews">
<app-saved-view-widget [savedView]="v"></app-saved-view-widget> <app-saved-view-widget [savedView]="v"></app-saved-view-widget>
</ng-container> </ng-container>

15
src-ui/src/app/components/dashboard/dashboard.component.ts
View File

@ -1,6 +1,5 @@
import { Component, OnInit } from '@angular/core' import { Component, OnInit } from '@angular/core'
import { Meta } from '@angular/platform-browser' import { Meta } from '@angular/platform-browser'
import { PaperlessSavedView } from 'src/app/data/paperless-saved-view'
import { SavedViewService } from 'src/app/services/rest/saved-view.service' import { SavedViewService } from 'src/app/services/rest/saved-view.service'
@Component({ @Component({
@ -8,8 +7,8 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service'
templateUrl: './dashboard.component.html', templateUrl: './dashboard.component.html',
styleUrls: ['./dashboard.component.scss'], styleUrls: ['./dashboard.component.scss'],
}) })
export class DashboardComponent implements OnInit { export class DashboardComponent {
constructor(private savedViewService: SavedViewService, private meta: Meta) {} constructor(public savedViewService: SavedViewService, private meta: Meta) {}
get displayName() { get displayName() {
let tagFullName = this.meta.getTag('name=full_name') let tagFullName = this.meta.getTag('name=full_name')
@ -30,14 +29,4 @@ export class DashboardComponent implements OnInit {
return $localize`Welcome to Paperless-ngx!` return $localize`Welcome to Paperless-ngx!`
} }
} }
savedViews: PaperlessSavedView[] = []
ngOnInit(): void {
this.savedViewService.listAll().subscribe((results) => {
this.savedViews = results.results.filter(
(savedView) => savedView.show_on_dashboard
)
})
}
} }