From 20ebaa54b2f7b87eb6a1a66a3e53cff18e3d6cc8 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta@devplant.ro>
Date: Mon, 6 Mar 2023 12:48:13 +0200
Subject: [PATCH] RED-6245: refactoring

---
 .../paginator/paginator.component.html         |  12 +++++-------
 .../paginator/paginator.component.scss         |  15 ++++++++++-----
 .../watermark/paginator/paginator.component.ts |   4 +---
 .../watermark-screen.component.html            |   2 +-
 .../watermark-screen.component.scss            |   1 +
 .../watermark-screen.component.ts              |   8 --------
 apps/red-ui/src/assets/pdftron/blank.pdf       | Bin 4911 -> 945 bytes
 7 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html
index 1bfe8cd76..896efd4d0 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html
@@ -1,13 +1,11 @@
-<div [style.visibility]="(loaded$ | async) ? 'visible' : 'hidden'" class="pagination noselect">
-    <div (click)="changePage.emit(1)">
+<div class="pagination noselect">
+    <div id="portraitPage" class="page-button" (click)="changePage.emit(1)">
         <mat-icon class="chevron-icon" svgIcon="red:nav-prev"></mat-icon>
+        Portrait
     </div>
-
-    <div id="portraitPage">Portrait</div>
     <div class="separator">/</div>
-    <div id="landscapePage">Landscape</div>
-
-    <div (click)="changePage.emit(2)">
+    <div id="landscapePage" class="page-button" (click)="changePage.emit(2)">
+        Landscape
         <mat-icon class="chevron-icon" svgIcon="red:nav-next"></mat-icon>
     </div>
 </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.scss b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.scss
index f337dee2e..7293a732d 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.scss
@@ -23,15 +23,20 @@
         padding-right: 2px;
     }
 
-    .chevron-icon {
-        height: 16px;
-        transform: rotate(-90deg);
+    .page-button {
         cursor: pointer;
-        padding-left: 4px;
-        padding-right: 4px;
+        align-items: center;
+        display: inline-flex;
 
         &:hover {
             color: var(--iqser-text);
         }
     }
+
+    .chevron-icon {
+        height: 16px;
+        transform: rotate(-90deg);
+        padding-left: 4px;
+        padding-right: 4px;
+    }
 }
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.ts
index 3893f6f6c..02ba06c3b 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.ts
@@ -1,5 +1,4 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Component, EventEmitter, Output } from '@angular/core';
 
 @Component({
     selector: 'redaction-paginator',
@@ -7,6 +6,5 @@ import { Observable } from 'rxjs';
     styleUrls: ['./paginator.component.scss'],
 })
 export class PaginatorComponent {
-    @Input() loaded$: Observable<boolean>;
     @Output() readonly changePage = new EventEmitter<number>();
 }
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 003da0eb8..ba2ad0723 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
@@ -1,6 +1,6 @@
 <div class="content-container">
     <div class="viewer" id="viewer"></div>
-    <redaction-paginator [loaded$]="loaded$" (changePage)="navigateTo($event)"></redaction-paginator>
+    <redaction-paginator *ngIf="loaded$ | async" (changePage)="navigateTo($event)"></redaction-paginator>
 
     <div *ngIf="changed && currentUser.isAdmin" class="changes-box">
         <iqser-icon-button
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.scss
index 283bc7a1c..7ec4b7bc0 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.scss
@@ -13,6 +13,7 @@
 
     .viewer {
         height: 100%;
+        width: 100%;
     }
 }
 
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 ebdd2658c..046b6a58c 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
@@ -170,7 +170,6 @@ export class WatermarkScreenComponent {
 
         this._instance.Core.documentViewer.addEventListener('documentLoaded', async () => {
             this.#loaded$.next(true);
-            await this._loadLandscapePage();
             this._loadingService.stop();
             await this._drawWatermark();
         });
@@ -188,13 +187,6 @@ export class WatermarkScreenComponent {
         this._instance.UI.loadDocument(blobData, { filename: 'blank.pdf' });
     }
 
-    private async _loadLandscapePage() {
-        const blankPdf = await this._instance.Core.createDocument('/ui/assets/pdftron/blank.pdf');
-        const pageCount = this._instance.Core.documentViewer.getPageCount();
-        await this._instance.Core.documentViewer.getDocument().insertPages(blankPdf, [pageCount], pageCount + 1);
-        await this._instance.Core.documentViewer.getDocument().rotatePages([pageCount + 1], 1);
-    }
-
     private _disableElements() {
         this._instance.UI.disableElements(['header', 'toolsHeader', 'pageNavOverlay', 'textPopup']);
     }
diff --git a/apps/red-ui/src/assets/pdftron/blank.pdf b/apps/red-ui/src/assets/pdftron/blank.pdf
index 757bb1f36404ff475efeb6fda3350468de425004..03dc3db0afb13d3fdb261c621e558570b7313b15 100644
GIT binary patch
literal 945
zcmb_bKa12r6ki2FhHWe?#O5^%cZJR*n@kc}7B2tT#S@p@fnqq=n9Qw_HFG4hvf6DS
zoSj!#2!h|hR{Rteegpjk7J`MKZ_X8icNU^k%?xjT^ZWB&ZxY5=jH{gVK74%lo>;&@
z-n~x-1483+u0#zqo@YvgBA10AbX!z2bq@?ihC|Y*T4WE%=;_(>tb^+e5mm9i#GMA}
zw*Yq^9SES4Y=$^NEf0LTgp^?cH%xFmbC1v)qA0Ud?i10-MV*TVG_y%9^BtierN|!W
zu2`x)&4&iEQle4~XdMX_W;GtcJU(H;niOx5`Y$T&7T~|AlnSi|j}iK}g0-YS3)Tkw
zjP)14hS2L}(Lkz0N<fQ9FoQrYv}fATwO_`G=Ru~jxtwW-XBf)w20N_>7*?^!v5_{)
zZTV1OVw;$=EJ7`HBfMrZv(NgB8;mj2y0h8(*KNV<l#kIFG)77Vnh>fTSNjt5UwR)x
zI`G3dbOX=W;=aoR7DcYhEYFWE7KM>%2SXUxfwkp%f$P}JicHQ;)^|9wZPzwK<{17E
z9r$6<?L_PodJ9qm_37q3wN=JdA&%SF!;1BESVn6)mM`<^^vkzbN8{(K)zPO*&!(f!
qg|G1X^5N%;Blcu<__o{ayy%{Lb8>hZmDOrlBMr_y((6SxWAYupX9~{%

literal 4911
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
Ln%aA!F6aLMq`se{