From 5bf5710d39e4e878a6e3fff67406ce1d6d6fc7db Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 15 Dec 2022 22:48:16 -0800 Subject: [PATCH] lint frontend --- src-ui/src/app/app.module.ts | 4 +-- .../clearable-badge.component.ts | 2 +- .../edit-dialog/edit-dialog.component.ts | 4 +-- .../storage-path-edit-dialog.component.html | 2 +- .../filterable-dropdown.component.ts | 4 +-- .../select-dialog/select-dialog.component.ts | 6 ++-- .../components/common/tag/tag.component.ts | 6 ++-- .../statistics-widget.component.html | 2 +- .../upload-file-widget.component.ts | 9 ++--- .../welcome-widget.component.ts | 6 ++-- .../widget-frame/widget-frame.component.ts | 6 ++-- .../document-detail.component.html | 18 +++++----- .../metadata-collapse.component.ts | 6 ++-- .../bulk-editor/bulk-editor.component.ts | 4 +-- .../document-card-large.component.ts | 5 +-- .../document-card-small.component.ts | 5 +-- .../document-list.component.html | 24 ++++++------- .../filter-editor.component.html | 6 ++-- .../management-list.component.html | 8 ++--- .../manage/settings/settings.component.html | 10 +++--- .../manage/tasks/tasks.component.html | 12 +++---- .../not-found/not-found.component.ts | 6 ++-- .../src/app/directives/sortable.directive.ts | 35 ++++++++++++------- 23 files changed, 90 insertions(+), 100 deletions(-) diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index ea366b968..70939b928 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -24,7 +24,7 @@ import { CorrespondentEditDialogComponent } from './components/common/edit-dialo import { TagEditDialogComponent } from './components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component' import { DocumentTypeEditDialogComponent } from './components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component' import { TagComponent } from './components/common/tag/tag.component' -import { ClearableBadge } from './components/common/clearable-badge/clearable-badge.component' +import { ClearableBadgeComponent } from './components/common/clearable-badge/clearable-badge.component' import { PageHeaderComponent } from './components/common/page-header/page-header.component' import { AppFrameComponent } from './components/app-frame/app-frame.component' import { ToastsComponent } from './components/common/toasts/toasts.component' @@ -146,7 +146,7 @@ function initializeApp(settings: SettingsService) { DocumentTypeEditDialogComponent, StoragePathEditDialogComponent, TagComponent, - ClearableBadge, + ClearableBadgeComponent, PageHeaderComponent, AppFrameComponent, ToastsComponent, diff --git a/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts b/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts index 93f63d4d8..0f0b7d64f 100644 --- a/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts +++ b/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts @@ -5,7 +5,7 @@ import { Component, Input, Output, EventEmitter } from '@angular/core' templateUrl: './clearable-badge.component.html', styleUrls: ['./clearable-badge.component.scss'], }) -export class ClearableBadge { +export class ClearableBadgeComponent { constructor() {} @Input() diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts index 9bf141e78..07c3dfbd8 100644 --- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts @@ -22,7 +22,7 @@ export abstract class EditDialogComponent object: T @Output() - success = new EventEmitter() + succeeded = new EventEmitter() networkActive = false @@ -95,7 +95,7 @@ export abstract class EditDialogComponent serverResponse.subscribe({ next: (result) => { this.activeModal.close() - this.success.emit(result) + this.succeeded.emit(result) }, error: (error) => { this.error = error.error diff --git a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html index 280c101a6..c5cfe3647 100644 --- a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html @@ -6,7 +6,7 @@
-

+

Note that editing a path does not apply changes to stored files until you have run the 'document_renamer' utility. See the documentation.

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 373f0aa5d..165fc7779 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -321,7 +321,7 @@ export class FilterableDropdownComponent { apply = new EventEmitter() @Output() - open = new EventEmitter() + opened = new EventEmitter() get operatorToggleEnabled(): boolean { return ( @@ -356,7 +356,7 @@ export class FilterableDropdownComponent { if (this.editing) { this.selectionModel.reset() } - this.open.next(this) + this.opened.next(this) } else { this.filterText = '' if (this.applyOnClose && this.selectionModel.isDirty()) { diff --git a/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts b/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts index dc0375caf..c341ac96b 100644 --- a/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts +++ b/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' +import { Component, EventEmitter, Input, Output } from '@angular/core' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' import { ObjectWithId } from 'src/app/data/object-with-id' @@ -7,7 +7,7 @@ import { ObjectWithId } from 'src/app/data/object-with-id' templateUrl: './select-dialog.component.html', styleUrls: ['./select-dialog.component.scss'], }) -export class SelectDialogComponent implements OnInit { +export class SelectDialogComponent { constructor(public activeModal: NgbActiveModal) {} @Output() @@ -24,8 +24,6 @@ export class SelectDialogComponent implements OnInit { selected: number - ngOnInit(): void {} - cancelClicked() { this.activeModal.close() } diff --git a/src-ui/src/app/components/common/tag/tag.component.ts b/src-ui/src/app/components/common/tag/tag.component.ts index af2663536..d7d929594 100644 --- a/src-ui/src/app/components/common/tag/tag.component.ts +++ b/src-ui/src/app/components/common/tag/tag.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core' +import { Component, Input } from '@angular/core' import { PaperlessTag } from 'src/app/data/paperless-tag' @Component({ @@ -6,7 +6,7 @@ import { PaperlessTag } from 'src/app/data/paperless-tag' templateUrl: './tag.component.html', styleUrls: ['./tag.component.scss'], }) -export class TagComponent implements OnInit { +export class TagComponent { constructor() {} @Input() @@ -17,6 +17,4 @@ export class TagComponent implements OnInit { @Input() clickable: boolean = false - - ngOnInit(): void {} } diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html index 106d30610..5bba41a4d 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html @@ -1,6 +1,6 @@ -

Documents in inbox: {{statistics?.documents_inbox}}

+

Documents in inbox: {{statistics?.documents_inbox}}

Total documents: {{statistics?.documents_total}}

 diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts index e2f59a0a4..f59be5da9 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts @@ -1,6 +1,5 @@ -import { HttpEventType } from '@angular/common/http' -import { Component, OnInit } from '@angular/core' -import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop' +import { Component } from '@angular/core' +import { NgxFileDropEntry } from 'ngx-file-drop' import { ConsumerStatusService, FileStatus, @@ -15,7 +14,7 @@ const MAX_ALERTS = 5 templateUrl: './upload-file-widget.component.html', styleUrls: ['./upload-file-widget.component.scss'], }) -export class UploadFileWidgetComponent implements OnInit { +export class UploadFileWidgetComponent { alertsExpanded = false constructor( @@ -109,8 +108,6 @@ export class UploadFileWidgetComponent implements OnInit { this.consumerStatusService.dismissCompleted() } - ngOnInit(): void {} - public fileOver(event) {} public fileLeave(event) {} diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts index 718f3291c..7a83780c3 100644 --- a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core' +import { Component } from '@angular/core' import { TourService } from 'ngx-ui-tour-ng-bootstrap' @Component({ @@ -6,8 +6,6 @@ import { TourService } from 'ngx-ui-tour-ng-bootstrap' templateUrl: './welcome-widget.component.html', styleUrls: ['./welcome-widget.component.scss'], }) -export class WelcomeWidgetComponent implements OnInit { +export class WelcomeWidgetComponent { constructor(public readonly tourService: TourService) {} - - ngOnInit(): void {} } diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts index b1e926eef..64f5c682b 100644 --- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts @@ -1,11 +1,11 @@ -import { Component, Input, OnInit } from '@angular/core' +import { Component, Input } from '@angular/core' @Component({ selector: 'app-widget-frame', templateUrl: './widget-frame.component.html', styleUrls: ['./widget-frame.component.scss'], }) -export class WidgetFrameComponent implements OnInit { +export class WidgetFrameComponent { constructor() {} @Input() @@ -13,6 +13,4 @@ export class WidgetFrameComponent implements OnInit { @Input() loading: boolean = false - - ngOnInit(): void {} } diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 6934801a4..0384de371 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -1,5 +1,5 @@ -
+
Page
of {{previewNumPages}}
@@ -149,9 +149,9 @@
  • Preview - +
    - +
    @@ -159,7 +159,7 @@     - +
    @@ -180,14 +180,14 @@
    -   -   -   +   +   +  
    - +
    @@ -195,7 +195,7 @@     - +
    diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts index efef478b6..ab117be81 100644 --- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts +++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts @@ -1,11 +1,11 @@ -import { Component, Input, OnInit } from '@angular/core' +import { Component, Input } from '@angular/core' @Component({ selector: 'app-metadata-collapse', templateUrl: './metadata-collapse.component.html', styleUrls: ['./metadata-collapse.component.scss'], }) -export class MetadataCollapseComponent implements OnInit { +export class MetadataCollapseComponent { constructor() {} expand = false @@ -15,6 +15,4 @@ export class MetadataCollapseComponent implements OnInit { @Input() title = $localize`Metadata` - - ngOnInit(): void {} } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index dbfb9d2f0..bea961a3e 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core' +import { Component, OnDestroy, OnInit } from '@angular/core' import { PaperlessTag } from 'src/app/data/paperless-tag' import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent' import { PaperlessDocumentType } from 'src/app/data/paperless-document-type' @@ -33,7 +33,7 @@ import { first, Subject, takeUntil } from 'rxjs' templateUrl: './bulk-editor.component.html', styleUrls: ['./bulk-editor.component.scss'], }) -export class BulkEditorComponent { +export class BulkEditorComponent implements OnInit, OnDestroy { tags: PaperlessTag[] correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index 512cb51ae..b43187879 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -2,7 +2,6 @@ import { Component, EventEmitter, Input, - OnInit, Output, ViewChild, } from '@angular/core' @@ -20,7 +19,7 @@ import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' '../popover-preview/popover-preview.scss', ], }) -export class DocumentCardLargeComponent implements OnInit { +export class DocumentCardLargeComponent { constructor( private documentService: DocumentService, private settingsService: SettingsService @@ -71,8 +70,6 @@ export class DocumentCardLargeComponent implements OnInit { } } - ngOnInit(): void {} - getIsThumbInverted() { return this.settingsService.get(SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED) } diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index 8e6ae33a6..b7f53e42c 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -2,7 +2,6 @@ import { Component, EventEmitter, Input, - OnInit, Output, ViewChild, } from '@angular/core' @@ -21,7 +20,7 @@ import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' '../popover-preview/popover-preview.scss', ], }) -export class DocumentCardSmallComponent implements OnInit { +export class DocumentCardSmallComponent { constructor( private documentService: DocumentService, private settingsService: SettingsService @@ -55,8 +54,6 @@ export class DocumentCardSmallComponent implements OnInit { mouseOnPreview = false popoverHidden = true - ngOnInit(): void {} - getIsThumbInverted() { return this.settingsService.get(SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED) } 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 892a0d3b2..7f8502483 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 @@ -53,7 +53,7 @@
    @@ -94,7 +94,7 @@     {list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}} - {list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}} (filtered) + {list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}} (filtered)

    -
    +
    - +
    ASN Correspondent Title Document type Storage path Created
    -
    +
    diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index 99004854c..0a6b95939 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -5,10 +5,10 @@
    - +
    - - +
    diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.html b/src-ui/src/app/components/manage/management-list/management-list.component.html index f153ac4c6..d35bc0853 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.html +++ b/src-ui/src/app/components/manage/management-list/management-list.component.html @@ -16,10 +16,10 @@ - - - - + + + + diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html index 0286e3561..eb279f4b6 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -24,7 +24,7 @@
    You need to reload the page after applying a new language. @@ -215,7 +215,7 @@
    -
    No saved views defined.
    +
    No saved views defined.
    @@ -264,7 +264,7 @@
    -
    No mail accounts defined.
    +
    No mail accounts defined.

    @@ -299,7 +299,7 @@ -
    No mail rules defined.
    +
    No mail rules defined.
    @@ -314,5 +314,5 @@
    - + diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index 88c119c8d..f6b09333d 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -1,11 +1,11 @@
    - -

    - + @@ -55,7 +55,7 @@ - - diff --git a/src-ui/src/app/components/not-found/not-found.component.ts b/src-ui/src/app/components/not-found/not-found.component.ts index 7051da161..573f57f99 100644 --- a/src-ui/src/app/components/not-found/not-found.component.ts +++ b/src-ui/src/app/components/not-found/not-found.component.ts @@ -1,12 +1,10 @@ -import { Component, OnInit } from '@angular/core' +import { Component } from '@angular/core' @Component({ selector: 'app-not-found', templateUrl: './not-found.component.html', styleUrls: ['./not-found.component.scss'], }) -export class NotFoundComponent implements OnInit { +export class NotFoundComponent { constructor() {} - - ngOnInit(): void {} } diff --git a/src-ui/src/app/directives/sortable.directive.ts b/src-ui/src/app/directives/sortable.directive.ts index 85d65e398..57253aa48 100644 --- a/src-ui/src/app/directives/sortable.directive.ts +++ b/src-ui/src/app/directives/sortable.directive.ts @@ -1,4 +1,11 @@ -import { Directive, EventEmitter, Input, Output } from '@angular/core' +import { + Directive, + EventEmitter, + HostBinding, + HostListener, + Input, + Output, +} from '@angular/core' export interface SortEvent { column: string @@ -6,18 +13,13 @@ export interface SortEvent { } @Directive({ - selector: 'th[sortable]', - host: { - '[class.asc]': 'currentSortField == sortable && !currentSortReverse', - '[class.des]': 'currentSortField == sortable && currentSortReverse', - '(click)': 'rotate()', - }, + selector: 'th[appSortable]', }) export class SortableDirective { constructor() {} @Input() - sortable: string = '' + appSortable: string = '' @Input() currentSortReverse: boolean = false @@ -27,11 +29,20 @@ export class SortableDirective { @Output() sort = new EventEmitter() - rotate() { - if (this.currentSortField != this.sortable) { - this.sort.emit({ column: this.sortable, reverse: false }) + @HostBinding('class.asc') get asc() { + return ( + this.currentSortField === this.appSortable && !this.currentSortReverse + ) + } + @HostBinding('class.des') get des() { + return this.currentSortField === this.appSortable && this.currentSortReverse + } + + @HostListener('click') rotate() { + if (this.currentSortField != this.appSortable) { + this.sort.emit({ column: this.appSortable, reverse: false }) } else if ( - this.currentSortField == this.sortable && + this.currentSortField == this.appSortable && !this.currentSortReverse ) { this.sort.emit({ column: this.currentSortField, reverse: true })
    NameMatchingDocument count{{column.name}}NameMatchingDocument count{{column.name}} Actions
    - +
    		Name CreatedResultsResults Info Actions
    {{ task.task_file_name }} {{ task.date_created | customDate:'short' }} +
    {{ task.result | slice:0:50 }}… @@ -89,7 +89,7 @@
    + 
    {{ task.result }}