From 95d0d1edf8c273f33e5cce24615dfd6d4a1e52a5 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Wed, 19 Jul 2023 12:31:51 +0300
Subject: [PATCH] Icons updates

---
 apps/red-ui/src/app/app.module.ts                    | 11 ++++++++++-
 .../file-preview/services/file-data.service.ts       | 12 ++++++------
 .../app/services/dossiers/dossier-changes.service.ts |  6 +++++-
 .../assets/icons/general/pdftron-action-add-hint.svg |  4 ++--
 .../icons/general/pdftron-action-add-redaction.svg   |  2 +-
 docker/red-ui/Dockerfile                             |  2 +-
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts
index f1b55a336..469f657d1 100644
--- a/apps/red-ui/src/app/app.module.ts
+++ b/apps/red-ui/src/app/app.module.ts
@@ -144,7 +144,7 @@ export const appModuleFactory = (config: AppConfig) => {
                                 enabled: false,
                             },
                             PDF: {
-                                enabled: true,
+                                enabled: false,
                             },
                             FILE: {
                                 enabled: true,
@@ -155,6 +155,15 @@ export const appModuleFactory = (config: AppConfig) => {
                             STATS: {
                                 enabled: false,
                             },
+                            REDACTION_LOG: {
+                                enabled: false,
+                            },
+                            VIEWED_PAGES: {
+                                enabled: false,
+                            },
+                            PAGES: {
+                                enabled: false,
+                            },
                         },
                     } as ILoggerConfig,
                 },
diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
index 63cff5a04..aeec3258d 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
@@ -43,14 +43,14 @@ export function chronologicallyBy<T>(property: (x: T) => string) {
 
 @Injectable()
 export class FileDataService extends EntitiesService<AnnotationWrapper, AnnotationWrapper> {
+    readonly #annotations = signal<AnnotationWrapper[]>([]);
+    readonly #earmarks = signal<Map<number, AnnotationWrapper[]>>(new Map());
+    #originalViewedPages: ViewedPage[] = [];
+    protected readonly _entityClass = AnnotationWrapper;
     missingTypes = new Set<string>();
     readonly earmarks: Signal<Map<number, AnnotationWrapper[]>>;
     readonly annotations: Signal<AnnotationWrapper[]>;
     readonly annotations$: Observable<AnnotationWrapper[]>;
-    protected readonly _entityClass = AnnotationWrapper;
-    readonly #annotations = signal<AnnotationWrapper[]>([]);
-    readonly #earmarks = signal<Map<number, AnnotationWrapper[]>>(new Map());
-    #originalViewedPages: ViewedPage[] = [];
 
     constructor(
         private readonly _state: FilePreviewStateService,
@@ -155,12 +155,12 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
     async #loadViewedPages(file: File) {
         if (!this._permissionsService.canMarkPagesAsViewed(file)) {
             this._viewedPagesMapService.set(file.fileId, []);
-            this._logger.info('[VIEWED-PAGES] Cannot mark pages as viewed, skip loading viewed pages');
+            this._logger.info('[VIEWED_PAGES] Cannot mark pages as viewed, skip loading viewed pages');
             return;
         }
 
         this.#originalViewedPages = await this._viewedPagesService.load(file.dossierId, file.fileId);
-        this._logger.info('[VIEWED-PAGES] Loaded viewed pages', this.#originalViewedPages);
+        this._logger.info('[VIEWED_PAGES] Loaded viewed pages', this.#originalViewedPages);
         this._viewedPagesMapService.set(file.fileId, this.#originalViewedPages);
     }
 
diff --git a/apps/red-ui/src/app/services/dossiers/dossier-changes.service.ts b/apps/red-ui/src/app/services/dossiers/dossier-changes.service.ts
index f7db33bd6..26e757263 100644
--- a/apps/red-ui/src/app/services/dossiers/dossier-changes.service.ts
+++ b/apps/red-ui/src/app/services/dossiers/dossier-changes.service.ts
@@ -35,7 +35,7 @@ export class DossiersChangesService extends GenericService<Dossier> implements O
             changes.map(change => this.#load(change.dossierId).pipe(removeIfNotFound(change.dossierId)));
 
         return this.hasChangesDetails$().pipe(
-            tap(changes => this.#logger.info('[CHANGES] Dossier changes', changes)),
+            tap(changes => this.#logger.info('[DOSSIERS_CHANGES] Found changes', changes)),
             switchMap(dossierChanges =>
                 forkJoin([...load(dossierChanges), this.#dashboardStatsService.loadAll().pipe(take(1))]).pipe(map(() => dossierChanges)),
             ),
@@ -45,9 +45,13 @@ export class DossiersChangesService extends GenericService<Dossier> implements O
     hasChangesDetails$(): Observable<IDossierChanges> {
         const body = { value: this._lastCheckedForChanges.get(ROOT_CHANGES_KEY) };
         const dateBeforeRequest = new Date(Date.now() - LAST_CHECKED_OFFSET).toISOString();
+
+        this.#logger.info('[DOSSIERS_CHANGES] Check with Last Checked Date', body.value);
+
         return this._post<IDossierChanges>(body, `${this._defaultModelPath}/changes/details`).pipe(
             filter(changes => changes.length > 0),
             tap(() => this._lastCheckedForChanges.set(ROOT_CHANGES_KEY, dateBeforeRequest)),
+            tap(() => this.#logger.info('[DOSSIERS_CHANGES] Save Last Checked Date value', dateBeforeRequest)),
         );
     }
 
diff --git a/apps/red-ui/src/assets/icons/general/pdftron-action-add-hint.svg b/apps/red-ui/src/assets/icons/general/pdftron-action-add-hint.svg
index 1fe57ac1b..e90c4b123 100644
--- a/apps/red-ui/src/assets/icons/general/pdftron-action-add-hint.svg
+++ b/apps/red-ui/src/assets/icons/general/pdftron-action-add-hint.svg
@@ -2,8 +2,8 @@
 <svg height="16px" version="1.1" viewBox="0 0 16 16" width="16px"
      xmlns="http://www.w3.org/2000/svg">
     <g fill="none" fill-rule="evenodd" id="Redacted" stroke="none" stroke-width="1">
-        <circle fill="#94989f" cx="8" cy="8" r="8" />
-        <text fill="#FFFFFF" font-family="Arial, Helvetica, sans-serif" font-size="11" font-weight="500"
+        <circle cx="8" cy="8" fill="#94989f" r="8" />
+        <text fill="#FFFFFF" font-family="Inter-SemiBold, Inter" font-size="11" font-weight="500"
               id="H">
             <tspan x="4" y="12">H</tspan>
         </text>
diff --git a/apps/red-ui/src/assets/icons/general/pdftron-action-add-redaction.svg b/apps/red-ui/src/assets/icons/general/pdftron-action-add-redaction.svg
index 584946975..8e984bddf 100644
--- a/apps/red-ui/src/assets/icons/general/pdftron-action-add-redaction.svg
+++ b/apps/red-ui/src/assets/icons/general/pdftron-action-add-redaction.svg
@@ -3,7 +3,7 @@
      xmlns="http://www.w3.org/2000/svg">
     <g fill="none" fill-rule="evenodd" id="Redacted" stroke="none" stroke-width="1">
         <rect fill="#283241" height="16" id="Rectangle" width="16" x="0" y="0"></rect>
-        <text fill="#FFFFFF" font-family="Arial, Helvetica, sans-serif" font-size="11" font-weight="500"
+        <text fill="#FFFFFF" font-family="Inter-SemiBold, Inter" font-size="11" font-weight="500"
               id="H">
             <tspan x="4.421875" y="12">R</tspan>
         </text>
diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile
index 5d023e232..730dfb3bc 100644
--- a/docker/red-ui/Dockerfile
+++ b/docker/red-ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.12-buster as builder
+FROM node:20.4-buster as builder
 
 WORKDIR /ng-app