From dc36e8566a9d2b56d58be7b5a958669d38b99d84 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 7 Dec 2020 22:15:56 +0100 Subject: [PATCH] addresses #106 --- .../dashboard/dashboard.component.ts | 6 ++++- .../document-detail.component.ts | 6 ++++- .../document-list/document-list.component.ts | 7 +++++- .../correspondent-list.component.ts | 25 ++++++++++++------- .../document-type-list.component.ts | 13 +++++++--- .../components/manage/logs/logs.component.ts | 5 +++- .../manage/settings/settings.component.ts | 6 ++++- .../manage/tag-list/tag-list.component.ts | 12 +++++++-- .../app/components/search/search.component.ts | 5 +++- src-ui/src/environments/environment.prod.ts | 3 ++- src-ui/src/environments/environment.ts | 3 ++- 11 files changed, 69 insertions(+), 22 deletions(-) diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index aa2426179..c7410c3f2 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -1,5 +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 { environment } from 'src/environments/environment'; @Component({ @@ -10,13 +12,15 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi export class DashboardComponent implements OnInit { constructor( - public savedViewConfigService: SavedViewConfigService) { } + public savedViewConfigService: SavedViewConfigService, + private titleService: Title) { } savedViews = [] ngOnInit(): void { this.savedViews = this.savedViewConfigService.getDashboardConfigs() + 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 253833792..cf16f01c5 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,5 +1,6 @@ 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'; @@ -11,6 +12,7 @@ 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 { DeleteDialogComponent } from '../common/delete-dialog/delete-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'; @@ -51,7 +53,8 @@ export class DocumentDetailComponent implements OnInit { private router: Router, private modalService: NgbModal, private openDocumentService: OpenDocumentsService, - private documentListViewService: DocumentListViewService) { } + private documentListViewService: DocumentListViewService, + private titleService: Title) { } ngOnInit(): void { this.documentForm.valueChanges.subscribe(wow => { @@ -80,6 +83,7 @@ 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 fe6c8a894..dd939ac01 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,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { Title } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { cloneFilterRules, FilterRule } from 'src/app/data/filter-rule'; @@ -8,6 +9,7 @@ import { DocumentListViewService } from 'src/app/services/document-list-view.ser import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service'; import { SavedViewConfigService } from 'src/app/services/saved-view-config.service'; import { Toast, ToastService } from 'src/app/services/toast.service'; +import { environment } from 'src/environments/environment'; import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component'; @Component({ @@ -22,7 +24,8 @@ export class DocumentListComponent implements OnInit { public savedViewConfigService: SavedViewConfigService, public route: ActivatedRoute, private toastService: ToastService, - public modalService: NgbModal) { } + public modalService: NgbModal, + private titleService: Title) { } displayMode = 'smallCards' // largeCards, smallCards, details @@ -50,10 +53,12 @@ export class DocumentListComponent implements OnInit { this.list.savedView = this.savedViewConfigService.getConfig(params.get('id')) this.filterRules = this.list.filterRules this.showFilter = false + this.titleService.setTitle(`${this.list.savedView.title} - ${environment.appTitle}`) } else { this.list.savedView = null this.filterRules = this.list.filterRules this.showFilter = this.filterRules.length > 0 + this.titleService.setTitle(`Documents - ${environment.appTitle}`) } this.list.clear() 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 83aa5d2cc..11027c60f 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,7 +1,9 @@ -import { Component } from '@angular/core'; +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'; @@ -10,14 +12,19 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co templateUrl: './correspondent-list.component.html', styleUrls: ['./correspondent-list.component.scss'] }) -export class CorrespondentListComponent extends GenericListComponent { +export class CorrespondentListComponent extends GenericListComponent implements OnInit { - constructor(correspondentsService: CorrespondentService, - modalService: NgbModal) { - super(correspondentsService,modalService,CorrespondentEditDialogComponent) - } + constructor(correspondentsService: CorrespondentService, modalService: NgbModal, private titleService: Title) { + super(correspondentsService,modalService,CorrespondentEditDialogComponent) + } + + getObjectName(object: PaperlessCorrespondent) { + return `correspondent '${object.name}'` + } + + ngOnInit(): void { + super.ngOnInit() + this.titleService.setTitle(`Correspondents - ${environment.appTitle}`) + } - getObjectName(object: PaperlessCorrespondent) { - return `correspondent '${object.name}'` - } } diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts index 733d2c44b..5276187ab 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts +++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts @@ -1,7 +1,9 @@ import { Component, OnInit } from '@angular/core'; +import { Title } from '@angular/platform-browser'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; +import { environment } from 'src/environments/environment'; import { GenericListComponent } from '../generic-list/generic-list.component'; import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/document-type-edit-dialog.component'; @@ -12,11 +14,16 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc }) export class DocumentTypeListComponent extends GenericListComponent { - constructor(service: DocumentTypeService, modalService: NgbModal) { + constructor(service: DocumentTypeService, modalService: NgbModal, private titleService: Title) { super(service, modalService, DocumentTypeEditDialogComponent) - } + } - getObjectName(object: PaperlessDocumentType) { + getObjectName(object: PaperlessDocumentType) { return `document type '${object.name}'` } + + ngOnInit(): void { + super.ngOnInit() + this.titleService.setTitle(`Document types - ${environment.appTitle}`) + } } diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts index d52b90a5a..565b8b9b5 100644 --- a/src-ui/src/app/components/manage/logs/logs.component.ts +++ b/src-ui/src/app/components/manage/logs/logs.component.ts @@ -1,7 +1,9 @@ import { Component, OnInit } from '@angular/core'; +import { Title } from '@angular/platform-browser'; import { kMaxLength } from 'buffer'; import { LOG_LEVELS, LOG_LEVEL_INFO, PaperlessLog } from 'src/app/data/paperless-log'; import { LogService } from 'src/app/services/rest/log.service'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-logs', @@ -10,13 +12,14 @@ import { LogService } from 'src/app/services/rest/log.service'; }) export class LogsComponent implements OnInit { - constructor(private logService: LogService) { } + constructor(private logService: LogService, private titleService: Title) { } logs: PaperlessLog[] = [] level: number = LOG_LEVEL_INFO ngOnInit(): void { this.reload() + this.titleService.setTitle(`Logs - ${environment.appTitle}`) } reload() { diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index 1b93268fc..c7b976c65 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -1,9 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; +import { Title } from '@angular/platform-browser'; import { SavedViewConfig } from 'src/app/data/saved-view-config'; import { GENERAL_SETTINGS } from 'src/app/data/storage-keys'; import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { SavedViewConfigService } from 'src/app/services/saved-view-config.service'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-settings', @@ -18,10 +20,12 @@ export class SettingsComponent implements OnInit { constructor( private savedViewConfigService: SavedViewConfigService, - private documentListViewService: DocumentListViewService + private documentListViewService: DocumentListViewService, + private titleService: Title ) { } ngOnInit(): void { + this.titleService.setTitle(`Settings - ${environment.appTitle}`) } deleteViewConfig(config: SavedViewConfig) { 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 761a9484c..55a37f194 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,7 +1,9 @@ import { Component } from '@angular/core'; +import { Title } from '@angular/platform-browser'; 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 { CorrespondentEditDialogComponent } from '../correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component'; import { GenericListComponent } from '../generic-list/generic-list.component'; import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component'; @@ -13,9 +15,15 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon }) export class TagListComponent extends GenericListComponent { - constructor(tagService: TagService, modalService: NgbModal) { + constructor(tagService: TagService, modalService: NgbModal, private titleService: Title) { 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 de8b4652f..3371debd2 100644 --- a/src-ui/src/app/components/search/search.component.ts +++ b/src-ui/src/app/components/search/search.component.ts @@ -1,7 +1,9 @@ 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', @@ -26,7 +28,7 @@ export class SearchComponent implements OnInit { errorMessage: string - constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router) { } + constructor(private searchService: SearchService, private route: ActivatedRoute, private router: Router, private titleService: Title) { } ngOnInit(): void { this.route.queryParamMap.subscribe(paramMap => { @@ -34,6 +36,7 @@ export class SearchComponent implements OnInit { this.searching = true this.currentPage = 1 this.loadPage() + this.titleService.setTitle(`Search: ${this.query} - ${environment.appTitle}`) }) } diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 2d8d5261b..09154dfca 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -1,4 +1,5 @@ export const environment = { production: true, - apiBaseUrl: "/api/" + apiBaseUrl: "/api/", + appTitle: "Paperless-ng" }; diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts index a0877d69f..5e4b148dc 100644 --- a/src-ui/src/environments/environment.ts +++ b/src-ui/src/environments/environment.ts @@ -4,7 +4,8 @@ export const environment = { production: false, - apiBaseUrl: "http://localhost:8000/api/" + apiBaseUrl: "http://localhost:8000/api/", + appTitle: "DEVELOPMENT P-NG" }; /*