From 5f7717e9af247a9a9fb2bfc09b93ddc3a2a24eb6 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 19 Oct 2023 17:09:22 +0300 Subject: [PATCH] RED-7023 - Option to compare (effective) dossier dictionary with template dictionary --- .../dictionary-manager/dictionary-manager.component.html | 9 ++++++--- .../modules/shared/components/editor/editor.component.ts | 7 +++++-- apps/red-ui/src/app/modules/shared/shared.module.ts | 2 ++ package.json | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html index 5afb996f0..00f4ce51d 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html @@ -68,9 +68,12 @@ {{ selectDossier.dossierName | translate }} - - {{ dossier.dossierName }} - + + + {{ dossier.dossierName }} + + + diff --git a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts index e171885b5..e6019eb51 100644 --- a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts @@ -20,7 +20,7 @@ const lineChangeToDecoration = ({ originalEndLineNumber, originalStartLineNumber glyphMarginClassName: 'arrow-left', isWholeLine: true, }, - } as IModelDeltaDecoration); + }) as IModelDeltaDecoration; const isPositive = (lineChange: ILineChange) => lineChange.originalEndLineNumber - lineChange.originalStartLineNumber >= 0; const notZero = (lineChange: ILineChange) => lineChange.originalEndLineNumber !== 0 && lineChange.originalStartLineNumber !== 0; @@ -47,7 +47,10 @@ export class EditorComponent implements OnInit, OnChanges { codeEditor: ICodeEditor; value: string; - constructor(private readonly _loadingService: LoadingService, private readonly _editorThemeService: EditorThemeService) { + constructor( + private readonly _loadingService: LoadingService, + private readonly _editorThemeService: EditorThemeService, + ) { const textChanged$ = this._editorTextChanged$.pipe( debounceTime(300), // prevent race condition with onPaste event takeUntilDestroyed(), diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index fcf871c30..af66e23fb 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -49,6 +49,7 @@ import { IqserUsersModule } from '@iqser/common-ui/lib/users'; import { SmallChipComponent } from '@iqser/common-ui/lib/shared'; import { SelectComponent } from '@shared/components/select/select.component'; import { FileAttributeComponent } from '../dossier-overview/components/file-attribute/file-attribute.component'; +import { MatDividerModule } from '@angular/material/divider'; const buttons = [FileDownloadBtnComponent]; @@ -103,6 +104,7 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent, FileAttri SelectComponent, RoundCheckboxComponent, DynamicInputComponent, + MatDividerModule, ], exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone], providers: [ diff --git a/package.json b/package.json index 926607e8a..1c9986cd8 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "keycloak-angular": "14.1.0", "keycloak-js": "22.0.4", "lodash-es": "^4.17.21", - "monaco-editor": "0.44.0", + "monaco-editor": "0.43.0", "ng2-charts": "5.0.3", "ngx-color-picker": "15.0.0", "ngx-logger": "^5.0.11",