From 1ee8873a9cfb1113c238632498782ed148544735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 4 Oct 2021 22:47:48 +0300 Subject: [PATCH] Updated common --- .../screens/audit/audit-screen.component.html | 2 +- .../dictionary-overview-screen.component.html | 2 +- .../digital-signature-screen.component.html | 2 +- ...e-attributes-listing-screen.component.html | 2 +- ...ile-attributes-listing-screen.component.ts | 2 +- .../reports/reports-screen.component.html | 2 +- .../admin/services/admin-dialog.service.ts | 3 +- .../document-info.component.html | 2 +- .../file-workload.component.html | 2 +- .../edit-dossier-attributes.component.html | 8 +-- ...t-dossier-deleted-documents.component.html | 2 +- .../dossier-details-stats.component.html | 2 +- .../dossier-overview/config.service.ts | 2 +- .../dossier-overview-screen.component.html | 12 ++--- ...ssiers-listing-dossier-name.component.html | 2 +- .../dossiers-listing-screen.component.ts | 2 +- .../services/annotation-actions.service.ts | 6 +-- .../services/dossiers-dialog.service.ts | 3 +- .../src/app/modules/icons/icons.module.ts | 2 - .../modules/shared/services/dialog.service.ts | 49 ------------------- .../file-drop/file-drop.component.html | 4 +- .../file-drop/file-drop.component.scss | 26 ---------- .../src/assets/icons/general/document.svg | 9 ---- .../src/assets/icons/general/upload.svg | 9 ---- libs/common-ui | 2 +- 25 files changed, 31 insertions(+), 128 deletions(-) delete mode 100644 apps/red-ui/src/app/modules/shared/services/dialog.service.ts delete mode 100644 apps/red-ui/src/assets/icons/general/document.svg delete mode 100644 apps/red-ui/src/assets/icons/general/upload.svg diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html index 0cac1dc3a..bcebedeab 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html @@ -23,7 +23,7 @@ diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html index 8d5b0c877..5d87d6716 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html @@ -32,7 +32,7 @@ (action)="fileInput.click()" *ngIf="currentUser.isAdmin" [tooltip]="'dictionary-overview.action.upload' | translate" - icon="red:upload" + icon="iqser:upload" tooltipPosition="below" > diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html index 3d9649b9e..b21e9d089 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html @@ -21,7 +21,7 @@ *ngIf="!hasDigitalSignatureSet" [buttonLabel]="'digital-signature-screen.no-data.action' | translate" [text]="'digital-signature-screen.no-data.title' | translate" - buttonIcon="red:upload" + buttonIcon="iqser:upload" >
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html index 38309e225..066c2dfd3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html @@ -60,7 +60,7 @@ *ngIf="currentUser.isAdmin" [tooltip]="'file-attributes-listing.upload-csv' | translate" [type]="circleButtonTypes.dark" - icon="red:upload" + icon="iqser:upload" tooltipPosition="above" > diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts index 0a277efda..8e88adbb6 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts @@ -71,7 +71,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent { + async (newValue: IFileAttributeConfig) => { this._loadingService.start(); await this._fileAttributesService .setFileAttributesConfig(newValue, this._appStateService.activeDossierTemplateId) diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html index 0b430d297..72b069b64 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html @@ -49,7 +49,7 @@ (action)="fileInput.click()" *ngIf="permissionsService.isAdmin()" [tooltip]="'reports-screen.upload-document' | translate" - icon="red:upload" + icon="iqser:upload" >
diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts index 8cc7e0827..efb040bad 100644 --- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts @@ -10,9 +10,8 @@ import { AddEditUserDialogComponent } from '../dialogs/add-edit-user-dialog/add- import { ConfirmDeleteUsersDialogComponent } from '../dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component'; import { FileAttributesCsvImportDialogComponent } from '../dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component'; import { ComponentType } from '@angular/cdk/portal'; -import { DialogService, largeDialogConfig } from '@shared/services/dialog.service'; import { AddEditDossierAttributeDialogComponent } from '../dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component'; -import { ConfirmationDialogComponent } from '@iqser/common-ui'; +import { ConfirmationDialogComponent, DialogService, largeDialogConfig } from '@iqser/common-ui'; type DialogType = | 'confirm' diff --git a/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html b/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html index c717583fb..feb858389 100644 --- a/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html @@ -29,7 +29,7 @@ {{ 'file-preview.tabs.document-info.details.dossier' | translate: { dossierName: dossier.dossierName } }}
- + {{ 'file-preview.tabs.document-info.details.pages' | translate: { pages: file.numberOfPages } }}
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html index 8b6714ac2..29c21f206 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html @@ -139,7 +139,7 @@ [horizontalPadding]="24" [text]="'file-preview.no-data.title' | translate" [verticalPadding]="40" - icon="red:document" + icon="iqser:document" > {{ 'file-preview.tabs.annotations.page-is' | translate }} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html index 427774292..925644162 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html @@ -55,9 +55,9 @@ *ngIf="!currentAttrValue(attr)" [disabled]="!canEdit" [label]="'edit-dossier-dialog.attributes.upload-image' | translate" - class="upload-button" - icon="red:upload" [type]="iconButtonTypes.dark" + class="upload-button" + icon="iqser:upload" >
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html index 81c1f8810..81a16b9c3 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html @@ -5,7 +5,7 @@ [noDataText]="'edit-dossier-dialog.deleted-documents.no-data.title' | translate" [selectionEnabled]="true" [tableItemClasses]="{ disabled: disabledFn }" - noDataIcon="red:document" + noDataIcon="iqser:document" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html index 5201a21e5..f95880bc1 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html @@ -1,6 +1,6 @@
- + {{ 'dossier-overview.dossier-details.stats.documents' | translate: { count: dossier.files.length } }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts index 748c86a01..6e8dffd17 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts @@ -283,7 +283,7 @@ export class ConfigService { filterGroups.push({ slug: 'filesNamesFilter', label: this._translateService.instant('dossier-overview.filters.label'), - icon: 'red:document', + icon: 'iqser:document', filters: filesNamesFilters, checker: keyChecker('filename'), filterceptionPlaceholder: this._translateService.instant('dossier-overview.filters.search') diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html index 7f3e38fbf..700f1f9c9 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html @@ -26,7 +26,7 @@ [tooltip]="'dossier-overview.header-actions.upload-document' | translate" [type]="circleButtonTypes.primary" class="ml-14" - icon="red:upload" + icon="iqser:upload" tooltipPosition="below" > @@ -47,8 +47,8 @@ [selectionEnabled]="true" [showNoDataButton]="true" [tableItemClasses]="{ disabled: disabledFn, 'last-opened': lastOpenedFn }" - noDataButtonIcon="red:upload" - noDataIcon="red:document" + noDataButtonIcon="iqser:upload" + noDataIcon="iqser:document" >
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html index 30b70e884..3dac0bd80 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html @@ -9,7 +9,7 @@
- + {{ dossier.filesLength }}
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