diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
index 071959d12..b68a6b827 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
@@ -109,7 +109,7 @@ export class DossiersListingScreenComponent
}
openAddDossierDialog(): void {
- this._dialogService.openDialog('addDossier', null, null, async addResponse => {
+ this._dialogService.openDialog('addDossier', null, null, async (addResponse: { dossier: Dossier; addMembers: boolean }) => {
await this._router.navigate([`/main/dossiers/${addResponse.dossier.id}`]);
if (addResponse.addMembers) {
this._dialogService.openDialog('editDossier', null, {
diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
index 625105baa..029baa5f5 100644
--- a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
@@ -4,7 +4,7 @@ import { ManualAnnotationService } from './manual-annotation.service';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { Observable } from 'rxjs';
import { TranslateService } from '@ngx-translate/core';
-import { AddRedactionRequest } from '@redaction/red-ui-http';
+import { AddRedactionRequest, ForceRedactionRequest } from '@redaction/red-ui-http';
import { getFirstRelevantTextPart } from '@utils/functions';
import { AnnotationPermissions } from '@models/file/annotation.permissions';
import { DossiersDialogService } from './dossiers-dialog.service';
@@ -44,7 +44,7 @@ export class AnnotationActionsService {
}
forceRedaction($event: MouseEvent, annotations: AnnotationWrapper[], annotationsChanged: EventEmitter
) {
- this._dialogService.openDialog('forceRedaction', $event, null, request => {
+ this._dialogService.openDialog('forceRedaction', $event, null, (request: ForceRedactionRequest) => {
annotations.forEach(annotation => {
this._processObsAndEmit(
this._manualAnnotationService.forceRedaction({
@@ -77,7 +77,7 @@ export class AnnotationActionsService {
annotationsChanged: EventEmitter
) {
const data = { annotationsToRemove: annotations, removeFromDictionary };
- this._dialogService.openDialog('removeAnnotations', $event, data, result => {
+ this._dialogService.openDialog('removeAnnotations', $event, data, (result: { comment: string }) => {
annotations.forEach(annotation => {
this._processObsAndEmit(
this._manualAnnotationService.removeOrSuggestRemoveAnnotation(annotation, removeFromDictionary, result.comment),
diff --git a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
index b655b571f..150d328de 100644
--- a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
@@ -12,9 +12,8 @@ import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewe
import { ConfigService } from '@services/config.service';
import { ChangeLegalBasisDialogComponent } from '../dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component';
import { RecategorizeImageDialogComponent } from '../dialogs/recategorize-image-dialog/recategorize-image-dialog.component';
-import { DialogService, largeDialogConfig } from '@shared/services/dialog.service';
+import { ConfirmationDialogComponent, DialogService, largeDialogConfig } from '@iqser/common-ui';
import { ComponentType } from '@angular/cdk/portal';
-import { ConfirmationDialogComponent } from '@iqser/common-ui';
type DialogType =
| 'confirm'
diff --git a/apps/red-ui/src/app/modules/icons/icons.module.ts b/apps/red-ui/src/app/modules/icons/icons.module.ts
index ea7c8fe70..bc7e3e171 100644
--- a/apps/red-ui/src/app/modules/icons/icons.module.ts
+++ b/apps/red-ui/src/app/modules/icons/icons.module.ts
@@ -25,7 +25,6 @@ export class IconsModule {
'comment',
'comment-fill',
'dictionary',
- 'document',
'double-chevron-right',
'download',
'entries',
@@ -67,7 +66,6 @@ export class IconsModule {
'trash',
'under-construction',
'undo',
- 'upload',
'user',
'visibility',
'visibility-off'
diff --git a/apps/red-ui/src/app/modules/shared/services/dialog.service.ts b/apps/red-ui/src/app/modules/shared/services/dialog.service.ts
deleted file mode 100644
index a17286c39..000000000
--- a/apps/red-ui/src/app/modules/shared/services/dialog.service.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
-import { ComponentType } from '@angular/cdk/portal';
-
-export const largeDialogConfig: MatDialogConfig = {
- width: '90vw',
- maxWidth: '90vw',
- maxHeight: '90vh',
- autoFocus: false
-} as const;
-
-export const defaultDialogConfig: MatDialogConfig = {
- width: '662px',
- maxWidth: '90vw',
- autoFocus: false
-} as const;
-
-@Injectable()
-export abstract class DialogService {
- protected readonly _config: {
- [key in T]: {
- component: ComponentType;
- dialogConfig?: MatDialogConfig;
- };
- };
-
- protected constructor(protected readonly _dialog: MatDialog) {}
-
- openDialog(type: T, $event: MouseEvent, data: any, cb?: Function, finallyCb?: Function): MatDialogRef {
- const config = this._config[type];
-
- $event?.stopPropagation();
- const ref = this._dialog.open(config.component, {
- ...defaultDialogConfig,
- ...(config.dialogConfig || {}),
- data
- });
- ref.afterClosed().subscribe(async result => {
- if (result && cb) {
- await cb(result);
- }
-
- if (finallyCb) {
- await finallyCb(result);
- }
- });
- return ref;
- }
-}
diff --git a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html
index 8ddd0edbd..4c193c443 100644
--- a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html
+++ b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html
@@ -1,5 +1,5 @@
-
-
+
+
{{ 'dossier-overview.upload-files' | translate }}
diff --git a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss
index 76c424883..e69de29bb 100644
--- a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss
+++ b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss
@@ -1,26 +0,0 @@
-section {
- position: fixed;
- top: 0;
- bottom: 0;
- right: 0;
- left: 0;
- width: 100vw;
- height: 100vh;
- z-index: 1000;
- padding: 12px;
- opacity: 0.7;
- background: white;
- justify-content: center;
- align-items: center;
- display: flex;
- flex-direction: column;
-
- mat-icon {
- height: 60px;
- width: 60px;
- }
-
- .heading-xl {
- margin-top: 24px;
- }
-}
diff --git a/apps/red-ui/src/assets/icons/general/document.svg b/apps/red-ui/src/assets/icons/general/document.svg
deleted file mode 100644
index e8e69f04d..000000000
--- a/apps/red-ui/src/assets/icons/general/document.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/icons/general/upload.svg b/apps/red-ui/src/assets/icons/general/upload.svg
deleted file mode 100644
index 31dfde2e2..000000000
--- a/apps/red-ui/src/assets/icons/general/upload.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/libs/common-ui b/libs/common-ui
index 88f7d46b7..057fbfd2a 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 88f7d46b73c5965b3b3d913bb328fe90952e55df
+Subproject commit 057fbfd2a8fe8a6b9432e03042f2cb5ed092fa0e