From ccee85a05e7aa3c4d57d4b91b856da6d282bad96 Mon Sep 17 00:00:00 2001 From: Frank Strieter Date: Wed, 23 Mar 2022 08:33:19 +0100 Subject: [PATCH] fix code style issues solve merge conflicts format code format code format code --- .github/workflows/project-actions.yml | 3 - src-ui/angular.json | 347 +++++++++--------- src-ui/jest.config.js | 10 +- src-ui/package.json | 2 +- src-ui/setup-jest.ts | 20 +- .../edit-dialog/edit-dialog.component.ts | 36 +- .../common/input/check/check.component.ts | 2 +- src-ui/test-config.helper.ts | 27 +- 8 files changed, 222 insertions(+), 225 deletions(-) diff --git a/.github/workflows/project-actions.yml b/.github/workflows/project-actions.yml index 9c1acfaa9..2cf98bf4b 100644 --- a/.github/workflows/project-actions.yml +++ b/.github/workflows/project-actions.yml @@ -8,9 +8,6 @@ on: types: - opened - reopened - branches: - - main - - dev # map fields with customized labels env: diff --git a/src-ui/angular.json b/src-ui/angular.json index 6edccee5b..16cc2070e 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -2,179 +2,176 @@ "$schema": "./node_modules/@angular/cli/lib/config/schema.json", "version": 1, "newProjectRoot": "projects", - "projects": { - "paperless-ui": { - "projectType": "application", - "schematics": { - "@schematics/angular:component": { - "style": "scss" - } - }, - "root": "", - "sourceRoot": "src", - "prefix": "app", - "i18n": { - "sourceLocale": "en-US", - "locales": { - "cs-CZ": "src/locale/messages.cs_CZ.xlf", - "da-DK": "src/locale/messages.da_DK.xlf", - "de-DE": "src/locale/messages.de_DE.xlf", - "en-GB": "src/locale/messages.en_GB.xlf", - "es-ES": "src/locale/messages.es_ES.xlf", - "fr-FR": "src/locale/messages.fr_FR.xlf", - "it-IT": "src/locale/messages.it_IT.xlf", - "lb-LU": "src/locale/messages.lb_LU.xlf", - "nl-NL": "src/locale/messages.nl_NL.xlf", - "pl-PL": "src/locale/messages.pl_PL.xlf", - "pt-BR": "src/locale/messages.pt_BR.xlf", - "pt-PT": "src/locale/messages.pt_PT.xlf", - "ro-RO": "src/locale/messages.ro_RO.xlf", - "ru-RU": "src/locale/messages.ru_RU.xlf", - "sl-SI": "src/locale/messages.sl_SI.xlf", - "sr-CS": "src/locale/messages.sr_CS.xlf", - "sv-SE": "src/locale/messages.sv_SE.xlf", - "zh-CN": "src/locale/messages.zh_CN.xlf" - } - }, - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "dist/paperless-ui", - "outputHashing": "none", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.app.json", - "localize": true, - "assets": [ - "src/favicon.ico", - "src/apple-touch-icon.png", - "src/assets", - "src/manifest.webmanifest", - { - "glob": "pdf.worker.min.js", - "input": "node_modules/pdfjs-dist/build/", - "output": "/assets/js/" - } - ], - "styles": [ - "src/styles.scss" - ], - "scripts": [], - "allowedCommonJsDependencies": [ - "ng2-pdf-viewer" - ], - "vendorChunk": true, - "extractLicenses": false, - "buildOptimizer": false, - "sourceMap": true, - "optimization": false, - "namedChunks": true - }, - "configurations": { - "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "outputPath": "../src/documents/static/frontend/", - "optimization": true, - "outputHashing": "none", - "sourceMap": false, - "namedChunks": false, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, - "budgets": [ - { - "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "6kb", - "maximumError": "10kb" - } - ] - }, - "en-US": { - "localize": [ - "en-US" - ] - } - }, - "defaultConfiguration": "" - }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "options": { - "browserTarget": "paperless-ui:build:en-US" - }, - "configurations": { - "production": { - "browserTarget": "paperless-ui:build:production" - } - } - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", - "options": { - "browserTarget": "paperless-ui:build" - } - }, - "test": { - "builder": "@angular-builders/jest:run", - "options": { - "tsConfig": "tsconfig.spec.json", - "assets": [ - "src/favicon.ico", - "src/apple-touch-icon.png", - "src/assets", - "src/manifest.webmanifest" - ], - "styles": [ - "src/styles.scss" - ], - "scripts": [] - } - }, - "e2e": { - "builder": "@cypress/schematic:cypress", - "options": { - "devServerTarget": "paperless-ui:serve", - "watch": true, - "headless": false - }, - "configurations": { - "production": { - "devServerTarget": "paperless-ui:serve:production" - } - } - }, - "cypress-run": { - "builder": "@cypress/schematic:cypress", - "options": { - "devServerTarget": "paperless-ui:serve" - }, - "configurations": { - "production": { - "devServerTarget": "paperless-ui:serve:production" - } - } - }, - "cypress-open": { - "builder": "@cypress/schematic:cypress", - "options": { - "watch": true, - "headless": false - } - } - } - } - }, - "defaultProject": "paperless-ui" + "projects": { + "paperless-ui": { + "projectType": "application", + "schematics": { + "@schematics/angular:component": { + "style": "scss" + } + }, + "root": "", + "sourceRoot": "src", + "prefix": "app", + "i18n": { + "sourceLocale": "en-US", + "locales": { + "cs-CZ": "src/locale/messages.cs_CZ.xlf", + "da-DK": "src/locale/messages.da_DK.xlf", + "de-DE": "src/locale/messages.de_DE.xlf", + "en-GB": "src/locale/messages.en_GB.xlf", + "es-ES": "src/locale/messages.es_ES.xlf", + "fr-FR": "src/locale/messages.fr_FR.xlf", + "it-IT": "src/locale/messages.it_IT.xlf", + "lb-LU": "src/locale/messages.lb_LU.xlf", + "nl-NL": "src/locale/messages.nl_NL.xlf", + "pl-PL": "src/locale/messages.pl_PL.xlf", + "pt-BR": "src/locale/messages.pt_BR.xlf", + "pt-PT": "src/locale/messages.pt_PT.xlf", + "ro-RO": "src/locale/messages.ro_RO.xlf", + "ru-RU": "src/locale/messages.ru_RU.xlf", + "sl-SI": "src/locale/messages.sl_SI.xlf", + "sr-CS": "src/locale/messages.sr_CS.xlf", + "sv-SE": "src/locale/messages.sv_SE.xlf", + "zh-CN": "src/locale/messages.zh_CN.xlf" + } + }, + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/paperless-ui", + "outputHashing": "none", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.app.json", + "localize": true, + "assets": [ + "src/favicon.ico", + "src/apple-touch-icon.png", + "src/assets", + "src/manifest.webmanifest", { + "glob": "pdf.worker.min.js", + "input": "node_modules/pdfjs-dist/build/", + "output": "/assets/js/" + } + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [], + "allowedCommonJsDependencies": [ + "ng2-pdf-viewer" + ], + "vendorChunk": true, + "extractLicenses": false, + "buildOptimizer": false, + "sourceMap": true, + "optimization": false, + "namedChunks": true + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "outputPath": "../src/documents/static/frontend/", + "optimization": true, + "outputHashing": "none", + "sourceMap": false, + "namedChunks": false, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb", + "maximumError": "10kb" + } + ] + }, + "en-US": { + "localize": ["en-US"] + } + }, + "defaultConfiguration": "" + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "paperless-ui:build:en-US" + }, + "configurations": { + "production": { + "browserTarget": "paperless-ui:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "paperless-ui:build" + } + }, + "test": { + "builder": "@angular-builders/jest:run", + "options": { + "tsConfig": "tsconfig.spec.json", + "assets": [ + "src/favicon.ico", + "src/apple-touch-icon.png", + "src/assets", + "src/manifest.webmanifest" + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [] + } + }, + "e2e": { + "builder": "@cypress/schematic:cypress", + "options": { + "devServerTarget": "paperless-ui:serve", + "watch": true, + "headless": false + }, + "configurations": { + "production": { + "devServerTarget": "paperless-ui:serve:production" + } + } + }, + "cypress-run": { + "builder": "@cypress/schematic:cypress", + "options": { + "devServerTarget": "paperless-ui:serve" + }, + "configurations": { + "production": { + "devServerTarget": "paperless-ui:serve:production" + } + } + }, + "cypress-open": { + "builder": "@cypress/schematic:cypress", + "options": { + "watch": true, + "headless": false + } + } + } + } + }, + "defaultProject": "paperless-ui" } diff --git a/src-ui/jest.config.js b/src-ui/jest.config.js index 45ef68959..23de7b188 100644 --- a/src-ui/jest.config.js +++ b/src-ui/jest.config.js @@ -1,8 +1,8 @@ module.exports = { moduleNameMapper: { - "@core/(.*)": "/src/app/core/$1", + '@core/(.*)': '/src/app/core/$1', }, - preset: "jest-preset-angular", - setupFilesAfterEnv: ["/setup-jest.ts"], - testPathIgnorePatterns: ["/node_modules/", "/cypress/"], -}; + preset: 'jest-preset-angular', + setupFilesAfterEnv: ['/setup-jest.ts'], + testPathIgnorePatterns: ['/node_modules/', '/cypress/'], +} diff --git a/src-ui/package.json b/src-ui/package.json index 6683b997d..38602c730 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -9,7 +9,7 @@ "lint": "ng lint", "e2e": "ng e2e", "cy:run": "cypress run", - "e2e:ci": "concurrently \"npm run start\" \"wait-on http-get://localhost:4200 && npm run cy:run\" --kill-others --success first" + "e2e:ci": "concurrently 'npm run start' 'wait-on http-get://localhost:4200 && npm run cy:run' --kill-others --success first" }, "private": true, "dependencies": { diff --git a/src-ui/setup-jest.ts b/src-ui/setup-jest.ts index c581590b2..5ada7e7c6 100644 --- a/src-ui/setup-jest.ts +++ b/src-ui/setup-jest.ts @@ -1,30 +1,30 @@ -import 'jest-preset-angular/setup-jest'; +import 'jest-preset-angular/setup-jest' /* global mocks for jsdom */ const mock = () => { - let storage: { [key: string]: string } = {}; + let storage: { [key: string]: string } = {} return { getItem: (key: string) => (key in storage ? storage[key] : null), setItem: (key: string, value: string) => (storage[key] = value || ''), removeItem: (key: string) => delete storage[key], clear: () => (storage = {}), - }; -}; + } +} -Object.defineProperty(window, 'localStorage', { value: mock() }); -Object.defineProperty(window, 'sessionStorage', { value: mock() }); +Object.defineProperty(window, 'localStorage', { value: mock() }) +Object.defineProperty(window, 'sessionStorage', { value: mock() }) Object.defineProperty(window, 'getComputedStyle', { value: () => ['-webkit-appearance'], -}); +}) Object.defineProperty(document.body.style, 'transform', { value: () => { return { enumerable: true, configurable: true, - }; + } }, -}); +}) /* output shorter and more meaningful Zone error stack traces */ -// Error.stackTraceLimit = 2; +// Error.stackTraceLimit = 2 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 1ba9c53ec..92b16a93d 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 @@ -19,27 +19,27 @@ export abstract class EditDialogComponent ) {} @Input() - dialogMode: string = 'create'; + dialogMode: string = 'create' @Input() - object: T; + object: T @Output() - success = new EventEmitter(); + success = new EventEmitter() - networkActive = false; + networkActive = false - closeEnabled = false; + closeEnabled = false - error = null; + error = null - abstract getForm(): FormGroup; + abstract getForm(): FormGroup - objectForm: FormGroup = this.getForm(); + objectForm: FormGroup = this.getForm() ngOnInit(): void { if (this.object != null) { - this.objectForm.patchValue(this.object); + this.objectForm.patchValue(this.object) } // wait to enable close button so it doesnt steal focus from input since its the first clickable element in the DOM @@ -49,34 +49,34 @@ export abstract class EditDialogComponent } getCreateTitle() { - return $localize`Create new item`; + return $localize`Create new item` } getEditTitle() { - return $localize`Edit item`; + return $localize`Edit item` } getSaveErrorMessage(error: string) { - return $localize`Could not save element: ${error}`; + return $localize`Could not save element: ${error}` } getTitle() { switch (this.dialogMode) { case 'create': - return this.getCreateTitle(); + return this.getCreateTitle() case 'edit': - return this.getEditTitle(); + return this.getEditTitle() default: break } } getMatchingAlgorithms() { - return MATCHING_ALGORITHMS; + return MATCHING_ALGORITHMS } get patternRequired(): boolean { - return this.objectForm?.value.matching_algorithm !== MATCH_AUTO; + return this.objectForm?.value.matching_algorithm !== MATCH_AUTO } save() { @@ -90,7 +90,7 @@ export abstract class EditDialogComponent serverResponse = this.service.create(newObject) break case 'edit': - serverResponse = this.service.update(newObject); + serverResponse = this.service.update(newObject) default: break } @@ -108,6 +108,6 @@ export abstract class EditDialogComponent } cancel() { - this.activeModal.close(); + this.activeModal.close() } } diff --git a/src-ui/src/app/components/common/input/check/check.component.ts b/src-ui/src/app/components/common/input/check/check.component.ts index bf99b3c6a..f4a6e527e 100644 --- a/src-ui/src/app/components/common/input/check/check.component.ts +++ b/src-ui/src/app/components/common/input/check/check.component.ts @@ -17,6 +17,6 @@ import { AbstractInputComponent } from '../abstract-input' }) export class CheckComponent extends AbstractInputComponent { constructor() { - super(); + super() } } diff --git a/src-ui/test-config.helper.ts b/src-ui/test-config.helper.ts index 4bec94ea4..f38cdfb26 100644 --- a/src-ui/test-config.helper.ts +++ b/src-ui/test-config.helper.ts @@ -1,21 +1,24 @@ -import { TestBed } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing' type CompilerOptions = Partial<{ - providers: any[]; - useJit: boolean; - preserveWhitespaces: boolean; -}>; -export type ConfigureFn = (testBed: typeof TestBed) => void; + providers: any[] + useJit: boolean + preserveWhitespaces: boolean +}> +export type ConfigureFn = (testBed: typeof TestBed) => void -export const configureTests = (configure: ConfigureFn, compilerOptions: CompilerOptions = {}) => { +export const configureTests = ( + configure: ConfigureFn, + compilerOptions: CompilerOptions = {} +) => { const compilerConfig: CompilerOptions = { preserveWhitespaces: false, ...compilerOptions, - }; + } - const configuredTestBed = TestBed.configureCompiler(compilerConfig); + const configuredTestBed = TestBed.configureCompiler(compilerConfig) - configure(configuredTestBed); + configure(configuredTestBed) - return configuredTestBed.compileComponents().then(() => configuredTestBed); -}; + return configuredTestBed.compileComponents().then(() => configuredTestBed) +}