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 1/8] 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"

From 9afaa56a3de12d557d633ad60f59961e3962ff95 Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Thu, 21 Jul 2022 15:33:52 +0200
Subject: [PATCH 2/8] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3332 -> 3330 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3d861b2c4..c88b01778 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.647.0",
+  "version": "3.648.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index f4cfc764eb5e89f009f7587cae85e28173c35976..c475d241726e829db8ebba044473ca64f3c2decc 100644
GIT binary patch
delta 3244
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

delta 3246
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


From ba06905a8d26a71b2cd8adde16fe388fa4cf6b94 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Fri, 22 Jul 2022 07:37:31 +0300
Subject: [PATCH 3/8] RED-3800: update common-ui

---
 .../components/user-management/user-management.component.html   | 1 +
 libs/common-ui                                                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
index b7c3de488..2acb04c9c 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
@@ -18,6 +18,7 @@
         (click)="editingReviewer$.next(true)"
         *ngIf="(editingReviewer$ | async) === false && (canAssignReviewer$ | async)"
         class="assign-reviewer pointer"
+        id="assign-reviewer"
         translate="file-preview.assign-reviewer"
     ></div>
 
diff --git a/libs/common-ui b/libs/common-ui
index 859e41dd6..b1f8de6ea 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 859e41dd62a236ee84511ae11d78980810483d07
+Subproject commit b1f8de6ea1b12f1d3973bfd479b58ae4a480bda1

From 09d9a9940315b781ee6bd93d90a931d63c8e5a1f Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Fri, 22 Jul 2022 06:40:07 +0200
Subject: [PATCH 4/8] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3330 -> 3329 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c88b01778..190326052 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.648.0",
+  "version": "3.649.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index c475d241726e829db8ebba044473ca64f3c2decc..3a4f18af302a2c706a5a57af18c6f83b52e997d0 100644
GIT binary patch
delta 101
zcmV-r0Gj`T8i5*+cu~9l%7gEY9XR$A6#O9A3|dn&Tp{#hEcJ72OI`l*rDpdTsXvxB
zJY4>sXZvUQ{}}D4{3{aUh{?WXRM#K21{d(kpOU`^g74)Y*h2oRz;~aq$}kKFAykvU
H08jt`G?_Am

delta 102
zcmV-s0Ga=R8iE>-cv1$gzgj=B9XoK=Pf+lKU^8e<&2WX#kFnIxu`PA^%a@wnXQcjE
z+VF7sd!FN+<^N-}qw=pvj3XxdmQh`Q*cx2GD}PG<9ti#*fBtMcs~~WmvB@wD2m}2%
Ii2zUl0J|D9H~;_u


From 7c61b3b1a4023bd9b32ef69a5961b7c3b3fc7dfe Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Fri, 22 Jul 2022 10:38:12 +0300
Subject: [PATCH 5/8] RED-3800 Sorting for last modified date

---
 .../dossier-overview/config.service.ts        |   1 +
 .../table-item/table-item.component.ts        |  10 +-
 .../dossiers-listing/config.service.ts        |   2 +-
 .../src/lib/dossiers/dossier.model.ts         |   1 +
 yarn.lock                                     | 371 +-----------------
 5 files changed, 22 insertions(+), 363 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts
index f93a69cdf..d8313b689 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts
+++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts
@@ -150,6 +150,7 @@ export class ConfigService {
             },
             {
                 label: _('dossier-overview.table-col-names.last-modified'),
+                sortByKey: 'redactionModificationDate',
                 width: '2fr',
             },
             ...dynamicColumns,
diff --git a/apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.ts
index 5495b6946..c9c3ab6dc 100644
--- a/apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.ts
+++ b/apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/c
 import { Dossier, DossierStats } from '@red/domain';
 import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { switchMap, tap } from 'rxjs/operators';
 
 @Component({
     selector: 'redaction-table-item [dossier]',
@@ -17,7 +17,13 @@ export class TableItemComponent implements OnChanges {
     readonly #ngOnChanges$ = new BehaviorSubject<string>(undefined);
 
     constructor(readonly dossierStatsService: DossierStatsService) {
-        this.stats$ = this.#ngOnChanges$.pipe(switchMap(dossierId => this.dossierStatsService.watch$(dossierId)));
+        this.stats$ = this.#ngOnChanges$.pipe(
+            switchMap(dossierId => this.dossierStatsService.watch$(dossierId)),
+            // TODO required for sorting the dossier table - fix me Baby one more time!
+            tap(stats => {
+                this.dossier.changedDate = stats.fileManipulationDate;
+            }),
+        );
     }
 
     ngOnChanges() {
diff --git a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts
index f04aedf47..cd2da6657 100644
--- a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts
+++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts
@@ -38,7 +38,7 @@ export class ConfigService {
     get tableConfig(): TableColumnConfig<Dossier>[] {
         return [
             { label: _('dossier-listing.table-col-names.name'), sortByKey: 'searchKey', width: '2fr' },
-            { label: _('dossier-listing.table-col-names.last-modified') },
+            { label: _('dossier-listing.table-col-names.last-modified'), sortByKey: 'changedDate' },
             { label: _('dossier-listing.table-col-names.needs-work') },
             { label: _('dossier-listing.table-col-names.owner'), class: 'user-column' },
             { label: _('dossier-listing.table-col-names.documents-status'), class: 'flex-end', width: 'auto' },
diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts
index 939cdb268..bd0a8d8aa 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.model.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts
@@ -26,6 +26,7 @@ export class Dossier implements IDossier, IListable {
     readonly routerLink: string;
     readonly dossiersListRouterLink: string;
     readonly id: string;
+    changedDate?: string;
 
     constructor(dossier: IDossier) {
         this.dossierId = dossier.dossierId;
diff --git a/yarn.lock b/yarn.lock
index e8a8066b7..e27ef83f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2998,17 +2998,6 @@ array-flatten@^2.1.2:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
-  integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-    get-intrinsic "^1.1.1"
-    is-string "^1.0.7"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -3019,16 +3008,6 @@ array-union@^3.0.1:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975"
   integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==
 
-array.prototype.flat@^1.2.5:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
-  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.2"
-    es-shim-unscopables "^1.0.0"
-
 asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@@ -3471,7 +3450,7 @@ cacache@^16.0.0, cacache@^16.1.0:
     tar "^6.1.11"
     unique-filename "^1.1.1"
 
-call-bind@^1.0.0, call-bind@^1.0.2:
+call-bind@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
@@ -3759,7 +3738,7 @@ config-chain@^1.1.11:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-confusing-browser-globals@^1.0.10, confusing-browser-globals@^1.0.9:
+confusing-browser-globals@^1.0.9:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
@@ -4123,7 +4102,7 @@ dayjs@^1.11.3:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.3.tgz#4754eb694a624057b9ad2224b67b15d552589258"
   integrity sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==
 
-debug@2.6.9, debug@^2.6.9:
+debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4144,7 +4123,7 @@ debug@=3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
+debug@^3.1.1, debug@^3.2.6:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -4255,7 +4234,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3, define-properties@^1.1.4:
+define-properties@^1.1.3:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
   integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
@@ -4340,13 +4319,6 @@ dns-packet@^5.2.2:
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -4533,56 +4505,11 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
-  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    regexp.prototype.flags "^1.4.3"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
-    unbox-primitive "^1.0.2"
-
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
-es-shim-unscopables@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
-  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
-  dependencies:
-    has "^1.0.3"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 esbuild-android-64@0.14.38:
   version "0.14.38"
   resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.38.tgz#5b94a1306df31d55055f64a62ff6b763a47b7f64"
@@ -4751,63 +4678,11 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-airbnb-base@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
-  integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==
-  dependencies:
-    confusing-browser-globals "^1.0.10"
-    object.assign "^4.1.2"
-    object.entries "^1.1.5"
-    semver "^6.3.0"
-
-eslint-config-airbnb-typescript@^17.0.0:
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz#360dbcf810b26bbcf2ff716198465775f1c49a07"
-  integrity sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==
-  dependencies:
-    eslint-config-airbnb-base "^15.0.0"
-
 eslint-config-prettier@8.5.0:
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
   integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
 
-eslint-import-resolver-node@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
-  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
-  dependencies:
-    debug "^3.2.7"
-    resolve "^1.20.0"
-
-eslint-module-utils@^2.7.3:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
-  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
-  dependencies:
-    debug "^3.2.7"
-    find-up "^2.1.0"
-
-eslint-plugin-import@2.26.0:
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
-  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
-  dependencies:
-    array-includes "^3.1.4"
-    array.prototype.flat "^1.2.5"
-    debug "^2.6.9"
-    doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.3"
-    has "^1.0.3"
-    is-core-module "^2.8.1"
-    is-glob "^4.0.3"
-    minimatch "^3.1.2"
-    object.values "^1.1.5"
-    resolve "^1.22.0"
-    tsconfig-paths "^3.14.1"
-
 eslint-plugin-prettier@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
@@ -5232,13 +5107,6 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -5390,26 +5258,11 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
-
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
-functions-have-names@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
 gauge@^4.0.3:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
@@ -5434,7 +5287,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598"
   integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
@@ -5473,14 +5326,6 @@ get-stream@^6.0.0, get-stream@^6.0.1:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
 gettext-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-4.2.0.tgz#9327140f76b122d44f0e8cb9338fd855667d9434"
@@ -5643,11 +5488,6 @@ harmony-reflect@^1.4.6:
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
   integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==
 
-has-bigints@^1.0.1, has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5670,7 +5510,7 @@ has-symbol-support-x@^1.4.1:
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
   integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+has-symbols@^1.0.1, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
@@ -5682,13 +5522,6 @@ has-to-string-tag-x@^1.2.0:
   dependencies:
     has-symbol-support-x "^1.4.1"
 
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
-  dependencies:
-    has-symbols "^1.0.2"
-
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -6019,15 +5852,6 @@ inquirer@8.2.4:
     through "^2.3.6"
     wrap-ansi "^7.0.0"
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
 internmap@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
@@ -6053,13 +5877,6 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
-is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
-  dependencies:
-    has-bigints "^1.0.1"
-
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
@@ -6067,24 +5884,11 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
 is-buffer@^2.0.2:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-
 is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -6092,13 +5896,6 @@ is-core-module@^2.8.1, is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
-is-date-object@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
@@ -6146,18 +5943,6 @@ is-natural-number@^4.0.1:
   resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
   integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
-
-is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -6190,26 +5975,11 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
 is-retry-allowed@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
   integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
 
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
-  dependencies:
-    call-bind "^1.0.2"
-
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -6225,20 +5995,6 @@ is-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
   integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
 
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -6249,13 +6005,6 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
-  dependencies:
-    call-bind "^1.0.2"
-
 is-what@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
@@ -6977,14 +6726,6 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -7741,7 +7482,7 @@ object-hash@^3.0.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
-object-inspect@^1.12.0, object-inspect@^1.12.2, object-inspect@^1.9.0:
+object-inspect@^1.12.2, object-inspect@^1.9.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
   integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
@@ -7751,7 +7492,7 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.2:
+object.assign@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -7761,24 +7502,6 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.values@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -7892,13 +7615,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -7906,13 +7622,6 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -7942,11 +7651,6 @@ p-timeout@^1.1.1:
   dependencies:
     p-finally "^1.0.0"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -8055,11 +7759,6 @@ parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
-
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -8823,15 +8522,6 @@ regex-parser@^2.2.11:
   resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
   integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -8911,7 +8601,7 @@ resolve@1.22.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -9530,24 +9220,6 @@ string-width@^5.0.0, string-width@^5.0.1:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
-string.prototype.trimstart@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
-  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -9972,7 +9644,7 @@ tsconfig-paths-webpack-plugin@3.5.2:
     enhanced-resolve "^5.7.0"
     tsconfig-paths "^3.9.0"
 
-tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0:
+tsconfig-paths@^3.9.0:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
   integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
@@ -10070,16 +9742,6 @@ typescript@4.7.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
   integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
 
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
-  dependencies:
-    call-bind "^1.0.2"
-    has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
-    which-boxed-primitive "^1.0.2"
-
 unbzip2-stream@^1.0.9:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
@@ -10518,17 +10180,6 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0:
     tr46 "^2.1.0"
     webidl-conversions "^6.1.0"
 
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"

From 9c063f205818a4a4595641661935892e0ae26516 Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Fri, 22 Jul 2022 09:52:10 +0200
Subject: [PATCH 6/8] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3329 -> 3330 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 190326052..b09b502d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.649.0",
+  "version": "3.650.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index 3a4f18af302a2c706a5a57af18c6f83b52e997d0..2ed86c1a13b68c83e22e34156f725fec3301672a 100644
GIT binary patch
delta 3242
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

delta 3241
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
b+qs?Fxt-g&o!hzn@3j8{AykvU08jt`7h_a5


From b6f8333a6d888c377cd7c3c229cceb80f4708177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Fri, 22 Jul 2022 10:56:12 +0300
Subject: [PATCH 7/8] RED-3800: Entity id can be number

---
 .../add-entity-dialog.component.ts                  |  2 +-
 .../modules/file-preview/services/stamp.service.ts  |  2 +-
 .../edit-dossier-download-package.component.ts      | 13 +++----------
 .../watermark-selector.component.ts                 |  6 +++---
 .../services/entity-services/watermark.service.ts   |  6 +++---
 libs/common-ui                                      |  2 +-
 libs/red-domain/src/lib/dossiers/dossier.model.ts   |  4 ++--
 libs/red-domain/src/lib/dossiers/dossier.request.ts |  4 ++--
 libs/red-domain/src/lib/dossiers/dossier.ts         |  4 ++--
 .../src/lib/watermarks/watermark.model.ts           |  4 ++--
 libs/red-domain/src/lib/watermarks/watermark.ts     |  2 +-
 11 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
index 524cd2916..4fa8a622d 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Inject, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { AddEditEntityComponent } from '../../../shared/components/add-edit-entity/add-edit-entity.component';
+import { AddEditEntityComponent } from '@shared/components/add-edit-entity/add-edit-entity.component';
 import { BaseDialogComponent } from '@iqser/common-ui';
 
 interface DialogData {
diff --git a/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts b/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts
index d1ced1889..2ebb48292 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts
@@ -69,7 +69,7 @@ export class StampService {
         }
     }
 
-    private async _stampPreview(document: PDFNet.PDFDoc, dossierTemplateId: string, watermarkId: string): Promise<void> {
+    private async _stampPreview(document: PDFNet.PDFDoc, dossierTemplateId: string, watermarkId: number): Promise<void> {
         const watermark = this._watermarksMapService.get(dossierTemplateId, watermarkId);
         await stampPDFPage(
             document,
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 5157d0a45..1db6d6a20 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._asStringIfSet(this.dossier[key]) !== this.form.get(key).value) {
+                if (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._asStringIfSet(this.dossier.watermarkId)],
-                previewWatermarkId: [this._asStringIfSet(this.dossier.previewWatermarkId)],
+                watermarkId: [this.dossier.watermarkId],
+                previewWatermarkId: [this.dossier.previewWatermarkId],
             },
             {
                 validators: control =>
@@ -127,11 +127,4 @@ 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/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
index 85bb4a7f3..7b039f177 100644
--- a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
@@ -25,11 +25,11 @@ import { MatCheckboxChange } from '@angular/material/checkbox';
         },
     ],
 })
-export class WatermarkSelectorComponent extends FormFieldComponent<string> implements OnChanges {
+export class WatermarkSelectorComponent extends FormFieldComponent<number> implements OnChanges {
     @Input() dossierTemplateId: string;
     @Input() label: string;
     readonly watermarks$: Observable<Watermark[]>;
-    watermarksMap = new Map<string, Watermark>();
+    watermarksMap = new Map<number, Watermark>();
     #watermarks: Watermark[] = [];
     readonly #dossierTemplateId$ = new BehaviorSubject<string>(null);
 
@@ -67,7 +67,7 @@ export class WatermarkSelectorComponent extends FormFieldComponent<string> imple
         }
     }
 
-    selectWatermark(watermarkId: string): void {
+    selectWatermark(watermarkId: number): void {
         this.markAsTouched();
         this._value = watermarkId;
         this.onChange(this._value);
diff --git a/apps/red-ui/src/app/services/entity-services/watermark.service.ts b/apps/red-ui/src/app/services/entity-services/watermark.service.ts
index 5d296d215..eeb8a062c 100644
--- a/apps/red-ui/src/app/services/entity-services/watermark.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/watermark.service.ts
@@ -20,7 +20,7 @@ export class WatermarkService extends GenericService<IWatermark> {
     }
 
     @Validate()
-    deleteWatermark(@RequiredParam() dossierTemplateId: string, @RequiredParam() watermarkId: string): Observable<Watermark[]> {
+    deleteWatermark(@RequiredParam() dossierTemplateId: string, @RequiredParam() watermarkId: number): Observable<Watermark[]> {
         return super
             .delete(null, `${this._defaultModelPath}/${watermarkId}`)
             .pipe(switchMap(() => this.loadForDossierTemplate(dossierTemplateId)));
@@ -31,7 +31,7 @@ export class WatermarkService extends GenericService<IWatermark> {
         return this._post(body, `${this._defaultModelPath}`).pipe(
             switchMap(watermark =>
                 this.loadForDossierTemplate(watermark.dossierTemplateId).pipe(
-                    map(() => this._watermarksMapService.get(watermark.dossierTemplateId, watermark.id.toString())),
+                    map(() => this._watermarksMapService.get(watermark.dossierTemplateId, watermark.id)),
                 ),
             ),
         );
@@ -52,7 +52,7 @@ export class WatermarkService extends GenericService<IWatermark> {
     }
 
     @Validate()
-    isWatermarkUsed(@RequiredParam() watermarkId: string): Observable<boolean> {
+    isWatermarkUsed(@RequiredParam() watermarkId: number): Observable<boolean> {
         const queryParams: QueryParam[] = [{ key: 'watermarkId', value: watermarkId }];
         return this.getAll<IsUsedResponse>(`${this._defaultModelPath}/used`, queryParams).pipe(map(result => result.value));
     }
diff --git a/libs/common-ui b/libs/common-ui
index b1f8de6ea..7875f99a0 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit b1f8de6ea1b12f1d3973bfd479b58ae4a480bda1
+Subproject commit 7875f99a074704eaa3252258d7efd83c39a355b7
diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts
index bd0a8d8aa..fd2eb2757 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.model.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts
@@ -19,8 +19,8 @@ export class Dossier implements IDossier, IListable {
     readonly hardDeletedTime?: string;
     readonly softDeletedTime?: string;
     readonly startDate?: string;
-    readonly watermarkId: string;
-    readonly previewWatermarkId: string;
+    readonly watermarkId?: number;
+    readonly previewWatermarkId?: number;
     readonly archivedTime: string;
     readonly hasReviewers: boolean;
     readonly routerLink: string;
diff --git a/libs/red-domain/src/lib/dossiers/dossier.request.ts b/libs/red-domain/src/lib/dossiers/dossier.request.ts
index 2e65c95ba..d31e01c90 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.request.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.request.ts
@@ -56,9 +56,9 @@ export interface IDossierRequest {
     /**
      * Watermark id that will be applied  to the redacted files.
      */
-    readonly watermarkId?: string;
+    readonly watermarkId?: number;
     /**
      * Watermark id that will be applied  to the preview files.
      */
-    readonly previewWatermarkId?: string;
+    readonly previewWatermarkId?: number;
 }
diff --git a/libs/red-domain/src/lib/dossiers/dossier.ts b/libs/red-domain/src/lib/dossiers/dossier.ts
index d8ebe113b..b99bebb6b 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.ts
@@ -17,7 +17,7 @@ export interface IDossier {
     readonly reportTemplateIds: List;
     readonly softDeletedTime?: string;
     readonly startDate?: string;
-    readonly watermarkId: string;
-    readonly previewWatermarkId: string;
+    readonly watermarkId?: number;
+    readonly previewWatermarkId?: number;
     readonly archivedTime: string;
 }
diff --git a/libs/red-domain/src/lib/watermarks/watermark.model.ts b/libs/red-domain/src/lib/watermarks/watermark.model.ts
index e63a8072c..d4d7a11ae 100644
--- a/libs/red-domain/src/lib/watermarks/watermark.model.ts
+++ b/libs/red-domain/src/lib/watermarks/watermark.model.ts
@@ -2,7 +2,7 @@ import { IWatermark, WatermarkOrientation } from './watermark';
 import { Entity } from '@iqser/common-ui';
 
 export class Watermark extends Entity<IWatermark> {
-    readonly id: string;
+    readonly id: number;
     readonly dossierTemplateId: string;
     readonly enabled: boolean;
     readonly fontSize: number;
@@ -20,7 +20,7 @@ export class Watermark extends Entity<IWatermark> {
 
     constructor(watermark: IWatermark) {
         super(watermark);
-        this.id = watermark.id.toString();
+        this.id = watermark.id;
         this.dossierTemplateId = watermark.dossierTemplateId;
         this.enabled = watermark.enabled;
         this.fontSize = watermark.fontSize;
diff --git a/libs/red-domain/src/lib/watermarks/watermark.ts b/libs/red-domain/src/lib/watermarks/watermark.ts
index deba31803..27270bb51 100644
--- a/libs/red-domain/src/lib/watermarks/watermark.ts
+++ b/libs/red-domain/src/lib/watermarks/watermark.ts
@@ -1,5 +1,5 @@
 export interface IWatermark {
-    id: string;
+    id: number;
     dossierTemplateId: string;
     enabled: boolean;
     fontSize: number;

From f91b1c9d31175e2fc280f5c40e08552fa9a22053 Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Fri, 22 Jul 2022 10:00:00 +0200
Subject: [PATCH 8/8] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3330 -> 3329 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b09b502d0..75623b687 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.650.0",
+  "version": "3.651.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index 2ed86c1a13b68c83e22e34156f725fec3301672a..73c4789806148ba3c0df5cddaa0581c4f139a735 100644
GIT binary patch
delta 3229
zcmV;O3}W+w8i5*+d4ImM@}Ag^9XS3I6#O9A3|dn&Tp{#hEcJ72OI`l*rDpdTsXvxB
zJY4>s=h$cY{}}D4{3{aUh{?WXRM#K21{d(kpOU`^f<MUL6Y^gLLGT3GAD2{f`#+ce
z%P7TFO&GfT%hz96o6F}HFX_H4Du$XWdv=*JR@U3=>!iq8y?@*l#V#Ybr1df?_Sc{g
z?ynQPr`i2ye=14-tFLfgZz;ps;%=9+m-fQ5?dSHw7k>lscP0L=#orD5b;KA)jB&&m
zM~rdA7>AGfWlZZb!}p)nceuQ~dVaCw_~Fb-364pH{&9iOTZ`r~d9y{%b9hS$h4r_{
z5A5>I^NV+b8GqYtNRpx=VrGb=+g(*Od2B^RR#aQ`)ZKWl?~Lc6)DcrSGpw4vC0n%e
z`2zCOom`ev1m7~66RSgIvu+3OakZnl#flOpZ?tb=!C0{etc^&c?zJYkic*2d9>1~f
zXv|W8W!oySEy4{e_<LE@l+gmdR3yWUz9y$(FWX-$p?@Tc#Y%D&$F@J=K*OTqd_+$9
z2GvDIWArrk;vmL{POHK(ZEB#r#mm6wBuO5K%XSNj5RtUVI>8qujwrj|B73=hAh5;b
zRvv1LrWcOX3rz={%^bmwnP1{Kruhy4xWI2`Jqt?6@^*4Be;k6S8b&x?Rg00((*t-e
zPG?eHtbc;-UE+%5?75NtsHtlHsVr#DNM+Ckn`?vkXU`*Hn-;GnzYPi$$9^0LNEa{n
zB&HY@d3KNLs3IgsIFHdYWs9u&e!CK|%==oCpzpSPFz@YwWCOXo-zh}Zz|)LaWfNvJ
z!dwIsWDNK!v2`~CGhl%C0^t^>&Sn4P#HI3L(SK+XHI>85gkaV{NC2H6Uf@ZFLy}2D
zbg*i!RDDL?FpGy1pn4H$6~Y8&62QPLwi+{<y`*_AHKa3rLPFnwW2eb|H%`UD07T`7
z{8;OIk7FfGv(f$$m-ysH5nyL4HLRwrpjn28h4LaNvvy^tJ;A^o*vJV0*<ZBI9rMBS
z8Gn)bhmnl3j4WnP1#1?GFRX~#xkFJs0u6*8g$Op<@kim)+N;N5rP#c&jTO5pCQ(u0
z)~bUlkcu0lhhRP-6~+9yo0)-)x02Ro=F&|z-mCp4dyqP0RD<OAUS;<DZ9=P>Sy4)*
zr`61m{V>7+T!u~1MseMI`g9HLjIkbRtbYuVhU-6kDTCS_7W_DBm-+}yRX%@v08iCe
zT_ysZIs5=tDvYCfN-D}myz9S%v%3Biy`p(WC~NW^`t<r@36L!yfn=7WV%B?^%fBbK
zy}s;b|E;KQldQNK%ylQ{Zi0U9UxC?84Y}D{SRCRR9fUUp!m)395TBF0VQ)#bCx7|-
z@43v7RaQkpvjH%F4lMu-M`=Z)l+m3DrC<_D;`LCzYN9l0@>>yy=<`?8Sh)TCS0Tw^
zWtt-%xpf2<A*qt={dZAH;Cqd}6qSoV;vDZtRS(u#Pp#wnn|_@yi!6h6IL|&O6`3S@
zGc8KL2lm^dt|_1kxG>Vgh3$5SGk-P$c{2%e9VsAhn>`O{Pzd322rA0CvPZ9C%8F{J
ztM;U}1kngfNED(pqvZX+C8Dq)8Xi1l5G@apb*A@$b5O)Dq{Qp@--D!Tu0umO(|f|h
zJ)GZVfFmA}H@O*XH$LF-n?L{OpZ}`Sv-JIUO+t4BeNlmW<X1yz)4L&%6o2WNidB)i
z$=Fm3o%l(RtlN2V0tbp|7q?3H*E<TwmY(9sI=#!}X#zxdcI*2tnoO?Ij;)paU?N<7
zXh^F1NY8B%9j)3Cnu1NuxLsAOFRv|f6JG6cCUDNEHXAf~ug3^-ogSl}Q6_qN&hSZS
z({XaR0({6I2m;q(T>E68J%7w>$E$pdxXKis>Z{Z_Ela{QhVhu7jjX0;OJ%ac3Uc76
zYW87m^!<t!CPl$Sa9abL<eQp*3Y9o66D{p;AsmCQ_l-idexnS=wK?Gc(Wyl7u#?0_
zTKOICW(QfO#UVHU)QkXh=sVcJlWy!XD$09Nt1-hm^s806fG3_Hw|}sR@5Oh^qTkja
zpt7PsI>b+6ONLn^a>_xkRqa9`&b1fF^~4|FG|Jr~h)=*Fs+~BBgsmKcZojvX9oG{;
z7szoOb<knUZP8synFfIepd2oYQ9naOh{KG)jHfr=%?8_QXI`*=fW`Qa#rHQia5o7~
zLTzydf%?u8G4NJZU4MN5pKB*hqOs%-S2^#9!`Rjk5L6h55o8#s$y&u4jjsvV9nAQ?
z1Qz0FuDb#jx*N_%V5Ysixl)JkDsm6ushT$GT{iT2ju-o6)VDTrQgnIHg)xpoZ`2iR
z)dH~A<r}#vx>iPRiY{02n}e>6QGPpK@)Jbcc9Pgb?4gf?41XdL+-R${IxHq8$;Ngx
z0`4JJEAC`xxbZ?mr)!kF>}<DE05WnmHw&Z<;aQ8LC0S~Z0PC!rm9HyK)8guH)&t&%
zE?0C#H-;`Qy&$|<$Kj}pi^yC1(Z(5daluAG>=A8NN%Py5D~=n)ni8cXEB8fA4z@;c
zUmc>_Rj;+H{ePMbIQG1Es?OTjeHuXTM18$m%xq7rw&)K$q+OsI+&b*AiYC%Max+`g
zn1pz;@O;=<byPv307JXJ*SLDtEl2aRVYO8>j604itq*hG+e5z6VM#;IQYttH!Ryx*
zjOBr<c>6uhV~8!__1ysBWmfD8L*)`;s5Vd>Q~<Tf+kY*DB;hRu?kZ$e`KSWFJx<C1
zt^uresN_gLdSZ^n1P?wkCKgK}_Bjf5AjYwpsAqBqw|)o^Ok;oKGq#f`%s5&*31jg=
z>pbEhZ60HLk*xXome*wjIeu-8HoF#HcBReH$R+gC2>f+^t7UNQG^a&*l-4;)=zo$r
zB@&lXKYxM9@uRZN-5Y`6h@T5XWICklg8}J<OPNn<IS)VNHv)OVt92cOj)xgZ)QEd(
zQj;B<-es#ZrXL67_xU+1BDCCP_hs6jq6r-c<Vw6>0#bSVVmL`vJO2Q@=xt?Kys_#O
z$Hm>@Fz8_6xs8}OHVYJ7`TBjK^pN-s$`Kkac7IRE#N=UudsL;38ZZrd@_^>Zl*g2@
zr@^Y+$|1a&N|pD(MuaOyBkiC|J;WSlei!mAW^h`s-qz@ca4q6hg%a<GeAE(J>FT@u
zA7(z)X?lT-pi<WW%vN03#S)@9h?8Gaawl#FsRP@qChtaL=zcdYOLT)F<K?y4k;Zwp
zQGboQ&ja2`Ani_FXs`UFVaD-^=>pHnP>*qLlw)mC3rdO#5NpbkR1vPp5WCqmB;|D1
zP*c(<?2i`*bSg@JOvN8?t3xgSL@9}GGg>oVGa|sI3Ui`oUM~?+m5_L*4EzBCAUEfy
z$bB%n;1$@0LxLwp%duX#X1#C+dLfid?0*CCv^o(Q^-PzRT?w{&b(y$cA&HU2VoB5C
zttaj9Nm6+D0EFtb=Aou`$N5tG`_hv=ea8ayR&kb+{}IljXMz0*vcx@rE0qA0dJ_5e
zsYkqhl}NWQTr#OQs$c0_YSP#n3uq&eZgl>lvcs;_kSi73N{L#lHu@qH{!g`prGIXw
z+}?UF#fgC764s<%3^(<=4o3T9iJF|g;vqon;uGVHE%4x(Jh3hki`|#xY8<lm^=@$=
zstCUUBBzhG)j^%LK34Vb44V>+Kw`=F8fOZ>U?S>MzP*6BV}VuyFHSlB)o3x0T&XeN
zV3N(st)3z9tEMy>peLMF&UIkO0)H@(;FxjN0c~=yW(T)jWQ+D;ctt_;gUZc`pZ<c-
zI~^a>Jsq`w)@7Wd0ELr10dg{GI{~?OZl~Zs=7P)&c0B49j0%6oRTp*m<b4)>(7a14
zgE=#ArVP+|^!1Y=yvGFRy7qJzNd|Ntzb*0rMmi>eo@8WieaotdNDSI7vVXs2%}9CT
z*7-ze=$HbMG4FKt_a%;R8&dbVg)#Z+N4!8R9=SqsglY?~f(+wF9PH9$8UOW0Gof$z
zK9~8d%#T`!jJ6CGBdmvPJbdp&csSD<@BAZ2?~?eg@_Whuw*un-Tj5f#|Nb26xq`yf
zS+oz!{wa0)Pu&v_$>gW*DS!3*Pu)`*^q;z?bk%?Ap33gG8aaiz+>^L}yecvWH?w#=
zG4#V~#*@H4q*OeT=g`SK@c)p!8>_<*Vt04_B*Z|2sA$s=qBj?!@2L<KWqh=29qIBY
zZhTnYAt8>#&to1<OfkE~u5)%SJ_#TxqGswc#!vnK#m?>A&h6aJ?UU#X4U_K-1`f{c
Pf2aKy{q;S+08jt`@?KLN

delta 3229
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
PciMjey9nsZ08jt`h1EKn