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

Merge pull request #2199 from paperless-ngx/eslint

Browse Source 
Chore: migrate to eslint
This commit is contained in:
shamoon 2022-12-16 09:53:59 -08:00 committed by GitHub
commit 940f5d5b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 3031 additions and 983 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View File

@ -195,6 +195,7 @@ jobs:
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- run: cd src-ui && npm ci - run: cd src-ui && npm ci
- run: cd src-ui && npm run lint
- run: cd src-ui && npm run test - run: cd src-ui && npm run test
- run: cd src-ui && npm run e2e:ci - run: cd src-ui && npm run e2e:ci

51
src-ui/.eslintrc.json Normal file
View File

@ -0,0 +1,51 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"tsconfig.json",
"e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "app",
"style": "kebab-case"
}
]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {}
}
]
}

371
src-ui/angular.json
View File

@ -1,179 +1,196 @@
{ {
"$schema": "./node_modules/@angular/cli/lib/config/schema.json", "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1, "version": 1,
"newProjectRoot": "projects", "newProjectRoot": "projects",
"projects": { "projects": {
"paperless-ui": { "paperless-ui": {
"projectType": "application", "projectType": "application",
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
"style": "scss" "style": "scss"
} }
}, },
"root": "", "root": "",
"sourceRoot": "src", "sourceRoot": "src",
"prefix": "app", "prefix": "app",
"i18n": { "i18n": {
"sourceLocale": "en-US", "sourceLocale": "en-US",
"locales": { "locales": {
"be-BY": "src/locale/messages.be_BY.xlf", "be-BY": "src/locale/messages.be_BY.xlf",
"cs-CZ": "src/locale/messages.cs_CZ.xlf", "cs-CZ": "src/locale/messages.cs_CZ.xlf",
"da-DK": "src/locale/messages.da_DK.xlf", "da-DK": "src/locale/messages.da_DK.xlf",
"de-DE": "src/locale/messages.de_DE.xlf", "de-DE": "src/locale/messages.de_DE.xlf",
"en-GB": "src/locale/messages.en_GB.xlf", "en-GB": "src/locale/messages.en_GB.xlf",
"es-ES": "src/locale/messages.es_ES.xlf", "es-ES": "src/locale/messages.es_ES.xlf",
"fr-FR": "src/locale/messages.fr_FR.xlf", "fr-FR": "src/locale/messages.fr_FR.xlf",
"it-IT": "src/locale/messages.it_IT.xlf", "it-IT": "src/locale/messages.it_IT.xlf",
"lb-LU": "src/locale/messages.lb_LU.xlf", "lb-LU": "src/locale/messages.lb_LU.xlf",
"nl-NL": "src/locale/messages.nl_NL.xlf", "nl-NL": "src/locale/messages.nl_NL.xlf",
"pl-PL": "src/locale/messages.pl_PL.xlf", "pl-PL": "src/locale/messages.pl_PL.xlf",
"pt-BR": "src/locale/messages.pt_BR.xlf", "pt-BR": "src/locale/messages.pt_BR.xlf",
"pt-PT": "src/locale/messages.pt_PT.xlf", "pt-PT": "src/locale/messages.pt_PT.xlf",
"ro-RO": "src/locale/messages.ro_RO.xlf", "ro-RO": "src/locale/messages.ro_RO.xlf",
"ru-RU": "src/locale/messages.ru_RU.xlf", "ru-RU": "src/locale/messages.ru_RU.xlf",
"sl-SI": "src/locale/messages.sl_SI.xlf", "sl-SI": "src/locale/messages.sl_SI.xlf",
"sr-CS": "src/locale/messages.sr_CS.xlf", "sr-CS": "src/locale/messages.sr_CS.xlf",
"sv-SE": "src/locale/messages.sv_SE.xlf", "sv-SE": "src/locale/messages.sv_SE.xlf",
"tr-TR": "src/locale/messages.tr_TR.xlf", "tr-TR": "src/locale/messages.tr_TR.xlf",
"zh-CN": "src/locale/messages.zh_CN.xlf" "zh-CN": "src/locale/messages.zh_CN.xlf"
} }
}, },
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:browser",
"options": { "options": {
"outputPath": "dist/paperless-ui", "outputPath": "dist/paperless-ui",
"outputHashing": "none", "outputHashing": "none",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "main": "src/main.ts",
"polyfills": "src/polyfills.ts", "polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json", "tsConfig": "tsconfig.app.json",
"localize": true, "localize": true,
"assets": [ "assets": [
"src/favicon.ico", "src/favicon.ico",
"src/apple-touch-icon.png", "src/apple-touch-icon.png",
"src/assets", "src/assets",
"src/manifest.webmanifest", { "src/manifest.webmanifest",
"glob": "pdf.worker.min.js", {
"input": "node_modules/pdfjs-dist/build/", "glob": "pdf.worker.min.js",
"output": "/assets/js/" "input": "node_modules/pdfjs-dist/build/",
} "output": "/assets/js/"
], }
"styles": [ ],
"src/styles.scss" "styles": [
], "src/styles.scss"
"scripts": [], ],
"allowedCommonJsDependencies": [ "scripts": [],
"ng2-pdf-viewer" "allowedCommonJsDependencies": [
], "ng2-pdf-viewer"
"vendorChunk": true, ],
"extractLicenses": false, "vendorChunk": true,
"buildOptimizer": false, "extractLicenses": false,
"sourceMap": true, "buildOptimizer": false,
"optimization": false, "sourceMap": true,
"namedChunks": true "optimization": false,
}, "namedChunks": true
"configurations": { },
"production": { "configurations": {
"fileReplacements": [ "production": {
{ "fileReplacements": [
"replace": "src/environments/environment.ts", {
"with": "src/environments/environment.prod.ts" "replace": "src/environments/environment.ts",
} "with": "src/environments/environment.prod.ts"
], }
"outputPath": "../src/documents/static/frontend/", ],
"optimization": true, "outputPath": "../src/documents/static/frontend/",
"outputHashing": "none", "optimization": true,
"sourceMap": false, "outputHashing": "none",
"namedChunks": false, "sourceMap": false,
"extractLicenses": true, "namedChunks": false,
"vendorChunk": false, "extractLicenses": true,
"buildOptimizer": true, "vendorChunk": false,
"budgets": [ "buildOptimizer": true,
{ "budgets": [
"type": "initial", {
"maximumWarning": "2mb", "type": "initial",
"maximumError": "5mb" "maximumWarning": "2mb",
}, "maximumError": "5mb"
{ },
"type": "anyComponentStyle", {
"maximumWarning": "6kb", "type": "anyComponentStyle",
"maximumError": "10kb" "maximumWarning": "6kb",
} "maximumError": "10kb"
] }
}, ]
"en-US": { },
"localize": ["en-US"] "en-US": {
} "localize": [
}, "en-US"
"defaultConfiguration": "" ]
}, }
"serve": { },
"builder": "@angular-devkit/build-angular:dev-server", "defaultConfiguration": ""
"options": { },
"browserTarget": "paperless-ui:build:en-US" "serve": {
}, "builder": "@angular-devkit/build-angular:dev-server",
"configurations": { "options": {
"production": { "browserTarget": "paperless-ui:build:en-US"
"browserTarget": "paperless-ui:build:production" },
} "configurations": {
} "production": {
}, "browserTarget": "paperless-ui:build:production"
"extract-i18n": { }
"builder": "@angular-devkit/build-angular:extract-i18n", }
"options": { },
"browserTarget": "paperless-ui:build" "extract-i18n": {
} "builder": "@angular-devkit/build-angular:extract-i18n",
}, "options": {
"test": { "browserTarget": "paperless-ui:build"
"builder": "@angular-builders/jest:run", }
"options": { },
"tsConfig": "tsconfig.spec.json", "test": {
"assets": [ "builder": "@angular-builders/jest:run",
"src/favicon.ico", "options": {
"src/apple-touch-icon.png", "tsConfig": "tsconfig.spec.json",
"src/assets", "assets": [
"src/manifest.webmanifest" "src/favicon.ico",
], "src/apple-touch-icon.png",
"styles": [ "src/assets",
"src/styles.scss" "src/manifest.webmanifest"
], ],
"scripts": [] "styles": [
} "src/styles.scss"
}, ],
"e2e": { "scripts": []
"builder": "@cypress/schematic:cypress", }
"options": { },
"devServerTarget": "paperless-ui:serve", "e2e": {
"watch": true, "builder": "@cypress/schematic:cypress",
"headless": false "options": {
}, "devServerTarget": "paperless-ui:serve",
"configurations": { "watch": true,
"production": { "headless": false
"devServerTarget": "paperless-ui:serve:production" },
} "configurations": {
} "production": {
}, "devServerTarget": "paperless-ui:serve:production"
"cypress-run": { }
"builder": "@cypress/schematic:cypress", }
"options": { },
"devServerTarget": "paperless-ui:serve" "cypress-run": {
}, "builder": "@cypress/schematic:cypress",
"configurations": { "options": {
"production": { "devServerTarget": "paperless-ui:serve"
"devServerTarget": "paperless-ui:serve:production" },
} "configurations": {
} "production": {
}, "devServerTarget": "paperless-ui:serve:production"
"cypress-open": { }
"builder": "@cypress/schematic:cypress", }
"options": { },
"watch": true, "cypress-open": {
"headless": false "builder": "@cypress/schematic:cypress",
} "options": {
} "watch": true,
} "headless": false
} }
}, },
"defaultProject": "paperless-ui" "lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
}
},
"defaultProject": "paperless-ui",
"cli": {
"schematicCollections": [
"@angular-eslint/schematics"
]
}
} }

3239
src-ui/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
src-ui/package.json
View File

@ -40,17 +40,23 @@
"devDependencies": { "devDependencies": {
"@angular-builders/jest": "14.1.0", "@angular-builders/jest": "14.1.0",
"@angular-devkit/build-angular": "~14.2.7", "@angular-devkit/build-angular": "~14.2.7",
"@angular-eslint/builder": "14.4.0",
"@angular-eslint/eslint-plugin": "14.4.0",
"@angular-eslint/eslint-plugin-template": "14.4.0",
"@angular-eslint/schematics": "14.4.0",
"@angular-eslint/template-parser": "14.4.0",
"@angular/cli": "~14.2.7", "@angular/cli": "~14.2.7",
"@angular/compiler-cli": "~14.2.8", "@angular/compiler-cli": "~14.2.8",
"@types/jest": "28.1.6", "@types/jest": "28.1.6",
"@types/node": "^18.7.23", "@types/node": "^18.7.23",
"codelyzer": "^6.0.2", "@typescript-eslint/eslint-plugin": "5.43.0",
"@typescript-eslint/parser": "5.43.0",
"concurrently": "7.4.0", "concurrently": "7.4.0",
"eslint": "^8.28.0",
"jest": "28.1.3", "jest": "28.1.3",
"jest-environment-jsdom": "^29.2.2", "jest-environment-jsdom": "^29.2.2",
"jest-preset-angular": "^12.2.3", "jest-preset-angular": "^12.2.3",
"ts-node": "~10.9.1", "ts-node": "~10.9.1",
"tslint": "~6.1.3",
"typescript": "~4.8.4", "typescript": "~4.8.4",
"wait-on": "~6.0.1" "wait-on": "~6.0.1"
}, },

4
src-ui/src/app/app.module.ts
View File

@ -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 { 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 { DocumentTypeEditDialogComponent } from './components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component'
import { TagComponent } from './components/common/tag/tag.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 { PageHeaderComponent } from './components/common/page-header/page-header.component'
import { AppFrameComponent } from './components/app-frame/app-frame.component' import { AppFrameComponent } from './components/app-frame/app-frame.component'
import { ToastsComponent } from './components/common/toasts/toasts.component' import { ToastsComponent } from './components/common/toasts/toasts.component'
@ -146,7 +146,7 @@ function initializeApp(settings: SettingsService) {
DocumentTypeEditDialogComponent, DocumentTypeEditDialogComponent,
StoragePathEditDialogComponent, StoragePathEditDialogComponent,
TagComponent, TagComponent,
ClearableBadge, ClearableBadgeComponent,
PageHeaderComponent, PageHeaderComponent,
AppFrameComponent, AppFrameComponent,
ToastsComponent, ToastsComponent,

2
src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts
View File

@ -5,7 +5,7 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'
templateUrl: './clearable-badge.component.html', templateUrl: './clearable-badge.component.html',
styleUrls: ['./clearable-badge.component.scss'], styleUrls: ['./clearable-badge.component.scss'],
}) })
export class ClearableBadge { export class ClearableBadgeComponent {
constructor() {} constructor() {}
@Input() @Input()

4
src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
View File

@ -22,7 +22,7 @@ export abstract class EditDialogComponent<T extends ObjectWithId>
object: T object: T
@Output() @Output()
success = new EventEmitter() succeeded = new EventEmitter()
networkActive = false networkActive = false
@ -95,7 +95,7 @@ export abstract class EditDialogComponent<T extends ObjectWithId>
serverResponse.subscribe({ serverResponse.subscribe({
next: (result) => { next: (result) => {
this.activeModal.close() this.activeModal.close()
this.success.emit(result) this.succeeded.emit(result)
}, },
error: (error) => { error: (error) => {
this.error = error.error this.error = error.error

2
src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html
View File

@ -6,7 +6,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p *ngIf="this.dialogMode == 'edit'" i18n> <p *ngIf="this.dialogMode === 'edit'" i18n>
<em>Note that editing a path does not apply changes to stored files until you have run the 'document_renamer' utility. See the <a target="_blank" href="https://docs.paperless-ngx.com/administration/#renamer">documentation</a>.</em> <em>Note that editing a path does not apply changes to stored files until you have run the 'document_renamer' utility. See the <a target="_blank" href="https://docs.paperless-ngx.com/administration/#renamer">documentation</a>.</em>
</p> </p>

4
src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
View File

@ -321,7 +321,7 @@ export class FilterableDropdownComponent {
apply = new EventEmitter<ChangedItems>() apply = new EventEmitter<ChangedItems>()
@Output() @Output()
open = new EventEmitter() opened = new EventEmitter()
get operatorToggleEnabled(): boolean { get operatorToggleEnabled(): boolean {
return ( return (
@ -356,7 +356,7 @@ export class FilterableDropdownComponent {
if (this.editing) { if (this.editing) {
this.selectionModel.reset() this.selectionModel.reset()
} }
this.open.next(this) this.opened.next(this)
} else { } else {
this.filterText = '' this.filterText = ''
if (this.applyOnClose && this.selectionModel.isDirty()) { if (this.applyOnClose && this.selectionModel.isDirty()) {

6
src-ui/src/app/components/common/select-dialog/select-dialog.component.ts
View File

@ -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 { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
import { ObjectWithId } from 'src/app/data/object-with-id' 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', templateUrl: './select-dialog.component.html',
styleUrls: ['./select-dialog.component.scss'], styleUrls: ['./select-dialog.component.scss'],
}) })
export class SelectDialogComponent implements OnInit { export class SelectDialogComponent {
constructor(public activeModal: NgbActiveModal) {} constructor(public activeModal: NgbActiveModal) {}
@Output() @Output()
@ -24,8 +24,6 @@ export class SelectDialogComponent implements OnInit {
selected: number selected: number
ngOnInit(): void {}
cancelClicked() { cancelClicked() {
this.activeModal.close() this.activeModal.close()
} }

6
src-ui/src/app/components/common/tag/tag.component.ts
View File

@ -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' import { PaperlessTag } from 'src/app/data/paperless-tag'
@Component({ @Component({
@ -6,7 +6,7 @@ import { PaperlessTag } from 'src/app/data/paperless-tag'
templateUrl: './tag.component.html', templateUrl: './tag.component.html',
styleUrls: ['./tag.component.scss'], styleUrls: ['./tag.component.scss'],
}) })
export class TagComponent implements OnInit { export class TagComponent {
constructor() {} constructor() {}
@Input() @Input()
@ -17,6 +17,4 @@ export class TagComponent implements OnInit {
@Input() @Input()
clickable: boolean = false clickable: boolean = false
ngOnInit(): void {}
} }

2
src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html
View File

@ -1,6 +1,6 @@
<app-widget-frame title="Statistics" [loading]="loading" i18n-title> <app-widget-frame title="Statistics" [loading]="loading" i18n-title>
<ng-container content> <ng-container content>
<p class="card-text" i18n *ngIf="statistics?.documents_inbox != null">Documents in inbox: {{statistics?.documents_inbox}}</p> <p class="card-text" i18n *ngIf="statistics?.documents_inbox !== null">Documents in inbox: {{statistics?.documents_inbox}}</p>
<p class="card-text" i18n>Total documents: {{statistics?.documents_total}}</p> <p class="card-text" i18n>Total documents: {{statistics?.documents_total}}</p>
</ng-container> </ng-container>
</app-widget-frame> </app-widget-frame>

9
src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts
View File

@ -1,6 +1,5 @@
import { HttpEventType } from '@angular/common/http' import { Component } from '@angular/core'
import { Component, OnInit } from '@angular/core' import { NgxFileDropEntry } from 'ngx-file-drop'
import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop'
import { import {
ConsumerStatusService, ConsumerStatusService,
FileStatus, FileStatus,
@ -15,7 +14,7 @@ const MAX_ALERTS = 5
templateUrl: './upload-file-widget.component.html', templateUrl: './upload-file-widget.component.html',
styleUrls: ['./upload-file-widget.component.scss'], styleUrls: ['./upload-file-widget.component.scss'],
}) })
export class UploadFileWidgetComponent implements OnInit { export class UploadFileWidgetComponent {
alertsExpanded = false alertsExpanded = false
constructor( constructor(
@ -109,8 +108,6 @@ export class UploadFileWidgetComponent implements OnInit {
this.consumerStatusService.dismissCompleted() this.consumerStatusService.dismissCompleted()
} }
ngOnInit(): void {}
public fileOver(event) {} public fileOver(event) {}
public fileLeave(event) {} public fileLeave(event) {}

6
src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core' import { Component } from '@angular/core'
import { TourService } from 'ngx-ui-tour-ng-bootstrap' import { TourService } from 'ngx-ui-tour-ng-bootstrap'
@Component({ @Component({
@ -6,8 +6,6 @@ import { TourService } from 'ngx-ui-tour-ng-bootstrap'
templateUrl: './welcome-widget.component.html', templateUrl: './welcome-widget.component.html',
styleUrls: ['./welcome-widget.component.scss'], styleUrls: ['./welcome-widget.component.scss'],
}) })
export class WelcomeWidgetComponent implements OnInit { export class WelcomeWidgetComponent {
constructor(public readonly tourService: TourService) {} constructor(public readonly tourService: TourService) {}
ngOnInit(): void {}
} }

6
src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts
View File

@ -1,11 +1,11 @@
import { Component, Input, OnInit } from '@angular/core' import { Component, Input } from '@angular/core'
@Component({ @Component({
selector: 'app-widget-frame', selector: 'app-widget-frame',
templateUrl: './widget-frame.component.html', templateUrl: './widget-frame.component.html',
styleUrls: ['./widget-frame.component.scss'], styleUrls: ['./widget-frame.component.scss'],
}) })
export class WidgetFrameComponent implements OnInit { export class WidgetFrameComponent {
constructor() {} constructor() {}
@Input() @Input()
@ -13,6 +13,4 @@ export class WidgetFrameComponent implements OnInit {
@Input() @Input()
loading: boolean = false loading: boolean = false
ngOnInit(): void {}
} }

18
src-ui/src/app/components/document-detail/document-detail.component.html
View File

@ -1,5 +1,5 @@
<app-page-header [(title)]="title"> <app-page-header [(title)]="title">
<div class="input-group input-group-sm me-5 d-none d-md-flex" *ngIf="getContentType() == 'application/pdf' && !useNativePdfViewer"> <div class="input-group input-group-sm me-5 d-none d-md-flex" *ngIf="getContentType() === 'application/pdf' && !useNativePdfViewer">
<div class="input-group-text" i18n>Page</div> <div class="input-group-text" i18n>Page</div>
<input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="previewCurrentPage" /> <input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="previewCurrentPage" />
<div class="input-group-text" i18n>of {{previewNumPages}}</div> <div class="input-group-text" i18n>of {{previewNumPages}}</div>
@ -149,9 +149,9 @@
<li [ngbNavItem]="4" class="d-md-none"> <li [ngbNavItem]="4" class="d-md-none">
<a ngbNavLink>Preview</a> <a ngbNavLink>Preview</a>
<ng-template ngbNavContent *ngIf="pdfPreview.offsetParent == undefined"> <ng-template ngbNavContent *ngIf="pdfPreview.offsetParent === undefined">
<div class="position-relative"> <div class="position-relative">
<ng-container *ngIf="getContentType() == 'application/pdf'"> <ng-container *ngIf="getContentType() === 'application/pdf'">
<div class="preview-sticky pdf-viewer-container" *ngIf="!useNativePdfViewer ; else nativePdfViewer"> <div class="preview-sticky pdf-viewer-container" *ngIf="!useNativePdfViewer ; else nativePdfViewer">
<pdf-viewer [src]="{ url: previewUrl, password: password }" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" [render-text-mode]="2" (error)="onError($event)" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer> <pdf-viewer [src]="{ url: previewUrl, password: password }" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" [render-text-mode]="2" (error)="onError($event)" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
</div> </div>
@ -159,7 +159,7 @@
<object [data]="previewUrl | safeUrl" class="preview-sticky" width="100%"></object> <object [data]="previewUrl | safeUrl" class="preview-sticky" width="100%"></object>
</ng-template> </ng-template>
</ng-container> </ng-container>
<ng-container *ngIf="getContentType() == 'text/plain'"> <ng-container *ngIf="getContentType() === 'text/plain'">
<object [data]="previewUrl | safeUrl" type="text/plain" class="preview-sticky bg-white" width="100%"></object> <object [data]="previewUrl | safeUrl" type="text/plain" class="preview-sticky bg-white" width="100%"></object>
</ng-container> </ng-container>
<div *ngIf="requiresPassword" class="password-prompt"> <div *ngIf="requiresPassword" class="password-prompt">
@ -180,14 +180,14 @@
<div [ngbNavOutlet]="nav" class="mt-2"></div> <div [ngbNavOutlet]="nav" class="mt-2"></div>
<button type="button" class="btn btn-outline-secondary" (click)="discard()" i18n [disabled]="networkActive || !(isDirty$ | async)">Discard</button>&nbsp; <button type="button" class="btn btn-outline-secondary" (click)="discard()" i18n [disabled]="networkActive || (isDirty$ | async) === false">Discard</button>&nbsp;
<button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n [disabled]="networkActive || !(isDirty$ | async) || error">Save & next</button>&nbsp; <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()" i18n [disabled]="networkActive || (isDirty$ | async) === false || error">Save & next</button>&nbsp;
<button type="submit" class="btn btn-primary" i18n [disabled]="networkActive || !(isDirty$ | async) || error">Save</button>&nbsp; <button type="submit" class="btn btn-primary" i18n [disabled]="networkActive || (isDirty$ | async) === false || error">Save</button>&nbsp;
</form> </form>
</div> </div>
<div class="col-md-6 col-xl-8 mb-3 d-none d-md-block position-relative" #pdfPreview> <div class="col-md-6 col-xl-8 mb-3 d-none d-md-block position-relative" #pdfPreview>
<ng-container *ngIf="getContentType() == 'application/pdf'"> <ng-container *ngIf="getContentType() === 'application/pdf'">
<div class="preview-sticky pdf-viewer-container" *ngIf="!useNativePdfViewer ; else nativePdfViewer"> <div class="preview-sticky pdf-viewer-container" *ngIf="!useNativePdfViewer ; else nativePdfViewer">
<pdf-viewer [src]="{ url: previewUrl, password: password }" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" [render-text-mode]="2" (error)="onError($event)" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer> <pdf-viewer [src]="{ url: previewUrl, password: password }" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" [render-text-mode]="2" (error)="onError($event)" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
</div> </div>
@ -195,7 +195,7 @@
<object [data]="previewUrl | safeUrl" class="preview-sticky" width="100%"></object> <object [data]="previewUrl | safeUrl" class="preview-sticky" width="100%"></object>
</ng-template> </ng-template>
</ng-container> </ng-container>
<ng-container *ngIf="getContentType() == 'text/plain'"> <ng-container *ngIf="getContentType() === 'text/plain'">
<object [data]="previewUrl | safeUrl" type="text/plain" class="preview-sticky bg-white" width="100%"></object> <object [data]="previewUrl | safeUrl" type="text/plain" class="preview-sticky bg-white" width="100%"></object>
</ng-container> </ng-container>
<div *ngIf="requiresPassword" class="password-prompt"> <div *ngIf="requiresPassword" class="password-prompt">

6
src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts
View File

@ -1,11 +1,11 @@
import { Component, Input, OnInit } from '@angular/core' import { Component, Input } from '@angular/core'
@Component({ @Component({
selector: 'app-metadata-collapse', selector: 'app-metadata-collapse',
templateUrl: './metadata-collapse.component.html', templateUrl: './metadata-collapse.component.html',
styleUrls: ['./metadata-collapse.component.scss'], styleUrls: ['./metadata-collapse.component.scss'],
}) })
export class MetadataCollapseComponent implements OnInit { export class MetadataCollapseComponent {
constructor() {} constructor() {}
expand = false expand = false
@ -15,6 +15,4 @@ export class MetadataCollapseComponent implements OnInit {
@Input() @Input()
title = $localize`Metadata` title = $localize`Metadata`
ngOnInit(): void {}
} }

4
src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
View File

@ -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 { PaperlessTag } from 'src/app/data/paperless-tag'
import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent' import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'
import { PaperlessDocumentType } from 'src/app/data/paperless-document-type' import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'
@ -33,7 +33,7 @@ import { first, Subject, takeUntil } from 'rxjs'
templateUrl: './bulk-editor.component.html', templateUrl: './bulk-editor.component.html',
styleUrls: ['./bulk-editor.component.scss'], styleUrls: ['./bulk-editor.component.scss'],
}) })
export class BulkEditorComponent { export class BulkEditorComponent implements OnInit, OnDestroy {
tags: PaperlessTag[] tags: PaperlessTag[]
correspondents: PaperlessCorrespondent[] correspondents: PaperlessCorrespondent[]
documentTypes: PaperlessDocumentType[] documentTypes: PaperlessDocumentType[]

5
src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
View File

@ -2,7 +2,6 @@ import {
Component, Component,
EventEmitter, EventEmitter,
Input, Input,
OnInit,
Output, Output,
ViewChild, ViewChild,
} from '@angular/core' } from '@angular/core'
@ -20,7 +19,7 @@ import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
'../popover-preview/popover-preview.scss', '../popover-preview/popover-preview.scss',
], ],
}) })
export class DocumentCardLargeComponent implements OnInit { export class DocumentCardLargeComponent {
constructor( constructor(
private documentService: DocumentService, private documentService: DocumentService,
private settingsService: SettingsService private settingsService: SettingsService
@ -71,8 +70,6 @@ export class DocumentCardLargeComponent implements OnInit {
} }
} }
ngOnInit(): void {}
getIsThumbInverted() { getIsThumbInverted() {
return this.settingsService.get(SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED) return this.settingsService.get(SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED)
} }

5
src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
View File

@ -2,7 +2,6 @@ import {
Component, Component,
EventEmitter, EventEmitter,
Input, Input,
OnInit,
Output, Output,
ViewChild, ViewChild,
} from '@angular/core' } from '@angular/core'
@ -21,7 +20,7 @@ import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
'../popover-preview/popover-preview.scss', '../popover-preview/popover-preview.scss',
], ],
}) })
export class DocumentCardSmallComponent implements OnInit { export class DocumentCardSmallComponent {
constructor( constructor(
private documentService: DocumentService, private documentService: DocumentService,
private settingsService: SettingsService private settingsService: SettingsService
@ -55,8 +54,6 @@ export class DocumentCardSmallComponent implements OnInit {
mouseOnPreview = false mouseOnPreview = false
popoverHidden = true popoverHidden = true
ngOnInit(): void {}
getIsThumbInverted() { getIsThumbInverted() {
return this.settingsService.get(SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED) return this.settingsService.get(SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED)
} }

24
src-ui/src/app/components/document-list/document-list.component.html
View File

@ -53,7 +53,7 @@
</div> </div>
<div> <div>
<button *ngFor="let f of getSortFields()" ngbDropdownItem (click)="setSortField(f.field)" <button *ngFor="let f of getSortFields()" ngbDropdownItem (click)="setSortField(f.field)"
[class.active]="list.sortField == f.field">{{f.name}} [class.active]="list.sortField === f.field">{{f.name}}
</button> </button>
</div> </div>
</div> </div>
@ -94,7 +94,7 @@
</ng-container> </ng-container>
<span i18n *ngIf="list.selected.size > 0">{list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}}</span> <span i18n *ngIf="list.selected.size > 0">{list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}}</span>
<ng-container *ngIf="!list.isReloading"> <ng-container *ngIf="!list.isReloading">
<span i18n *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}}</span>&nbsp;<span i18n *ngIf="isFiltered">(filtered)</span> <span i18n *ngIf="list.selected.size === 0">{list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}}</span>&nbsp;<span i18n *ngIf="isFiltered">(filtered)</span>
</ng-container> </ng-container>
</p> </p>
<ngb-pagination *ngIf="list.collectionSize" [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5" <ngb-pagination *ngIf="list.collectionSize" [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
@ -111,52 +111,52 @@
</ng-container> </ng-container>
<ng-template #documentListNoError> <ng-template #documentListNoError>
<div *ngIf="displayMode == 'largeCards'"> <div *ngIf="displayMode === 'largeCards'">
<app-document-card-large [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" *ngFor="let d of list.documents; trackBy: trackByDocumentId" [document]="d" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)" (clickStoragePath)="clickStoragePath($event)" (clickMoreLike)="clickMoreLike(d.id)"> <app-document-card-large [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" *ngFor="let d of list.documents; trackBy: trackByDocumentId" [document]="d" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)" (clickStoragePath)="clickStoragePath($event)" (clickMoreLike)="clickMoreLike(d.id)">
</app-document-card-large> </app-document-card-large>
</div> </div>
<table class="table table-sm align-middle border shadow-sm" *ngIf="displayMode == 'details'"> <table class="table table-sm align-middle border shadow-sm" *ngIf="displayMode === 'details'">
<thead> <thead>
<th></th> <th></th>
<th class="d-none d-lg-table-cell" <th class="d-none d-lg-table-cell"
sortable="archive_serial_number" appSortable="archive_serial_number"
[currentSortField]="list.sortField" [currentSortField]="list.sortField"
[currentSortReverse]="list.sortReverse" [currentSortReverse]="list.sortReverse"
(sort)="onSort($event)" (sort)="onSort($event)"
i18n>ASN</th> i18n>ASN</th>
<th class="d-none d-md-table-cell" <th class="d-none d-md-table-cell"
sortable="correspondent__name" appSortable="correspondent__name"
[currentSortField]="list.sortField" [currentSortField]="list.sortField"
[currentSortReverse]="list.sortReverse" [currentSortReverse]="list.sortReverse"
(sort)="onSort($event)" (sort)="onSort($event)"
i18n>Correspondent</th> i18n>Correspondent</th>
<th <th
sortable="title" appSortable="title"
[currentSortField]="list.sortField" [currentSortField]="list.sortField"
[currentSortReverse]="list.sortReverse" [currentSortReverse]="list.sortReverse"
(sort)="onSort($event)" (sort)="onSort($event)"
i18n>Title</th> i18n>Title</th>
<th class="d-none d-xl-table-cell" <th class="d-none d-xl-table-cell"
sortable="document_type__name" appSortable="document_type__name"
[currentSortField]="list.sortField" [currentSortField]="list.sortField"
[currentSortReverse]="list.sortReverse" [currentSortReverse]="list.sortReverse"
(sort)="onSort($event)" (sort)="onSort($event)"
i18n>Document type</th> i18n>Document type</th>
<th class="d-none d-xl-table-cell" <th class="d-none d-xl-table-cell"
sortable="storage_path__name" appSortable="storage_path__name"
[currentSortField]="list.sortField" [currentSortField]="list.sortField"
[currentSortReverse]="list.sortReverse" [currentSortReverse]="list.sortReverse"
(sort)="onSort($event)" (sort)="onSort($event)"
i18n>Storage path</th> i18n>Storage path</th>
<th <th
sortable="created" appSortable="created"
[currentSortField]="list.sortField" [currentSortField]="list.sortField"
[currentSortReverse]="list.sortReverse" [currentSortReverse]="list.sortReverse"
(sort)="onSort($event)" (sort)="onSort($event)"
i18n>Created</th> i18n>Created</th>
<th class="d-none d-xl-table-cell" <th class="d-none d-xl-table-cell"
sortable="added" appSortable="added"
[currentSortField]="list.sortField" [currentSortField]="list.sortField"
[currentSortReverse]="list.sortReverse" [currentSortReverse]="list.sortReverse"
(sort)="onSort($event)" (sort)="onSort($event)"
@ -202,7 +202,7 @@
</tbody> </tbody>
</table> </table>
<div class="row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'"> <div class="row row-cols-paperless-cards" *ngIf="displayMode === 'smallCards'">
<app-document-card-small class="p-0" [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickStoragePath)="clickStoragePath($event)" (clickDocumentType)="clickDocumentType($event)"></app-document-card-small> <app-document-card-small class="p-0" [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickStoragePath)="clickStoragePath($event)" (clickDocumentType)="clickDocumentType($event)"></app-document-card-small>
</div> </div>
<div *ngIf="list.documents?.length > 15" class="mt-3"> <div *ngIf="list.documents?.length > 15" class="mt-3">

6
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
View File

@ -5,10 +5,10 @@
<div ngbDropdown> <div ngbDropdown>
<button class="btn btn-sm btn-outline-primary" ngbDropdownToggle>{{textFilterTargetName}}</button> <button class="btn btn-sm btn-outline-primary" ngbDropdownToggle>{{textFilterTargetName}}</button>
<div class="dropdown-menu shadow" ngbDropdownMenu> <div class="dropdown-menu shadow" ngbDropdownMenu>
<button *ngFor="let t of textFilterTargets" ngbDropdownItem [class.active]="textFilterTarget == t.id" (click)="changeTextFilterTarget(t.id)">{{t.name}}</button> <button *ngFor="let t of textFilterTargets" ngbDropdownItem [class.active]="textFilterTarget === t.id" (click)="changeTextFilterTarget(t.id)">{{t.name}}</button>
</div> </div>
</div> </div>
<select *ngIf="textFilterTarget == 'asn'" class="form-select flex-grow-0 w-auto" [(ngModel)]="textFilterModifier" (change)="textFilterModifierChange()"> <select *ngIf="textFilterTarget === 'asn'" class="form-select flex-grow-0 w-auto" [(ngModel)]="textFilterModifier" (change)="textFilterModifierChange()">
<option *ngFor="let m of textFilterModifiers" ngbDropdownItem [value]="m.id">{{m.label}}</option> <option *ngFor="let m of textFilterModifiers" ngbDropdownItem [value]="m.id">{{m.label}}</option>
</select> </select>
<button *ngIf="_textFilter" class="btn btn-link btn-sm px-0 position-absolute top-0 end-0 z-10" (click)="resetTextField()"> <button *ngIf="_textFilter" class="btn btn-link btn-sm px-0 position-absolute top-0 end-0 z-10" (click)="resetTextField()">
@ -16,7 +16,7 @@
<path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/> <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
</svg> </svg>
</button> </button>
<input #textFilterInput class="form-control form-control-sm" type="text" [disabled]="textFilterModifierIsNull" [(ngModel)]="textFilter" (keyup)="textFilterKeyup($event)" [readonly]="textFilterTarget == 'fulltext-morelike'"> <input #textFilterInput class="form-control form-control-sm" type="text" [disabled]="textFilterModifierIsNull" [(ngModel)]="textFilter" (keyup)="textFilterKeyup($event)" [readonly]="textFilterTarget === 'fulltext-morelike'">
</div> </div>
</div> </div>
</div> </div>

8
src-ui/src/app/components/manage/management-list/management-list.component.html
View File

@ -16,10 +16,10 @@
<table class="table table-striped align-middle border shadow-sm"> <table class="table table-striped align-middle border shadow-sm">
<thead> <thead>
<tr> <tr>
<th scope="col" sortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th> <th scope="col" appSortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th>
<th scope="col" class="d-none d-sm-table-cell" sortable="matching_algorithm" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Matching</th> <th scope="col" class="d-none d-sm-table-cell" appSortable="matching_algorithm" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Matching</th>
<th scope="col" sortable="document_count" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Document count</th> <th scope="col" appSortable="document_count" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Document count</th>
<th scope="col" *ngFor="let column of extraColumns" sortable="{{column.key}}" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)">{{column.name}}</th> <th scope="col" *ngFor="let column of extraColumns" appSortable="{{column.key}}" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)">{{column.name}}</th>
<th scope="col" i18n>Actions</th> <th scope="col" i18n>Actions</th>
</tr> </tr>
</thead> </thead>

10
src-ui/src/app/components/manage/settings/settings.component.html
View File

@ -24,7 +24,7 @@
<div class="col"> <div class="col">
<select class="form-select" formControlName="displayLanguage"> <select class="form-select" formControlName="displayLanguage">
<option *ngFor="let lang of displayLanguageOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code && currentLocale != 'en-US'"> - {{lang.englishName}}</span></option> <option *ngFor="let lang of displayLanguageOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code && currentLocale !== 'en-US'"> - {{lang.englishName}}</span></option>
</select> </select>
<small *ngIf="displayLanguageIsDirty" class="form-text text-primary" i18n>You need to reload the page after applying a new language.</small> <small *ngIf="displayLanguageIsDirty" class="form-text text-primary" i18n>You need to reload the page after applying a new language.</small>
@ -215,7 +215,7 @@
</div> </div>
</div> </div>
<div *ngIf="savedViews && savedViews.length == 0" i18n>No saved views defined.</div> <div *ngIf="savedViews && savedViews.length === 0" i18n>No saved views defined.</div>
<div *ngIf="!savedViews"> <div *ngIf="!savedViews">
<div class="spinner-border spinner-border-sm fw-normal ms-2 me-auto" role="status"></div> <div class="spinner-border spinner-border-sm fw-normal ms-2 me-auto" role="status"></div>
@ -264,7 +264,7 @@
</div> </div>
</li> </li>
<div *ngIf="mailAccounts.length == 0" i18n>No mail accounts defined.</div> <div *ngIf="mailAccounts.length === 0" i18n>No mail accounts defined.</div>
</ul> </ul>
<h4 class="mt-4"> <h4 class="mt-4">
@ -299,7 +299,7 @@
</div> </div>
</li> </li>
<div *ngIf="mailRules.length == 0" i18n>No mail rules defined.</div> <div *ngIf="mailRules.length === 0" i18n>No mail rules defined.</div>
</ul> </ul>
</ng-container> </ng-container>
@ -314,5 +314,5 @@
<div [ngbNavOutlet]="nav" class="border-start border-end border-bottom p-3 mb-3 shadow-sm"></div> <div [ngbNavOutlet]="nav" class="border-start border-end border-bottom p-3 mb-3 shadow-sm"></div>
<button type="submit" class="btn btn-primary mb-2" [disabled]="!(isDirty$ | async)" i18n>Save</button> <button type="submit" class="btn btn-primary mb-2" [disabled]="(isDirty$ | async) === false" i18n>Save</button>
</form> </form>

12
src-ui/src/app/components/manage/tasks/tasks.component.html
View File

@ -1,11 +1,11 @@
<app-page-header title="File Tasks" i18n-title> <app-page-header title="File Tasks" i18n-title>
<div class="btn-toolbar col col-md-auto"> <div class="btn-toolbar col col-md-auto">
<button class="btn btn-sm btn-outline-secondary me-2" (click)="clearSelection()" [hidden]="selectedTasks.size == 0"> <button class="btn btn-sm btn-outline-secondary me-2" (click)="clearSelection()" [hidden]="selectedTasks.size === 0">
<svg class="sidebaricon" fill="currentColor"> <svg class="sidebaricon" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#x"/> <use xlink:href="assets/bootstrap-icons.svg#x"/>
</svg>&nbsp;<ng-container i18n>Clear selection</ng-container> </svg>&nbsp;<ng-container i18n>Clear selection</ng-container>
</button> </button>
<button class="btn btn-sm btn-outline-primary me-4" (click)="dismissTasks()" [disabled]="tasksService.total == 0"> <button class="btn btn-sm btn-outline-primary me-4" (click)="dismissTasks()" [disabled]="tasksService.total === 0">
<svg class="sidebaricon" fill="currentColor"> <svg class="sidebaricon" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#check2-all"/> <use xlink:href="assets/bootstrap-icons.svg#check2-all"/>
</svg>&nbsp;<ng-container i18n>{{dismissButtonText}}</ng-container> </svg>&nbsp;<ng-container i18n>{{dismissButtonText}}</ng-container>
@ -33,13 +33,13 @@
<tr> <tr>
<th scope="col"> <th scope="col">
<div class="form-check"> <div class="form-check">
<input type="checkbox" class="form-check-input" id="all-tasks" [disabled]="currentTasks.length == 0" (click)="toggleAll($event); $event.stopPropagation();"> <input type="checkbox" class="form-check-input" id="all-tasks" [disabled]="currentTasks.length === 0" (click)="toggleAll($event); $event.stopPropagation();">
<label class="form-check-label" for="all-tasks"></label> <label class="form-check-label" for="all-tasks"></label>
</div> </div>
</th> </th>
<th scope="col" i18n>Name</th> <th scope="col" i18n>Name</th>
<th scope="col" class="d-none d-lg-table-cell" i18n>Created</th> <th scope="col" class="d-none d-lg-table-cell" i18n>Created</th>
<th scope="col" class="d-none d-lg-table-cell" *ngIf="activeTab != 'started' && activeTab != 'queued'" i18n>Results</th> <th scope="col" class="d-none d-lg-table-cell" *ngIf="activeTab !== 'started' && activeTab !== 'queued'" i18n>Results</th>
<th scope="col" class="d-table-cell d-lg-none" i18n>Info</th> <th scope="col" class="d-table-cell d-lg-none" i18n>Info</th>
<th scope="col" i18n>Actions</th> <th scope="col" i18n>Actions</th>
</tr> </tr>
@ -55,7 +55,7 @@
</th> </th>
<td class="overflow-auto">{{ task.task_file_name }}</td> <td class="overflow-auto">{{ task.task_file_name }}</td>
<td class="d-none d-lg-table-cell">{{ task.date_created | customDate:'short' }}</td> <td class="d-none d-lg-table-cell">{{ task.date_created | customDate:'short' }}</td>
<td class="d-none d-lg-table-cell" *ngIf="activeTab != 'started' && activeTab != 'queued'"> <td class="d-none d-lg-table-cell" *ngIf="activeTab !== 'started' && activeTab !== 'queued'">
<div *ngIf="task.result?.length > 50" class="result" (click)="expandTask(task); $event.stopPropagation();" <div *ngIf="task.result?.length > 50" class="result" (click)="expandTask(task); $event.stopPropagation();"
[ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body"> [ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body">
<span class="small d-none d-md-inline-block font-monospace text-muted">{{ task.result | slice:0:50 }}&hellip;</span> <span class="small d-none d-md-inline-block font-monospace text-muted">{{ task.result | slice:0:50 }}&hellip;</span>
@ -89,7 +89,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="p-0" [class.border-0]="expandedTask != task.id" colspan="5"> <td class="p-0" [class.border-0]="expandedTask !== task.id" colspan="5">
<pre #collapse="ngbCollapse" [ngbCollapse]="expandedTask !== task.id" class="small mb-0"><div class="small p-1 p-lg-3 ms-lg-3">{{ task.result }}</div></pre> <pre #collapse="ngbCollapse" [ngbCollapse]="expandedTask !== task.id" class="small mb-0"><div class="small p-1 p-lg-3 ms-lg-3">{{ task.result }}</div></pre>
</td> </td>
</tr> </tr>

6
src-ui/src/app/components/not-found/not-found.component.ts
View File

@ -1,12 +1,10 @@
import { Component, OnInit } from '@angular/core' import { Component } from '@angular/core'
@Component({ @Component({
selector: 'app-not-found', selector: 'app-not-found',
templateUrl: './not-found.component.html', templateUrl: './not-found.component.html',
styleUrls: ['./not-found.component.scss'], styleUrls: ['./not-found.component.scss'],
}) })
export class NotFoundComponent implements OnInit { export class NotFoundComponent {
constructor() {} constructor() {}
ngOnInit(): void {}
} }

35
src-ui/src/app/directives/sortable.directive.ts
View File

@ -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 { export interface SortEvent {
column: string column: string
@ -6,18 +13,13 @@ export interface SortEvent {
} }
@Directive({ @Directive({
selector: 'th[sortable]', selector: 'th[appSortable]',
host: {
'[class.asc]': 'currentSortField == sortable && !currentSortReverse',
'[class.des]': 'currentSortField == sortable && currentSortReverse',
'(click)': 'rotate()',
},
}) })
export class SortableDirective { export class SortableDirective {
constructor() {} constructor() {}
@Input() @Input()
sortable: string = '' appSortable: string = ''
@Input() @Input()
currentSortReverse: boolean = false currentSortReverse: boolean = false
@ -27,11 +29,20 @@ export class SortableDirective {
@Output() sort = new EventEmitter<SortEvent>() @Output() sort = new EventEmitter<SortEvent>()
rotate() { @HostBinding('class.asc') get asc() {
if (this.currentSortField != this.sortable) { return (
this.sort.emit({ column: this.sortable, reverse: false }) 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 ( } else if (
this.currentSortField == this.sortable && this.currentSortField == this.appSortable &&
!this.currentSortReverse !this.currentSortReverse
) { ) {
this.sort.emit({ column: this.currentSortField, reverse: true }) this.sort.emit({ column: this.currentSortField, reverse: true })

152
src-ui/tslint.json
View File

@ -1,152 +0,0 @@
{
"extends": "tslint:recommended",
"rulesDirectory": [
"codelyzer"
],
"rules": {
"align": {
"options": [
"parameters",
"statements"
]
},
"array-type": false,
"arrow-return-shorthand": true,
"curly": true,
"deprecation": {
"severity": "warning"
},
"eofline": true,
"import-blacklist": [
true,
"rxjs/Rx"
],
"import-spacing": true,
"indent": {
"options": [
"spaces"
]
},
"max-classes-per-file": false,
"max-line-length": [
true,
140
],
"member-ordering": [
true,
{
"order": [
"static-field",
"instance-field",
"static-method",
"instance-method"
]
}
],
"no-console": [
true,
"debug",
"info",
"time",
"timeEnd",
"trace"
],
"no-empty": false,
"no-inferrable-types": [
true,
"ignore-params"
],
"no-non-null-assertion": true,
"no-redundant-jsdoc": true,
"no-switch-case-fall-through": true,
"no-var-requires": false,
"object-literal-key-quotes": [
true,
"as-needed"
],
"quotemark": [
true,
"single"
],
"semicolon": {
"options": [
"always"
]
},
"space-before-function-paren": {
"options": {
"anonymous": "never",
"asyncArrow": "always",
"constructor": "never",
"method": "never",
"named": "never"
}
},
"typedef": [
true,
"call-signature"
],
"typedef-whitespace": {
"options": [
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
},
{
"call-signature": "onespace",
"index-signature": "onespace",
"parameter": "onespace",
"property-declaration": "onespace",
"variable-declaration": "onespace"
}
]
},
"variable-name": {
"options": [
"ban-keywords",
"check-format",
"allow-pascal-case"
]
},
"whitespace": {
"options": [
"check-branch",
"check-decl",
"check-operator",
"check-separator",
"check-type",
"check-typecast"
]
},
"component-class-suffix": true,
"contextual-lifecycle": true,
"directive-class-suffix": true,
"no-conflicting-lifecycle": true,
"no-host-metadata-property": true,
"no-input-rename": true,
"no-inputs-metadata-property": true,
"no-output-native": true,
"no-output-on-prefix": true,
"no-output-rename": true,
"no-outputs-metadata-property": true,
"template-banana-in-box": true,
"template-no-negated-async": true,
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"directive-selector": [
true,
"attribute",
"app",
"camelCase"
],
"component-selector": [
true,
"element",
"app",
"kebab-case"
]
}
}