From 44a6439adc6341351673409b4c0fbbeac9940969 Mon Sep 17 00:00:00 2001 From: Timo Date: Mon, 8 Feb 2021 13:51:51 +0200 Subject: [PATCH] some logging changes --- .../file-preview-screen.component.ts | 13 ++++++++++++- .../src/app/screens/file/model/file-data.model.ts | 1 - apps/red-ui/src/assets/config/config.json | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts index 4650057ca..3eed82583 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts @@ -210,12 +210,12 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy { if (fileDataModel.fileStatus.isWorkable) { if (performUpdate) { this.fileData.redactionLog = fileDataModel.redactionLog; + this.fileData.redactionChangeLog = fileDataModel.redactionChangeLog; this.fileData.fileStatus = fileDataModel.fileStatus; this.fileData.manualRedactions = fileDataModel.manualRedactions; this._rebuildFilters(true); } else { this.fileData = fileDataModel; - this._rebuildFilters(); } } else { if (fileDataModel.fileStatus.isError) { @@ -229,10 +229,13 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy { } private _rebuildFilters(deletePreviousAnnotations: boolean = false) { + const startTime = new Date().getTime(); if (deletePreviousAnnotations) { const existingAnnotations = this.annotations.map((a) => this.activeViewer.annotManager.getAnnotationById(a.id)); this.activeViewer.annotManager.deleteAnnotations(existingAnnotations, true, true); } + console.log('[REDACTION] Delete previous annotations time: ' + (new Date().getTime() - startTime)); + const processStartTime = new Date().getTime(); this.annotationData = this.fileData.getAnnotations( this.appStateService.dictionaryData[this.appStateService.activeProject.ruleSetId], this.permissionsService.currentUser, @@ -242,6 +245,14 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy { const annotationFilters = this._annotationProcessingService.getAnnotationFilter(this.annotations); this.annotationFilters = processFilters(this.annotationFilters, annotationFilters); this.filtersChanged(this.annotationFilters); + console.log('[REDACTION] Process time: ' + (new Date().getTime() - processStartTime)); + console.log( + '[REDACTION] Annotation Redraw and filter rebuild time: ' + + (new Date().getTime() - startTime) + + 'ms for : ' + + this.annotations.length + + ' annotations' + ); } handleAnnotationSelected(annotationId: string) { diff --git a/apps/red-ui/src/app/screens/file/model/file-data.model.ts b/apps/red-ui/src/app/screens/file/model/file-data.model.ts index 229881074..d1390cd0e 100644 --- a/apps/red-ui/src/app/screens/file/model/file-data.model.ts +++ b/apps/red-ui/src/app/screens/file/model/file-data.model.ts @@ -209,7 +209,6 @@ export class FileDataModel { // remove undone entriesToAdd and idsToRemove result = result.filter((redactionLogEntry) => !redactionLogEntry.hidden); - return result; } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index c62ab67d5..63ae17c1c 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "OAUTH_URL": "https://redkc-staging.iqser.cloud/auth/realms/redaction", "OAUTH_CLIENT_ID": "redaction", - "API_URL": "https://timo-redaction-dev.iqser.cloud", + "API_URL": "https://redapi-staging.iqser.cloud", "BACKEND_APP_VERSION": "4.4.40", "FRONTEND_APP_VERSION": "1.0", "EULA_URL": "EULA_URL",