From 4209feaedaf31a0775a31e0f0d86ca57777135af Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Thu, 21 Jul 2022 16:24:58 +0300
Subject: [PATCH] Fixed RED-4696 - watermarkId in ui treated as string

---
 .../edit-dossier-download-package.component.ts      | 13 ++++++++++---
 apps/red-ui/src/assets/config/config.json           |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

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 1db6d6a20..5157d0a45 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
@@ -47,7 +47,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
 
         for (const key of Object.keys(this.form.getRawValue())) {
             if (key.toLowerCase().includes('watermark')) {
-                if (this.dossier[key] !== this.form.get(key).value) {
+                if (this._asStringIfSet(this.dossier[key]) !== this.form.get(key).value) {
                     return true;
                 }
             } else {
@@ -116,8 +116,8 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
             {
                 reportTemplateIds: [this.dossier.reportTemplateIds],
                 downloadFileTypes: [this.dossier.downloadFileTypes],
-                watermarkId: [this.dossier.watermarkId],
-                previewWatermarkId: [this.dossier.previewWatermarkId],
+                watermarkId: [this._asStringIfSet(this.dossier.watermarkId)],
+                previewWatermarkId: [this._asStringIfSet(this.dossier.previewWatermarkId)],
             },
             {
                 validators: control =>
@@ -127,4 +127,11 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
             },
         );
     }
+
+    private _asStringIfSet(value: any): string {
+        if (value === undefined || value === null) {
+            return value;
+        }
+        return `${value}`;
+    }
 }
diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json
index 62578148a..8e7d077a8 100644
--- a/apps/red-ui/src/assets/config/config.json
+++ b/apps/red-ui/src/assets/config/config.json
@@ -1,7 +1,7 @@
 {
   "ADMIN_CONTACT_NAME": null,
   "ADMIN_CONTACT_URL": null,
-  "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1",
+  "API_URL": "https://dev-05.iqser.cloud/redaction-gateway-v1",
   "APP_NAME": "RedactManager",
   "AUTO_READ_TIME": 3,
   "BACKEND_APP_VERSION": "4.4.40",
@@ -11,7 +11,7 @@
   "MAX_RETRIES_ON_SERVER_ERROR": 3,
   "OAUTH_CLIENT_ID": "redaction",
   "OAUTH_IDP_HINT": null,
-  "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction",
+  "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction",
   "RECENT_PERIOD_IN_HOURS": 24,
   "SELECTION_MODE": "structural",
   "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview"