diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.scss index 40a7ed6bb..218de10d3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.scss @@ -17,10 +17,6 @@ z-index: 1; max-width: 100%; } - - .stats-subtitle { - margin-top: 4px; - } } .right-container { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss index 232ac1f4c..d186203e1 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss @@ -1,7 +1,3 @@ -.stats-subtitle { - margin-top: 4px; -} - .table-item-title { max-width: 100%; } diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts index e5efc9162..13a3ac48b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts @@ -3,16 +3,14 @@ import { ActivatedRoute } from '@angular/router'; import { AppStateService } from '@state/app-state.service'; import { PlaceholdersResponse, ReportTemplate, ReportTemplateControllerService } from '@redaction/red-ui-http'; import { download } from '@utils/file-download-utils'; -import { LoadingService } from '@iqser/common-ui'; +import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; import { generalPlaceholdersDescriptionsTranslations, placeholdersDescriptionsTranslations } from '../../translations/placeholders-descriptions-translations'; import { removeBraces } from '@utils/functions'; -import { Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ConfirmationDialogInput } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { AdminDialogService } from '../../services/admin-dialog.service'; interface Placeholder { diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss index b0ed00292..e69de29bb 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss @@ -1,3 +0,0 @@ -.stats-subtitle { - margin-top: 4px; -} diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts index bdec52e11..855ae2e45 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts @@ -2,18 +2,19 @@ import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit } from import { IDossier } from '@redaction/red-ui-http'; import { CircleButtonTypes, + ConfirmationDialogInput, DefaultListingServices, IListable, ListingComponent, LoadingService, SortingOrders, - TableColumnConfig + TableColumnConfig, + TitleColors } from '@iqser/common-ui'; import { ConfigService } from '@services/config.service'; import * as moment from 'moment'; import { DossiersService } from '../../../dossier/services/dossiers.service'; import { AdminDialogService } from '../../services/admin-dialog.service'; -import { ConfirmationDialogInput, TitleColors } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Observable } from 'rxjs'; import { distinctUntilChanged, map } from 'rxjs/operators'; 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 177e62ae4..8cc7e0827 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 @@ -3,7 +3,6 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import { AddEditFileAttributeDialogComponent } from '../dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; import { AddEditDictionaryDialogComponent } from '../dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component'; import { AddEditDossierTemplateDialogComponent } from '../dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component'; -import { ConfirmationDialogComponent } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { ConfirmDeleteFileAttributeDialogComponent } from '../dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component'; import { EditColorDialogComponent } from '../dialogs/edit-color-dialog/edit-color-dialog.component'; import { SmtpAuthDialogComponent } from '../dialogs/smtp-auth-dialog/smtp-auth-dialog.component'; @@ -13,6 +12,7 @@ import { FileAttributesCsvImportDialogComponent } from '../dialogs/file-attribut 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'; type DialogType = | 'confirm' diff --git a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts index 94b20a5d0..5f198d887 100644 --- a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts @@ -24,9 +24,8 @@ import { AnnotationActionsService } from '../../services/annotation-actions.serv import { UserPreferenceService } from '@services/user-preference.service'; import { BASE_HREF } from '../../../../tokens'; import { ConfigService } from '@services/config.service'; -import { LoadingService } from '@iqser/common-ui'; +import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; import { DossiersDialogService } from '../../services/dossiers-dialog.service'; -import { ConfirmationDialogInput } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { loadCompareDocumentWrapper } from '../../utils/compare-mode.utils'; import { PdfViewerUtils } from '../../utils/pdf-viewer.utils'; import { ViewMode } from '@models/file/view-mode'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts index f408458d9..667538849 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts @@ -3,12 +3,14 @@ import { EditDossierSectionInterface } from '../edit-dossier-section.interface'; import { Dossier } from '@state/model/dossier'; import { CircleButtonTypes, + ConfirmationDialogInput, DefaultListingServices, IListable, ListingComponent, LoadingService, SortingOrders, - TableColumnConfig + TableColumnConfig, + TitleColors } from '@iqser/common-ui'; import { FileManagementControllerService, IFile } from '@redaction/red-ui-http'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -17,7 +19,6 @@ import { ConfigService } from '@services/config.service'; import { getLeftDateTime } from '@utils/functions'; import { Observable } from 'rxjs'; import { distinctUntilChanged, map } from 'rxjs/operators'; -import { ConfirmationDialogInput, TitleColors } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; import { AppStateService } from '@state/app-state.service'; import { FilesService } from '../../../services/files.service'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 8f10d34a9..03967596f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -10,9 +10,8 @@ import { PermissionsService } from '@services/permissions.service'; import { Router } from '@angular/router'; import { MatDialogRef } from '@angular/material/dialog'; import { EditDossierDialogComponent } from '../edit-dossier-dialog.component'; -import { IconButtonTypes, Toaster } from '@iqser/common-ui'; +import { ConfirmationDialogInput, IconButtonTypes, TitleColors, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ConfirmationDialogInput, TitleColors } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { DossiersService } from '../../../services/dossiers.service'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts index aeeb3d51c..58d55bdb5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts @@ -6,8 +6,7 @@ import { File } from '../../../../../../models/file/file'; import { FileActionService } from '../../../../shared/services/file-action.service'; import { Observable } from 'rxjs'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; -import { CircleButtonTypes, EntitiesService, LoadingService } from '@iqser/common-ui'; -import { ConfirmationDialogInput } from '../../../../../shared/dialogs/confirmation-dialog/confirmation-dialog.component'; +import { CircleButtonTypes, ConfirmationDialogInput, EntitiesService, LoadingService } from '@iqser/common-ui'; import { TranslateService } from '@ngx-translate/core'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Dossier } from '@state/model/dossier'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.scss index 501b10239..6b70634b3 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.scss @@ -92,7 +92,3 @@ display: block; } } - -.stats-subtitle { - margin-top: 4px; -} 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 7d61e0a19..b655b571f 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 @@ -3,7 +3,6 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component'; import { RemoveAnnotationsDialogComponent } from '../dialogs/remove-annotations-dialog/remove-annotations-dialog.component'; import { ForceRedactionDialogComponent } from '../dialogs/force-redaction-dialog/force-redaction-dialog.component'; -import { ConfirmationDialogComponent } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component'; import { AppStateService } from '@state/app-state.service'; import { ManualAnnotationService } from './manual-annotation.service'; @@ -15,6 +14,7 @@ import { ChangeLegalBasisDialogComponent } from '../dialogs/change-legal-basis-d import { RecategorizeImageDialogComponent } from '../dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; import { DialogService, largeDialogConfig } from '@shared/services/dialog.service'; import { ComponentType } from '@angular/cdk/portal'; +import { ConfirmationDialogComponent } from '@iqser/common-ui'; type DialogType = | 'confirm' 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 a5ff74d11..7c60c66a5 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 @@ -3,8 +3,16 @@ import { PermissionsService } from '@services/permissions.service'; import { File } from '@models/file/file'; import { AppStateService } from '@state/app-state.service'; import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; -import { ConfirmationDialogInput } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; -import { AutoUnsubscribe, CircleButtonType, CircleButtonTypes, LoadingService, Required, StatusBarConfig, Toaster } from '@iqser/common-ui'; +import { + AutoUnsubscribe, + CircleButtonType, + CircleButtonTypes, + ConfirmationDialogInput, + LoadingService, + Required, + StatusBarConfig, + Toaster +} from '@iqser/common-ui'; import { FileManagementControllerService, FileStatus } from '@redaction/red-ui-http'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts index a2eac1cfc..ebcd2346d 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts @@ -5,9 +5,9 @@ import { ReanalysisControllerService } from '@redaction/red-ui-http'; import { File } from '@models/file/file'; import { PermissionsService } from '@services/permissions.service'; import { DossiersDialogService } from '../../services/dossiers-dialog.service'; -import { ConfirmationDialogInput } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '../../services/files.service'; +import { ConfirmationDialogInput } from '@iqser/common-ui'; import { DossiersService } from '../../services/dossiers.service'; @Injectable() diff --git a/apps/red-ui/src/app/modules/shared/dialogs/confirmation-dialog/confirmation-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/confirmation-dialog/confirmation-dialog.component.html deleted file mode 100644 index c9bc3dfc1..000000000 --- a/apps/red-ui/src/app/modules/shared/dialogs/confirmation-dialog/confirmation-dialog.component.html +++ /dev/null @@ -1,37 +0,0 @@ -
-
- {{ config.title }} -
- -
-

-

- -
- - -
-
- -
- - - - -
- {{ config.denyText }} -
-
- - -
diff --git a/apps/red-ui/src/app/modules/shared/dialogs/confirmation-dialog/confirmation-dialog.component.scss b/apps/red-ui/src/app/modules/shared/dialogs/confirmation-dialog/confirmation-dialog.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/red-ui/src/app/modules/shared/dialogs/confirmation-dialog/confirmation-dialog.component.ts b/apps/red-ui/src/app/modules/shared/dialogs/confirmation-dialog/confirmation-dialog.component.ts deleted file mode 100644 index 4fee8c4fc..000000000 --- a/apps/red-ui/src/app/modules/shared/dialogs/confirmation-dialog/confirmation-dialog.component.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { Component, HostListener, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { TranslateService } from '@ngx-translate/core'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; - -export type TitleColor = 'default' | 'primary'; - -export enum TitleColors { - DEFAULT = 'default', - PRIMARY = 'primary' -} - -export class ConfirmationDialogInput { - title?: string; - titleColor?: TitleColor; - question?: string; - details?: string; - confirmationText?: string; - alternativeConfirmationText?: string; - requireInput?: boolean; - denyText?: string; - translateParams?: Record; - - constructor(options?: ConfirmationDialogInput) { - this.title = options?.title || _('common.confirmation-dialog.title'); - this.titleColor = options?.titleColor || TitleColors.DEFAULT; - this.question = options?.question || _('common.confirmation-dialog.description'); - this.details = options?.details || ''; - this.confirmationText = options?.confirmationText || _('common.confirmation-dialog.confirm'); - this.alternativeConfirmationText = options?.alternativeConfirmationText; - this.requireInput = options?.requireInput || false; - this.denyText = options?.denyText || _('common.confirmation-dialog.deny'); - this.translateParams = options?.translateParams || {}; - } -} - -@Component({ - templateUrl: './confirmation-dialog.component.html', - styleUrls: ['./confirmation-dialog.component.scss'] -}) -export class ConfirmationDialogComponent { - config: ConfirmationDialogInput; - inputValue = ''; - readonly inputLabel: string; - - constructor( - private readonly _dialogRef: MatDialogRef, - private readonly _translateService: TranslateService, - @Inject(MAT_DIALOG_DATA) private readonly _confirmationDialogInput: ConfirmationDialogInput - ) { - this.config = _confirmationDialogInput ?? new ConfirmationDialogInput(); - this.config = this.translate(this.config); - this.inputLabel = this._translateService.instant('confirmation-dialog.input-label') + ` '${this.config.confirmationText}'`; - } - - get isDeleteAction() { - return this.config?.titleColor === TitleColors.PRIMARY; - } - - @HostListener('window:keyup.enter') - onKeyupEnter() { - if (this.config.requireInput && !this.confirmationDoesNotMatch()) { - this.confirm(1); - } - } - - confirmationDoesNotMatch(): boolean { - return this.inputValue.toLowerCase() !== this.config.confirmationText.toLowerCase(); - } - - deny(): void { - this._dialogRef.close(); - } - - confirm(option: number): void { - this._dialogRef.close(option); - } - - translate(obj: T): T { - const translateKeys = ['title', 'question', 'details', 'confirmationText', 'alternativeConfirmationText', 'denyText']; - - if (typeof obj === 'string') { - return this._translateService.instant(obj, this.config.translateParams); - } - - const stringKeys = Object.keys(obj).filter(key => typeof key === 'string' && !!obj[key] && translateKeys.includes(key)); - stringKeys.forEach(key => (obj[key] = this.translate(obj[key]))); - - return obj; - } -} diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 34b12e6ce..3cffa1235 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -11,7 +11,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component'; import { SimpleDoughnutChartComponent } from './components/simple-doughnut-chart/simple-doughnut-chart.component'; import { DictionaryAnnotationIconComponent } from './components/dictionary-annotation-icon/dictionary-annotation-icon.component'; -import { ConfirmationDialogComponent } from './dialogs/confirmation-dialog/confirmation-dialog.component'; import { CommonUiModule } from '@iqser/common-ui'; import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; import { MomentDateAdapter } from '@angular/material-moment-adapter'; @@ -35,7 +34,6 @@ const components = [ AnnotationIconComponent, SimpleDoughnutChartComponent, DictionaryAnnotationIconComponent, - ConfirmationDialogComponent, SelectComponent, SideNavComponent, DictionaryManagerComponent, diff --git a/apps/red-ui/src/assets/styles/red-components.scss b/apps/red-ui/src/assets/styles/red-components.scss index 5e43e1b88..72175eff2 100644 --- a/apps/red-ui/src/assets/styles/red-components.scss +++ b/apps/red-ui/src/assets/styles/red-components.scss @@ -1,19 +1,6 @@ @use 'variables'; @use 'common-mixins'; -.pill { - padding: 2px 5px; - border-radius: 9px; - background-color: variables.$primary; - color: variables.$white; - font-size: 10px; - font-weight: 600; - line-height: 12px; - height: 12px; - text-align: center; - white-space: pre; -} - .UNASSIGNED { stroke: variables.$grey-5; background-color: variables.$grey-5; diff --git a/package.json b/package.json index 921cb6714..9b6f3c555 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "2.250.0", + "version": "2.252.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 8836b7760..c5d836f44 100644 Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ