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

RED-5385 - revert "Keep hidden text" option in Edit Dossier dialog

Browse Source
This commit is contained in:
Valentin Mihai 2023-04-25 12:36:49 +03:00
parent 3f8edaee45
commit ca65f138d3
8 changed files with 35 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html
View File

@ -83,7 +83,7 @@
></redaction-select>
</div>
<p class="heading download-includes">{{ 'documents-hidden-text-option.heading' | translate }}</p>
<p class="heading download-includes">{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}</p>
<div class="hidden-elements">
<div class="iqser-input-group">
<mat-checkbox color="primary" formControlName="keepHiddenText">

47
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html
View File

@ -17,37 +17,24 @@
></redaction-select>
</div>
<div>
<div>
<p class="heading">{{ 'dossier-watermark-selector.heading' | translate }}</p>
<ng-container *ngIf="ctx.existsWatermarks; else noWatermarks">
<redaction-watermark-selector
[dossierTemplateId]="dossier.dossierTemplateId"
[isReadonly]="!canEditDossier"
[label]="'dossier-watermark-selector.watermark' | translate"
formControlName="watermarkId"
>
</redaction-watermark-selector>
<p class="heading">{{ 'dossier-watermark-selector.heading' | translate }}</p>
<ng-container *ngIf="ctx.existsWatermarks; else noWatermarks">
<redaction-watermark-selector
[dossierTemplateId]="dossier.dossierTemplateId"
[isReadonly]="!canEditDossier"
[label]="'dossier-watermark-selector.watermark' | translate"
formControlName="watermarkId"
>
</redaction-watermark-selector>
<redaction-watermark-selector
[dossierTemplateId]="dossier.dossierTemplateId"
[isReadonly]="!canEditDossier"
[label]="'dossier-watermark-selector.preview' | translate"
formControlName="previewWatermarkId"
>
</redaction-watermark-selector>
</ng-container>
</div>
<div>
<p class="heading">{{ 'documents-hidden-text-option.heading' | translate }}</p>
<div class="iqser-input-group">
<mat-checkbox color="primary" formControlName="keepHiddenText">
{{ 'documents-hidden-text-option.title' | translate }}
</mat-checkbox>
<div class="info mt-4">{{ 'documents-hidden-text-option.description' | translate }}</div>
</div>
</div>
</div>
<redaction-watermark-selector
[dossierTemplateId]="dossier.dossierTemplateId"
[isReadonly]="!canEditDossier"
[label]="'dossier-watermark-selector.preview' | translate"
formControlName="previewWatermarkId"
>
</redaction-watermark-selector>
</ng-container>
<ng-template #noWatermarks>
<p class="no-watermark" [innerHTML]="'dossier-watermark-selector.no-watermark' | translate"></p>

12
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss
View File

@ -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;
}

52
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
View File

@ -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<boolean>;
#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 =>

6
apps/red-ui/src/assets/i18n/redact/de.json
View File

@ -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",

6
apps/red-ui/src/assets/i18n/redact/en.json
View File

@ -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",

6
apps/red-ui/src/assets/i18n/scm/de.json
View File

@ -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",

6
apps/red-ui/src/assets/i18n/scm/en.json
View File

@ -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",