From 889fe5890dfb3c939c9b8d6c445920eeefcdf0ba Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 14 Dec 2020 20:59:18 +0100 Subject: [PATCH] refactored titles --- .../page-header/page-header.component.ts | 22 +++++++++++++------ .../dashboard/dashboard.component.ts | 6 +---- .../document-detail.component.ts | 6 +---- .../document-list/document-list.component.ts | 7 +----- .../correspondent-list.component.ts | 11 ++-------- .../document-type-list.component.ts | 12 +++------- .../components/manage/logs/logs.component.ts | 5 +---- .../manage/settings/settings.component.ts | 11 ++-------- .../manage/tag-list/tag-list.component.ts | 14 +++--------- .../app/components/search/search.component.ts | 5 +---- 10 files changed, 30 insertions(+), 69 deletions(-) diff --git a/src-ui/src/app/components/common/page-header/page-header.component.ts b/src-ui/src/app/components/common/page-header/page-header.component.ts index 93ec3bfb7..153e6bea6 100644 --- a/src-ui/src/app/components/common/page-header/page-header.component.ts +++ b/src-ui/src/app/components/common/page-header/page-header.component.ts @@ -1,21 +1,29 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; +import { Title } from '@angular/platform-browser'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-page-header', templateUrl: './page-header.component.html', styleUrls: ['./page-header.component.scss'] }) -export class PageHeaderComponent implements OnInit { +export class PageHeaderComponent { - constructor() { } + constructor(private titleService: Title) { } + + _title = "" @Input() - title: string = "" + set title(title: string) { + this._title = title + this.titleService.setTitle(`${this.title} - ${environment.appTitle}`) + } + + get title() { + return this._title + } @Input() subTitle: string = "" - ngOnInit(): void { - } - } diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index 57744d194..a14ec5e90 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; 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'; @Component({ @@ -13,8 +11,7 @@ import { environment } from 'src/environments/environment'; export class DashboardComponent implements OnInit { constructor( - private savedViewService: SavedViewService, - private titleService: Title) { } + private savedViewService: SavedViewService) { } savedViews: PaperlessSavedView[] = [] @@ -23,7 +20,6 @@ export class DashboardComponent implements OnInit { 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/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 4aac9c769..5fe9f9250 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 @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; @@ -12,7 +11,6 @@ import { OpenDocumentsService } from 'src/app/services/open-documents.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { DocumentService } from 'src/app/services/rest/document.service'; -import { environment } from 'src/environments/environment'; import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'; import { CorrespondentEditDialogComponent } from '../manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component'; import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component'; @@ -56,8 +54,7 @@ export class DocumentDetailComponent implements OnInit { private router: Router, private modalService: NgbModal, private openDocumentService: OpenDocumentsService, - private documentListViewService: DocumentListViewService, - private titleService: Title) { } + private documentListViewService: DocumentListViewService) { } getContentType() { return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type @@ -90,7 +87,6 @@ export class DocumentDetailComponent implements OnInit { updateComponent(doc: PaperlessDocument) { this.document = doc - this.titleService.setTitle(`${doc.title} - ${environment.appTitle}`) this.documentsService.getMetadata(doc.id).subscribe(result => { this.metadata = result }) diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 1653b0965..d31b12e6c 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PaperlessSavedView } from 'src/app/data/paperless-saved-view'; @@ -7,7 +6,6 @@ import { DocumentListViewService } from 'src/app/services/document-list-view.ser import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service'; import { SavedViewService } from 'src/app/services/rest/saved-view.service'; import { Toast, ToastService } from 'src/app/services/toast.service'; -import { environment } from 'src/environments/environment'; import { FilterEditorComponent } from '../filter-editor/filter-editor.component'; import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component'; @@ -24,8 +22,7 @@ export class DocumentListComponent implements OnInit { public route: ActivatedRoute, private router: Router, private toastService: ToastService, - public modalService: NgbModal, - private titleService: Title) { } + public modalService: NgbModal) { } @ViewChild("filterEditor") private filterEditor: FilterEditorComponent @@ -62,12 +59,10 @@ export class DocumentListComponent implements OnInit { } this.list.savedView = view - this.titleService.setTitle(`${this.list.savedView.name} - ${environment.appTitle}`) this.list.reload() }) } else { this.list.savedView = null - this.titleService.setTitle(`Documents - ${environment.appTitle}`) this.list.reload() } }) diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts index 11027c60f..effae2826 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts @@ -1,9 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; -import { environment } from 'src/environments/environment'; import { GenericListComponent } from '../generic-list/generic-list.component'; import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/correspondent-edit-dialog.component'; @@ -12,9 +10,9 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co templateUrl: './correspondent-list.component.html', styleUrls: ['./correspondent-list.component.scss'] }) -export class CorrespondentListComponent extends GenericListComponent implements OnInit { +export class CorrespondentListComponent extends GenericListComponent { - constructor(correspondentsService: CorrespondentService, modalService: NgbModal, private titleService: Title) { + constructor(correspondentsService: CorrespondentService, modalService: NgbModal,) { super(correspondentsService,modalService,CorrespondentEditDialogComponent) } @@ -22,9 +20,4 @@ export class CorrespondentListComponent extends GenericListComponent implements OnInit { +export class DocumentTypeListComponent extends GenericListComponent { - constructor(service: DocumentTypeService, modalService: NgbModal, private titleService: Title) { + constructor(service: DocumentTypeService, modalService: NgbModal) { super(service, modalService, DocumentTypeEditDialogComponent) } @@ -22,8 +20,4 @@ export class DocumentTypeListComponent extends GenericListComponent {}) } diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts index efbe11321..32093e0a8 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts @@ -1,9 +1,7 @@ -import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; +import { Component } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag'; import { TagService } from 'src/app/services/rest/tag.service'; -import { environment } from 'src/environments/environment'; import { GenericListComponent } from '../generic-list/generic-list.component'; import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component'; @@ -12,18 +10,12 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon templateUrl: './tag-list.component.html', styleUrls: ['./tag-list.component.scss'] }) -export class TagListComponent extends GenericListComponent implements OnInit { +export class TagListComponent extends GenericListComponent { - constructor(tagService: TagService, modalService: NgbModal, private titleService: Title) { + constructor(tagService: TagService, modalService: NgbModal) { super(tagService, modalService, TagEditDialogComponent) } - - ngOnInit(): void { - super.ngOnInit() - this.titleService.setTitle(`Tags - ${environment.appTitle}`) - } - getColor(id) { return TAG_COLOURS.find(c => c.id == id) } diff --git a/src-ui/src/app/components/search/search.component.ts b/src-ui/src/app/components/search/search.component.ts index 3371debd2..de8b4652f 100644 --- a/src-ui/src/app/components/search/search.component.ts +++ b/src-ui/src/app/components/search/search.component.ts @@ -1,9 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; import { SearchHit } from 'src/app/data/search-result'; import { SearchService } from 'src/app/services/rest/search.service'; -import { environment } from 'src/environments/environment'; @Component({ selector: 'app-search', @@ -28,7 +26,7 @@ export class SearchComponent implements OnInit { errorMessage: string - constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router, private titleService: Title) { } + constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router) { } ngOnInit(): void { this.route.queryParamMap.subscribe(paramMap => { @@ -36,7 +34,6 @@ export class SearchComponent implements OnInit { this.searching = true this.currentPage = 1 this.loadPage() - this.titleService.setTitle(`Search: ${this.query} - ${environment.appTitle}`) }) }