From 456ca8cc468f556575bec2ac2eb3c76293b697e0 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Fri, 26 Jul 2024 16:14:37 +0300 Subject: [PATCH 1/3] RED-9201 - UI for Component Mapping Tables --- .../add-edit-component-mapping-dialog.component.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts index b3ae5b60f..2542e31eb 100644 --- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts @@ -73,19 +73,20 @@ export class AddEditComponentMappingDialogComponent } } - fileChanged(file: Blob) { + fileChanged(file: File) { this.form.get('file').setValue(file); + this.form.get('fileName').setValue(file?.name); } save() { - const fileName = document.getElementById('file-name-label')?.textContent; - this.dialogRef.close({ ...this.data.mapping, ...this.form.getRawValue(), fileName }); + this.dialogRef.close({ ...this.data.mapping, ...this.form.getRawValue() }); } #getForm(): UntypedFormGroup { return this._formBuilder.group({ name: [this.data?.mapping?.name, Validators.required], file: [null, Validators.required], + fileName: [this.data?.mapping?.fileName, Validators.required], encoding: this.encodingTypeOptions.find(e => e === this.data?.mapping?.encoding) ?? this.encodingTypeOptions[0], delimiter: [this.data?.mapping?.delimiter ?? ',', Validators.required], }); From 47b16d22875354bce909e31c4f9db805b795153e Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Fri, 26 Jul 2024 16:28:36 +0300 Subject: [PATCH 2/3] RED-9754: removed document version in dossier templates in documine. --- ...ossier-template-info-screen.component.html | 138 +++++++++--------- .../dossier-template-info-screen.component.ts | 2 + 2 files changed, 72 insertions(+), 68 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html index 94e7dc00a..529fbd011 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html @@ -33,7 +33,7 @@
- + @if (hasValidFrom()) { - + }
@@ -53,7 +53,7 @@ {{ 'add-edit-clone-dossier-template.form.valid-to' | translate }}
- + @if (hasValidTo()) { - + }
-
-
- {{ 'add-edit-clone-dossier-template.form.apply-updates-default.heading' | translate }} -
-
- - {{ 'add-edit-clone-dossier-template.form.apply-updates-default.description' | translate }} - -
-
- -
-
{{ 'download-includes' | translate }}
- - -
- -
-
- {{ 'add-edit-clone-dossier-template.form.upload-settings.heading' | translate }} -
-
- - {{ 'add-edit-clone-dossier-template.form.upload-settings.ocr-by-default' | translate }} - -
-
- - {{ 'add-edit-clone-dossier-template.form.upload-settings.remove-watermark' | translate }} - -
-
- -
-
{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}
-
- - {{ 'add-edit-clone-dossier-template.form.hidden-text.title' | translate }} - -
{{ 'add-edit-clone-dossier-template.form.hidden-text.description' | translate }}
-
-
- - {{ 'add-edit-clone-dossier-template.form.image-metadata.title' | translate }} - -
{{ 'add-edit-clone-dossier-template.form.image-metadata.description' | translate }}
-
-
- - {{ 'add-edit-clone-dossier-template.form.overlapping-elements.title' | translate }} - -
- {{ 'add-edit-clone-dossier-template.form.overlapping-elements.description' | translate }} + @if (!isDocumine) { +
+
+ {{ 'add-edit-clone-dossier-template.form.apply-updates-default.heading' | translate }} +
+
+ + {{ 'add-edit-clone-dossier-template.form.apply-updates-default.description' | translate }} +
-
+ +
+
{{ 'download-includes' | translate }}
+ + +
+ +
+
+ {{ 'add-edit-clone-dossier-template.form.upload-settings.heading' | translate }} +
+
+ + {{ 'add-edit-clone-dossier-template.form.upload-settings.ocr-by-default' | translate }} + +
+
+ + {{ 'add-edit-clone-dossier-template.form.upload-settings.remove-watermark' | translate }} + +
+
+ +
+
{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}
+
+ + {{ 'add-edit-clone-dossier-template.form.hidden-text.title' | translate }} + +
{{ 'add-edit-clone-dossier-template.form.hidden-text.description' | translate }}
+
+
+ + {{ 'add-edit-clone-dossier-template.form.image-metadata.title' | translate }} + +
{{ 'add-edit-clone-dossier-template.form.image-metadata.description' | translate }}
+
+
+ + {{ 'add-edit-clone-dossier-template.form.overlapping-elements.title' | translate }} + +
+ {{ 'add-edit-clone-dossier-template.form.overlapping-elements.description' | translate }} +
+
+
+ }
diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts index 0d21402f1..a9b2ffd59 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts @@ -26,6 +26,7 @@ import { NgIf } from '@angular/common'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIcon } from '@angular/material/icon'; import { SelectComponent } from '@shared/components/select/select.component'; +import { MatSuffix } from '@angular/material/form-field'; const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(type => ({ key: type, @@ -47,6 +48,7 @@ const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(t SelectComponent, IconButtonComponent, MatIcon, + MatSuffix, ], }) export default class DossierTemplateInfoScreenComponent extends BaseFormComponent implements OnInit { From aaef6c764941293f2f38ec1c2aed7a73455ad9ed Mon Sep 17 00:00:00 2001 From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1 Date: Sat, 27 Jul 2024 01:03:29 +0000 Subject: [PATCH 3/3] push back localazy update --- apps/red-ui/src/assets/i18n/redact/de.json | 1 + apps/red-ui/src/assets/i18n/scm/de.json | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 57cc94144..91a25aeb1 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -568,6 +568,7 @@ }, "search": "Nach Name suchen...", "table-col-names": { + "column-labels": "Column labels", "name": "Name", "number-of-lines": "Zeilenzahl", "version": "Version" diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 515f352af..9c1134212 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -568,6 +568,7 @@ }, "search": "Search by name...", "table-col-names": { + "column-labels": "Column labels", "name": "name", "number-of-lines": "Number of lines", "version": "version"