From eae067f67c38c341027de20496819fc05afc649e Mon Sep 17 00:00:00 2001
From: Valentin Mihai <valentin@devplant.ro>
Date: Fri, 15 Jul 2022 16:22:48 +0300
Subject: [PATCH] RED-4247 - added new route path for watermark creation
 instead of using '0' value as param

---
 .../app/modules/admin/admin-routing.module.ts |  9 ++++++++
 .../watermark-screen.component.html           |  1 -
 .../watermark-screen.component.ts             | 22 +++++++++++--------
 .../watermarks-listing-screen.component.ts    |  2 +-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
index 4836ff31e..6004dd990 100644
--- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
@@ -81,6 +81,15 @@ const dossierTemplateIdRoutes: Routes = [
                     routeGuards: [AuthGuard, RedRoleGuard],
                 },
             },
+            {
+                path: 'create',
+                component: BaseWatermarkScreenComponent,
+                canActivate: [CompositeRouteGuard],
+                loadChildren: () => import('./screens/watermark/watermark.module').then(m => m.WatermarkModule),
+                data: {
+                    routeGuards: [AuthGuard, RedRoleGuard],
+                },
+            },
             {
                 path: `:${WATERMARK_ID}`,
                 component: BaseWatermarkScreenComponent,
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html
index 9a05c9caa..15765c39a 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html
@@ -22,7 +22,6 @@
         <div class="iqser-input-group required w-300">
             <label translate="watermark-screen.form.text-label"></label>
             <textarea
-                (mousemove)="triggerChanges()"
                 [placeholder]="'watermark-screen.form.text-placeholder' | translate"
                 class="w-full"
                 formControlName="text"
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 95aa6abf5..8b0fcad16 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
@@ -79,6 +79,10 @@ export class WatermarkScreenComponent implements OnInit {
     }
 
     async ngOnInit(): Promise<void> {
+        if (!this.#watermarkId) {
+            this._initForm(DEFAULT_WATERMARK);
+            return;
+        }
         await firstValueFrom(this._loadWatermark());
     }
 
@@ -117,8 +121,6 @@ export class WatermarkScreenComponent implements OnInit {
         await this.configChanged();
     }
 
-    triggerChanges() {}
-
     async setValue(type: 'fontType' | 'orientation' | 'hexColor', value: any) {
         if (!this.form.get(type).disabled) {
             this.form.get(type).setValue(value);
@@ -129,16 +131,18 @@ export class WatermarkScreenComponent implements OnInit {
     private _loadWatermark(): Observable<IWatermark> {
         return this._watermarkService.getWatermark(this.#watermarkId).pipe(
             catchError(() => of(DEFAULT_WATERMARK)),
-            tap(watermark => {
-                this._watermark = watermark;
-                this._watermark.dossierTemplateId = this.#dossierTemplateId;
-                this.form.setValue({ ...watermark });
-                this._loadViewer();
-                this._changeDetectorRef.markForCheck();
-            }),
+            tap(watermark => this._initForm(watermark)),
         );
     }
 
+    private _initForm(watermark: IWatermark) {
+        this._watermark = watermark;
+        this._watermark.dossierTemplateId = this.#dossierTemplateId;
+        this.form.setValue({ ...watermark });
+        this._loadViewer();
+        this._changeDetectorRef.markForCheck();
+    }
+
     private _loadViewer() {
         if (!this._instance) {
             WebViewer(
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermarks-listing/watermarks-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermarks-listing/watermarks-listing-screen.component.ts
index b49e4ca68..61090f0b9 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermarks-listing/watermarks-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/watermarks-listing/watermarks-listing-screen.component.ts
@@ -74,7 +74,7 @@ export class WatermarksListingScreenComponent extends ListingComponent<Watermark
     }
 
     getRouterLink(watermark: Watermark = null): string {
-        return `/main/admin/dossier-templates/${this.#dossierTemplateId}/watermarks/${watermark ? watermark.id : 0}`;
+        return `/main/admin/dossier-templates/${this.#dossierTemplateId}/watermarks/${watermark ? watermark.id : 'create'}`;
     }
 
     private async _loadData(): Promise<void> {