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 1cedeefde..7876150af 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 @@ -37,16 +37,16 @@ - 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 34e804db4..ef859bf35 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 @@ -5,8 +5,8 @@ import { from, Observable, Subscription } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, switchMap } from 'rxjs/operators'; import { PaperlessDocument } from 'src/app/data/paperless-document'; import { OpenDocumentsService } from 'src/app/services/open-documents.service'; +import { SavedViewService } from 'src/app/services/rest/saved-view.service'; import { SearchService } from 'src/app/services/rest/search.service'; -import { SavedViewConfigService } from 'src/app/services/saved-view-config.service'; import { DocumentDetailComponent } from '../document-detail/document-detail.component'; @Component({ @@ -21,7 +21,7 @@ export class AppFrameComponent implements OnInit, OnDestroy { private activatedRoute: ActivatedRoute, private openDocumentsService: OpenDocumentsService, private searchService: SearchService, - public viewConfigService: SavedViewConfigService + public savedViewService: SavedViewService ) { } diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index c7410c3f2..57744d194 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Title } from '@angular/platform-browser'; -import { SavedViewConfigService } from 'src/app/services/saved-view-config.service'; +import { PaperlessSavedView } from 'src/app/data/paperless-saved-view'; +import { SavedViewService } from 'src/app/services/rest/saved-view.service'; import { environment } from 'src/environments/environment'; @@ -12,14 +13,16 @@ import { environment } from 'src/environments/environment'; export class DashboardComponent implements OnInit { constructor( - public savedViewConfigService: SavedViewConfigService, + private savedViewService: SavedViewService, private titleService: Title) { } - savedViews = [] + savedViews: PaperlessSavedView[] = [] ngOnInit(): void { - this.savedViews = this.savedViewConfigService.getDashboardConfigs() + this.savedViewService.listAll().subscribe(results => { + this.savedViews = results.results.filter(savedView => savedView.show_on_dashboard) + }) this.titleService.setTitle(`Dashboard - ${environment.appTitle}`) } 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 e63ecc47b..194497d39 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 @@ -1,4 +1,4 @@ - + Show all diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts index a55bf57fc..5bfecc640 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { PaperlessDocument } from 'src/app/data/paperless-document'; -import { SavedViewConfig } from 'src/app/data/saved-view-config'; +import { PaperlessSavedView } from 'src/app/data/paperless-saved-view'; import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { DocumentService } from 'src/app/services/rest/document.service'; @@ -18,18 +18,18 @@ export class SavedViewWidgetComponent implements OnInit { private list: DocumentListViewService) { } @Input() - savedView: SavedViewConfig + savedView: PaperlessSavedView documents: PaperlessDocument[] = [] ngOnInit(): void { - this.documentService.list(1,10,this.savedView.sortField,this.savedView.sortDirection,this.savedView.filterRules).subscribe(result => { + this.documentService.list(1,10,this.savedView.sort_field, this.savedView.sort_reverse, this.savedView.filter_rules).subscribe(result => { this.documents = result.results }) } showAll() { - if (this.savedView.showInSideBar) { + if (this.savedView.show_in_sidebar) { this.router.navigate(['view', this.savedView.id]) } else { this.list.load(this.savedView) diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index df86507f0..acbfd3602 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -21,7 +21,7 @@ -
+
@@ -30,13 +30,13 @@