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 e9f1f4d66..41ce299fc 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 @@ -4,8 +4,9 @@ import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dos import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui'; +import { ImportRedactionsDialogComponent } from '../../file-preview/dialogs/import-redactions-dialog/import-redactions-dialog'; -type DialogType = 'confirm' | 'editDossier' | 'addDossier' | 'assignFile'; +type DialogType = 'confirm' | 'editDossier' | 'addDossier' | 'assignFile' | 'importRedactions'; @Injectable() export class DossiersDialogService extends DialogService { @@ -26,6 +27,10 @@ export class DossiersDialogService extends DialogService { component: AssignReviewerApproverDialogComponent, dialogConfig: { disableClose: false }, }, + importRedactions: { + component: ImportRedactionsDialogComponent, + dialogConfig: { disableClose: false }, + }, }; constructor(protected readonly _dialog: MatDialog) { diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html index 125b5b28c..deeb284f9 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html @@ -4,13 +4,13 @@ - + + + + + + + diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index 43a4a559f..a73721573 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -53,7 +53,7 @@ export class FileActionsComponent implements OnChanges { @Input() maxWidth: number; @Input() fileActionsHelpModeKey: 'document_features' | 'editor_document_features' = 'document_features'; - @ViewChild('importRedactionsInput', { static: true }) importRedactionsInput: ElementRef; + // @ViewChild('importRedactionsInput', { static: true }) importRedactionsInput: ElementRef; toggleTooltip?: string; assignTooltip?: string; @@ -320,7 +320,8 @@ export class FileActionsComponent implements OnChanges { private _triggerImportRedactions($event: MouseEvent) { $event.stopPropagation(); - this.importRedactionsInput.nativeElement.click(); + this._dialogService.openDialog('importRedactions', null, null); + // this.importRedactionsInput.nativeElement.click(); } private _openDeleteFileDialog($event: MouseEvent) { diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.html b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.html new file mode 100644 index 000000000..d921438c8 --- /dev/null +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.html @@ -0,0 +1,27 @@ +
+
+ +
+
+
+ +
+
+ +
+ +

{{file.name}}

+ +
+
+
+ +
+ +
+
+ + +
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.scss new file mode 100644 index 000000000..16310ac8c --- /dev/null +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.scss @@ -0,0 +1,64 @@ +@use 'variables'; + +.upload-area { + display: flex; + align-items: center; + border-radius: 8px; + width: 586px; + background: variables.$grey-2; + gap: 16px; + + height: 88px; + cursor: pointer; + + mat-icon, + div { + opacity: 0.5; + transition: 0.1s; + } + + mat-icon { + margin-left: 32px; + } + + div { + font-size: 16px; + font-weight: 500; + } + + //&:hover { + // mat-icon { + // transform: scale(1.2); + // } + // + // div { + // font-size: 19px; + // } + //} +} + +.file-area { + display: flex; + align-items: center; + border-radius: 8px; + width: 586px; + background: variables.$grey-2; + gap: 10px; + + height: 48px; + + mat-icon:first-child { + opacity: 0.5; + margin-left: 16px; + } + + mat-icon:last-child { + margin-left: auto; + margin-right: 16px; + cursor: pointer; + } + + mat-icon { + transform: scale(0.7); + } +} diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.ts new file mode 100644 index 000000000..c9f1fe4a9 --- /dev/null +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.ts @@ -0,0 +1,21 @@ +import { Component, Injector } from '@angular/core'; +import { BaseDialogComponent } from '@iqser/common-ui'; +import { MatDialogRef } from '@angular/material/dialog'; + +@Component({ + templateUrl: './import-redactions-dialog.html', + styleUrls: ['./import-redactions-dialog.scss'], +}) +export class ImportRedactionsDialogComponent extends BaseDialogComponent { + hasFile = false; + + file = { + name: 'File with redactions.pdf', + }; + + constructor(protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef) { + super(_injector, _dialogRef); + } + + save(): void {} +} 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 a91dcf8d5..2b62af345 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 @@ -38,6 +38,7 @@ import { DocumentInfoDialogComponent } from './dialogs/document-info-dialog/docu import { ManualRedactionService } from './services/manual-redaction.service'; import { AnnotationWrapperComponent } from './components/annotation-wrapper/annotation-wrapper.component'; import { AnnotationReferenceComponent } from './components/annotation-reference/annotation-reference.component'; +import { ImportRedactionsDialogComponent } from './dialogs/import-redactions-dialog/import-redactions-dialog'; const routes: Routes = [ { @@ -59,6 +60,7 @@ const dialogs = [ HighlightActionDialogComponent, AcceptRecommendationDialogComponent, DocumentInfoDialogComponent, + ImportRedactionsDialogComponent, ]; const components = [ diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 3a691f506..aecb1effb 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1453,6 +1453,15 @@ "logo": "Logo", "signature": "Signatur" }, + "import-redactions-dialog": { + "actions": { + "cancel": "", + "import": "" + }, + "details": "", + "upload-area-text": "", + "title": "" + }, "initials-avatar": { "unassigned": "Unbekannt", "you": "Sie" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 0ceb4c396..a78ab2130 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -822,7 +822,7 @@ "edit": "Edit Dossier", "upload-document": "Upload Document" }, - "import-redactions": "Import redactions from other file", + "import-redactions": "Import redactions", "new-rule": { "toast": { "actions": { @@ -1453,6 +1453,15 @@ "logo": "Logo", "signature": "Signature" }, + "import-redactions-dialog": { + "actions": { + "cancel": "Cancel", + "import": "Import" + }, + "details": "To apply redactions from another document, you first need to upload it.", + "upload-area-text": "Click or drag & drop anywhere on this area...", + "title": "Import document with redactions" + }, "initials-avatar": { "unassigned": "Unassigned", "you": "You" diff --git a/libs/common-ui b/libs/common-ui index 3c0d4368c..d8c2a342b 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 3c0d4368c70975255478d5ee038587c1ea97ecf8 +Subproject commit d8c2a342baa6acb330132c44000562bdd823f620