From 018a8c8d544ae5272e4e0b1b8d43b7094f97f494 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Mon, 12 Dec 2022 19:32:54 +0200
Subject: [PATCH] RED-3800: fix undefined lastChange

---
 .../app/modules/file-preview/file-preview-screen.component.ts   | 2 --
 .../src/app/modules/file-preview/services/file-data.service.ts  | 2 +-
 .../modules/pdf-viewer/services/readable-redactions.service.ts  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
index 0dbb75e5c..cc93d8ec2 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
@@ -12,7 +12,6 @@ import {
     ViewChild,
 } from '@angular/core';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationExtras, Router } from '@angular/router';
-import { Core } from '@pdftron/webviewer';
 import {
     AutoUnsubscribe,
     bool,
@@ -72,7 +71,6 @@ import { ConfigService } from '@services/config.service';
 import { ReadableRedactionsService } from '../pdf-viewer/services/readable-redactions.service';
 import { ROLES } from '@users/roles';
 import { SuggestionsService } from './services/suggestions.service';
-import Annotation = Core.Annotations.Annotation;
 
 const textActions = [TextPopups.ADD_DICTIONARY, TextPopups.ADD_FALSE_POSITIVE];
 
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 c1bc2bd95..ef04cce80 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
@@ -182,7 +182,7 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
         const redactionLogCopy = JSON.parse(JSON.stringify(redactionLog));
         redactionLogCopy.redactionLogEntry = redactionLogCopy.redactionLogEntry.reduce((filtered, entry) => {
             const lastChange = entry.manualChanges.at(-1);
-            const isRemoveChange = this.#isRemoveChange(lastChange.manualRedactionType);
+            const isRemoveChange = this.#isRemoveChange(lastChange?.manualRedactionType);
             if (isRemoveChange) {
                 entry.manualChanges.pop();
                 filtered.push(entry);
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/readable-redactions.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/readable-redactions.service.ts
index 693f71290..c98c4ba77 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/readable-redactions.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/readable-redactions.service.ts
@@ -12,10 +12,10 @@ import Annotation = Core.Annotations.Annotation;
 
 @Injectable()
 export class ReadableRedactionsService {
+    readonly active$: Observable<boolean>;
     readonly #enableIcon = this._convertPath('/assets/icons/general/pdftron-action-enable-tooltips.svg');
     readonly #disableIcon = this._convertPath('/assets/icons/general/pdftron-action-disable-tooltips.svg');
     readonly #active$ = new BehaviorSubject<boolean>(true);
-    readonly active$: Observable<boolean>;
 
     constructor(
         @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,