Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'master' into VM/RED-8342

Browse Source
This commit is contained in:
Valentin Mihai 2024-02-15 13:25:41 +02:00
commit c411676c6c
9 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/resize-annotation-dialog/resize-annotation-dialog.component.ts
View File

@ -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();

2
apps/red-ui/src/app/modules/file-preview/file-preview.module.ts
View File

@ -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,
];

2
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
View File

@ -55,7 +55,7 @@
<input
#fileInput
(change)="uploadImage($event, attr)"
[id]="attr.id"
[id]="'upload-image-attribute-input'"
[name]="attr.id"
accept="image/jpg, image/jpeg, image/png"
class="file-upload-input"

1
apps/red-ui/src/assets/i18n/redact/de.json
View File

@ -362,6 +362,7 @@
},
"annotation-engines": {
"dictionary": "{isHint, select, true{Hint} other{Redaction}} basierend auf Wörterbuch",
"imported": "Imported",
"ner": "Redaktion basierend auf KI",
"rule": "Schwärzung basierend auf Regel {rule}"
},

10
apps/red-ui/src/assets/i18n/redact/en.json
View File

@ -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",
@ -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 <br> 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}}"
},

1
apps/red-ui/src/assets/i18n/scm/de.json
View File

@ -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}"
},

2
docker/common/nginx/nginx.conf
View File

@ -27,6 +27,6 @@ http {
#gzip on;
include /etc/nginx/conf.d/*.conf;
# include /etc/nginx/conf.d/*.conf;
include /tmp/*.conf;
}

2
docker/red-ui/Dockerfile
View File

@ -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

2
libs/common-ui

@ -1 +1 @@
Subproject commit b4007f3fe5ff4b82dfad5f4aa83298889fd12570
Subproject commit 42cc494e2f3ff18182198bced1320b40c8b41d5e