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 c8e5e0aa0..9e2edf0cf 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
@@ -68,6 +68,13 @@
+
{{ '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 }}
this.hasValidFrom),
+ this.#requiredIfValidator(() => this.hasValidFrom),
],
validTo: [
this.dossierTemplate?.validTo ? dayjs(this.dossierTemplate?.validTo).toDate() : null,
- this._requiredIfValidator(() => this.hasValidTo),
+ this.#requiredIfValidator(() => this.hasValidTo),
],
+ applyDictionaryUpdatesToAllDossiersByDefault: [this.dossierTemplate?.applyDictionaryUpdatesToAllDossiersByDefault],
downloadFileTypes: [this.dossierTemplate?.downloadFileTypes || ['PREVIEW', 'REDACTED']],
keepHiddenText: [this.dossierTemplate?.keepHiddenText],
keepImageMetadata: [this.dossierTemplate?.keepImageMetadata],
@@ -132,7 +133,7 @@ export class AddEditCloneDossierTemplateDialogComponent extends BaseDialogCompon
});
}
- private _getCloneName(): string {
+ #getCloneName(): string {
if (!this.data?.clone) {
return this.dossierTemplate?.name;
}
@@ -157,7 +158,7 @@ export class AddEditCloneDossierTemplateDialogComponent extends BaseDialogCompon
return `Copy of ${nameOfClonedTemplate}`;
}
- private _requiredIfValidator(predicate) {
+ #requiredIfValidator(predicate) {
return (formControl: AbstractControl) => {
if (!formControl.parent) {
return null;
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
index 26ab564a2..4a2f7c1e3 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
@@ -260,7 +260,7 @@ export class WatermarkScreenComponent implements OnInit {
}
async #loadDocument() {
- const filename = `blank-${this.#config.WATERMARK_PREVIEW_PAPER_FORMAT}.pdf`;
+ const filename = `blank-${this.#config.WATERMARK_PREVIEW_PAPER_FORMAT || 'a4'}.pdf`;
const request = this._http.get(`/assets/pdftron/${filename}`, {
responseType: 'blob',
});
diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts
index 5610feadb..6bd587d2f 100644
--- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts
+++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts
@@ -282,13 +282,11 @@ export class SearchScreenComponent extends ListingComponent imp
}: IMatchedDocument): ISearchListItem {
const file = this._filesMapService.get(dossierId, fileId);
if (!file) {
- console.error('Missing file');
return undefined;
}
const dossier = this._dossiersCacheService.get(dossierId);
if (!dossier) {
- console.error('Missing dossier');
return undefined;
}
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 2b45f6636..a6bddeaee 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -61,7 +61,11 @@
"title": ""
},
"valid-from": "Gültig ab",
- "valid-to": "Gültig bis"
+ "valid-to": "Gültig bis",
+ "apply-updates-default": {
+ "heading": "",
+ "description": ""
+ }
},
"save": "Dossier-Vorlage speichern",
"title": "{type, select, edit{Dossier-Vorlage {name} bearbeiten} create{Dossier-Vorlage erstellen} clone{} other{}}"
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index df39dafe3..43c8c7528 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -61,7 +61,11 @@
"title": "Keep overlapping elements"
},
"valid-from": "Valid from",
- "valid-to": "Valid to"
+ "valid-to": "Valid to",
+ "apply-updates-default": {
+ "heading": "Entity configuration",
+ "description": "Apply dictionary updates to all dossiers by default"
+ }
},
"save": "Save Dossier Template",
"title": "{type, select, edit{Edit {name}} create{Create} clone{Clone} other{}} Dossier Template"
diff --git a/docker/red-ui/docker-entrypoint.sh b/docker/red-ui/docker-entrypoint.sh
index bef8197a7..e7cc6339e 100755
--- a/docker/red-ui/docker-entrypoint.sh
+++ b/docker/red-ui/docker-entrypoint.sh
@@ -23,7 +23,7 @@ AVAILABLE_OLD_NOTIFICATIONS_MINUTES="${AVAILABLE_OLD_NOTIFICATIONS_MINUTES:-60}"
NOTIFICATIONS_THRESHOLD="${NOTIFICATIONS_THRESHOLD:-1000}"
BASE_TRANSLATIONS_DIRECTORY="${BASE_TRANSLATIONS_DIRECTORY:-/assets/i18n/redact/}"
THEME="${THEME:-theme-template}"
-WATERMARK_PREVIEW_PAPER_FORMAT="${WATERMARK_PREVIEW_PAPER_FORMAT:a4}"
+WATERMARK_PREVIEW_PAPER_FORMAT="${WATERMARK_PREVIEW_PAPER_FORMAT:-a4}"
@@ -50,7 +50,7 @@ echo '{
"AVAILABLE_NOTIFICATIONS_DAYS":"'"$AVAILABLE_NOTIFICATIONS_DAYS"'",
"AVAILABLE_OLD_NOTIFICATIONS_MINUTES":"'"$AVAILABLE_OLD_NOTIFICATIONS_MINUTES"'",
"NOTIFICATIONS_THRESHOLD":"'"$NOTIFICATIONS_THRESHOLD"'",
- "WATERMARK_PREVIEW_PAPER_FORMAT":"'"$WATERMARK_PREVIEW_PAPER_FORMAT"'",
+ "WATERMARK_PREVIEW_PAPER_FORMAT":"'"$WATERMARK_PREVIEW_PAPER_FORMAT"'"
}' > /usr/share/nginx/html/ui/assets/config/config.json
echo 'Env variables: '
diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts
index edc85ab5e..811a06cc9 100644
--- a/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts
+++ b/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts
@@ -19,6 +19,7 @@ export class DossierTemplate implements IDossierTemplate, IListable {
readonly keepHiddenText: boolean;
readonly keepImageMetadata: boolean;
readonly keepOverlappingObjects: boolean;
+ readonly applyDictionaryUpdatesToAllDossiersByDefault: boolean;
constructor(dossierTemplate: IDossierTemplate) {
this.createdBy = dossierTemplate.createdBy;
@@ -36,6 +37,7 @@ export class DossierTemplate implements IDossierTemplate, IListable {
this.keepHiddenText = dossierTemplate.keepHiddenText;
this.keepImageMetadata = dossierTemplate.keepImageMetadata;
this.keepOverlappingObjects = dossierTemplate.keepOverlappingObjects;
+ this.applyDictionaryUpdatesToAllDossiersByDefault = dossierTemplate.applyDictionaryUpdatesToAllDossiersByDefault;
}
get isActive(): boolean {
diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template.ts
index a0f695a5a..b92254a06 100644
--- a/libs/red-domain/src/lib/dossier-templates/dossier-template.ts
+++ b/libs/red-domain/src/lib/dossier-templates/dossier-template.ts
@@ -60,4 +60,5 @@ export interface IDossierTemplate {
* Overlapping elements in the document can potentially contain hidden sensitive information
*/
readonly keepOverlappingObjects: boolean;
+ readonly applyDictionaryUpdatesToAllDossiersByDefault: boolean;
}
diff --git a/package.json b/package.json
index b79a5c8f6..73a78f74a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "redaction",
- "version": "4.128.0",
+ "version": "4.129.0",
"private": true,
"license": "MIT",
"scripts": {