From 8d15fb07ea22290264745bab78185715cb5575d0 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 19 Jun 2023 13:02:25 +0300 Subject: [PATCH 1/3] RED-6922 remove ngZone.run from event listeners --- .../services/document-viewer.service.ts | 38 ++++++++----------- package.json | 2 +- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts index a98fb00e2..855708d92 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts @@ -145,40 +145,32 @@ export class REDDocumentViewer { #listenForDocEvents() { this.#document.addEventListener('textSelected', (quads: Quad, selectedText: string, pageNumber: number) => { - this.#ngZone.run(() => { - this.#disableTextPopupIfCompareMode(pageNumber); - this.#selectedText.set(selectedText); - }); + this.#selectedText.set(selectedText); + this.#disableTextPopupIfCompareMode(pageNumber); }); this.#document.addEventListener('pageComplete', event => { - this.#ngZone.run(() => { - setTimeout(() => { - this.#pageComplete.set(event); - }, 300); - }); + setTimeout(() => { + this.#pageComplete.set(event); + }, 300); }); this.#document.addEventListener('documentUnloaded', () => { - this.#ngZone.run(() => { - this.#logger.info('[PDF] Document unloaded'); - this.#loaded.set(false); - }); + this.#logger.info('[PDF] Document unloaded'); + this.#loaded.set(false); }); this.#document.addEventListener('documentLoaded', () => { - this.#ngZone.run(() => { - this.#logger.info('[PDF] Document loaded'); + this.#logger.info('[PDF] Document loaded'); - this.#pdf.runWithCleanup(() => { - this.#flattenAnnotations().then(); - this.#setCurrentPage(); - this.#setInitialDisplayMode(); - this.updateTooltipsVisibility(); - }); - - this.#loaded.set(true); + this.#pdf.runWithCleanup(() => { + this.#flattenAnnotations().then(); + this.#setCurrentPage(); + this.#setInitialDisplayMode(); + this.updateTooltipsVisibility(); }); + + this.#loaded.set(true); }); } diff --git a/package.json b/package.json index 0c54e43bb..b79a5c8f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.126.0", + "version": "4.128.0", "private": true, "license": "MIT", "scripts": { From c21f5e27aebb7c33264dd6c48b5473795c8c2b5b Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 19 Jun 2023 15:51:50 +0300 Subject: [PATCH 2/3] RED-3800 try fix version --- docker/red-ui/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index 905bf5dd1..d8e392dd3 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -1,5 +1,8 @@ FROM node:18.12-buster as prep +RUN ls -al +RUN cat version.json + RUN apt-get update && apt-get install -y jq COPY package.json /tmp @@ -25,6 +28,8 @@ COPY apps apps COPY libs libs COPY tools tools COPY package.json package.json +RUN jq --arg version "$(jq .FRONTEND_APP_VERSION version.json -r | cat)" '.version = $version' package.json +RUN cat package.json COPY yarn.lock yarn.lock COPY nx.json nx.json COPY .eslintrc.json .eslintrc.json From 813f13adf7263d1d81196a5bc0076db2b8cea716 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 19 Jun 2023 15:56:37 +0300 Subject: [PATCH 3/3] RED-3800 try fix version 2 --- docker/red-ui/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index d8e392dd3..b0665a796 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -1,7 +1,8 @@ FROM node:18.12-buster as prep RUN ls -al -RUN cat version.json +RUN cat .dockerenv +RUN printenv RUN apt-get update && apt-get install -y jq COPY package.json /tmp @@ -28,8 +29,8 @@ COPY apps apps COPY libs libs COPY tools tools COPY package.json package.json -RUN jq --arg version "$(jq .FRONTEND_APP_VERSION version.json -r | cat)" '.version = $version' package.json -RUN cat package.json +#RUN jq --arg version "$(jq .FRONTEND_APP_VERSION version.json -r | cat)" '.version = $version' package.json +#RUN cat package.json COPY yarn.lock yarn.lock COPY nx.json nx.json COPY .eslintrc.json .eslintrc.json