Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-3800: update common-ui

Browse Source
This commit is contained in:
Dan Percic 2022-06-21 11:40:00 +03:00
parent 4c03f92c62
commit 16a1d99bc1
8 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -21,3 +21,5 @@ ij_typescript_spaces_within_imports = true
[{*.json, .prettierrc, .eslintrc}] [{*.json, .prettierrc, .eslintrc}]
indent_size = 2 indent_size = 2
tab_width = 2
ij_json_array_wrapping = off

1
.prettierignore
View File

@ -4,3 +4,4 @@
/coverage /coverage
/node_modules /node_modules
/bamboo-specs /bamboo-specs
*.md

6
apps/red-ui/.eslintrc.json
View File

@ -12,9 +12,13 @@
"rules": { "rules": {
"@typescript-eslint/no-unsafe-return": "off", "@typescript-eslint/no-unsafe-return": "off",
"@typescript-eslint/no-unsafe-assignment": "off", "@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-argument": "off",
"@typescript-eslint/no-unsafe-member-access": "off", "@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/no-unsafe-call": "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"
} }
} }
] ]

2
apps/red-ui/src/app/app.component.ts
View File

@ -12,7 +12,7 @@ export class AppComponent {
// ViewContainerRef needs to be injected for the color picker to work // 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 // RouterHistoryService needs to be injected for last dossiers screen to be updated on first app load
constructor( constructor(
public viewContainerRef: ViewContainerRef, readonly viewContainerRef: ViewContainerRef,
private readonly _routerHistoryService: RouterHistoryService, private readonly _routerHistoryService: RouterHistoryService,
private readonly _userService: UserService, private readonly _userService: UserService,
readonly documentViewer: REDDocumentViewer, readonly documentViewer: REDDocumentViewer,

3
apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
View File

@ -428,9 +428,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
if (hasAnnotations) { if (hasAnnotations) {
return this.#findAnnotationsToDraw(newAnnotations, oldAnnotations); return this.#findAnnotationsToDraw(newAnnotations, oldAnnotations);
} else {
return newAnnotations;
} }
return newAnnotations;
} }
#rebuildFilters() { #rebuildFilters() {

8
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
View File

@ -84,7 +84,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
this.states.length === 1 this.states.length === 1
? 'edit-dossier-dialog.general-info.form.dossier-state.no-state-placeholder' ? 'edit-dossier-dialog.general-info.form.dossier-state.no-state-placeholder'
: 'edit-dossier-dialog.general-info.form.dossier-state.placeholder', : 'edit-dossier-dialog.general-info.form.dossier-state.placeholder',
); ) as string;
} }
ngOnInit() { ngOnInit() {
@ -174,10 +174,8 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
} }
getStateName(stateId: string): string { getStateName(stateId: string): string {
return ( return (this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId)?.name ||
this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId)?.name || this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-state.placeholder')) as string;
this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-state.placeholder')
);
} }
getStateColor(stateId: string): string { getStateColor(stateId: string): string {

2
apps/red-ui/src/app/services/config.service.ts
View File

@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
import { Title } from '@angular/platform-browser'; import { Title } from '@angular/platform-browser';
import packageInfo from '../../../../../package.json'; import packageInfo from '../../../../../package.json';
import envConfig from '../../assets/config/config.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 { Observable } from 'rxjs';
import { tap } from 'rxjs/operators'; import { tap } from 'rxjs/operators';
import { AppConfig } from '@red/domain'; import { AppConfig } from '@red/domain';

2
libs/common-ui

@ -1 +1 @@
Subproject commit f1934abc2b259a6e89303e95fe70a54471d2401d Subproject commit 90419f2f8b7c1d970ca0bf2cfdfebae9d3271156