From 6562b362a848be7eeb803dff03440e59190c2a25 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Wed, 29 Sep 2021 20:01:56 +0300
Subject: [PATCH] reverted type-id

---
 apps/red-ui/src/app/models/file/file-data.model.ts     | 10 ++--------
 .../src/app/models/file/manual-annotation-response.ts  |  2 +-
 libs/red-ui-http/src/lib/model/manualRedactionEntry.ts |  2 +-
 libs/red-ui-http/src/lib/model/redactionLogEntry.ts    |  2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/red-ui/src/app/models/file/file-data.model.ts b/apps/red-ui/src/app/models/file/file-data.model.ts
index 392a04a82..0c7eb12ff 100644
--- a/apps/red-ui/src/app/models/file/file-data.model.ts
+++ b/apps/red-ui/src/app/models/file/file-data.model.ts
@@ -13,12 +13,7 @@ export class AnnotationData {
 }
 
 export class FileDataModel {
-    constructor(
-        public file: File,
-        public fileData: Blob,
-        public redactionLog: RedactionLog,
-        public viewedPages?: ViewedPages
-    ) {}
+    constructor(public file: File, public fileData: Blob, public redactionLog: RedactionLog, public viewedPages?: ViewedPages) {}
 
     getAnnotations(
         dictionaryData: { [p: string]: TypeValue },
@@ -59,8 +54,7 @@ export class FileDataModel {
             // copy the redactionLog Entry
             const redactionLogEntryWrapper: RedactionLogEntryWrapper = {};
             Object.assign(redactionLogEntryWrapper, redactionLogEntry);
-            console.log(redactionLogEntry.typeId);
-            redactionLogEntryWrapper.type = redactionLogEntry.typeId.substr(0, redactionLogEntry.typeId.indexOf(":"));
+            redactionLogEntryWrapper.type = redactionLogEntry.type;
 
             redactionLogEntryWrapper.isChangeLogEntry = this._isChangeLogEntry(redactionLogEntry);
             // redactionLogEntryWrapper.changeLogType = changeLogEntry.changeType;
diff --git a/apps/red-ui/src/app/models/file/manual-annotation-response.ts b/apps/red-ui/src/app/models/file/manual-annotation-response.ts
index c2203d0e0..c19074328 100644
--- a/apps/red-ui/src/app/models/file/manual-annotation-response.ts
+++ b/apps/red-ui/src/app/models/file/manual-annotation-response.ts
@@ -11,6 +11,6 @@ export class ManualAnnotationResponse {
     }
 
     get dictionary() {
-        return this.manualRedactionEntryWrapper.manualRedactionEntry.typeId;
+        return this.manualRedactionEntryWrapper.manualRedactionEntry.type;
     }
 }
diff --git a/libs/red-ui-http/src/lib/model/manualRedactionEntry.ts b/libs/red-ui-http/src/lib/model/manualRedactionEntry.ts
index 8a5f5ec3a..f5c97259b 100644
--- a/libs/red-ui-http/src/lib/model/manualRedactionEntry.ts
+++ b/libs/red-ui-http/src/lib/model/manualRedactionEntry.ts
@@ -23,7 +23,7 @@ export interface ManualRedactionEntry {
     requestDate?: string;
     softDeletedTime?: string;
     status?: ManualRedactionEntry.StatusEnum;
-    typeId?: string;
+    type?: string;
     user?: string;
     value?: string;
 }
diff --git a/libs/red-ui-http/src/lib/model/redactionLogEntry.ts b/libs/red-ui-http/src/lib/model/redactionLogEntry.ts
index ad0b523d6..769174c86 100644
--- a/libs/red-ui-http/src/lib/model/redactionLogEntry.ts
+++ b/libs/red-ui-http/src/lib/model/redactionLogEntry.ts
@@ -44,7 +44,7 @@ export interface RedactionLogEntry {
     status?: RedactionLogEntry.StatusEnum;
     textAfter?: string;
     textBefore?: string;
-    typeId?: string;
+    type?: string;
     value?: string;
 }