From 61e9df1844e8d9a0df1e9155d5f55accbc6561b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kilian=20Sch=C3=BCttler?= <kilian.schuettler@knecon.com>
Date: Thu, 24 Oct 2024 09:59:21 +0200
Subject: [PATCH] feature/RED-10260: add quoteChar to componentMapping

---
 ...add-edit-component-mapping-dialog.component.html |  9 +++++++++
 .../add-edit-component-mapping-dialog.component.ts  | 13 +++++++++----
 .../component-mappings-screen.component.ts          |  4 ++--
 .../entity-services/component-mappings.service.ts   |  1 +
 apps/red-ui/src/assets/i18n/redact/de.json          |  8 +++++---
 apps/red-ui/src/assets/i18n/redact/en.json          |  8 +++++---
 .../src/lib/component-mappings/component-mapping.ts |  3 +++
 7 files changed, 34 insertions(+), 12 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.html b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.html
index 8283e05a8..5fc1dd487 100644
--- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.html
@@ -42,6 +42,15 @@
                         type="text"
                     />
                 </div>
+                <div class="iqser-input-group required w-150">
+                    <label translate="add-edit-component-mapping.form.quote-char"></label>
+                    <input
+                        [placeholder]="'add-edit-component-mapping.form.quote-char-placeholder' | translate"
+                        formControlName="quoteChar"
+                        name="quoteChar"
+                        type="text"
+                    />
+                </div>
 
                 <div class="iqser-input-group required w-150">
                     <label translate="add-edit-component-mapping.form.encoding-type"></label>
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 e8a628491..65ee0ac16 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
@@ -17,12 +17,14 @@ interface DialogData {
     dossierTemplateId: string;
     mapping: IComponentMapping;
 }
+
 interface DialogResult {
     id: string;
     name: string;
     file: Blob;
     encoding: string;
     delimiter: string;
+    quoteChar: string;
     fileName?: string;
 }
 
@@ -72,14 +74,14 @@ export class AddEditComponentMappingDialogComponent
             const file = new Blob([fileContent.body as Blob], { type: 'text/csv' });
             this.form.get('file').setValue(file);
             this.initialFormValue = this.form.getRawValue();
-            this.#disableEncodingAndDelimiter();
+            this.#disableEncodingAndQuoteCharAndDelimiter();
         }
     }
 
     changeFile(file: File) {
         this.form.get('file').setValue(file);
         this.form.get('fileName').setValue(file?.name);
-        this.#enableEncodingAndDelimiter();
+        this.#enableEncodingAndQuoteCharAndDelimiter();
     }
 
     save() {
@@ -93,16 +95,19 @@ export class AddEditComponentMappingDialogComponent
             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],
+            quoteChar: [this.data?.mapping?.quoteChar ?? '"', Validators.required],
         });
     }
 
-    #disableEncodingAndDelimiter() {
+    #disableEncodingAndQuoteCharAndDelimiter() {
         this.form.get('encoding').disable();
         this.form.get('delimiter').disable();
+        this.form.get('quoteChar').disable();
     }
 
-    #enableEncodingAndDelimiter() {
+    #enableEncodingAndQuoteCharAndDelimiter() {
         this.form.get('encoding').enable();
         this.form.get('delimiter').enable();
+        this.form.get('quoteChar').enable();
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.ts
index b451d54b3..997aefcc2 100644
--- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.ts
@@ -99,8 +99,8 @@ export default class ComponentMappingsScreenComponent extends ListingComponent<C
         const result = await dialog.result();
         if (result) {
             this._loadingService.start();
-            const { id, name, encoding, delimiter, fileName } = result;
-            const newMapping = { id, name, encoding, delimiter, fileName };
+            const { id, name, encoding, delimiter, fileName, quoteChar } = result;
+            const newMapping = { id, name, encoding, delimiter, fileName, quoteChar };
             await firstValueFrom(
                 this._componentMappingService.createUpdateComponentMapping(this.#dossierTemplateId, newMapping, result.file),
             );
diff --git a/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts b/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts
index 76be4dd06..e3446d5fe 100644
--- a/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts
@@ -28,6 +28,7 @@ export class ComponentMappingsService extends EntitiesService<IComponentMapping,
             { key: 'name', value: componentMapping.name },
             { key: 'encoding', value: componentMapping.encoding },
             { key: 'delimiter', value: componentMapping.delimiter },
+            { key: 'quoteChar', value: componentMapping.quoteChar },
         ];
 
         if (componentMapping.id) {
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 87cb57ac4..4713bb576 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -102,9 +102,11 @@
     },
     "disabled-file-options": "",
     "form": {
-      "delimiter": "",
-      "delimiter-placeholder": "",
-      "encoding-type": "",
+      "quote-char": "Zitatzeichen",
+      "quote-char-placeholder": "\"",
+      "delimiter": "Trennzeichen",
+      "delimiter-placeholder": ",",
+      "encoding-type": "Codierung",
       "file": "Mapping-Datei",
       "name": "Mapping-Name",
       "name-placeholder": "Mapping-Name",
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index ae574fc2d..8c9615cb3 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -102,9 +102,11 @@
     },
     "disabled-file-options": "",
     "form": {
-      "delimiter": "",
-      "delimiter-placeholder": "",
-      "encoding-type": "",
+      "quote-char": "Quotation marker",
+      "quote-char-placeholder": "\"",
+      "delimiter": "Delimiter",
+      "delimiter-placeholder": ",",
+      "encoding-type": "Encoding",
       "file": "Mapping file",
       "name": "Mapping name",
       "name-placeholder": "Mapping name",
diff --git a/libs/red-domain/src/lib/component-mappings/component-mapping.ts b/libs/red-domain/src/lib/component-mappings/component-mapping.ts
index 9bfa2d6b1..0fd6246bf 100644
--- a/libs/red-domain/src/lib/component-mappings/component-mapping.ts
+++ b/libs/red-domain/src/lib/component-mappings/component-mapping.ts
@@ -10,6 +10,7 @@ export interface IComponentMapping extends IListable {
     numberOfLines: number;
     encoding: string;
     delimiter: string;
+    quoteChar: string;
 }
 
 export class ComponentMapping implements IComponentMapping, IListable {
@@ -22,6 +23,7 @@ export class ComponentMapping implements IComponentMapping, IListable {
     readonly numberOfLines: number;
     readonly encoding: string;
     readonly delimiter: string;
+    readonly quoteChar: string;
 
     constructor(componentMapping: IComponentMapping) {
         this.id = componentMapping.id;
@@ -33,6 +35,7 @@ export class ComponentMapping implements IComponentMapping, IListable {
         this.numberOfLines = componentMapping.numberOfLines;
         this.encoding = componentMapping.encoding;
         this.delimiter = componentMapping.delimiter;
+        this.quoteChar = componentMapping.quoteChar;
     }
 
     get searchKey(): string {