From ef5cd39b165e7712de4c5c859d36150cd54a73e2 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Thu, 12 Dec 2024 15:59:36 +0200
Subject: [PATCH] RED-10030: persist the keyColumn value even if csv mapping is
 disabled.

---
 .../file-attributes-configurations-dialog.component.ts       | 4 +++-
 .../file-attributes-listing-screen.component.ts              | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts
index 9548c2344..400d1a603 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts
@@ -57,6 +57,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo
         if (supportCsvMapping) {
             return {
                 ...this.#configuration,
+                keyColumn: this.form.get('keyColumn').value,
                 filenameMappingColumnHeaderName: this.form.get('keyColumn').value,
                 delimiter: this.form.get('delimiter').value,
                 encoding: this.form.get('encodingType').value,
@@ -66,13 +67,14 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo
         return {
             ...this.#configuration,
             filenameMappingColumnHeaderName: '',
+            keyColumn: this.form.get('keyColumn').value,
         };
     }
 
     #getForm() {
         return this._formBuilder.group({
             supportCsvMapping: [!!this.#configuration.filenameMappingColumnHeaderName],
-            keyColumn: [this.#configuration.filenameMappingColumnHeaderName || '', [Validators.required]],
+            keyColumn: [this.#configuration.filenameMappingColumnHeaderName || this.#configuration.keyColumn || '', [Validators.required]],
             delimiter: [this.#configuration.delimiter || '', [Validators.required]],
             encodingType: [this.#configuration.encoding || FileAttributeEncodingTypes['UTF-8'], [Validators.required]],
         });
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
index 3c6312f2c..35287524e 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
@@ -85,6 +85,7 @@ export default class FileAttributesListingScreenComponent extends ListingCompone
         },
     ];
     readonly roles = Roles;
+    keyColumnValue: string = '';
 
     constructor(
         readonly permissionsService: PermissionsService,
@@ -171,13 +172,13 @@ export default class FileAttributesListingScreenComponent extends ListingCompone
             FileAttributesConfigurationsDialogComponent,
             {
                 ...defaultDialogConfig,
-                data: this.#existingConfiguration,
+                data: { ...this.#existingConfiguration, keyColumn: this.keyColumnValue },
             },
         );
 
         const configuration = await firstValueFrom(ref.afterClosed());
-
         if (configuration) {
+            this.keyColumnValue = configuration.keyColumn;
             await this.#setConfigAndLoadData(configuration);
         }
     }