diff --git a/.editorconfig b/.editorconfig index 347f00f8a..73ad2e311 100644 --- a/.editorconfig +++ b/.editorconfig @@ -21,3 +21,5 @@ ij_typescript_spaces_within_imports = true [{*.json, .prettierrc, .eslintrc}] indent_size = 2 +tab_width = 2 +ij_json_array_wrapping = off diff --git a/.prettierignore b/.prettierignore index 62d06f966..81d117d52 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,3 +4,4 @@ /coverage /node_modules /bamboo-specs +*.md diff --git a/apps/red-ui/.eslintrc.json b/apps/red-ui/.eslintrc.json index a4c08896a..3261c1447 100644 --- a/apps/red-ui/.eslintrc.json +++ b/apps/red-ui/.eslintrc.json @@ -12,9 +12,13 @@ "rules": { "@typescript-eslint/no-unsafe-return": "off", "@typescript-eslint/no-unsafe-assignment": "off", + "@typescript-eslint/no-unsafe-argument": "off", "@typescript-eslint/no-unsafe-member-access": "off", "@typescript-eslint/no-unsafe-call": "off", - "@typescript-eslint/unbound-method": "off" + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/unbound-method": "off", + "@typescript-eslint/no-misused-promises": "off", + "@typescript-eslint/no-floating-promises": "off" } } ] diff --git a/apps/red-ui/src/app/app.component.ts b/apps/red-ui/src/app/app.component.ts index 39033dde8..2dbb71620 100644 --- a/apps/red-ui/src/app/app.component.ts +++ b/apps/red-ui/src/app/app.component.ts @@ -12,7 +12,7 @@ export class AppComponent { // ViewContainerRef needs to be injected for the color picker to work // RouterHistoryService needs to be injected for last dossiers screen to be updated on first app load constructor( - public viewContainerRef: ViewContainerRef, + readonly viewContainerRef: ViewContainerRef, private readonly _routerHistoryService: RouterHistoryService, private readonly _userService: UserService, readonly documentViewer: REDDocumentViewer, diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 5124d2521..dfc07a124 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -428,9 +428,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni if (hasAnnotations) { return this.#findAnnotationsToDraw(newAnnotations, oldAnnotations); - } else { - return newAnnotations; } + return newAnnotations; } #rebuildFilters() { diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 620b88105..663e6dd41 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -84,7 +84,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti this.states.length === 1 ? 'edit-dossier-dialog.general-info.form.dossier-state.no-state-placeholder' : 'edit-dossier-dialog.general-info.form.dossier-state.placeholder', - ); + ) as string; } ngOnInit() { @@ -174,10 +174,8 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } getStateName(stateId: string): string { - return ( - this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId)?.name || - this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-state.placeholder') - ); + return (this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId)?.name || + this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-state.placeholder')) as string; } getStateColor(stateId: string): string { diff --git a/apps/red-ui/src/app/services/config.service.ts b/apps/red-ui/src/app/services/config.service.ts index ff1381bbd..ffb9ccae1 100644 --- a/apps/red-ui/src/app/services/config.service.ts +++ b/apps/red-ui/src/app/services/config.service.ts @@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http'; import { Title } from '@angular/platform-browser'; import packageInfo from '../../../../../package.json'; import envConfig from '../../assets/config/config.json'; -import { CacheApiService, wipeAllCaches, wipeCaches } from '@red/cache'; +import { CacheApiService, wipeAllCaches } from '@red/cache'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; import { AppConfig } from '@red/domain'; diff --git a/libs/common-ui b/libs/common-ui index f1934abc2..90419f2f8 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit f1934abc2b259a6e89303e95fe70a54471d2401d +Subproject commit 90419f2f8b7c1d970ca0bf2cfdfebae9d3271156