From ca65f138d39a88024208d4c90123c51939e69460 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Tue, 25 Apr 2023 12:36:49 +0300 Subject: [PATCH] RED-5385 - revert "Keep hidden text" option in Edit Dossier dialog --- ...one-dossier-template-dialog.component.html | 2 +- ...it-dossier-download-package.component.html | 47 ++++++----------- ...it-dossier-download-package.component.scss | 12 ----- ...edit-dossier-download-package.component.ts | 52 +++++-------------- apps/red-ui/src/assets/i18n/redact/de.json | 6 +-- apps/red-ui/src/assets/i18n/redact/en.json | 6 +-- apps/red-ui/src/assets/i18n/scm/de.json | 6 +-- apps/red-ui/src/assets/i18n/scm/en.json | 6 +-- 8 files changed, 35 insertions(+), 102 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html index 0e87b5ac5..058bed64c 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html @@ -83,7 +83,7 @@ > -

{{ 'documents-hidden-text-option.heading' | translate }}

+

{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}

diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html index 50582da92..f11b0df05 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html @@ -17,37 +17,24 @@ >
-
-
-

{{ 'dossier-watermark-selector.heading' | translate }}

- - - +

{{ 'dossier-watermark-selector.heading' | translate }}

+ + + - - - -
-
-

{{ 'documents-hidden-text-option.heading' | translate }}

-
- - {{ 'documents-hidden-text-option.title' | translate }} - -
{{ 'documents-hidden-text-option.description' | translate }}
-
-
-
+ + +

diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss index 82a878d75..e00963652 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss @@ -9,14 +9,6 @@ form { > div { display: flex; - - > div { - width: 50%; - } - - > div:first-child { - margin-right: 16px; - } } } @@ -28,7 +20,3 @@ form { .no-watermark { color: var(--iqser-grey-7); } - -.info { - margin-left: 24px; -} diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 715577fdb..419210ef6 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -14,11 +14,8 @@ import { DossierTemplatesService } from '@services/dossier-templates/dossier-tem interface EditDossierDownloadPackageContext { existsWatermarks: boolean; - dossierTemplate: IDossierTemplate; } -const KEEP_HIDDEN_TEXT_KEY = 'keepHiddenText'; - @Component({ selector: 'redaction-edit-dossier-download-package', templateUrl: './edit-dossier-download-package.component.html', @@ -39,14 +36,11 @@ export class EditDossierDownloadPackageComponent #existsWatermarks$: Observable; - #dossierTemplate: DossierTemplate; - @Input() dossier: Dossier; constructor( private readonly _dossiersService: DossiersService, private readonly _reportTemplateController: ReportTemplateService, - private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _formBuilder: UntypedFormBuilder, private readonly _permissionsService: PermissionsService, private readonly _watermarksMapService: WatermarksMapService, @@ -68,28 +62,22 @@ export class EditDossierDownloadPackageComponent } for (const key of Object.keys(this.form.getRawValue())) { - if (key !== KEEP_HIDDEN_TEXT_KEY) { - if (key.toLowerCase().includes('watermark')) { - if (this.dossier[key] !== this.form.get(key).value) { - return true; - } - } else { - if (this.dossier[key].length !== this.form.get(key).value.length) { - return true; - } - const originalItems = [...this.dossier[key]].sort(); - const newItems = [...this.form.get(key).value].sort(); - - for (let idx = 0; idx < originalItems.length; ++idx) { - if (originalItems[idx] !== newItems[idx]) { - return true; - } - } + if (key.toLowerCase().includes('watermark')) { + if (this.dossier[key] !== this.form.get(key).value) { + return true; } } else { - if (this.#dossierTemplate.keepHiddenText !== this.form.get(KEEP_HIDDEN_TEXT_KEY).value) { + if (this.dossier[key].length !== this.form.get(key).value.length) { return true; } + const originalItems = [...this.dossier[key]].sort(); + const newItems = [...this.form.get(key).value].sort(); + + for (let idx = 0; idx < originalItems.length; ++idx) { + if (originalItems[idx] !== newItems[idx]) { + return true; + } + } } } @@ -113,16 +101,10 @@ export class EditDossierDownloadPackageComponent async ngOnInit() { const dossierTemplateId = this.dossier.dossierTemplateId; - this.#dossierTemplate = this._dossierTemplatesService.find(dossierTemplateId); - const dossierTemplate$ = this._dossierTemplatesService - .getEntityChanged$(dossierTemplateId) - .pipe(tap(dossierTemplate => (this.#dossierTemplate = dossierTemplate))); - this.#existsWatermarks$ = this._watermarksMapService.watchChanged$(dossierTemplateId).pipe(shareLast()); super._initContext({ existsWatermarks: this.#existsWatermarks$, - dossierTemplate: dossierTemplate$, }); this.availableReportTypes = (await this._reportTemplateController.getAvailableReportTemplates(dossierTemplateId)) || []; @@ -142,14 +124,8 @@ export class EditDossierDownloadPackageComponent previewWatermarkId: this.form.get('previewWatermarkId').value, }; - const dossierTemplate = { - ...this.#dossierTemplate, - keepHiddenText: this.form.get('keepHiddenText').value, - }; - const updateDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); - const updateDossierTemplate = await this._dossierTemplatesService.createOrUpdate(dossierTemplate); - return { success: !!updateDossier && !!updateDossierTemplate }; + return { success: !!updateDossier }; } revert() { @@ -158,7 +134,6 @@ export class EditDossierDownloadPackageComponent reportTemplateIds: this.dossier.reportTemplateIds, watermarkId: this.dossier.watermarkId, previewWatermarkId: this.dossier.previewWatermarkId, - keepHiddenText: [this.#dossierTemplate.keepHiddenText], }); } @@ -169,7 +144,6 @@ export class EditDossierDownloadPackageComponent downloadFileTypes: [this.dossier.downloadFileTypes], watermarkId: [this.dossier.watermarkId], previewWatermarkId: [this.dossier.previewWatermarkId], - keepHiddenText: [this.#dossierTemplate.keepHiddenText], }, { validators: control => diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 8f149cc1a..6a0bfceb2 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -47,6 +47,7 @@ "description-placeholder": "Beschreibung eingeben", "hidden-text": { "description": "", + "heading": "", "title": "" }, "image-metadata": { @@ -749,11 +750,6 @@ "save": "Dokumenteninformation speichern", "title": "Datei-Attribute anlegen" }, - "documents-hidden-text-option": { - "description": "", - "heading": "", - "title": "" - }, "dossier-attribute-types": { "date": "Datum", "image": "Bild", diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 05d327b20..893c1decf 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -47,6 +47,7 @@ "description-placeholder": "Enter Description", "hidden-text": { "description": "Hidden text is invisible to human readers but can be detected and read by software and machines. For example, the OCR output of scanned documents is stored as hidden text.", + "heading": "Hidden text on documents", "title": "Keep hidden text in redacted documents" }, "image-metadata": { @@ -749,11 +750,6 @@ "save": "Save Document Info", "title": "Enter File Attributes" }, - "documents-hidden-text-option": { - "description": "Hidden text is invisible to human readers but can be detected and read by software and machines. For example, the OCR output of scanned documents is stored as hidden text.", - "heading": "Hidden text on documents", - "title": "Keep hidden text in redacted documents" - }, "dossier-attribute-types": { "date": "Date", "image": "Image", diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 266b0d706..d59d6e4b8 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -47,6 +47,7 @@ "description-placeholder": "Beschreibung eingeben", "hidden-text": { "description": "", + "heading": "", "title": "" }, "image-metadata": { @@ -749,11 +750,6 @@ "save": "Dokumenteninformation speichern", "title": "Datei-Attribute anlegen" }, - "documents-hidden-text-option": { - "description": "", - "heading": "", - "title": "" - }, "dossier-attribute-types": { "date": "Datum", "image": "Bild", diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index f7de72e56..951f40d13 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -47,6 +47,7 @@ "description-placeholder": "Enter Description", "hidden-text": { "description": "Hidden text is invisible to human readers but can be detected and read by software and machines. For example, the OCR output of scanned documents is stored as hidden text.", + "heading": "Hidden text on documents", "title": "Keep hidden text in redacted documents" }, "image-metadata": { @@ -749,11 +750,6 @@ "save": "Save Document Info", "title": "Enter File Attributes" }, - "documents-hidden-text-option": { - "description": "Hidden text is invisible to human readers but can be detected and read by software and machines. For example, the OCR output of scanned documents is stored as hidden text.", - "heading": "Hidden text on documents", - "title": "Keep hidden text in redacted documents" - }, "dossier-attribute-types": { "date": "Date", "image": "Image",