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, ]; 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 @@ 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}" }, 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 diff --git a/libs/common-ui b/libs/common-ui index b4007f3fe..42cc494e2 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit b4007f3fe5ff4b82dfad5f4aa83298889fd12570 +Subproject commit 42cc494e2f3ff18182198bced1320b40c8b41d5e