From d9ffac81d31a78e139833abd4f3456765be6cb1c Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Tue, 13 Feb 2024 17:19:45 +0200 Subject: [PATCH 1/5] RED-8161 - Hard to read Document Versions in Read-Only Mode --- .../attributes/edit-dossier-attributes.component.html | 2 +- libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html index 93f577af5..6b7b5ba69 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html @@ -55,7 +55,7 @@ Date: Wed, 14 Feb 2024 02:03:22 +0000 Subject: [PATCH 2/5] push back localazy update --- apps/red-ui/src/assets/i18n/redact/de.json | 1 + apps/red-ui/src/assets/i18n/redact/en.json | 2 +- apps/red-ui/src/assets/i18n/scm/de.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index fee167dc1..675e35ec3 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -362,6 +362,7 @@ }, "annotation-engines": { "dictionary": "{isHint, select, true{Hint} other{Redaction}} basierend auf Wörterbuch", + "imported": "Redaction is imported", "ner": "Redaktion basierend auf KI", "rule": "Schwärzung basierend auf Regel {rule}" }, diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 6b342f61f..02570c017 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -2210,7 +2210,7 @@ }, "missing": "Missing", "must-contain": "Must contain", - "no-data": "Please enter a keyword into the search bar to look for documents or document content.", + "no-data": "Enter a keyword into the search bar
to look for documents or document content.", "no-match": "The specified search term was not found in any of the documents.", "table-header": "{length} search {length, plural, one{result} other{results}}" }, diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 00af71cca..60eb14b20 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -362,6 +362,7 @@ }, "annotation-engines": { "dictionary": "{isHint, select, true{Hint} other{Redaction}} basierend auf Wörterbuch", + "imported": "Annotation is imported", "ner": "Redaktion basierend auf KI", "rule": "Schwärzung basierend auf Regel {rule}" }, From 5e002ffca2eef9b8a8f497ed801ea00b9c830cd5 Mon Sep 17 00:00:00 2001 From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1 Date: Thu, 15 Feb 2024 02:03:25 +0000 Subject: [PATCH 3/5] push back localazy update --- apps/red-ui/src/assets/i18n/redact/de.json | 2 +- apps/red-ui/src/assets/i18n/redact/en.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 675e35ec3..41ec0f493 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -362,7 +362,7 @@ }, "annotation-engines": { "dictionary": "{isHint, select, true{Hint} other{Redaction}} basierend auf Wörterbuch", - "imported": "Redaction is imported", + "imported": "Imported", "ner": "Redaktion basierend auf KI", "rule": "Schwärzung basierend auf Regel {rule}" }, diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 02570c017..2ecb2e5ed 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -358,10 +358,10 @@ "resized": "Redaction area has been modified" }, "annotation-engines": { - "dictionary": "{isHint, select, true{Hint} other{Redaction}} based on dictionary", - "imported": "Redaction is imported", - "ner": "Redaction based on AI", - "rule": "Redaction based on rule {rule}" + "dictionary": "Based on dictionary", + "imported": "Imported", + "ner": "Based on AI", + "rule": "Based on rule" }, "annotation-type": { "hint": "Hint", From 18e68f0a0622b9a7b8ae4c16b55efc756447c281 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 15 Feb 2024 12:29:29 +0200 Subject: [PATCH 4/5] RED-8554 remove 80 port --- docker/common/nginx/nginx.conf | 2 +- docker/red-ui/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/common/nginx/nginx.conf b/docker/common/nginx/nginx.conf index c6cca8f43..ba11ab688 100644 --- a/docker/common/nginx/nginx.conf +++ b/docker/common/nginx/nginx.conf @@ -27,6 +27,6 @@ http { #gzip on; - include /etc/nginx/conf.d/*.conf; +# include /etc/nginx/conf.d/*.conf; include /tmp/*.conf; } diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index be4cccba3..477fffd5b 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -23,7 +23,7 @@ CMD ["/bin/cp", "-r", "/ng-app/dist/paligo-styles", "/tmp/styles-export"] ### STAGE 2: Setup ### -FROM nginx:1.25.3-alpine +FROM nginx:1.25.4-alpine ENV NGINX_ENVSUBST_OUTPUT_DIR=/tmp ENV PDFTRON_ALLOWED_HOSTS='' ## Copy our default nginx config From 77c04dd28b2b0904168c697b0dda1df6cb85f6b3 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 15 Feb 2024 12:49:28 +0200 Subject: [PATCH 5/5] RED-3800 fix build --- .../resize-annotation-dialog.component.ts | 12 ++++++++++-- .../app/modules/file-preview/file-preview.module.ts | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/resize-annotation-dialog/resize-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/resize-annotation-dialog/resize-annotation-dialog.component.ts index b8b6e015f..51b4b47ca 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/resize-annotation-dialog/resize-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/resize-annotation-dialog/resize-annotation-dialog.component.ts @@ -1,12 +1,16 @@ import { Component, inject } from '@angular/core'; -import { FormBuilder } from '@angular/forms'; -import { IconButtonTypes, IqserDialogComponent } from '@iqser/common-ui'; +import { FormBuilder, ReactiveFormsModule } from '@angular/forms'; +import { MatDialogClose } from '@angular/material/dialog'; +import { CircleButtonComponent, HasScrollbarDirective, IconButtonComponent, IconButtonTypes, IqserDialogComponent } from '@iqser/common-ui'; +import { TranslateModule } from '@ngx-translate/core'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; import { ResizeAnnotationData, ResizeAnnotationResult } from '../../../utils/dialog-types'; @Component({ templateUrl: './resize-annotation-dialog.component.html', + standalone: true, + imports: [ReactiveFormsModule, TranslateModule, HasScrollbarDirective, IconButtonComponent, CircleButtonComponent, MatDialogClose], }) export class ResizeAnnotationDialogComponent extends IqserDialogComponent< ResizeAnnotationDialogComponent, @@ -21,6 +25,10 @@ export class ResizeAnnotationDialogComponent extends IqserDialogComponent< comment: [null], }); + constructor() { + super(); + } + save() { const formValue = this.form.getRawValue(); diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts index b561e723b..8bad2b0f3 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts @@ -55,7 +55,6 @@ import { ChangeLegalBasisDialogComponent } from './dialogs/change-legal-basis-di import { AddAnnotationDialogComponent } from './dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component'; import { EditAnnotationDialogComponent } from './dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component'; import { RemoveAnnotationDialogComponent } from './dialogs/docu-mine/remove-annotation-dialog/remove-annotation-dialog.component'; -import { ResizeAnnotationDialogComponent } from './dialogs/docu-mine/resize-annotation-dialog/resize-annotation-dialog.component'; import { DocumentInfoDialogComponent } from './dialogs/document-info-dialog/document-info-dialog.component'; import { EditRedactionDialogComponent } from './dialogs/edit-redaction-dialog/edit-redaction-dialog.component'; import { ForceAnnotationDialogComponent } from './dialogs/force-redaction-dialog/force-annotation-dialog.component'; @@ -96,7 +95,6 @@ const dialogs = [ RemoveRedactionDialogComponent, AddAnnotationDialogComponent, RemoveAnnotationDialogComponent, - ResizeAnnotationDialogComponent, RedactRecommendationDialogComponent, ];