From 6c6998e9458c14741169cfbc750092bbc21dee7f Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Mon, 6 Mar 2023 11:33:13 +0200 Subject: [PATCH 01/99] RED-6245: wip landscape page --- .../paginator/paginator.component.html | 13 +++++++ .../paginator/paginator.component.scss | 37 +++++++++++++++++++ .../paginator/paginator.component.ts | 12 ++++++ .../watermark-screen.component.html | 1 + .../watermark-screen.component.scss | 1 + .../watermark-screen.component.ts | 21 +++++++++-- .../screens/watermark/watermark.module.ts | 3 +- 7 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html create mode 100644 apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.scss create mode 100644 apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.ts diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html new file mode 100644 index 000000000..1bfe8cd76 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html @@ -0,0 +1,13 @@ + diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.scss b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.scss new file mode 100644 index 000000000..f337dee2e --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.scss @@ -0,0 +1,37 @@ +.pagination { + z-index: 1; + position: absolute; + bottom: 20px; + right: calc(50% - (var(--viewer-width) / 2)); + transform: translate(-50%); + background: var(--iqser-background); + color: var(--iqser-grey-7); + border: 1px solid var(--iqser-grey-7); + border-radius: 8px; + padding: 6px 2px; + display: flex; + justify-content: center; + align-items: center; + + > div { + height: 16px; + cursor: default; + } + + .separator { + padding-left: 2px; + padding-right: 2px; + } + + .chevron-icon { + height: 16px; + transform: rotate(-90deg); + cursor: pointer; + padding-left: 4px; + padding-right: 4px; + + &:hover { + color: var(--iqser-text); + } + } +} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.ts new file mode 100644 index 000000000..3893f6f6c --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.ts @@ -0,0 +1,12 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'redaction-paginator', + templateUrl: './paginator.component.html', + styleUrls: ['./paginator.component.scss'], +}) +export class PaginatorComponent { + @Input() loaded$: Observable; + @Output() readonly changePage = new EventEmitter(); +} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html index 373bbf0a8..003da0eb8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html @@ -1,5 +1,6 @@
+
= {}; @@ -167,6 +169,8 @@ export class WatermarkScreenComponent { this._instance.UI.setTheme(this._userPreferenceService.getTheme()); this._instance.Core.documentViewer.addEventListener('documentLoaded', async () => { + this.#loaded$.next(true); + await this._loadLandscapePage(); this._loadingService.stop(); await this._drawWatermark(); }); @@ -184,6 +188,13 @@ export class WatermarkScreenComponent { this._instance.UI.loadDocument(blobData, { filename: 'blank.pdf' }); } + private async _loadLandscapePage() { + const blankPdf = await this._instance.Core.createDocument('/ui/assets/pdftron/blank.pdf'); + const pageCount = this._instance.Core.documentViewer.getPageCount(); + await this._instance.Core.documentViewer.getDocument().insertPages(blankPdf, [pageCount], pageCount + 1); + await this._instance.Core.documentViewer.getDocument().rotatePages([pageCount + 1], 1); + } + private _disableElements() { this._instance.UI.disableElements(['header', 'toolsHeader', 'pageNavOverlay', 'textPopup']); } @@ -201,11 +212,11 @@ export class WatermarkScreenComponent { this.form.controls.orientation.value, this.form.controls.opacity.value, this.form.controls.hexColor.value, - [1], + [1, 2], this._licenseService.activeLicenseKey, ); this._instance.Core.documentViewer.refreshAll(); - this._instance.Core.documentViewer.updateView([0], 0); + this._instance.Core.documentViewer.updateView([0, 1], 0); } private _getForm() { @@ -225,4 +236,8 @@ export class WatermarkScreenComponent { return form; } + + navigateTo($event: number) { + this._instance.Core.documentViewer.displayPageLocation($event, 0, 0); + } } diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts index b33918c7f..a2169c3fb 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts @@ -18,6 +18,7 @@ import { RedRoleGuard } from '@users/red-role.guard'; import { WATERMARK_ID } from '@red/domain'; import { WatermarkExistsGuard } from '@guards/watermark-exists.guard'; import { TranslateModule } from '@ngx-translate/core'; +import { PaginatorComponent } from './paginator/paginator.component'; const routes = [ { @@ -47,7 +48,7 @@ const routes = [ ]; @NgModule({ - declarations: [WatermarkScreenComponent, WatermarksListingScreenComponent], + declarations: [WatermarkScreenComponent, WatermarksListingScreenComponent, PaginatorComponent], imports: [ RouterModule.forChild(routes), CommonModule, From 20ebaa54b2f7b87eb6a1a66a3e53cff18e3d6cc8 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Mon, 6 Mar 2023 12:48:13 +0200 Subject: [PATCH 02/99] RED-6245: refactoring --- .../paginator/paginator.component.html | 12 +++++------- .../paginator/paginator.component.scss | 15 ++++++++++----- .../watermark/paginator/paginator.component.ts | 4 +--- .../watermark-screen.component.html | 2 +- .../watermark-screen.component.scss | 1 + .../watermark-screen.component.ts | 8 -------- apps/red-ui/src/assets/pdftron/blank.pdf | Bin 4911 -> 945 bytes 7 files changed, 18 insertions(+), 24 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html index 1bfe8cd76..896efd4d0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html @@ -1,13 +1,11 @@ - diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss rename to apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts similarity index 92% rename from apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts rename to apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts index 280674e8f..70f623695 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts @@ -6,8 +6,8 @@ import { DossierStatesService } from '@services/entity-services/dossier-states.s import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -interface DialogData { - readonly dossierState: IDossierState; +export interface AddEditDossierStateDialogData { + readonly dossierState?: IDossierState; readonly dossierTemplateId: string; } @@ -25,7 +25,7 @@ export class AddEditDossierStateDialogComponent extends BaseDialogComponent { constructor( private readonly _dossierStatesService: DossierStatesService, protected readonly _dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) readonly data: DialogData, + @Inject(MAT_DIALOG_DATA) readonly data: AddEditDossierStateDialogData, ) { super(_dialogRef, !!data.dossierState); this.form = this.#getForm(); diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html rename to apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss rename to apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts similarity index 92% rename from apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts rename to apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts index 9a669a851..bf8db1b8b 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { DossierState } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder } from '@angular/forms'; @@ -9,7 +9,7 @@ import { IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service'; -interface DialogData { +export interface ConfirmDeleteDossierStateDialogData { readonly toBeDeletedState: DossierState; readonly otherStates: DossierState[]; readonly dossierCount: number; @@ -18,7 +18,6 @@ interface DialogData { @Component({ templateUrl: './confirm-delete-dossier-state-dialog.component.html', styleUrls: ['./confirm-delete-dossier-state-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, }) export class ConfirmDeleteDossierStateDialogComponent { readonly iconButtonTypes = IconButtonTypes; @@ -36,7 +35,7 @@ export class ConfirmDeleteDossierStateDialogComponent { private readonly _dialogRef: MatDialogRef, private readonly _activeDossiersService: ActiveDossiersService, private readonly _archivedDossiersService: ArchivedDossiersService, - @Inject(MAT_DIALOG_DATA) readonly data: DialogData, + @Inject(MAT_DIALOG_DATA) readonly data: ConfirmDeleteDossierStateDialogData, ) {} get label(): string { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html similarity index 59% rename from apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html rename to apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html index 0332051c9..dd0ed0200 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html @@ -52,7 +52,7 @@ > -
-
-
-
-
{{ state.name }}
-
-
- -
- {{ state.rank }} -
- -
- {{ state.dossierCount }} -
- -
-
-
- - - -
-
-
-
+ diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.scss new file mode 100644 index 000000000..9c456907d --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.scss @@ -0,0 +1,4 @@ +.right-container { + padding: 50px 26px 0; + width: 250px; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.ts similarity index 74% rename from apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts rename to apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.ts index 47a73d96d..1fcc76707 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { - CircleButtonTypes, + defaultDialogConfig, getParam, IconButtonTypes, ListingComponent, @@ -8,14 +8,18 @@ import { SortingOrders, TableColumnConfig, } from '@iqser/common-ui'; -import { type DonutChartConfig, DOSSIER_TEMPLATE_ID, type DossierState, type IDossierState } from '@red/domain'; +import { type DonutChartConfig, DOSSIER_TEMPLATE_ID, type DossierState } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom, Observable } from 'rxjs'; -import { AdminDialogService } from '../../services/admin-dialog.service'; import { DossierStatesMapService } from '@services/entity-services/dossier-states-map.service'; import { map, tap } from 'rxjs/operators'; import { DossierStatesService } from '@services/entity-services/dossier-states.service'; import { PermissionsService } from '@services/permissions.service'; +import { MatDialog } from '@angular/material/dialog'; +import { + AddEditDossierStateDialogComponent, + AddEditDossierStateDialogData, +} from '../add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component'; @Component({ templateUrl: './dossier-states-listing-screen.component.html', @@ -24,7 +28,6 @@ import { PermissionsService } from '@services/permissions.service'; }) export class DossierStatesListingScreenComponent extends ListingComponent implements OnInit, OnDestroy { readonly iconButtonTypes = IconButtonTypes; - readonly circleButtonTypes = CircleButtonTypes; readonly tableHeaderLabel = _('dossier-states-listing.table-header.title'); readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('dossier-states-listing.table-col-names.name'), sortByKey: 'name', width: '3fr' }, @@ -35,7 +38,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent state.id !== dossierState.id), - dossierCount: dossierState.dossierCount, - }; - this._dialogService.openDialog('deleteDossierState', $event, data); + this._dialog.open(AddEditDossierStateDialogComponent, { + ...defaultDialogConfig, + data: { + dossierTemplateId: this.#dossierTemplateId, + }, + }); } #chartConfig(states: DossierState[]): DonutChartConfig[] { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing.module.ts new file mode 100644 index 000000000..6b34c2cf5 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing.module.ts @@ -0,0 +1,62 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { DossierStatesListingScreenComponent } from './dossier-states-listing-screen/dossier-states-listing-screen.component'; +import { DossierStatesTableItemComponent } from './dossier-states-table-item/dossier-states-table-item.component'; +import { RouterModule } from '@angular/router'; +import { + CircleButtonComponent, + IconButtonComponent, + InputWithActionComponent, + IqserHelpModeModule, + IqserListingModule, +} from '@iqser/common-ui'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; +import { DonutChartComponent } from '@shared/components/donut-chart/donut-chart.component'; +import { AdminSideNavComponent } from '../../shared/components/admin-side-nav/admin-side-nav.component'; +import { DossierTemplateActionsComponent } from '../../shared/components/dossier-template-actions/dossier-template-actions.component'; +import { DossierTemplateBreadcrumbsComponent } from '../../shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component'; +import { AddEditDossierStateDialogComponent } from './add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component'; +import { ReactiveFormsModule } from '@angular/forms'; +import { ColorPickerModule } from 'ngx-color-picker'; +import { MatIconModule } from '@angular/material/icon'; +import { ConfirmDeleteDossierStateDialogComponent } from './confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component'; +import { MatLegacyCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatSelectModule } from '@angular/material/select'; +import { MatDialogModule } from '@angular/material/dialog'; + +@NgModule({ + declarations: [ + DossierStatesListingScreenComponent, + DossierStatesTableItemComponent, + AddEditDossierStateDialogComponent, + ConfirmDeleteDossierStateDialogComponent, + ], + imports: [ + CommonModule, + RouterModule.forChild([ + { + path: '', + component: DossierStatesListingScreenComponent, + }, + ]), + MatDialogModule, + CircleButtonComponent, + IqserHelpModeModule, + MatTooltipModule, + IconButtonComponent, + TranslateModule, + IqserListingModule, + DonutChartComponent, + AdminSideNavComponent, + DossierTemplateActionsComponent, + InputWithActionComponent, + DossierTemplateBreadcrumbsComponent, + ReactiveFormsModule, + ColorPickerModule, + MatIconModule, + MatLegacyCheckboxModule, + MatSelectModule, + ], +}) +export class DossierStatesListingModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html new file mode 100644 index 000000000..61c99bb63 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html @@ -0,0 +1,34 @@ +
+
+
+
{{ state.name }}
+
+
+ +
+ {{ state.rank }} +
+ +
+ {{ state.dossierCount }} +
+ +
+
+
+ + + +
+
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.scss similarity index 80% rename from apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss rename to apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.scss index bce23ef20..76adc2722 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.scss @@ -12,11 +12,6 @@ color: var(--iqser-text); } -.right-container { - padding: 50px 26px 0; - width: 250px; -} - .action-buttons > div { display: flex; } diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.ts new file mode 100644 index 000000000..ac6b46490 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.ts @@ -0,0 +1,57 @@ +import { Component, inject, Input } from '@angular/core'; +import { CircleButtonTypes, defaultDialogConfig, EntitiesService } from '@iqser/common-ui'; +import { DossierState, IDossierState } from '@red/domain'; +import { PermissionsService } from '@services/permissions.service'; +import { + AddEditDossierStateDialogComponent, + AddEditDossierStateDialogData, +} from '../add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component'; +import { MatDialog } from '@angular/material/dialog'; +import { + ConfirmDeleteDossierStateDialogComponent, + ConfirmDeleteDossierStateDialogData, +} from '../confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component'; + +@Component({ + selector: 'redaction-dossier-states-table-item', + templateUrl: './dossier-states-table-item.component.html', + styleUrls: ['./dossier-states-table-item.component.scss'], +}) +export class DossierStatesTableItemComponent { + @Input() state: DossierState; + + readonly circleButtonTypes = CircleButtonTypes; + readonly permissionsService = inject(PermissionsService); + readonly #dialog = inject(MatDialog); + readonly #entitiesService = inject(EntitiesService); + + openConfirmDeleteStateDialog($event: MouseEvent, dossierState: DossierState) { + $event.stopPropagation(); + + const data: ConfirmDeleteDossierStateDialogData = { + toBeDeletedState: dossierState, + otherStates: this.#entitiesService.all.filter(s => s.id !== dossierState.id), + dossierCount: dossierState.dossierCount, + }; + + this.#dialog.open( + ConfirmDeleteDossierStateDialogComponent, + { + ...defaultDialogConfig, + data, + }, + ); + } + + openEditStateDialog($event: MouseEvent, dossierState: IDossierState) { + $event.stopPropagation(); + + this.#dialog.open(AddEditDossierStateDialogComponent, { + ...defaultDialogConfig, + data: { + dossierState, + dossierTemplateId: dossierState.dossierTemplateId, + }, + }); + } +} 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 95e85faa4..dfab4ec29 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 @@ -20,8 +20,6 @@ import { } from '@iqser/common-ui'; import { UploadDictionaryDialogComponent } from '../dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component'; import { FileAttributesConfigurationsDialogComponent } from '../dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component'; -import { AddEditDossierStateDialogComponent } from '../dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component'; -import { ConfirmDeleteDossierStateDialogComponent } from '../dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom, forkJoin } from 'rxjs'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; @@ -44,8 +42,6 @@ type DialogType = | 'auditInfo' | 'addEditDossierAttribute' | 'uploadDictionary' - | 'addEditDossierState' - | 'deleteDossierState' | 'configureCertificate'; @Injectable() @@ -93,12 +89,6 @@ export class AdminDialogService extends DialogService { uploadDictionary: { component: UploadDictionaryDialogComponent, }, - addEditDossierState: { - component: AddEditDossierStateDialogComponent, - }, - deleteDossierState: { - component: ConfirmDeleteDossierStateDialogComponent, - }, configureCertificate: { component: ConfigureCertificateDialogComponent, dialogConfig: { disableClose: false, maxHeight: '100vh' }, diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index c81f4bc32..07317e72b 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -11,7 +11,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview", From 16815cc343adba1a1bd7b6356f59acfbcf190c25 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 15 Mar 2023 23:33:13 +0200 Subject: [PATCH 26/99] RED-3800: remove buttons module --- apps/red-ui/src/app/app.module.ts | 2 ++ .../src/app/modules/account/account.module.ts | 13 ++++++++--- .../notifications/notifications.module.ts | 3 ++- .../user-profile/user-profile.module.ts | 3 ++- .../src/app/modules/admin/admin.module.ts | 8 +++++-- .../dossier-templates-listing.module.ts | 6 +++-- .../admin/screens/entities/entities.module.ts | 3 ++- .../info/dossier-template-info.module.ts | 3 +-- ...d-edit-justification-dialog.component.html | 3 +-- .../justifications/justifications.module.ts | 13 +++++++++-- .../admin/screens/reports/reports.module.ts | 6 ++--- .../rules-screen/rules-screen.component.ts | 1 - .../admin/screens/rules/rules.module.ts | 6 ++--- .../paginator/paginator.component.html | 6 +++-- .../screens/watermark/watermark.module.ts | 18 +++++++++++---- .../src/app/modules/archive/archive.module.ts | 11 ++++----- .../template-stats.component.html | 12 ++++++---- .../app/modules/dashboard/dashboard.module.ts | 4 ++-- .../file-attribute.component.html | 23 ++++++++++--------- .../dossier-overview.module.ts | 8 +++---- .../dossiers-listing.module.ts | 4 ---- .../file-preview/file-preview.module.ts | 14 ++++++----- .../shared-dossiers/shared-dossiers.module.ts | 6 +++-- .../src/app/modules/shared/shared.module.ts | 7 ++++-- .../trash-table-item.component.html | 4 ++-- .../src/app/modules/trash/trash.module.ts | 4 ++-- .../file-upload-download.module.ts | 4 ++-- libs/common-ui | 2 +- 28 files changed, 118 insertions(+), 79 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 0bfe6c1e0..2b93c463a 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -9,6 +9,7 @@ import { MissingTranslationHandler } from '@ngx-translate/core'; import { BASE_HREF, CachingModule, + CircleButtonComponent, CommonUiModule, IqserHelpModeModule, IqserLoadingModule, @@ -153,6 +154,7 @@ export const appModuleFactory = (config: AppConfig) => { } as ILoggerConfig, }, }), + CircleButtonComponent, ], providers: [ { diff --git a/apps/red-ui/src/app/modules/account/account.module.ts b/apps/red-ui/src/app/modules/account/account.module.ts index df77271c3..c9faf70ec 100644 --- a/apps/red-ui/src/app/modules/account/account.module.ts +++ b/apps/red-ui/src/app/modules/account/account.module.ts @@ -6,13 +6,20 @@ import { AccountSideNavComponent } from './account-side-nav/account-side-nav.com import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component'; import { NotificationPreferencesService } from './services/notification-preferences.service'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserSharedModule } from '@iqser/common-ui'; -import { IqserHelpModeModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, IqserSharedModule } from '@iqser/common-ui'; import { PreferencesComponent } from './screens/preferences/preferences.component'; @NgModule({ declarations: [AccountSideNavComponent, BaseAccountScreenComponent, PreferencesComponent], - imports: [CommonModule, SharedModule, AccountRoutingModule, TranslateModule, IqserSharedModule, IqserHelpModeModule], + imports: [ + CommonModule, + SharedModule, + AccountRoutingModule, + TranslateModule, + IqserSharedModule, + IqserHelpModeModule, + IconButtonComponent, + ], providers: [NotificationPreferencesService], }) export class AccountModule {} diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts index 4621b45c0..5cdaf8a16 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts @@ -5,11 +5,12 @@ import { SharedModule } from '@shared/shared.module'; import { NotificationsScreenComponent } from './notifications-screen/notifications-screen.component'; import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { TranslateModule } from '@ngx-translate/core'; +import { IconButtonComponent } from '@iqser/common-ui'; const routes = [{ path: '', component: NotificationsScreenComponent, canDeactivate: [PendingChangesGuard] }]; @NgModule({ declarations: [NotificationsScreenComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule, IconButtonComponent], }) export class NotificationsModule {} diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts index 6ef42fa66..72f352ea7 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts @@ -7,12 +7,13 @@ import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { TranslateModule } from '@ngx-translate/core'; import { ConfirmPasswordDialogComponent } from './confirm-password-dialog/confirm-password-dialog.component'; import { UserProfileDialogService } from './services/user-profile-dialog.service'; +import { CircleButtonComponent, IconButtonComponent } from '@iqser/common-ui'; const routes = [{ path: '', component: UserProfileScreenComponent, canDeactivate: [PendingChangesGuard] }]; @NgModule({ declarations: [UserProfileScreenComponent, ConfirmPasswordDialogComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule, IconButtonComponent, CircleButtonComponent], providers: [UserProfileDialogService], }) export class UserProfileModule {} diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 96ae930b9..ddabd1f2a 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -42,8 +42,10 @@ import { ConfigureCertificateDialogComponent } from './dialogs/configure-digital import { PkcsSignatureConfigurationComponent } from './dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component'; import { KmsSignatureConfigurationComponent } from './dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component'; import { + ChevronButtonComponent, + CircleButtonComponent, HumanizePipe, - IqserButtonsModule, + IconButtonComponent, IqserEmptyStatesModule, IqserHelpModeModule, IqserInputsModule, @@ -113,7 +115,6 @@ const components = [ IqserUsersModule, TranslateModule, HumanizePipe, - IqserButtonsModule, IqserListingModule, IqserScrollbarModule, IqserInputsModule, @@ -125,6 +126,9 @@ const components = [ AdminSideNavComponent, DossierTemplateActionsComponent, DossierTemplateBreadcrumbsComponent, + IconButtonComponent, + CircleButtonComponent, + ChevronButtonComponent, ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts index aab8e565e..82f18874d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts @@ -5,7 +5,8 @@ import { SharedModule } from '@shared/shared.module'; import { TableItemComponent } from './table-item/table-item.component'; import { DossierTemplatesListingScreenComponent } from './dossier-templates-listing-screen/dossier-templates-listing-screen.component'; import { - IqserButtonsModule, + CircleButtonComponent, + IconButtonComponent, IqserHelpModeModule, IqserInputsModule, IqserListingModule, @@ -26,11 +27,12 @@ const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }] IqserUsersModule, TranslateModule, IqserInputsModule, - IqserButtonsModule, IqserListingModule, IqserHelpModeModule, IqserPermissionsModule, DossierTemplateActionsComponent, + CircleButtonComponent, + IconButtonComponent, ], }) export class DossierTemplatesListingModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts index 25cc0a68b..ca43a2617 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts @@ -7,7 +7,7 @@ import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { EntityInfoComponent } from './screens/entity-info/entity-info.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; const routes: Routes = [ { path: '', redirectTo: 'info', pathMatch: 'full' }, @@ -44,6 +44,7 @@ const routes: Routes = [ IqserScrollbarModule, IqserHelpModeModule, IqserPermissionsModule, + IconButtonComponent, ], }) export class EntitiesModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts index bd74d6021..fc4f7af02 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { DossierTemplateInfoScreenComponent } from './info-screen/dossier-template-info-screen.component'; import { RouterModule } from '@angular/router'; import { SharedModule } from '@shared/shared.module'; -import { IqserButtonsModule, IqserHelpModeModule, IqserScrollbarModule, IqserUsersModule } from '@iqser/common-ui'; +import { IqserHelpModeModule, IqserScrollbarModule, IqserUsersModule } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }]; @@ -16,7 +16,6 @@ const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }]; SharedModule, IqserUsersModule, TranslateModule, - IqserButtonsModule, IqserScrollbarModule, IqserHelpModeModule, ], diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html index e5bb07198..a236f7090 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html @@ -48,8 +48,7 @@ [label]="'add-edit-justification.actions.save' | translate" [submit]="true" [type]="iconButtonTypes.primary" - > - + >
diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts index 5d0ff0eec..91f85d329 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts @@ -7,13 +7,22 @@ import { TableItemComponent } from './table-item/table-item.component'; import { JustificationsDialogService } from './justifications-dialog.service'; import { AddEditJustificationDialogComponent } from './add-edit-justification-dialog/add-edit-justification-dialog.component'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserButtonsModule, IqserListingModule } from '@iqser/common-ui'; +import { CircleButtonComponent, IconButtonComponent, IqserListingModule, IqserScrollbarModule } from '@iqser/common-ui'; const routes = [{ path: '', component: JustificationsScreenComponent }]; @NgModule({ declarations: [JustificationsScreenComponent, TableItemComponent, AddEditJustificationDialogComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule, IqserButtonsModule, IqserListingModule], + imports: [ + RouterModule.forChild(routes), + CommonModule, + SharedModule, + TranslateModule, + IqserListingModule, + IconButtonComponent, + CircleButtonComponent, + IqserScrollbarModule, + ], providers: [JustificationsDialogService], }) export class JustificationsModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts index 6be448070..437cdf0ac 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts @@ -1,10 +1,9 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@shared/shared.module'; import { ReportsScreenComponent } from './reports-screen/reports-screen.component'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserButtonsModule, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; +import { CircleButtonComponent, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; const routes = [{ path: '', component: ReportsScreenComponent }]; @@ -13,12 +12,11 @@ const routes = [{ path: '', component: ReportsScreenComponent }]; imports: [ RouterModule.forChild(routes), CommonModule, - SharedModule, TranslateModule, - IqserButtonsModule, IqserScrollbarModule, IqserHelpModeModule, IqserPermissionsModule, + CircleButtonComponent, ], }) export class ReportsModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts index 2e41aafe2..c819bdd82 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts @@ -13,7 +13,6 @@ import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration; import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions; @Component({ - selector: 'redaction-rules-screen', templateUrl: './rules-screen.component.html', styleUrls: ['./rules-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts index 7b8d87b2f..bd26cc278 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts @@ -1,17 +1,17 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@shared/shared.module'; import { RulesScreenComponent } from './rules-screen/rules-screen.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserButtonsModule } from '@iqser/common-ui'; +import { IconButtonComponent } from '@iqser/common-ui'; +import { FormsModule } from '@angular/forms'; const routes = [{ path: '', component: RulesScreenComponent, canDeactivate: [PendingChangesGuard] }]; @NgModule({ declarations: [RulesScreenComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, MonacoEditorModule, TranslateModule, IqserButtonsModule], + imports: [RouterModule.forChild(routes), CommonModule, MonacoEditorModule, TranslateModule, IconButtonComponent, FormsModule], }) export class RulesModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html index 896efd4d0..7c177e1ea 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html @@ -1,10 +1,12 @@ @@ -42,7 +44,7 @@ [config]="translateChartService.translateDossierStates(dossierTemplate.dossiersChartConfig, dossierTemplate.id)" [radius]="63" [strokeWidth]="15" - [subtitles]="['dossier-template-stats.active-dossiers' | translate: { count: dossierTemplate.numberOfActiveDossiers }]" + [subtitles]="['dossier-template-stats.active-dossiers' | translate : { count: dossierTemplate.numberOfActiveDossiers }]" direction="row" totalType="sum" > diff --git a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts index 6197c84c7..8bc4f730f 100644 --- a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts +++ b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts @@ -6,7 +6,7 @@ import { SharedModule } from '@shared/shared.module'; import { TemplateStatsComponent } from './components/template-stats/template-stats.component'; import { BreadcrumbTypes } from '@red/domain'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserButtonsModule, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; const routes = [ { @@ -25,9 +25,9 @@ const routes = [ CommonModule, SharedModule, TranslateModule, - IqserButtonsModule, IqserHelpModeModule, IqserPermissionsModule, + IconButtonComponent, ], }) export class DashboardModule {} diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html index 69898c796..33c2410ec 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html @@ -5,35 +5,36 @@ -
+
-
+
- + +
diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 3e2a64bfb..59075ab62 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -1,9 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@shared/shared.module'; import { - IqserButtonsModule, + CircleButtonComponent, IqserHelpModeModule, IqserIconsModule, IqserInputsModule, @@ -26,6 +25,7 @@ import { WorkflowItemComponent } from './components/workflow-item/workflow-item. import { DossierOverviewScreenHeaderComponent } from './components/screen-header/dossier-overview-screen-header.component'; import { ViewModeSelectionComponent } from './components/view-mode-selection/view-mode-selection.component'; import { FileAttributeComponent } from './components/table-item/file-attribute/file-attribute.component'; +import { SharedModule } from '@shared/shared.module'; const routes: Routes = [ { @@ -54,19 +54,19 @@ const routes: Routes = [ imports: [ RouterModule.forChild(routes), CommonModule, - SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule, IqserHelpModeModule, IqserUsersModule, IqserListingModule, - IqserButtonsModule, IqserLoadingModule, IqserSharedModule, IqserScrollbarModule, IqserPermissionsModule, IqserInputsModule, + SharedModule, + CircleButtonComponent, ], }) export class DossierOverviewModule {} diff --git a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts index 7bfb2c734..af6f75cfc 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CompositeRouteGuard, - IqserButtonsModule, IqserHelpModeModule, IqserIconsModule, IqserListingModule, @@ -10,7 +9,6 @@ import { IqserScrollbarModule, IqserSharedModule, IqserUsersModule, - LogPipe, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingScreenComponent } from './screen/dossiers-listing-screen.component'; @@ -53,12 +51,10 @@ const routes: Routes = [ TranslateModule, IqserHelpModeModule, IqserUsersModule, - IqserButtonsModule, IqserListingModule, IqserScrollbarModule, IqserSharedModule, IqserPermissionsModule, - LogPipe, ], }) export class DossiersListingModule {} 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 578db0e0e..db2a9712d 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 @@ -2,7 +2,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CapitalizePipe, - IqserButtonsModule, + CircleButtonComponent, + IconButtonComponent, IqserEmptyStatesModule, IqserFiltersModule, IqserHelpModeModule, @@ -16,8 +17,6 @@ import { } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@shared/shared.module'; -import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; import { FilePreviewScreenComponent } from './file-preview-screen.component'; import { FileWorkloadComponent } from './components/file-workload/file-workload.component'; import { AnnotationDetailsComponent } from './components/annotation-details/annotation-details.component'; @@ -55,6 +54,8 @@ import { RssDialogComponent } from './dialogs/rss-dialog/rss-dialog.component'; import { ReadonlyBannerComponent } from './components/readonly-banner/readonly-banner.component'; import { SuggestionsService } from './services/suggestions.service'; import { PagesComponent } from './components/pages/pages.component'; +import { SharedModule } from '@shared/shared.module'; +import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; const routes: Routes = [ { @@ -108,15 +109,12 @@ const components = [ imports: [ RouterModule.forChild(routes), CommonModule, - SharedModule, - SharedDossiersModule, IqserIconsModule, TranslateModule, OverlayModule, IqserHelpModeModule, IqserUsersModule, CapitalizePipe, - IqserButtonsModule, IqserInputsModule, IqserSharedModule, IqserUploadFileModule, @@ -124,6 +122,10 @@ const components = [ IqserFiltersModule, IqserScrollbarModule, IqserPermissionsModule, + SharedModule, + CircleButtonComponent, + SharedDossiersModule, + IconButtonComponent, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard, SuggestionsService], }) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts index 0659a7b1b..b5728738f 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -13,7 +13,8 @@ import { DateColumnComponent } from './components/date-column/date-column.compon import { FileAssignService } from './services/file-assign.service'; import { DictionaryDetailsDialogComponent } from './dialogs/edit-dossier-dialog/dictionary/dictionary-details-dialog/dictionary-details-dialog.component'; import { - IqserButtonsModule, + CircleButtonComponent, + IconButtonComponent, IqserEmptyStatesModule, IqserHelpModeModule, IqserInputsModule, @@ -49,12 +50,13 @@ const services = [FileAssignService]; IqserHelpModeModule, IqserUsersModule, TranslateModule, - IqserButtonsModule, IqserEmptyStatesModule, IqserSharedModule, IqserInputsModule, IqserScrollbarModule, IqserPermissionsModule, + IconButtonComponent, + CircleButtonComponent, ], }) export class SharedDossiersModule {} 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 c605caf46..0d5ed600a 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -9,7 +9,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component'; import { DonutChartComponent } from './components/donut-chart/donut-chart.component'; import { - IqserButtonsModule, + CircleButtonComponent, + IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule, @@ -74,7 +75,7 @@ const utils = [DatePipe, NavigateLastDossiersScreenDirective, LongPressDirective const services = [SharedDialogService]; -const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, IqserButtonsModule, ReactiveFormsModule, ColorPickerModule]; +const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, ReactiveFormsModule, ColorPickerModule]; const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; @@ -92,6 +93,8 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; IqserScrollbarModule, IqserPermissionsModule, ...deleteThisWhenAllComponentsAreStandalone, + CircleButtonComponent, + IconButtonComponent, ], exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone], providers: [ diff --git a/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html b/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html index 6b289c9ac..c328c4ca3 100644 --- a/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html +++ b/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html @@ -29,13 +29,13 @@
- {{ item.softDeletedTime | date: 'exactDate' }} + {{ item.softDeletedTime | date : 'exactDate' }}
- {{ item.restoreDate | date: 'timeFromNow' }} + {{ item.restoreDate | date : 'timeFromNow' }}
Date: Wed, 15 Mar 2023 22:35:48 +0100 Subject: [PATCH 27/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3445 -> 3445 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 61a7f7e0f..78afabc35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.989.0", + "version": "3.990.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index f6009ad8907ad0c7c678814fea323c8c94b295ce..a2e4a7e1bff7bc2141efc64def5c21f894540fce 100644 GIT binary patch delta 3353 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 delta 3353 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 Date: Thu, 16 Mar 2023 19:27:43 +0200 Subject: [PATCH 28/99] RED-6394: fix dossier states save button not enabled --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index b8f9e6a46..e67bfdf65 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit b8f9e6a46db94569a1d1a3412b3d1d49e3133609 +Subproject commit e67bfdf6596db985ca8c1c0dc8890394e24aa607 From 5d0c149966bd1f2e6979477e4e66c96380e397e1 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 16 Mar 2023 19:29:21 +0200 Subject: [PATCH 29/99] RED-3800: update UI version to 4.000.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 78afabc35..fbbfa4c06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.990.0", + "version": "4.000.0", "private": true, "license": "MIT", "scripts": { From b7c53c63558ddf8a1cce8555d33f198a8a202aec Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 16 Mar 2023 18:32:18 +0100 Subject: [PATCH 30/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3445 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fbbfa4c06..93661d514 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.000.0", + "version": "4.1.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a2e4a7e1bff7bc2141efc64def5c21f894540fce..d1e649c7c08f97cfb0a8dae42e28a4ae085f60a3 100644 GIT binary patch delta 3326 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 KRfJOjPyhh8#CZPz From 5d3ca73b3eee019914d07285fefe11d01ab5819c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 16 Mar 2023 18:05:19 +0200 Subject: [PATCH 31/99] RED-6330: Fixed owner in list of member options --- .../edit-dossier-team/edit-dossier-team.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts index 717f2cc8e..17b0ffb2b 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts @@ -8,7 +8,7 @@ import { PermissionsService } from '@services/permissions.service'; import { DossiersService } from '@services/dossiers/dossiers.service'; import { compareLists } from '@utils/functions'; import { FilesService } from '@services/files/files.service'; -import { getCurrentUser } from '@iqser/common-ui'; +import { Debounce, getCurrentUser } from '@iqser/common-ui'; @Component({ selector: 'redaction-edit-dossier-team', From bc549ab9a0766c3fb0506fba67eb1a39519ee1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 16 Mar 2023 20:14:27 +0200 Subject: [PATCH 32/99] RED-6316: Fixed showing rotation buttons --- .../file-preview-screen.component.ts | 10 +++--- .../services/viewer-header.service.ts | 32 +++++++++---------- .../src/app/services/permissions.service.ts | 4 +++ apps/red-ui/src/assets/config/config.json | 4 +-- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 13948d94a..415f14fa1 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -268,7 +268,7 @@ export class FilePreviewScreenComponent ngOnDetach() { this._viewerHeaderService.resetCompareButtons(); - this._viewerHeaderService.enableLoadAllAnnotations(); + this._viewerHeaderService.enableLoadAllAnnotations(); // Reset the button state (since the viewer is reused between files) super.ngOnDetach(); this._changeRef.markForCheck(); } @@ -690,12 +690,12 @@ export class FilePreviewScreenComponent .subscribe(); this.addActiveScreenSubscription = this._readableRedactionsService.active$.pipe(switchMap(() => this.updateViewMode())).subscribe(); - this.addActiveScreenSubscription = this._viewModeService.viewMode$ + this.addActiveScreenSubscription = combineLatest([this._viewModeService.viewMode$, this._documentViewer.loaded$, this.state.file$]) .pipe( - tap(viewMode => + tap(([viewMode]) => viewMode === 'STANDARD' || viewMode === 'TEXT_HIGHLIGHTS' - ? this._viewerHeaderService.enableRotationButtons() - : this._viewerHeaderService.disableRotationButtons(), + ? this._viewerHeaderService.updateRotationButtons(true) + : this._viewerHeaderService.updateRotationButtons(false), ), ) .subscribe(); diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts index f4b0088be..aab9e08fc 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts @@ -2,7 +2,7 @@ import { Inject, Injectable } from '@angular/core'; import { IHeaderElement, RotationTypes } from '@red/domain'; import { HeaderElements, HeaderElementType } from '../../file-preview/utils/constants'; import { TranslateService } from '@ngx-translate/core'; -import { BASE_HREF_FN, BaseHrefFn, IqserPermissionsService } from '@iqser/common-ui'; +import { BASE_HREF_FN, BaseHrefFn } from '@iqser/common-ui'; import { TooltipsService } from './tooltips.service'; import { PageRotationService } from './page-rotation.service'; import { PdfViewer } from './pdf-viewer.service'; @@ -13,8 +13,8 @@ import { UserPreferenceService } from '@users/user-preference.service'; import { fromEvent, Observable, Subject } from 'rxjs'; import { ViewerEvent, VisibilityChangedEvent } from '../utils/types'; import { ReadableRedactionsService } from './readable-redactions.service'; -import { ROLES } from '@users/roles'; import { filter, map, tap } from 'rxjs/operators'; +import { PermissionsService } from '@services/permissions.service'; const divider: IHeaderElement = { type: 'divider', @@ -23,6 +23,7 @@ const divider: IHeaderElement = { @Injectable() export class ViewerHeaderService { readonly events$: Observable; + toggleLoadAnnotations$: Observable; #buttons: Map; readonly #config = new Map([ [HeaderElements.SHAPE_TOOL_GROUP_BUTTON, true], @@ -38,7 +39,6 @@ export class ViewerHeaderService { ]); #docBeforeCompare: Blob; readonly #events$ = new Subject(); - toggleLoadAnnotations$: Observable; constructor( @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn, @@ -50,7 +50,7 @@ export class ViewerHeaderService { private readonly _tooltipsService: TooltipsService, private readonly _readableRedactionsService: ReadableRedactionsService, private readonly _userPreferenceService: UserPreferenceService, - private readonly _iqserPermissionsService: IqserPermissionsService, + private readonly _permissionsService: PermissionsService, ) { this.events$ = this.#events$.asObservable(); } @@ -169,11 +169,6 @@ export class ViewerHeaderService { }; } - #discardRotation(): void { - this._rotationService.discardRotation(); - this.disable(ROTATION_ACTION_BUTTONS); - } - private get _rotateRight(): IHeaderElement { return { type: 'actionButton', @@ -304,22 +299,27 @@ export class ViewerHeaderService { }); } - enableRotationButtons(): void { - if (this._iqserPermissionsService.has(ROLES.files.rotatePage)) { + updateRotationButtons(show: boolean): void { + const { dossierId, fileId } = this._pdf; + const file = this._filesMapService.get(dossierId, fileId); + if (show && this._permissionsService.canRotatePage(file)) { this.enable(ROTATION_BUTTONS); + } else { + this.disable(ROTATION_BUTTONS); + this.#discardRotation(); } } - disableRotationButtons(): void { - this.disable(ROTATION_BUTTONS); - this.#discardRotation(); - } - resetCompareButtons() { this.disable([HeaderElements.CLOSE_COMPARE_BUTTON]); this.enable([HeaderElements.COMPARE_BUTTON]); } + #discardRotation(): void { + this._rotationService.discardRotation(); + this.disable(ROTATION_ACTION_BUTTONS); + } + #toggleRotationActionButtons() { if (this._rotationService.hasRotations) { this.enable(ROTATION_ACTION_BUTTONS); diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 725837e62..a955fb06f 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -349,6 +349,10 @@ export class PermissionsService { ); } + canRotatePage(file: File) { + return this.isFileAssignee(file) && this._iqserPermissionsService.has(ROLES.files.rotatePage); + } + canDownloadRedactedFile() { return this._iqserPermissionsService.has(ROLES.files.processDownload); } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 07317e72b..c81f4bc32 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -11,7 +11,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview", From 16d34e679a5b1918062cdf14a73bb5357833a25c Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 16 Mar 2023 19:18:32 +0100 Subject: [PATCH 33/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3442 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93661d514..577a86597 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.1.0", + "version": "4.2.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index d1e649c7c08f97cfb0a8dae42e28a4ae085f60a3..87c6621550eb94069713e4daf902d5bc5d4a7c2f 100644 GIT binary patch delta 3355 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 delta 3356 zcmV+%4de3i8uJ>Ecz*)NcKs)|V+XeL1O-0{HiOpG3|9#K983K-wxuqA`J-m{8L2;( zHauMZp1Tgt^8Y#7QTbOS#u1Z!%c!nDYz;2pl|Lna&s(`}FMrqdK>n)$h9mpql4@@M z=kk9UrMRjILzjR4_A6_1`TXJ~-IqnhP*Y{kE>p(JdV77H6n{CZm%F0aWdxVBUPi_K z8Wh6)b%OUayZ_>kCCPvF4bJN=WjI^h?NavAUU;_s++O(NGZ3FE@wpbC8~Aj@7)Ok8 z#2816al{yhkNIUx>oUXlU(|QFyu5mTvE=yS%t{H4NrnD?fzVrv<}rD*Mb2~hl@bc; zZ;>C^<(uah?|%j}w%d>-MMcES5J$JWs%Y}qii)hLw&mwkw)Fmn&2u*1tNR= z#=4_1O97T`tH8DhH>}{l%c7=?7VxGb8D{h~ISqT+et%mDC0Q(1lB+nj{TT-u78U0s za>_TTE;1UUr%@D<*gJGu6^?0B1LZAV20kZA@<3d+TTq0Eq(#;Vz9?}-+5HyT%k=|+ zEgrY>P+K&;aHL*nI^b;P2zJc;62~#kcL2Zzemm<~P(qfslY9B&5Jc55!tttFjD(&Z zz;kgrlYjDJ6>RSkS0rc8jr2!NRr6P6L32hbgD%)y8^oVIkA!Vnyq5enC{P^xaUdXF zyxfzRVpQbWJ*uOMkR0JWM$eQjvgZ5kO29JjYfXZ_+w#G@w+E69wCNPr#24=Cu9 zDnI1QTHkvdD`}dI_KCpU@!J6ow?HDv|OGCVAl7de@=D?9B82JXN{P5{XMqIK?= z4}YG|h}1ufWRzuOF?%Xlvq-#QMbyq6is}()Ap9squ+fe`3ZK?qJq|0y=8bKv*i|u! ziVC+@9aMo-+!#Fs^9iXa=Fi>C3~aoWv^F!BZnE)S?Kjzj)FGo9B)|76v*&LUTGh;o zQYt;IW`^vC5eDEgY=Sn5>*mv^YiMVT^?yiXWr#Ff|KUp+)b6n0$5Fe~M_{V*`P&0{ zs>bRv5$Md}2e49M9L-ZwQ8waT{~nyx_2=jn%`-w-lkd>y*B48GYyk-*vm6z(-pgG6 zEwSzOWjFh;MRl8G#ob`8J2`g~^mG3L%x-GP&ECS|5YOl!yeSZleba;ZlH?70OMj|8 z$>0CTWrnP>DiWFvfcbN10bn>vD;lMY?o22JlTZ?`hw@DmrAd?Dia11{znaFv?dQJ= zNe(O19P!AlBd`cbm1OUKh*ARYYxK3KT>Js&ct@&wu+DmF9oOIV>wH~g8LY#3_9dyv zB+;8`QTjcw-xhUE0bRg_ksdB=w|_gFu@T6dNs#ME0eRc(c}Rmo2$w@pQO=b;dKFVv zR6||0C$%MrMp#0k5TzL<@Bbwcg$>d0;3

d5Ekty$_s&B7P+$UcdhlBvo@A8p4_0 z6CUp2{4N6=@rb<1&0xFn0f*oG>EHkOXN{hv?|*0#x+CbT3e+RN8bX`i4S#{8NY7NP ziquWUref&CPl9CK&XW^3P)xhHRl2|4Q8>2r6i3$ST_#TxAiA?#-*?eua*cLut>gz2 z;p#&}Qq@O#Zj0z>)sD~rOs(t5~eYX#{_L;H9cD@lNDBw z14mV}4{M|ESF|uG3MPWv8rUR%srjc+iQ_WS(*730G3a{VC`9Ww%3xfZ6AloaN)!(} zNo=H*-|=pCkY!pNa`Vs42tbFvgAF|C#xA3xyce|^Gps|uTBQqk;(rNp3yb((ytgd+ zeGLLCD+;7T{3Nzym^C7&9Q0b%E(GFSdx2a}eE6nO?iN9O0uE8_#8D({I3*(J8=??C3m>Wc}E<^wuXS9!a$55!$3{eD%NOxO~CG8 z#`h(#5I=L>6|m6Va6SSv?d8ptI(%1=dk9a}v{CP}q0e)?*e9dDwULve%Y!bAaTI!^ zu7Dd1FAicn>hg`;6kRJLH$|7L_{~Ar#wfoXFZl_gZ97TqA%FJJ$3X@W32wC2S{)V> zlVoE%8UgnZs}*;$Gu(Kgq0===UUs%yDF7Kco0|pFhVZP#(UL5+M}T!!&dS#nr)hEZ zH|qg!M3*bNq8mdOmtGLwtmAOh#YN<;{b=Kiy0~DYAohqhtEBmD%N55BVoixsl9l@+ zCI?$1xUUXT?SHD*+SPu|1{{0dJ5^_G>^=>kccQ-DEoQbSRuItD#hxIwtp6GV&4{I# zp*k%ZNaI6-xJ9UF%p>2s6h0t!gW$2Lz;;7YDUL=jHCtDfR*v`N6D%fqveAj|$4J*c zGCSZ)!T44^*H(@W0Md-c(*3Ssfce-*8`1^30?4reU4MY*`X)?hKJdYV0o=%2hv1R> zbv+d1j2(`D$FHr?X4ec^SG*pLTtYvMAR^0ewH&>jCJp2$ zad(vD?j&_et|ddK6Nnr?4DA9sBM=<%lYhuPhJSQ@Fd)4&Eh`3ER?Dw(7=gUt_1F$V z$HR;yYECsZsmYE_@9GgVrXL67_Z1jcL}t_#w3)6r40%?4FQ`$-@%HQI$4oz%=N| zBY(IfQyz0rF%4GbRt^E|R54@^Y(%(XG}4YT)nn>mZhs+9+XnYB)cZL75UxeMZdBqO zk&jx*Lc02{!UHp(>NLGTMo_710A?#L>|zP=I%GnxDY+B(ztn;4WukYZF?7Eh7oNJo z7fZhKSmQj~sK(vv0q-P`cBd}1pZqLo#(x2s>5A6MP;ql^l#2_Z+Lsg+Al8&6sUlpH zA$GH?gv$B7p=zj6*dHJd=v0*cn2JB(-i}(}i&7HZX0&F!DoB7$73M_Gyg($RDk1S& z2=E68$P32r3G~6}g4fs^4hfzZEysG{n)SjR=!H-+u@A)4>O^SNGhJHtL$GyFmw$;1 zG?Ey393W{r{OUHM>c@7=Lc+cO8uO%Mw*reZ@n7*u^Kt8C&4NGkGVWNGx_= zlB;pZ+NZJN##<472SiR^UQh>h*814FPG{JZU<49NzSlTY_!S~if%NSK#2pK?3V8X^ z@vlaUf#gb!`3940R&Mo_h+ihA(EvT+ta7dcLl%IE1jmfC4rr5uH9NTNB7a-755r3+ znjci|#(erKVDEH%OgFLA{#nyXiw!D58VKZnRsX7cD!cD$ zmGN%;NFH&=0E_PXhapQt?QhLnrgV{}OsPR)-#z(u>kuHzo#)st{65=@gJm%5F6ti3GI%ntNlK_$;YNoE+eCq!QJhyW@ mw{ttUb33HrS>0L%67{DPyhfH<$#O; From c6e0b58f8e49c017aaeaebf02940088ca0b3d145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 16 Mar 2023 20:29:30 +0200 Subject: [PATCH 34/99] RED-6330: Fixed owner in list of member options (again) --- .../edit-dossier-team/edit-dossier-team.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts index 17b0ffb2b..f5a06ac52 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts @@ -145,6 +145,7 @@ export class EditDossierTeamComponent implements EditDossierSectionInterface, On .map(user => user.id); } + @Debounce(0) onChangeOwner(ownerId: string) { if (this.hasOwner) { if (!this.isApprover(ownerId)) { From 8494395adf764af211035ae381898f96dc69a726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 16 Mar 2023 20:30:41 +0200 Subject: [PATCH 35/99] RED-6372: Only the dossier owner should be able to restore the dossier --- apps/red-ui/src/app/services/permissions.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index a955fb06f..d3de4966c 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -278,7 +278,7 @@ export class PermissionsService { } canRestoreDossier(dossier: IDossier): boolean { - return this._iqserPermissionsService.has(ROLES.dossiers.delete) && (this.isOwner(dossier) || this.isDossierMember(dossier)); + return this._iqserPermissionsService.has(ROLES.dossiers.delete) && this.isOwner(dossier); } canCreateDossier(dossierTemplate: DossierTemplate | DashboardStats): boolean { From ebcf83703ad2f1ba3ea6ff80a7c7e6daca5e84f4 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 16 Mar 2023 19:34:09 +0100 Subject: [PATCH 36/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3442 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 577a86597..ef35f9248 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.2.0", + "version": "4.3.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 87c6621550eb94069713e4daf902d5bc5d4a7c2f..5ee7104a5b12f77b0e842aed9139cf045020b3b0 100644 GIT binary patch delta 195 zcmV;!06hQl8uS{Fcz;&5>jqD3#|~`&2?~A^YzD2V8LkleIhOiwY)f7K@<+|?Gg5yn zZFso+Jr7=;<^MCZqw=pvj3XxdmQh`Q*cx2GD}PGgBE|b{WAXt(Q@; xzXpYHf1Thx&F;VWV@dK~eS`CQOBv1U%aIIvZxqps_fZi%2-)%udkCLXDsz{R}{O9;F8wMsMueF vLb$(9@SbM(U;MEo`LDjgdA+3!XN$XC%3j(F&$hEA0Y?l7pr4 Date: Thu, 16 Mar 2023 21:47:07 +0200 Subject: [PATCH 37/99] RED-6316: Small refactor --- .../file-preview-screen.component.ts | 12 +++++++----- .../services/viewer-header.service.ts | 18 +++++++----------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 415f14fa1..73fb3e88f 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -690,12 +690,14 @@ export class FilePreviewScreenComponent .subscribe(); this.addActiveScreenSubscription = this._readableRedactionsService.active$.pipe(switchMap(() => this.updateViewMode())).subscribe(); - this.addActiveScreenSubscription = combineLatest([this._viewModeService.viewMode$, this._documentViewer.loaded$, this.state.file$]) + + this.addActiveScreenSubscription = combineLatest([this._viewModeService.viewMode$, this.state.file$, this._documentViewer.loaded$]) .pipe( - tap(([viewMode]) => - viewMode === 'STANDARD' || viewMode === 'TEXT_HIGHLIGHTS' - ? this._viewerHeaderService.updateRotationButtons(true) - : this._viewerHeaderService.updateRotationButtons(false), + map( + ([viewMode, file]) => ['STANDARD', 'TEXT_HIGHLIGHTS'].includes(viewMode) && this.permissionsService.canRotatePage(file), + ), + tap(canRotate => + canRotate ? this._viewerHeaderService.enableRotationButtons() : this._viewerHeaderService.disableRotationButtons(), ), ) .subscribe(); diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts index aab9e08fc..226bae523 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts @@ -14,7 +14,6 @@ import { fromEvent, Observable, Subject } from 'rxjs'; import { ViewerEvent, VisibilityChangedEvent } from '../utils/types'; import { ReadableRedactionsService } from './readable-redactions.service'; import { filter, map, tap } from 'rxjs/operators'; -import { PermissionsService } from '@services/permissions.service'; const divider: IHeaderElement = { type: 'divider', @@ -50,7 +49,6 @@ export class ViewerHeaderService { private readonly _tooltipsService: TooltipsService, private readonly _readableRedactionsService: ReadableRedactionsService, private readonly _userPreferenceService: UserPreferenceService, - private readonly _permissionsService: PermissionsService, ) { this.events$ = this.#events$.asObservable(); } @@ -299,15 +297,13 @@ export class ViewerHeaderService { }); } - updateRotationButtons(show: boolean): void { - const { dossierId, fileId } = this._pdf; - const file = this._filesMapService.get(dossierId, fileId); - if (show && this._permissionsService.canRotatePage(file)) { - this.enable(ROTATION_BUTTONS); - } else { - this.disable(ROTATION_BUTTONS); - this.#discardRotation(); - } + enableRotationButtons(): void { + this.enable(ROTATION_BUTTONS); + } + + disableRotationButtons(): void { + this.disable(ROTATION_BUTTONS); + this.#discardRotation(); } resetCompareButtons() { From 8b732bfd7460cee060bc827e027263d673b5215f Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 16 Mar 2023 20:50:55 +0100 Subject: [PATCH 38/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef35f9248..2c9c65fbd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.3.0", + "version": "4.4.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 5ee7104a5b12f77b0e842aed9139cf045020b3b0..448633b17843c7fee5593da87b36fcdd5e552baa 100644 GIT binary patch delta 3356 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 delta 3357 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 From dbbbc6b5b1fe6edbbbe72f1189a92fb3b304154b Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 16 Mar 2023 22:07:40 +0200 Subject: [PATCH 39/99] RED-3800: remove IqserIconsModule --- .../src/app/modules/dossier-overview/dossier-overview.module.ts | 2 -- .../src/app/modules/dossiers-listing/dossiers-listing.module.ts | 2 -- apps/red-ui/src/app/modules/file-preview/file-preview.module.ts | 2 -- libs/common-ui | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 59075ab62..0f963631a 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -4,7 +4,6 @@ import { RouterModule, Routes } from '@angular/router'; import { CircleButtonComponent, IqserHelpModeModule, - IqserIconsModule, IqserInputsModule, IqserListingModule, IqserLoadingModule, @@ -55,7 +54,6 @@ const routes: Routes = [ RouterModule.forChild(routes), CommonModule, SharedDossiersModule, - IqserIconsModule, TranslateModule, IqserHelpModeModule, IqserUsersModule, diff --git a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts index af6f75cfc..e357f9a02 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { CompositeRouteGuard, IqserHelpModeModule, - IqserIconsModule, IqserListingModule, IqserPermissionsModule, IqserScrollbarModule, @@ -47,7 +46,6 @@ const routes: Routes = [ CommonModule, SharedModule, SharedDossiersModule, - IqserIconsModule, TranslateModule, IqserHelpModeModule, IqserUsersModule, 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 db2a9712d..f8f010069 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 @@ -7,7 +7,6 @@ import { IqserEmptyStatesModule, IqserFiltersModule, IqserHelpModeModule, - IqserIconsModule, IqserInputsModule, IqserPermissionsModule, IqserScrollbarModule, @@ -109,7 +108,6 @@ const components = [ imports: [ RouterModule.forChild(routes), CommonModule, - IqserIconsModule, TranslateModule, OverlayModule, IqserHelpModeModule, diff --git a/libs/common-ui b/libs/common-ui index e67bfdf65..8650dd472 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit e67bfdf6596db985ca8c1c0dc8890394e24aa607 +Subproject commit 8650dd472f5cc6317661ba294c6684b9646d5984 From bc827a34faa0b395220d7b64dfba51c903dbcd7f Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 16 Mar 2023 23:48:04 +0200 Subject: [PATCH 40/99] RED-3800: empty states standalone --- apps/red-ui/src/app/app.module.ts | 2 ++ apps/red-ui/src/app/modules/admin/admin.module.ts | 4 ++-- .../src/app/modules/file-preview/file-preview.module.ts | 4 ++-- .../src/app/modules/shared-dossiers/shared-dossiers.module.ts | 4 ++-- libs/common-ui | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 2b93c463a..11165b505 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -11,6 +11,7 @@ import { CachingModule, CircleButtonComponent, CommonUiModule, + EmptyStateComponent, IqserHelpModeModule, IqserLoadingModule, IqserPermissionsModule, @@ -155,6 +156,7 @@ export const appModuleFactory = (config: AppConfig) => { }, }), CircleButtonComponent, + EmptyStateComponent, ], providers: [ { diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index ddabd1f2a..b053b7a0a 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -44,9 +44,9 @@ import { KmsSignatureConfigurationComponent } from './dialogs/configure-digital- import { ChevronButtonComponent, CircleButtonComponent, + EmptyStateComponent, HumanizePipe, IconButtonComponent, - IqserEmptyStatesModule, IqserHelpModeModule, IqserInputsModule, IqserListingModule, @@ -119,7 +119,6 @@ const components = [ IqserScrollbarModule, IqserInputsModule, IqserUploadFileModule, - IqserEmptyStatesModule, IqserSharedModule, IqserHelpModeModule, IqserPermissionsModule, @@ -129,6 +128,7 @@ const components = [ IconButtonComponent, CircleButtonComponent, ChevronButtonComponent, + EmptyStateComponent, ], }) export class AdminModule {} 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 f8f010069..802ec7310 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 @@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common'; import { CapitalizePipe, CircleButtonComponent, + EmptyStateComponent, IconButtonComponent, - IqserEmptyStatesModule, IqserFiltersModule, IqserHelpModeModule, IqserInputsModule, @@ -116,7 +116,6 @@ const components = [ IqserInputsModule, IqserSharedModule, IqserUploadFileModule, - IqserEmptyStatesModule, IqserFiltersModule, IqserScrollbarModule, IqserPermissionsModule, @@ -124,6 +123,7 @@ const components = [ CircleButtonComponent, SharedDossiersModule, IconButtonComponent, + EmptyStateComponent, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard, SuggestionsService], }) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts index b5728738f..9cea2ae59 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -14,8 +14,8 @@ import { FileAssignService } from './services/file-assign.service'; import { DictionaryDetailsDialogComponent } from './dialogs/edit-dossier-dialog/dictionary/dictionary-details-dialog/dictionary-details-dialog.component'; import { CircleButtonComponent, + EmptyStateComponent, IconButtonComponent, - IqserEmptyStatesModule, IqserHelpModeModule, IqserInputsModule, IqserPermissionsModule, @@ -50,13 +50,13 @@ const services = [FileAssignService]; IqserHelpModeModule, IqserUsersModule, TranslateModule, - IqserEmptyStatesModule, IqserSharedModule, IqserInputsModule, IqserScrollbarModule, IqserPermissionsModule, IconButtonComponent, CircleButtonComponent, + EmptyStateComponent, ], }) export class SharedDossiersModule {} diff --git a/libs/common-ui b/libs/common-ui index 8650dd472..87b19da9a 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 8650dd472f5cc6317661ba294c6684b9646d5984 +Subproject commit 87b19da9a900cbc9de8af666612bbae7aedff900 From b269ddd039d57e8913e22d6ccf48de9f4d39e81c Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 16 Mar 2023 22:50:54 +0100 Subject: [PATCH 41/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2c9c65fbd..00a708276 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.4.0", + "version": "4.5.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 448633b17843c7fee5593da87b36fcdd5e552baa..c8b1b348e542f668c3e9cd1258e86153300f616e 100644 GIT binary patch delta 3357 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 delta 3356 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 From 6b9eb5bc0c5297a12dc8bf160e9d9d0181502a2b Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 17 Mar 2023 11:35:23 +0200 Subject: [PATCH 42/99] RED-6332: fix no notifications icon --- .../src/app/components/base-screen/base-screen.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 515df50ea..877785591 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -30,7 +30,7 @@

From 3722a0d1107a08b8ff5bd763eaaa655babb739d7 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 17 Mar 2023 10:38:01 +0100 Subject: [PATCH 43/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 00a708276..20c2df93f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.5.0", + "version": "4.6.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index c8b1b348e542f668c3e9cd1258e86153300f616e..e841dc8a823bfa29f43228e995112dfb34999486 100644 GIT binary patch delta 3359 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 From 569fbf6b137a79d41e158589e92d8a7cd6d32ab6 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Fri, 17 Mar 2023 12:16:38 +0200 Subject: [PATCH 44/99] RED-6375 - Close "download options"-window if user click anywhere outside of the window --- .../download-dialog/download-dialog.component.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.ts b/apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.ts index e1826bdc0..d7c98e035 100644 --- a/apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.ts @@ -2,10 +2,10 @@ import { Component, Inject } from '@angular/core'; import { Dossier, DownloadFileType, DownloadFileTypes, IReportTemplate, File, WorkflowFileStatuses } from '@red/domain'; import { downloadTypesForDownloadTranslations } from '@translations/download-types-translations'; import { ReportTemplateService } from '@services/report-template.service'; -import { AbstractControl, FormBuilder } from '@angular/forms'; +import { AbstractControl } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DefaultColorsService } from '@services/entity-services/default-colors.service'; -import { IconButtonTypes, List } from '@iqser/common-ui'; +import { BaseDialogComponent, IconButtonTypes, List } from '@iqser/common-ui'; export interface DownloadDialogData { readonly dossier: Dossier; @@ -23,19 +23,21 @@ export interface DownloadDialogResult { templateUrl: './download-dialog.component.html', styleUrls: ['./download-dialog.component.scss'], }) -export class DownloadDialogComponent { +export class DownloadDialogComponent extends BaseDialogComponent { readonly iconButtonTypes = IconButtonTypes; readonly downloadTypes: { key: DownloadFileType; label: string }[] = this._formDownloadTypes; readonly availableReportTypes = this._availableReportTypes; - readonly form = this._getForm(); constructor( private readonly _defaultColorsService: DefaultColorsService, private readonly _reportTemplateController: ReportTemplateService, - private readonly _formBuilder: FormBuilder, - private readonly _dialogRef: MatDialogRef, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: DownloadDialogData, - ) {} + ) { + super(_dialogRef); + + this.form = this._getForm(); + } get reportTypesLength() { return this.form.controls.reportTemplateIds?.value?.length || 0; From 44867860c0c4a61cab613c8a6f182c6633a1f1b5 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 17 Mar 2023 11:23:21 +0100 Subject: [PATCH 45/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 20c2df93f..0b11eb3dc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.6.0", + "version": "4.7.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index e841dc8a823bfa29f43228e995112dfb34999486..4fe9d341b5c615fadf2aab6b832f875f22735f02 100644 GIT binary patch delta 3356 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 From f7caa70736d979152175f235882ab6c8bb1ab56d Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Fri, 17 Mar 2023 13:26:47 +0200 Subject: [PATCH 46/99] RED-6381 - Display titles of file attributes in workflow view --- .../workflow-item/workflow-item.component.html | 5 +++-- .../workflow-item/workflow-item.component.scss | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html index 9b743922e..27720cc5e 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html @@ -13,8 +13,9 @@
-
- {{ file.fileAttributes.attributeIdToValue[config.id] || '-' }} +
+ {{ config.label }} + {{ file.fileAttributes.attributeIdToValue[config.id] || '-' }}
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss index 3f2e7cc60..80fd48faa 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss +++ b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss @@ -10,6 +10,22 @@ &:hover redaction-file-actions { display: initial; } + + .attribute { + display: flex; + flex-direction: column; + + b { + text-transform: uppercase; + } + + b, + span { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + } } .details-wrapper { From da3842ae88f22bf4f4f6a9d2fc692d862072f0b1 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 17 Mar 2023 12:32:51 +0100 Subject: [PATCH 47/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b11eb3dc..cdcf9bc62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.7.0", + "version": "4.8.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 4fe9d341b5c615fadf2aab6b832f875f22735f02..a569d4e320128dbd81cd5845442170e8439865a6 100644 GIT binary patch delta 3357 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 delta 3356 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 Date: Fri, 17 Mar 2023 17:23:39 +0200 Subject: [PATCH 48/99] RED-6361, fix OCR documents image hint annotations showing the hide button when already hidden. --- .../modules/pdf-viewer/services/annotation-draw.service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts index 8f7b17d59..7f6f45016 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts @@ -146,10 +146,13 @@ export class AnnotationDrawService { annotation.Id = annotationWrapper.id; annotation.ReadOnly = true; + const isOCR = annotationWrapper.isOCR && !annotationWrapper.isSuggestionResize; + if (isOCR && !this._annotationManager.isHidden(annotationWrapper.annotationId)) { + this._annotationManager.addToHidden(annotationWrapper.annotationId); + } annotation.Hidden = annotationWrapper.isChangeLogRemoved || (hideSkipped && annotationWrapper.isSkipped) || - (annotationWrapper.isOCR && !annotationWrapper.isSuggestionResize) || this._annotationManager.isHidden(annotationWrapper.annotationId); annotation.setCustomData('redact-manager', 'true'); annotation.setCustomData('redaction', String(annotationWrapper.previewAnnotation)); From ddcfdc5367591c9e21e1807a822ca84010a51203 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 17 Mar 2023 16:26:39 +0100 Subject: [PATCH 49/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cdcf9bc62..b9694e71c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.8.0", + "version": "4.9.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a569d4e320128dbd81cd5845442170e8439865a6..64d9476f34e798d7e55b8bf3c672194f2df20795 100644 GIT binary patch delta 3357 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 From a47c98abd6ded3612e1b33dcdf298963c2880209 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 17 Mar 2023 21:45:23 +0200 Subject: [PATCH 50/99] RED-6403: reorder license information --- .../license-screen.component.html | 40 ++++++++++--------- apps/red-ui/src/assets/i18n/redact/de.json | 2 +- apps/red-ui/src/assets/i18n/redact/en.json | 8 ++-- apps/red-ui/src/assets/i18n/scm/de.json | 2 +- apps/red-ui/src/assets/i18n/scm/en.json | 8 ++-- 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html index 30d8341cc..d02b006f1 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html @@ -61,26 +61,8 @@
{{ licenseService.totalLicensedNumberOfPages }}
-
-
-
{{ licenseService.currentInfo.numberOfAnalyzedPages }}
-
- -
-
-
{{ licenseService.currentInfo.numberOfOcrPages }}
-
-
-
-
-
{{ licenseService.annualInfo.numberOfAnalyzedPages }}
-
-
@@ -89,10 +71,32 @@
+
+
+
{{ licenseService.currentInfo.numberOfOcrPages }}
+
+
{{ licenseService.unlicensedPages }}
+ +
+
+ +
{{ licenseService.annualInfo.numberOfAnalyzedPages }}
+
+ +
+
+
{{ licenseService.annualInfo.numberOfOcrPages }}
+
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index c87a21c93..ba2c6f114 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -1633,7 +1633,6 @@ "table-header": "{length} {length, plural, one{Begründung} other{Begründung}}" }, "license-info-screen": { - "analyzed-pages": "Analysierte Seiten", "backend-version": "Backend-Version der Anwendung", "chart": { "cumulative": "Seiten insgesamt", @@ -1666,6 +1665,7 @@ "inactive": "" }, "total-analyzed": "Seit {date} insgesamt analysierte Seiten", + "total-ocr-analyzed": "", "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten", "usage-details": "Nutzungsdetails" }, diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 8e39b3bd2..a6950c81d 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -1633,7 +1633,6 @@ "table-header": "{length} {length, plural, one{justification} other{justifications}}" }, "license-info-screen": { - "analyzed-pages": "Analyzed pages", "backend-version": "Backend Application Version", "chart": { "cumulative": "Cumulative Pages", @@ -1643,7 +1642,7 @@ }, "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)", "copyright-claim-title": "Copyright Claim", - "current-analyzed": "Analyzed Pages in Current Licensing Period", + "current-analyzed": "Analyzed Pages in Licensing Period", "custom-app-title": "Custom Application Title", "email-report": "Email Report", "email": { @@ -1656,16 +1655,17 @@ "end-user-license-text": "The use of this product is subject to the terms of the Redaction End User Agreement, unless otherwise specified therein.", "end-user-license-title": "End User License Agreement", "license-title": "License Title", - "licensed-page-count": "Number of licensed pages", + "licensed-page-count": "Licensed pages", "licensed-to": "Licensed to", "licensing-details": "Licensing Details", "licensing-period": "Licensing Period", - "ocr-analyzed-pages": "OCR Analyzed Pages", + "ocr-analyzed-pages": "OCR Processed Pages in Licensing Period", "status": { "active": "Active", "inactive": "Inactive" }, "total-analyzed": "Total Analyzed Pages Since {date}", + "total-ocr-analyzed": "Total OCR Processed Pages Since {date}", "unlicensed-analyzed": "Unlicensed Analyzed Pages", "usage-details": "Usage Details" }, diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 29b71265d..d6c71b494 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -1633,7 +1633,6 @@ "table-header": "{length} {length, plural, one{Begründung} other{Begründung}}" }, "license-info-screen": { - "analyzed-pages": "Analysierte Seiten", "backend-version": "Backend-Version der Anwendung", "chart": { "cumulative": "Seiten insgesamt", @@ -1666,6 +1665,7 @@ "inactive": "" }, "total-analyzed": "Seit {date} insgesamt analysierte Seiten", + "total-ocr-analyzed": "", "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten", "usage-details": "Nutzungsdetails" }, diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index 4ce547ea5..59f92efd4 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -1633,7 +1633,6 @@ "table-header": "{length} {length, plural, one{justification} other{justifications}}" }, "license-info-screen": { - "analyzed-pages": "Analyzed pages", "backend-version": "Backend Application Version", "chart": { "cumulative": "Cumulative Pages", @@ -1643,7 +1642,7 @@ }, "copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)", "copyright-claim-title": "Copyright Claim", - "current-analyzed": "Analyzed Pages in Current Licensing Period", + "current-analyzed": "Analyzed Pages in Licensing Period", "custom-app-title": "Custom Application Title", "email-report": "Email Report", "email": { @@ -1656,16 +1655,17 @@ "end-user-license-text": "The use of this product is subject to the terms of the Component End User Agreement, unless otherwise specified therein.", "end-user-license-title": "End User License Agreement", "license-title": "License Title", - "licensed-page-count": "Number of licensed pages", + "licensed-page-count": "Licensed pages", "licensed-to": "Licensed to", "licensing-details": "Licensing Details", "licensing-period": "Licensing Period", - "ocr-analyzed-pages": "OCR Analyzed Pages", + "ocr-analyzed-pages": "OCR Processed Pages in Licensing Period", "status": { "active": "Active", "inactive": "Inactive" }, "total-analyzed": "Total Analyzed Pages Since {date}", + "total-ocr-analyzed": "Total OCR Processed Pages Since {date}", "unlicensed-analyzed": "Unlicensed Analyzed Pages", "usage-details": "Usage Details" }, From 0141fc8ba9e4ed8d55857b1346c162822c10d2fd Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 17 Mar 2023 20:47:57 +0100 Subject: [PATCH 51/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b9694e71c..aecf35ce0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.9.0", + "version": "4.10.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 64d9476f34e798d7e55b8bf3c672194f2df20795..d9ee6a78531f21b8d0a69dbbc9c8e6614e5e4231 100644 GIT binary patch delta 3353 zcmV+!4d(Lm8uJ>Ecz?bVc&jJ2V+XeX1O-0{HiOpG3|9#K983K-wxuqA`J-m{8L2;( zHauMZo(Hea^8XpyQTbOS#u1Z!%c!nDYz;2pl|Lna&s(`}FaNdYg8Wwj3`h3ICDq*i z&*lFzN^w;ahA#j7?N`?3^7+L}x-W~0p{B~7U8anc_4fKYDSvWSFLy<;%Lp!My^MjdvoUXlU(|QFyu5mTvE=yS%t{H4NrnD?fzVrv<}rD*Mb2~hl@bc; zZ;>C^<(uah?|%j}w%d>-MMcES5J$JWs%Y}qii)hLw&mwkw)Fmn&2u*1tNR= z#=4_1O97T`tH8DhH>}{l%c7=?7VxGb8D{h~ISqT+et%mDC0Q(1lB+nj{TT-u78U0s za>_TTE;1UUr%@D<*gJGu6^?0B1LZAV20kZA@<3d+TTq0Eq(#;Vz9?}-+5HyT%k=|+ zEgrY>P+K&;aHL*nI^b;P2zJc;62~#kcL2Zzemm<~P(qfslY9B&5Jc55!tttFjD(&Z zz;kgrlYjDJ6>RSkS0rc8jr2!NRr6P6L32hbgD%)y8^oVIkA!Vnyq5enC{P^xaUdXF zyxfzRVpQbWJ*uOMkR0JWM$eQjvgZ5kO29JjYfXZ_+w#G@w+E69wCNPr#24=Cu9 zDnI1QTHkvdD`}dI_KCpU@!J6ow?HDv|OGCVAl7de@=D?9B82JXN{P5{XMqIK?= z4}YG|h}1ufWRzuOF?%Xlvq-#QMbyq6is}()Ap9squ+fe`3ZK?qJq|0y=8bKv*i|u! ziVC+@9aMo-+!#Fs^9iXa=Fi>C3~aoWv^F!BZnE)S?Kjzj)FGo9B)|76v*&LUTGh;o zQYt;IW`^vC5eDEgY=Sn5>*mv^YiMVT^?yiXWr#Ff|KUp+)b6n0$5Fe~M_{V*`P&0{ zs>bRv5$Md}2e49M9L-ZwQ8waT{~nyx_2=jn%`-w-lkd>y*B48GYyk-*vm6z(-pgG6 zEwSzOWjFh;MRl8G#ob`8J2`g~^mG3L%x-GP&ECS|5YOl!yeSZleba;ZlH?70OMj|8 z$>0CTWrnP>DiWFvfcbN10bn>vD;lMY?o22JlTZ?`hw@DmrAd?Dia11{znaFv?dQJ= zNe(O19P!AlBd`cbm1OUKh*ARYYxK3KT>Js&ct@&wu+DmF9oOIV>wH~g8LY#3_9dyv zB+;8`QTjcw-xhUE0bRg_ksdB=w|_gFu@T6dNs#ME0eRc(c}Rmo2$w@pQO=b;dKFVv zR6||0C$%MrMp#0k5TzL<@Bbwcg$>d0;3

d5Ekty$_s&B7P+$UcdhlBvo@A8p4_0 z6CUp2{4N6=@rb<1&0xFn0f*oG>EHkOXN{hv?|*0#x+CbT3e+RN8bX`i4S#{8NY7NP ziquWUref&CPl9CK&XW^3P)xhHRl2|4Q8>2r6i3$ST_#TxAiA?#-*?eua*cLut>gz2 z;p#&}Qq@O#Zj0z>)sD~rOs(t5~eYX#{_L;H9cD@lNDBw z14mV}4{M|ESF|uG3MPWv8rUR%srjc+iQ_WS(*730G3a{VC`9Ww%3xfZ6AloaN)!(} zNo=H*-|=pCkY!pNa`Vs42tbFvgAF|C#xA3xyce|^Gps|uTBQqk;(rNp3yb((ytgd+ zeGLLCD+;7T{3Nzym^C7&9Q0b%E(GFSdx2a}eE6nO?iN9O0uE8_#8D({I3*(J8=??C3m>Wc}E<^wuXS9!a$55!$3{eD%NOxO~CG8 z#`h(#5I=L>6|m6Va6SSv?d8ptI(%1=dk9a}v{CP}q0e)?*e9dDwULve%Y!bAaTI!^ zu7Dd1FAicn>hg`;6kRJLH$|7L_{~Ar#wfoXFZl_gZ97TqA%FJJ$3X@W32wC2S{)V> zlVoE%8UgnZs}*;$Gu(Kgq0===UUs%yDF7Kco0|pFhVZP#(UL5+M}T!!&dS#nr)hEZ zH|qg!M3*bNq8mdOmtGLwtmAOh#YN<;{b=Kiy0~DYAohqhtEBmD%N55BVoixsl9l@+ zCI?$1xUUXT?SHD*+SPu|1{{0dJ5^_G>^=>kccQ-DEoQbSRuItD#hxIwtp6GV&4{I# zp*k%ZNaI6-xJ9UF%p>2s6h0t!gW$2Lz;;7YDUL=jHCtDfR*v`N6D%fqveAj|$4J*c zGCSZ)!T44^*H(@W0Md-c(*3Ssfce-*8`1^30?4reU4MY*`X)?hKJdYV0o=%2hv1R> zbv+d1j2(`D$FHr?X4ec^SG*pLTtYvMAR^0ewH&>jCJp2$ zad(vD?j&_et|ddK6Nnr?4DA9sBM=<%lYhuPhJSQ@Fd)4&Eh`3ER?Dw(7=gUt_1F$V z$HR;yYECsZsmYE_@9GgVrXL67_Z1jcL}t_#w3)6r40%?4FQ`$-@%HQI$4oz%=N| zBY(IfQyz0rF%4GbRt^E|R54@^Y(%(XG}4YT)nn>mZhs+9+XnYB)cZL75UxeMZdBqO zk&jx*Lc02{!UHp(>NLGTMo_710A?#L>|zP=I%GnxDY+B(ztn;4WukYZF?7Eh7oNJo z7fZhKSmQj~sK(vv0q-P`cBd}1pZqLo#(x2s>5A6MP;ql^l#2_Z+Lsg+Al8&6sUlpH zA$GH?gv$B7p=zj6*dHJd=v0*cn2JB(-i}(}i&7HZX0&F!DoB7$73M_Gyg($RDk1S& z2=E68$P32r3G~6}g4fs^4hfzZEysG{n)SjR=!H-+u@A)4>O^SNGhJHtL$GyFmw$;1 zG?Ey393W{r{OUHM>c@7=Lc+cO8uO%Mw*reZ@n7*u^Kt8C&4NGkGVWNGx_= zlB;pZ+NZJN##<472SiR^UQh>h*814FPG{JZU<49NzSlTY_!S~if%NSK#2pK?3V8X^ z@vlaUf#gb!`3940R&Mo_h+ihA(EvT+ta7dcLl%IE1jmfC4rr5uH9NTNB7a-755r3+ znjci|#(erKVDEH%OgFLA{#nyXiw!D58VKZnRsX7cD!cD$ zmGN%;NFH&=0E_PXhapQt?QhLnrgV{}OsPR)-#z(u>kuHzo#)st{65=@gJm%5F6ti3GI%ntNlK_$;YNoE+eCq!QJhyW@ jw{ttUb33*H|D08jt`u4jOd delta 3353 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 Date: Fri, 17 Mar 2023 22:57:22 +0200 Subject: [PATCH 52/99] RED-3800: update common-ui --- apps/red-ui/src/app/app.module.ts | 6 ++++-- apps/red-ui/src/app/modules/account/account.module.ts | 4 ++-- apps/red-ui/src/app/modules/admin/admin.module.ts | 2 -- .../modules/dossier-overview/dossier-overview.module.ts | 4 ++-- .../modules/dossiers-listing/dossiers-listing.module.ts | 4 ++-- .../src/app/modules/file-preview/file-preview.module.ts | 4 ++-- apps/red-ui/src/app/modules/search/search.module.ts | 4 ++-- .../app/modules/shared-dossiers/shared-dossiers.module.ts | 8 ++++++-- apps/red-ui/src/app/modules/shared/shared.module.ts | 4 ++-- libs/common-ui | 2 +- 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 11165b505..7f37bb617 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -16,13 +16,14 @@ import { IqserLoadingModule, IqserPermissionsModule, IqserPermissionsService, - IqserSharedModule, IqserTranslateModule, IqserUsersModule, LanguageService, + LogoComponent, MAX_RETRIES_ON_SERVER_ERROR, SERVER_ERROR_SKIP_PATHS, ServerErrorInterceptor, + SkeletonComponent, ToastComponent, } from '@iqser/common-ui'; import { ToastrModule } from 'ngx-toastr'; @@ -103,7 +104,6 @@ export const appModuleFactory = (config: AppConfig) => { existingUserService: UserService, existingRoleGuard: RedRoleGuard, }), - IqserSharedModule, CachingModule.forRoot(UI_CACHES), IqserHelpModeModule.forRoot(links), PdfViewerModule, @@ -157,6 +157,8 @@ export const appModuleFactory = (config: AppConfig) => { }), CircleButtonComponent, EmptyStateComponent, + SkeletonComponent, + LogoComponent, ], providers: [ { diff --git a/apps/red-ui/src/app/modules/account/account.module.ts b/apps/red-ui/src/app/modules/account/account.module.ts index c9faf70ec..a8b2382fa 100644 --- a/apps/red-ui/src/app/modules/account/account.module.ts +++ b/apps/red-ui/src/app/modules/account/account.module.ts @@ -6,7 +6,7 @@ import { AccountSideNavComponent } from './account-side-nav/account-side-nav.com import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component'; import { NotificationPreferencesService } from './services/notification-preferences.service'; import { TranslateModule } from '@ngx-translate/core'; -import { IconButtonComponent, IqserHelpModeModule, IqserSharedModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, SideNavComponent } from '@iqser/common-ui'; import { PreferencesComponent } from './screens/preferences/preferences.component'; @NgModule({ @@ -16,9 +16,9 @@ import { PreferencesComponent } from './screens/preferences/preferences.componen SharedModule, AccountRoutingModule, TranslateModule, - IqserSharedModule, IqserHelpModeModule, IconButtonComponent, + SideNavComponent, ], providers: [NotificationPreferencesService], }) diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index b053b7a0a..c054923e9 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -52,7 +52,6 @@ import { IqserListingModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUploadFileModule, IqserUsersModule, } from '@iqser/common-ui'; @@ -119,7 +118,6 @@ const components = [ IqserScrollbarModule, IqserInputsModule, IqserUploadFileModule, - IqserSharedModule, IqserHelpModeModule, IqserPermissionsModule, AdminSideNavComponent, diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 0f963631a..4f3239d04 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -9,8 +9,8 @@ import { IqserLoadingModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUsersModule, + StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossierOverviewScreenComponent } from './screen/dossier-overview-screen.component'; @@ -59,12 +59,12 @@ const routes: Routes = [ IqserUsersModule, IqserListingModule, IqserLoadingModule, - IqserSharedModule, IqserScrollbarModule, IqserPermissionsModule, IqserInputsModule, SharedModule, CircleButtonComponent, + StatusBarComponent, ], }) export class DossierOverviewModule {} diff --git a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts index e357f9a02..51e67e566 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts @@ -6,8 +6,8 @@ import { IqserListingModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUsersModule, + StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingScreenComponent } from './screen/dossiers-listing-screen.component'; @@ -51,8 +51,8 @@ const routes: Routes = [ IqserUsersModule, IqserListingModule, IqserScrollbarModule, - IqserSharedModule, IqserPermissionsModule, + StatusBarComponent, ], }) export class DossiersListingModule {} 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 802ec7310..4b2817e9a 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 @@ -10,9 +10,9 @@ import { IqserInputsModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUploadFileModule, IqserUsersModule, + StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; @@ -114,7 +114,6 @@ const components = [ IqserUsersModule, CapitalizePipe, IqserInputsModule, - IqserSharedModule, IqserUploadFileModule, IqserFiltersModule, IqserScrollbarModule, @@ -124,6 +123,7 @@ const components = [ SharedDossiersModule, IconButtonComponent, EmptyStateComponent, + StatusBarComponent, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard, SuggestionsService], }) diff --git a/apps/red-ui/src/app/modules/search/search.module.ts b/apps/red-ui/src/app/modules/search/search.module.ts index 7a3f551fa..94862be23 100644 --- a/apps/red-ui/src/app/modules/search/search.module.ts +++ b/apps/red-ui/src/app/modules/search/search.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchScreenComponent } from './search-screen/search-screen.component'; import { RouterModule } from '@angular/router'; -import { IqserListingModule, IqserSharedModule, IqserUsersModule } from '@iqser/common-ui'; +import { IqserListingModule, IqserUsersModule, StatusBarComponent } from '@iqser/common-ui'; import { SharedModule } from '@shared/shared.module'; import { TranslateModule } from '@ngx-translate/core'; import { SearchItemTemplateComponent } from './search-item-template/search-item-template.component'; @@ -18,7 +18,7 @@ const routes = [{ path: '', component: SearchScreenComponent }]; IqserUsersModule, TranslateModule, IqserListingModule, - IqserSharedModule, + StatusBarComponent, ], }) export class SearchModule {} diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts index 9cea2ae59..e4538aff3 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -20,8 +20,10 @@ import { IqserInputsModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUsersModule, + SideNavComponent, + SmallChipComponent, + StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingActionsComponent } from './components/dossiers-listing-actions/dossiers-listing-actions.component'; @@ -50,13 +52,15 @@ const services = [FileAssignService]; IqserHelpModeModule, IqserUsersModule, TranslateModule, - IqserSharedModule, IqserInputsModule, IqserScrollbarModule, IqserPermissionsModule, IconButtonComponent, CircleButtonComponent, EmptyStateComponent, + SmallChipComponent, + StatusBarComponent, + SideNavComponent, ], }) export class SharedDossiersModule {} 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 0d5ed600a..c423823d2 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -14,8 +14,8 @@ import { IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUsersModule, + SmallChipComponent, } from '@iqser/common-ui'; import { SelectComponent } from './components/select/select.component'; import { NavigateLastDossiersScreenDirective } from './directives/navigate-last-dossiers-screen.directive'; @@ -89,12 +89,12 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; RouterModule, IqserHelpModeModule, IqserUsersModule, - IqserSharedModule, IqserScrollbarModule, IqserPermissionsModule, ...deleteThisWhenAllComponentsAreStandalone, CircleButtonComponent, IconButtonComponent, + SmallChipComponent, ], exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone], providers: [ diff --git a/libs/common-ui b/libs/common-ui index 87b19da9a..8ac6f5831 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 87b19da9a900cbc9de8af666612bbae7aedff900 +Subproject commit 8ac6f583197b4b3771d7db403eccb99926714fbc From f3f40bf60847295fc2c6914cebac7c0771686269 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 17 Mar 2023 22:00:12 +0100 Subject: [PATCH 53/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aecf35ce0..f4fa1d0cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.10.0", + "version": "4.11.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index d9ee6a78531f21b8d0a69dbbc9c8e6614e5e4231..8b0d5f4bba1de712e9140863d18544feb963967b 100644 GIT binary patch delta 3357 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 delta 3356 zcmV+%4de3k8uJ>Ecz?bVc&jJ2V+XeX1O-0{HiOpG3|9#K983K-wxuqA`J-m{8L2;( zHauMZo(Hea^8XpyQTbOS#u1Z!%c!nDYz;2pl|Lna&s(`}FaNdYg8Wwj3`h3ICDq*i z&*lFzN^w;ahA#j7?N`?3^7+L}x-W~0p{B~7U8anc_4fKYDSvWSFLy<;%Lp!My^MjdvoUXlU(|QFyu5mTvE=yS%t{H4NrnD?fzVrv<}rD*Mb2~hl@bc; zZ;>C^<(uah?|%j}w%d>-MMcES5J$JWs%Y}qii)hLw&mwkw)Fmn&2u*1tNR= z#=4_1O97T`tH8DhH>}{l%c7=?7VxGb8D{h~ISqT+et%mDC0Q(1lB+nj{TT-u78U0s za>_TTE;1UUr%@D<*gJGu6^?0B1LZAV20kZA@<3d+TTq0Eq(#;Vz9?}-+5HyT%k=|+ zEgrY>P+K&;aHL*nI^b;P2zJc;62~#kcL2Zzemm<~P(qfslY9B&5Jc55!tttFjD(&Z zz;kgrlYjDJ6>RSkS0rc8jr2!NRr6P6L32hbgD%)y8^oVIkA!Vnyq5enC{P^xaUdXF zyxfzRVpQbWJ*uOMkR0JWM$eQjvgZ5kO29JjYfXZ_+w#G@w+E69wCNPr#24=Cu9 zDnI1QTHkvdD`}dI_KCpU@!J6ow?HDv|OGCVAl7de@=D?9B82JXN{P5{XMqIK?= z4}YG|h}1ufWRzuOF?%Xlvq-#QMbyq6is}()Ap9squ+fe`3ZK?qJq|0y=8bKv*i|u! ziVC+@9aMo-+!#Fs^9iXa=Fi>C3~aoWv^F!BZnE)S?Kjzj)FGo9B)|76v*&LUTGh;o zQYt;IW`^vC5eDEgY=Sn5>*mv^YiMVT^?yiXWr#Ff|KUp+)b6n0$5Fe~M_{V*`P&0{ zs>bRv5$Md}2e49M9L-ZwQ8waT{~nyx_2=jn%`-w-lkd>y*B48GYyk-*vm6z(-pgG6 zEwSzOWjFh;MRl8G#ob`8J2`g~^mG3L%x-GP&ECS|5YOl!yeSZleba;ZlH?70OMj|8 z$>0CTWrnP>DiWFvfcbN10bn>vD;lMY?o22JlTZ?`hw@DmrAd?Dia11{znaFv?dQJ= zNe(O19P!AlBd`cbm1OUKh*ARYYxK3KT>Js&ct@&wu+DmF9oOIV>wH~g8LY#3_9dyv zB+;8`QTjcw-xhUE0bRg_ksdB=w|_gFu@T6dNs#ME0eRc(c}Rmo2$w@pQO=b;dKFVv zR6||0C$%MrMp#0k5TzL<@Bbwcg$>d0;3

d5Ekty$_s&B7P+$UcdhlBvo@A8p4_0 z6CUp2{4N6=@rb<1&0xFn0f*oG>EHkOXN{hv?|*0#x+CbT3e+RN8bX`i4S#{8NY7NP ziquWUref&CPl9CK&XW^3P)xhHRl2|4Q8>2r6i3$ST_#TxAiA?#-*?eua*cLut>gz2 z;p#&}Qq@O#Zj0z>)sD~rOs(t5~eYX#{_L;H9cD@lNDBw z14mV}4{M|ESF|uG3MPWv8rUR%srjc+iQ_WS(*730G3a{VC`9Ww%3xfZ6AloaN)!(} zNo=H*-|=pCkY!pNa`Vs42tbFvgAF|C#xA3xyce|^Gps|uTBQqk;(rNp3yb((ytgd+ zeGLLCD+;7T{3Nzym^C7&9Q0b%E(GFSdx2a}eE6nO?iN9O0uE8_#8D({I3*(J8=??C3m>Wc}E<^wuXS9!a$55!$3{eD%NOxO~CG8 z#`h(#5I=L>6|m6Va6SSv?d8ptI(%1=dk9a}v{CP}q0e)?*e9dDwULve%Y!bAaTI!^ zu7Dd1FAicn>hg`;6kRJLH$|7L_{~Ar#wfoXFZl_gZ97TqA%FJJ$3X@W32wC2S{)V> zlVoE%8UgnZs}*;$Gu(Kgq0===UUs%yDF7Kco0|pFhVZP#(UL5+M}T!!&dS#nr)hEZ zH|qg!M3*bNq8mdOmtGLwtmAOh#YN<;{b=Kiy0~DYAohqhtEBmD%N55BVoixsl9l@+ zCI?$1xUUXT?SHD*+SPu|1{{0dJ5^_G>^=>kccQ-DEoQbSRuItD#hxIwtp6GV&4{I# zp*k%ZNaI6-xJ9UF%p>2s6h0t!gW$2Lz;;7YDUL=jHCtDfR*v`N6D%fqveAj|$4J*c zGCSZ)!T44^*H(@W0Md-c(*3Ssfce-*8`1^30?4reU4MY*`X)?hKJdYV0o=%2hv1R> zbv+d1j2(`D$FHr?X4ec^SG*pLTtYvMAR^0ewH&>jCJp2$ zad(vD?j&_et|ddK6Nnr?4DA9sBM=<%lYhuPhJSQ@Fd)4&Eh`3ER?Dw(7=gUt_1F$V z$HR;yYECsZsmYE_@9GgVrXL67_Z1jcL}t_#w3)6r40%?4FQ`$-@%HQI$4oz%=N| zBY(IfQyz0rF%4GbRt^E|R54@^Y(%(XG}4YT)nn>mZhs+9+XnYB)cZL75UxeMZdBqO zk&jx*Lc02{!UHp(>NLGTMo_710A?#L>|zP=I%GnxDY+B(ztn;4WukYZF?7Eh7oNJo z7fZhKSmQj~sK(vv0q-P`cBd}1pZqLo#(x2s>5A6MP;ql^l#2_Z+Lsg+Al8&6sUlpH zA$GH?gv$B7p=zj6*dHJd=v0*cn2JB(-i}(}i&7HZX0&F!DoB7$73M_Gyg($RDk1S& z2=E68$P32r3G~6}g4fs^4hfzZEysG{n)SjR=!H-+u@A)4>O^SNGhJHtL$GyFmw$;1 zG?Ey393W{r{OUHM>c@7=Lc+cO8uO%Mw*reZ@n7*u^Kt8C&4NGkGVWNGx_= zlB;pZ+NZJN##<472SiR^UQh>h*814FPG{JZU<49NzSlTY_!S~if%NSK#2pK?3V8X^ z@vlaUf#gb!`3940R&Mo_h+ihA(EvT+ta7dcLl%IE1jmfC4rr5uH9NTNB7a-755r3+ znjci|#(erKVDEH%OgFLA{#nyXiw!D58VKZnRsX7cD!cD$ zmGN%;NFH&=0E_PXhapQt?QhLnrgV{}OsPR)-#z(u>kuHzo#)st{65=@gJm%5F6ti3GI%ntNlK_$;YNoE+eCq!QJhyW@ mw{ttUb33HrS>1|<8aIXPyhf-?1Ik# From 9a53d68efd668b3a87ab305a5a6a0b01112a094a Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 17 Mar 2023 23:58:14 +0200 Subject: [PATCH 54/99] RED-3800: use hidden actions directive --- apps/red-ui/src/app/app.module.ts | 2 ++ .../components/base-screen/base-screen.component.html | 4 +--- .../services/file-preview-state.service.ts | 10 +++++----- libs/common-ui | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 7f37bb617..c23ea1f9a 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -12,6 +12,7 @@ import { CircleButtonComponent, CommonUiModule, EmptyStateComponent, + HiddenActionDirective, IqserHelpModeModule, IqserLoadingModule, IqserPermissionsModule, @@ -159,6 +160,7 @@ export const appModuleFactory = (config: AppConfig) => { EmptyStateComponent, SkeletonComponent, LogoComponent, + HiddenActionDirective, ], providers: [ { diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 877785591..f9f73cfb2 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -11,9 +11,7 @@

diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts index a1e6d8d81..c6ce575a9 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts @@ -38,9 +38,9 @@ export class FilePreviewStateService { readonly isReadonly$: Observable; readonly isWritable$: Observable; - readonly dossierId: string = getParam(DOSSIER_ID); - readonly dossierTemplateId: string = getParam(DOSSIER_TEMPLATE_ID); - readonly fileId: string = getParam(FILE_ID); + readonly dossierId = getParam(DOSSIER_ID); + readonly dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID); + readonly fileId = getParam(FILE_ID); dossier: Dossier; dialogRef: MatDialogRef; file: File; @@ -51,7 +51,7 @@ export class FilePreviewStateService { router: Router, filesMapService: FilesMapService, private readonly _injector: Injector, - permissionsService: PermissionsService, + private readonly _permissionsService: PermissionsService, private readonly _filesService: FilesService, private readonly _dossiersService: DossiersService, private readonly _fileManagementService: FileManagementService, @@ -65,7 +65,7 @@ export class FilePreviewStateService { this.file$ = filesMapService.watch$(this.dossierId, this.fileId).pipe(tap(file => (this.file = file))); [this.isReadonly$, this.isWritable$] = boolFactory( combineLatest([this.file$, this.dossier$]), - ([file, dossier]) => !permissionsService.canPerformAnnotationActions(file, dossier), + ([file, dossier]) => !_permissionsService.canPerformAnnotationActions(file, dossier), ); this.blob$ = this.#blob$; diff --git a/libs/common-ui b/libs/common-ui index 8ac6f5831..655874989 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 8ac6f583197b4b3771d7db403eccb99926714fbc +Subproject commit 655874989bafa3b7017ceb94e1088c7f9fddd0a5 From df0b528b8db395e0edb4d130abdbdc2865ba6657 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sat, 18 Mar 2023 02:17:25 +0200 Subject: [PATCH 55/99] RED-3800: use stopPropagation --- apps/red-ui/src/app/app.module.ts | 2 + .../notifications.component.html | 18 +++-- .../notifications/notifications.component.ts | 4 +- .../user-profile-screen.component.ts | 2 +- .../base-entity-screen.component.ts | 6 +- .../user-details/user-details.component.ts | 2 +- .../screens/audit/audit-screen.component.html | 2 +- .../screens/audit/audit-screen.component.ts | 8 +- .../default-colors-screen.component.html | 2 +- .../default-colors-screen.component.ts | 4 +- .../digital-signature-screen.component.ts | 2 +- ...r-attributes-listing-screen.component.html | 8 +- ...ier-attributes-listing-screen.component.ts | 25 ++----- ...ssier-states-listing-screen.component.html | 2 +- ...dossier-states-listing-screen.component.ts | 4 +- .../dossier-states-table-item.component.html | 4 +- .../dossier-states-table-item.component.ts | 8 +- ...er-templates-listing-screen.component.html | 6 +- ...sier-templates-listing-screen.component.ts | 6 +- .../entities-listing-screen.component.html | 6 +- .../entities-listing-screen.component.ts | 8 +- ...e-attributes-listing-screen.component.html | 11 +-- ...ile-attributes-listing-screen.component.ts | 35 +++------ .../smtp-form/smtp-form.component.ts | 2 +- .../justifications-dialog.service.ts | 3 +- .../justifications-screen.component.ts | 2 +- .../table-item/table-item.component.ts | 2 +- .../reports-screen.component.ts | 6 +- .../user-listing-screen.component.html | 10 +-- .../user-listing-screen.component.ts | 8 +- .../watermarks-listing-screen.component.html | 4 +- .../watermarks-listing-screen.component.ts | 4 +- .../admin/services/admin-dialog.service.ts | 9 ++- .../dossier-template-actions.component.html | 14 ++-- .../dossier-template-actions.component.ts | 8 +- .../template-stats.component.ts | 2 +- .../dossier-details-stats.component.ts | 2 +- .../file-attribute.component.html | 17 ++--- .../file-attribute.component.ts | 67 ++++++++--------- .../dossier-overview/config.service.ts | 6 +- .../dossier-overview.module.ts | 2 + .../services/bulk-actions.service.ts | 4 +- .../dossiers-listing/config.service.ts | 2 +- .../dossiers-listing-screen.component.ts | 2 +- .../annotation-actions.component.html | 34 ++++----- .../annotation-actions.component.ts | 41 +++++----- .../annotation-wrapper.component.html | 3 +- .../comments/comments.component.html | 10 ++- .../components/comments/comments.component.ts | 6 +- .../document-info/document-info.component.ts | 2 +- .../file-workload.component.html | 3 +- .../highlights-separator.component.ts | 4 +- .../view-switch/view-switch.component.ts | 2 +- .../file-preview-screen.component.ts | 5 +- .../file-preview/file-preview.module.ts | 4 + .../services/annotation-actions.service.ts | 74 +++++++------------ .../pdf-annotation-actions.service.ts | 34 ++++----- .../services/pdf-proxy.service.ts | 2 +- .../file-preview/services/skipped.service.ts | 4 +- .../compare-file-input.component.ts | 1 - .../search-item-template.component.html | 2 +- .../src/app/modules/search/search.module.ts | 3 +- .../dossiers-listing-actions.component.html | 4 +- .../dossiers-listing-actions.component.ts | 7 +- .../file-actions/file-actions.component.ts | 69 ++++++++--------- .../edit-dossier-dictionary.component.ts | 2 +- .../edit-dossier-team.component.html | 3 +- .../edit-dossier-team.component.ts | 4 +- .../edit-dossier-general-info.component.ts | 4 +- .../services/file-assign.service.ts | 18 ++--- .../shared-dossiers/shared-dossiers.module.ts | 2 + .../file-download-btn.component.html | 2 +- .../file-download-btn.component.ts | 3 +- .../expandable-file-actions.component.html | 2 +- .../expandable-file-actions.component.ts | 6 +- .../components/select/select.component.html | 11 ++- .../components/select/select.component.ts | 6 +- .../team-members/team-members.component.ts | 2 +- .../add-dossier-dialog.component.ts | 2 +- .../src/app/modules/shared/shared.module.ts | 2 + .../trash/services/trash-dialog.service.ts | 3 +- libs/common-ui | 2 +- 82 files changed, 346 insertions(+), 393 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index c23ea1f9a..347ef2b86 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -25,6 +25,7 @@ import { SERVER_ERROR_SKIP_PATHS, ServerErrorInterceptor, SkeletonComponent, + StopPropagationDirective, ToastComponent, } from '@iqser/common-ui'; import { ToastrModule } from 'ngx-toastr'; @@ -161,6 +162,7 @@ export const appModuleFactory = (config: AppConfig) => { SkeletonComponent, LogoComponent, HiddenActionDirective, + StopPropagationDirective, ], providers: [ { diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.html b/apps/red-ui/src/app/components/notifications/notifications.component.html index 89da01870..517a15f89 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.html +++ b/apps/red-ui/src/app/components/notifications/notifications.component.html @@ -1,7 +1,7 @@ @@ -19,22 +19,24 @@
{{ group.date }}
{{ 'notifications.mark-all-as-read' | translate }}
@@ -42,12 +44,14 @@
{{ notification.creationDate | date : 'exactDate' }}
+
diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.ts b/apps/red-ui/src/app/components/notifications/notifications.component.ts index 8320e4193..90b6f15fb 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.ts +++ b/apps/red-ui/src/app/components/notifications/notifications.component.ts @@ -48,9 +48,7 @@ export class NotificationsComponent { ); } - async markRead($event, notifications: Notification[] = this._notificationsService.all, isRead = true): Promise { - $event.stopPropagation(); - + async markRead(notifications: Notification[] = this._notificationsService.all, isRead = true): Promise { if (!notifications.find(notification => !!notification.readDate !== isRead)) { // If no notification changes status after the request, abort return; diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts index 8d4bd718e..3307196e9 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts @@ -86,7 +86,7 @@ export class UserProfileScreenComponent extends BaseFormComponent implements OnI const value = this.form.getRawValue() as IProfile; if (this.emailChanged) { - const dialogRef = this._dialogService.openDialog('confirmPassword', null, null); + const dialogRef = this._dialogService.openDialog('confirmPassword'); const password = await firstValueFrom(dialogRef.afterClosed()); if (!password) { return; diff --git a/apps/red-ui/src/app/modules/admin/base-entity-screen/base-entity-screen.component.ts b/apps/red-ui/src/app/modules/admin/base-entity-screen/base-entity-screen.component.ts index adcd8e171..a2b3a7af4 100644 --- a/apps/red-ui/src/app/modules/admin/base-entity-screen/base-entity-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/base-entity-screen/base-entity-screen.component.ts @@ -17,8 +17,8 @@ import { PermissionsService } from '@services/permissions.service'; export class BaseEntityScreenComponent { readonly disabledItems$: Observable; readonly canDeleteEntity$: Observable; - readonly #dossierTemplateId: string = getParam(DOSSIER_TEMPLATE_ID); - readonly #entityType: string = getParam(ENTITY_TYPE); + readonly #dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID); + readonly #entityType = getParam(ENTITY_TYPE); constructor( private readonly _router: Router, @@ -37,7 +37,7 @@ export class BaseEntityScreenComponent { } openDeleteDictionariesDialog() { - this._dialogService.openDialog('confirm', null, null, async () => { + this._dialogService.openDialog('confirm', null, async () => { this._loadingService.start(); const dossierTemplate = this._dossierTemplatesService.find(this.#dossierTemplateId); await firstValueFrom(this._dictionaryService.deleteDictionaries([this.#entityType], this.#dossierTemplateId)); diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts index b57e13cdf..8950b2780 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts @@ -103,7 +103,7 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges } delete() { - this._dialogService.deleteUsers([this.user.id], null, () => this.closeDialog.emit(true)); + this._dialogService.deleteUsers([this.user.id], () => this.closeDialog.emit(true)); } setRolesRequirements(checked: boolean, role: string): void { 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 fd39ef1e3..dc0f6fe5c 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 @@ -99,7 +99,7 @@
implements OnI } } + openAuditDetails(log: Audit) { + this._dialogService.openDialog('auditInfo', { auditEntry: log }); + } + private _getForm(): UntypedFormGroup { return this._formBuilder.group({ category: [this.ALL_CATEGORIES], @@ -136,8 +140,4 @@ export class AuditScreenComponent extends ListingComponent implements OnI } this._loadingService.stop(); } - - openAuditDetails($event: MouseEvent, log: Audit) { - this._dialogService.openDialog('auditInfo', $event, { auditEntry: log }); - } } diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html index da6885c67..533f1ec38 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html @@ -38,7 +38,7 @@
{ ); } - openEditColorDialog($event: MouseEvent, color: ListItem) { - this._dialogService.openDialog('editColor', $event, { colorKey: color.key, dossierTemplateId: this.#dossierTemplateId }); + openEditColorDialog(color: ListItem) { + this._dialogService.openDialog('editColor', { colorKey: color.key, dossierTemplateId: this.#dossierTemplateId }); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts index 98d10be79..f53c497d4 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts @@ -81,7 +81,7 @@ export class DigitalSignatureScreenComponent implements OnInit { } openConfigureCertificate(): void { - const dialogRef = this._dialogService.openDialog('configureCertificate', null, null); + const dialogRef = this._dialogService.openDialog('configureCertificate'); firstValueFrom(dialogRef.afterClosed()).then(async res => { if (res) { await this.loadDigitalSignature(); diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html index 3ae58c130..e72e17e99 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html @@ -21,7 +21,7 @@
@@ -91,7 +91,7 @@
{ - this._loadingService.start(); - const ids = attributes.map(a => a.id); - await firstValueFrom(this._dossierAttributesService.delete(ids, this.#dossierTemplateId)); - await this._loadData(); - }, - ); + await this._dialogService.deleteAttributes(attributes, this.#dossierTemplateId, this.impactedTemplatesRef, 'dossier', async () => { + this._loadingService.start(); + const ids = attributes.map(a => a.id); + await firstValueFrom(this._dossierAttributesService.delete(ids, this.#dossierTemplateId)); + await this._loadData(); + }); } - openAddEditAttributeDialog($event: MouseEvent, dossierAttribute?: IDossierAttributeConfig) { + openAddEditAttributeDialog(dossierAttribute?: IDossierAttributeConfig) { const dossierTemplateId = this.#dossierTemplateId; - this._dialogService.openDialog('addEditDossierAttribute', $event, { dossierAttribute, dossierTemplateId }, async () => - this._loadData(), - ); + this._dialogService.openDialog('addEditDossierAttribute', { dossierAttribute, dossierTemplateId }, async () => this._loadData()); } private async _loadData() { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html index dd0ed0200..92bc9e700 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html @@ -52,7 +52,7 @@ > (AddEditDossierStateDialogComponent, { ...defaultDialogConfig, data: { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html index 61c99bb63..570097587 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html @@ -17,14 +17,14 @@
s.id !== dossierState.id), @@ -43,9 +41,7 @@ export class DossierStatesTableItemComponent { ); } - openEditStateDialog($event: MouseEvent, dossierState: IDossierState) { - $event.stopPropagation(); - + openEditStateDialog(dossierState: IDossierState) { this.#dialog.open(AddEditDossierStateDialogComponent, { ...defaultDialogConfig, data: { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html index dfb60f821..b0339acaf 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html @@ -18,21 +18,21 @@
{ + openBulkDeleteTemplatesDialog() { + return this._dialogService.openDialog('confirm', null, () => { this._loadingService.loadWhile(this._deleteTemplates()); }); } openAddDossierTemplateDialog() { - this._dialogService.openDialog('addEditCloneDossierTemplate', null, null); + this._dialogService.openDialog('addEditCloneDossierTemplate'); } private async _deleteTemplates(templateIds = this.listingService.selected.map(d => d.dossierTemplateId)) { diff --git a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html index 2d4e399da..6e8758ba7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html @@ -39,7 +39,7 @@ @@ -101,7 +101,7 @@
this.templateStats$ = this._dossierTemplateStatsService.watch$(this.#dossierTemplateId).pipe(tap(() => this._loadDictionaryData())); } - openDeleteEntitiesDialog($event?: MouseEvent, types = this.listingService.selected) { - this._dialogService.openDialog('confirm', $event, null, async () => { + openDeleteEntitiesDialog(types = this.listingService.selected) { + this._dialogService.openDialog('confirm', null, async () => { this._loadingService.start(); await firstValueFrom( this._dictionaryService.deleteDictionaries( @@ -62,8 +62,8 @@ export class EntitiesListingScreenComponent extends ListingComponent }); } - openAddEntityDialog($event?: MouseEvent) { - this._dialogService.openDialog('addEntity', $event, { dossierTemplateId: this.#dossierTemplateId }); + openAddEntityDialog() { + this._dialogService.openDialog('addEntity', { dossierTemplateId: this.#dossierTemplateId }); } private _loadDictionaryData(): void { 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 5b12e3b78..f1f991fc8 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 @@ -45,7 +45,7 @@
+ { + this._dialogService.openDialog('addEditFileAttribute', data, (newValue: IFileAttributeConfig) => { this._loadingService.loadWhile(this.#createNewFileAttributeAndRefreshView(newValue)); }); } - async openConfirmDeleteAttributeDialog( - $event: MouseEvent, - attributes: FileAttributeConfig[] = this.listingService.selected, - ): Promise { - await this._dialogService.deleteAttributes( - attributes, - this.#dossierTemplateId, - this._impactedTemplatesRef, - 'file', - $event, - async () => { - this._loadingService.start(); - const ids = attributes.map(a => a.id); - await firstValueFrom(this._fileAttributesService.deleteFileAttributes(ids, this.#dossierTemplateId)); - await firstValueFrom(this._dossierTemplatesService.refreshDossierTemplate(this.#dossierTemplateId)); - await this.#loadData(); - }, - ); + async openConfirmDeleteAttributeDialog(attributes: FileAttributeConfig[] = this.listingService.selected): Promise { + await this._dialogService.deleteAttributes(attributes, this.#dossierTemplateId, this._impactedTemplatesRef, 'file', async () => { + this._loadingService.start(); + const ids = attributes.map(a => a.id); + await firstValueFrom(this._fileAttributesService.deleteFileAttributes(ids, this.#dossierTemplateId)); + await firstValueFrom(this._dossierTemplatesService.refreshDossierTemplate(this.#dossierTemplateId)); + await this.#loadData(); + }); } importCSV(files: FileList | File[]) { @@ -114,7 +104,6 @@ export class FileAttributesListingScreenComponent extends ListingComponent { + this._dialogService.openDialog('smtpAuthConfig', this.form.getRawValue(), null, authConfig => { if (authConfig) { this.form.patchValue(authConfig); } else if (!skipDisableOnCancel) { diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts index 668de1d80..36563c498 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts @@ -48,7 +48,8 @@ export class JustificationsDialogService extends DialogService { justificationName: justifications[0].name, }, }); - this.openDialog('confirm', null, data, async () => { + + this.openDialog('confirm', data, async () => { this._loadingService.start(); const justificationIds = justifications.map(j => j.id); await firstValueFrom(this._justificationService.delete(justificationIds, dossierTemplateId)); diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts index 7a31b9ff1..59e11f857 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts @@ -60,7 +60,7 @@ export class JustificationsScreenComponent extends ListingComponent { + this._dialogService.openDialog('confirm', null, () => { this._loadingService.loadWhile(this._deleteTemplate(template)); }); } @@ -90,7 +90,7 @@ export class ReportsScreenComponent implements OnInit { fileName: file.name, }, }); - this._dialogService.openDialog('confirm', null, data, null, async result => { + this._dialogService.openDialog('confirm', data, null, async result => { if (result) { const multiFileReport = result > 1; if ( @@ -129,7 +129,7 @@ export class ReportsScreenComponent implements OnInit { }, }); - this._dialogService.openDialog('confirm', null, data, null, async result => { + this._dialogService.openDialog('confirm', data, null, async result => { if (result) { await this._uploadTemplateForm(file, multiFileReport); } diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html index 62caae326..f6cd676c9 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html @@ -1,5 +1,4 @@
@@ -28,7 +28,6 @@ @@ -53,10 +53,10 @@
@@ -71,14 +71,14 @@
implement await this.#loadData(); } - openAddEditUserDialog(event?: MouseEvent, user?: User) { - this._dialogService.openDialog('addEditUser', event, user, async () => { + openAddEditUserDialog(user?: User) { + this._dialogService.openDialog('addEditUser', user, async () => { await this.#loadData(); }); } - openDeleteUsersDialog(userIds: string[], $event?: MouseEvent) { - this._dialogService.deleteUsers(userIds, $event, async () => { + openDeleteUsersDialog(userIds: string[]) { + this._dialogService.deleteUsers(userIds, async () => { await this.#loadData(); }); } diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html index 92e1acfd9..a6083442b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html @@ -14,8 +14,8 @@ { + this._dialogService.openDialog('confirm', data, async () => { await this._deleteWatermark(watermark); }); } 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 dfab4ec29..91c7017d3 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 @@ -108,7 +108,7 @@ export class AdminDialogService extends DialogService { super(_dialog); } - deleteUsers(userIds: string[], $event?: MouseEvent, cb?: () => Promise | void): void { + deleteUsers(userIds: string[], cb?: () => Promise | void): void { const data = new ConfirmationDialogInput({ title: _('confirm-delete-users.title'), question: _('confirm-delete-users.warning'), @@ -123,7 +123,7 @@ export class AdminDialogService extends DialogService { toastMessage: _('confirm-delete-users.toast-error'), }); - this.openDialog('confirm', $event, data, async result => { + this.openDialog('confirm', data, async result => { if (result === ConfirmOptions.CONFIRM) { this._loadingService.start(); await firstValueFrom(this._userService.delete(userIds)); @@ -138,7 +138,6 @@ export class AdminDialogService extends DialogService { dossierTemplateId: string, impactedTemplatesRef: TemplateRef, type: 'dossier' | 'file', - $event: MouseEvent, cb: () => Promise | void, ): Promise { this._loadingService.start(); @@ -175,6 +174,7 @@ export class AdminDialogService extends DialogService { toastMessage: _('confirm-delete-attribute.toast-error'), translateParams: { reportsCount: uniqueTemplates.length, count: attributes.length, name: attributes[0].label }, }); + if (templates.length) { data.checkboxes.push({ value: false, @@ -183,7 +183,8 @@ export class AdminDialogService extends DialogService { extraContentData: { templates: uniqueTemplates }, }); } - this.openDialog('confirm', $event, data, async () => { + + this.openDialog('confirm', data, async () => { await cb(); }); } diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html index a707dd9ed..3e96c6552 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html @@ -1,27 +1,27 @@ -
+
diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts index fb5f63cca..2d2232f3d 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts @@ -33,12 +33,12 @@ export class DossierTemplateActionsComponent implements OnInit { this.dossierTemplateId ??= this._route.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID); } - openEditCloneDossierTemplateDialog($event: MouseEvent, clone: boolean = false) { - this._dialogService.openDialog('addEditCloneDossierTemplate', $event, { dossierTemplateId: this.dossierTemplateId, clone }); + openEditCloneDossierTemplateDialog(clone: boolean = false) { + this._dialogService.openDialog('addEditCloneDossierTemplate', { dossierTemplateId: this.dossierTemplateId, clone }); } - openDeleteDossierTemplateDialog($event?: MouseEvent) { - this._dialogService.openDialog('confirm', $event, null, async () => { + openDeleteDossierTemplateDialog() { + this._dialogService.openDialog('confirm', null, async () => { this._loadingService.start(); const success = await firstValueFrom(this._dossierTemplatesService.delete([this.dossierTemplateId])); diff --git a/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.ts b/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.ts index b111418ab..bb83e1846 100644 --- a/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.ts +++ b/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.ts @@ -24,6 +24,6 @@ export class TemplateStatsComponent { ) {} newDossier(): void { - this._dialogService.openDialog('addDossier', null, { dossierTemplateId: this.stats.dossierTemplateId }); + this._dialogService.openDialog('addDossier', { dossierTemplateId: this.stats.dossierTemplateId }); } } diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index 767368052..cde04f782 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -33,7 +33,7 @@ export class DossierDetailsStatsComponent implements OnInit { openEditDossierDialog(section: string): void { const data = { dossierId: this.dossier.id, section }; - this._dialogService.openDialog('editDossier', null, data, async () => { + this._dialogService.openDialog('editDossier', data, async () => { await firstValueFrom(this._filesService.loadAll(this.dossier.id)); }); } diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html index 33c2410ec..34220fd87 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html @@ -7,7 +7,7 @@
+ -
+
- + > - + - +
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts index c22ab777c..799e2e426 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts @@ -50,15 +50,6 @@ export class FileAttributeComponent extends BaseFormComponent implements OnInit ); } - ngOnInit(): void { - if (this.#noFileAttributes) { - this.#initFileAttributes(); - } - - this.form = this.#getForm(); - this.initialFormValue = this.form.getRawValue(); - } - get isDate(): boolean { return this.fileAttribute.type === FileAttributeConfigTypes.DATE; } @@ -71,28 +62,20 @@ export class FileAttributeComponent extends BaseFormComponent implements OnInit return JSON.stringify(this.file.fileAttributes.attributeIdToValue) === '{}'; } - #initFileAttributes() { - const configs = this._fileAttributesService.getFileAttributeConfig(this.file.dossierTemplateId).fileAttributeConfigs; - configs.forEach(config => (this.file.fileAttributes.attributeIdToValue[config.id] = null)); + ngOnInit(): void { + if (this.#noFileAttributes) { + this.#initFileAttributes(); + } + + this.form = this.#getForm(); + this.initialFormValue = this.form.getRawValue(); } - async editFileAttribute($event: MouseEvent): Promise { - $event?.stopPropagation(); + async editFileAttribute(): Promise { this.#toggleEdit(); } - #getForm(): UntypedFormGroup { - const config = {}; - const fileAttributes = this.file.fileAttributes.attributeIdToValue; - Object.keys(fileAttributes).forEach(key => { - const attrValue = fileAttributes[key]; - config[key] = [dayjs(attrValue, 'YYYY-MM-DD', true).isValid() ? dayjs(attrValue).toDate() : attrValue]; - }); - return this._formBuilder.group(config); - } - - async save($event?: MouseEvent): Promise { - $event?.stopPropagation(); + async save() { const rawFormValue = this.form.getRawValue(); const fileAttrValue = rawFormValue[this.fileAttribute.id]; const attributeIdToValue = { @@ -113,14 +96,35 @@ export class FileAttributeComponent extends BaseFormComponent implements OnInit this.#toggleEdit(); } - close($event?: MouseEvent): void { - $event?.stopPropagation(); + close(): void { if (this.isInEditMode) { this.form = this.#getForm(); this.#toggleEdit(); } } + @HostListener('document:click') + clickOutside() { + if (this.isInEditMode && this.closedDatepicker) { + this.close(); + } + } + + #initFileAttributes() { + const configs = this._fileAttributesService.getFileAttributeConfig(this.file.dossierTemplateId).fileAttributeConfigs; + configs.forEach(config => (this.file.fileAttributes.attributeIdToValue[config.id] = null)); + } + + #getForm(): UntypedFormGroup { + const config = {}; + const fileAttributes = this.file.fileAttributes.attributeIdToValue; + Object.keys(fileAttributes).forEach(key => { + const attrValue = fileAttributes[key]; + config[key] = [dayjs(attrValue, 'YYYY-MM-DD', true).isValid() ? dayjs(attrValue).toDate() : attrValue]; + }); + return this._formBuilder.group(config); + } + #formatAttributeValue(attrValue) { return this.isDate ? attrValue && dayjs(attrValue).format('YYYY-MM-DD') : attrValue; } @@ -140,11 +144,4 @@ export class FileAttributeComponent extends BaseFormComponent implements OnInit input.focus(); }, 100); } - - @HostListener('document:click') - clickOutside() { - if (this.isInEditMode && this.closedDatepicker) { - this.close(); - } - } } diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index 94ccb7e61..2df621d66 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -157,7 +157,7 @@ export class ConfigService { { id: 'editDossier', label: this._translateService.instant('dossier-overview.header-actions.edit'), - action: $event => this._openEditDossierDialog($event, dossierId), + action: () => this._openEditDossierDialog(dossierId), icon: 'iqser:edit', hide: !this.currentUser.isManager && !this._iqserPermissionsService.has(ROLES.dossiers.edit), helpModeKey: 'edit_dossier_in_dossier', @@ -449,8 +449,8 @@ export class ConfigService { ].map(filter => new NestedFilter(filter)); } - private _openEditDossierDialog($event: MouseEvent, dossierId: string) { - this._dialogService.openDialog('editDossier', $event, { dossierId }); + private _openEditDossierDialog(dossierId: string) { + this._dialogService.openDialog('editDossier', { dossierId }); } private _sortByName(ids: string[]) { diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 4f3239d04..1be5feb5f 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -11,6 +11,7 @@ import { IqserScrollbarModule, IqserUsersModule, StatusBarComponent, + StopPropagationDirective, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossierOverviewScreenComponent } from './screen/dossier-overview-screen.component'; @@ -65,6 +66,7 @@ const routes: Routes = [ SharedModule, CircleButtonComponent, StatusBarComponent, + StopPropagationDirective, ], }) export class DossierOverviewModule {} diff --git a/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts index 6ba3e94ff..53903e51b 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts @@ -47,7 +47,6 @@ export class BulkActionsService { delete(files: File[]) { this._dialogService.openDialog( 'confirm', - null, new ConfirmationDialogInput({ title: _('confirmation-dialog.delete-file.title'), question: _('confirmation-dialog.delete-file.question'), @@ -98,7 +97,6 @@ export class BulkActionsService { if (foundAnalysisRequiredFile || foundUpdatedFile) { this._dialogService.openDialog( 'confirm', - null, new ConfirmationDialogInput({ title: foundAnalysisRequiredFile ? _('confirmation-dialog.approve-multiple-files-without-analysis.title') @@ -133,6 +131,6 @@ export class BulkActionsService { } private _assignFiles(files: File[], targetStatus: WorkflowFileStatus, ignoreChanged = false, withUnassignedOption = false): void { - this._dialogService.openDialog('assignFile', null, { targetStatus, files, ignoreChanged, withUnassignedOption }); + this._dialogService.openDialog('assignFile', { targetStatus, files, ignoreChanged, withUnassignedOption }); } } diff --git a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts index e50a6e8ef..987a131a5 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts @@ -217,7 +217,7 @@ export class ConfigService { } private _openAddDossierDialog(dossierTemplateId: string): void { - this._dialogService.openDialog('addDossier', null, { dossierTemplateId }); + this._dialogService.openDialog('addDossier', { dossierTemplateId }); } private _quickFilters(entities: Dossier[]): NestedFilter[] { diff --git a/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts index 9ab4b00e5..1ca7f7ddf 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts @@ -47,7 +47,7 @@ export class DossiersListingScreenComponent extends ListingComponent im } openAddDossierDialog(): void { - this._dialogService.openDialog('addDossier', null, { dossierTemplateId: this.dossierTemplate.id }); + this._dialogService.openDialog('addDossier', { dossierTemplateId: this.dossierTemplate.id }); } async ngOnInit(): Promise { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html index 7ac04139c..7702ff635 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html @@ -6,7 +6,7 @@ this._annotations.reduce((acc, annotation) => !hidden.has(annotation.id) && acc, true)), - shareLast(), - ); - constructor( readonly viewModeService: ViewModeService, readonly helpModeService: HelpModeService, @@ -53,6 +48,11 @@ export class AnnotationActionsComponent implements OnChanges { private _annotations: AnnotationWrapper[]; + readonly isVisible$ = this._annotationManager.hidden$.pipe( + map(hidden => this._annotations.reduce((acc, annotation) => !hidden.has(annotation.id) && acc, true)), + shareLast(), + ); + get annotations(): AnnotationWrapper[] { return this._annotations; } @@ -75,43 +75,40 @@ export class AnnotationActionsComponent implements OnChanges { this._setPermissions(); } - removeOrSuggestRemoveAnnotation($event: MouseEvent, removeFromDict: boolean) { - $event.stopPropagation(); - this.annotationActionsService.removeOrSuggestRemoveAnnotation($event, this.annotations, removeFromDict); + removeOrSuggestRemoveAnnotation(removeFromDict: boolean) { + this.annotationActionsService.removeOrSuggestRemoveAnnotation(this.annotations, removeFromDict); } - markAsFalsePositive($event: MouseEvent) { - this.annotationActionsService.markAsFalsePositive($event, this.annotations); + markAsFalsePositive() { + this.annotationActionsService.markAsFalsePositive(this.annotations); } - acceptRecommendation($event: MouseEvent) { - this.annotationActionsService.convertRecommendationToAnnotation($event, this.annotations); + acceptRecommendation() { + this.annotationActionsService.convertRecommendationToAnnotation(this.annotations); } - hideAnnotation($event: MouseEvent) { - $event.stopPropagation(); + hideAnnotation() { this._annotationManager.hide(this.viewerAnnotations); this._annotationManager.deselect(); this._annotationManager.addToHidden(this.viewerAnnotations[0].Id); } - showAnnotation($event: MouseEvent) { - $event.stopPropagation(); + showAnnotation() { this._annotationManager.show(this.viewerAnnotations); this._annotationManager.deselect(); this._annotationManager.removeFromHidden(this.viewerAnnotations[0].Id); } - resize($event: MouseEvent) { - return this.annotationActionsService.resize($event, this.annotations[0]); + resize() { + return this.annotationActionsService.resize(this.annotations[0]); } - acceptResize($event: MouseEvent) { - return this.annotationActionsService.acceptResize($event, this.annotations[0]); + acceptResize() { + return this.annotationActionsService.acceptResize(this.annotations[0]); } - cancelResize($event: MouseEvent) { - return this.annotationActionsService.cancelResize($event, this.annotations[0]); + cancelResize() { + return this.annotationActionsService.cancelResize(this.annotations[0]); } private _setPermissions() { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html index 51e8453d4..b4c5a02da 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html @@ -10,10 +10,11 @@
{{ annotation.comments.length }} diff --git a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html index 7d566fc69..36f9b2e3e 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html @@ -8,12 +8,13 @@
@@ -30,5 +31,10 @@ width="full" > -
+
diff --git a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts index 22c1e3e67..2af8ee215 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts @@ -71,13 +71,11 @@ export class CommentsComponent extends ContextComponent impleme this._loadingService.stop(); } - toggleExpandComments($event?: MouseEvent): void { - $event?.stopPropagation(); + toggleExpandComments(): void { this._commentingService.toggle(this.annotation.id); } - async deleteComment($event: MouseEvent, comment: IComment): Promise { - $event.stopPropagation(); + async deleteComment(comment: IComment): Promise { this._loadingService.start(); const { dossierId, fileId } = this._stateService; await this._manualRedactionService.deleteComment(comment.id, this.annotation.id, dossierId, fileId); diff --git a/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.ts b/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.ts index 9ff04473f..9328d3a55 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.ts @@ -56,7 +56,7 @@ export class DocumentInfoComponent extends ContextComponent { } edit(file: File) { - this._dialogService.openDialog('documentInfo', null, file); + this._dialogService.openDialog('documentInfo', file); } isDate(attribute: FileAttribute) { diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html index 992bf5aa0..eb3cbb197 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html @@ -214,9 +214,10 @@ diff --git a/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.ts b/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.ts index 0ace5b714..531e7ec32 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.ts @@ -31,12 +31,12 @@ export class HighlightsSeparatorComponent { convertHighlights(highlightGroup: EarmarkGroup): void { const data = this._getActionData(highlightGroup, EarmarkOperation.CONVERT); - this._dialogService.openDialog('highlightAction', null, data); + this._dialogService.openDialog('highlightAction', data); } removeHighlights(highlightGroup: EarmarkGroup): void { const data = this._getActionData(highlightGroup, EarmarkOperation.REMOVE); - this._dialogService.openDialog('highlightAction', null, data); + this._dialogService.openDialog('highlightAction', data); } private _getActionData(highlightGroup: EarmarkGroup, operation: EarmarkOperation) { diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts index 95c8c4f8a..027169d21 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts @@ -80,7 +80,7 @@ export class ViewSwitchComponent { checkboxesValidation: false, }); - return this._dialogService.openDialog('confirm', null, data, result => { + return this._dialogService.openDialog('confirm', data, result => { if (!result) { return; } diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 73fb3e88f..26becd816 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -320,7 +320,6 @@ export class FilePreviewScreenComponent this.state.dialogRef = this._dialogService.openDialog( 'manualAnnotation', - null, { manualRedactionEntryWrapper, dossierId: this.dossierId, file }, (result: { annotations: ManualRedactionEntryWrapper[]; dictionary?: Dictionary }) => { const selectedAnnotations = this._annotationManager.selected; @@ -422,7 +421,7 @@ export class FilePreviewScreenComponent } openRSSView(file: File) { - this._dialogService.openDialog('rss', null, { file }); + this._dialogService.openDialog('rss', { file }); } loadAnnotations() { @@ -663,7 +662,7 @@ export class FilePreviewScreenComponent }, }); - const ref = this._dialogService.openDialog('confirm', null, data); + const ref = this._dialogService.openDialog('confirm', data); return ref.afterClosed().pipe( switchMap(async (result: ConfirmOptions) => { const doNotShowWarningAgain = result === ConfirmOptions.SECOND_CONFIRM; 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 4b2817e9a..61bc007a8 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 @@ -12,7 +12,9 @@ import { IqserScrollbarModule, IqserUploadFileModule, IqserUsersModule, + PreventDefaultDirective, StatusBarComponent, + StopPropagationDirective, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; @@ -124,6 +126,8 @@ const components = [ IconButtonComponent, EmptyStateComponent, StatusBarComponent, + StopPropagationDirective, + PreventDefaultDirective, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard, SuggestionsService], }) diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts index 134622ea8..1d4c5b12a 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts @@ -6,7 +6,6 @@ import { getFirstRelevantTextPart } from '../../../utils'; import { Core } from '@pdftron/webviewer'; import { DictionaryEntryTypes, - Dossier, EarmarkOperation, IAddRedactionRequest, ILegalBasisChangeRequest, @@ -16,7 +15,6 @@ import { } from '@red/domain'; import { toPosition } from '../utils/pdf-calculation.utils'; import { AnnotationDrawService } from '../../pdf-viewer/services/annotation-draw.service'; -import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { AcceptRecommendationData, AcceptRecommendationDialogComponent, @@ -43,18 +41,12 @@ export class AnnotationActionsService { private readonly _documentViewer: REDDocumentViewer, private readonly _annotationManager: REDAnnotationManager, private readonly _annotationDrawService: AnnotationDrawService, - private readonly _activeDossiersService: ActiveDossiersService, private readonly _state: FilePreviewStateService, private readonly _fileDataService: FileDataService, private readonly _skippedService: SkippedService, ) {} - private get _dossier(): Dossier { - return this._activeDossiersService.find(this._state.dossierId); - } - - acceptSuggestion($event: MouseEvent, annotations: AnnotationWrapper[]) { - $event?.stopPropagation(); + acceptSuggestion(annotations: AnnotationWrapper[]) { const { dossierId, fileId } = this._state; const ids = annotations.map(a => a.id); const request = this._manualRedactionService.approve(ids, dossierId, fileId); @@ -63,16 +55,15 @@ export class AnnotationActionsService { removeHighlights(highlights: AnnotationWrapper[]): void { const data = this.#getHighlightOperationData(EarmarkOperation.REMOVE, highlights); - this._dialogService.openDialog('highlightAction', null, data); + this._dialogService.openDialog('highlightAction', data); } convertHighlights(highlights: AnnotationWrapper[]): void { const data = this.#getHighlightOperationData(EarmarkOperation.CONVERT, highlights); - this._dialogService.openDialog('highlightAction', null, data); + this._dialogService.openDialog('highlightAction', data); } - rejectSuggestion($event: MouseEvent, annotations: AnnotationWrapper[]) { - $event?.stopPropagation(); + rejectSuggestion(annotations: AnnotationWrapper[]) { const { dossierId, fileId } = this._state; this.#processObsAndEmit( this._manualRedactionService.declineOrRemove( @@ -84,10 +75,10 @@ export class AnnotationActionsService { ); } - forceAnnotation($event: MouseEvent, annotations: AnnotationWrapper[], hint: boolean = false) { + forceAnnotation(annotations: AnnotationWrapper[], hint: boolean = false) { const { dossierId, fileId } = this._state; - const data = { dossier: this._dossier, annotations, hint }; - this._dialogService.openDialog('forceAnnotation', $event, data, (request: ILegalBasisChangeRequest) => { + const data = { dossier: this._state.dossier, annotations, hint }; + this._dialogService.openDialog('forceAnnotation', data, (request: ILegalBasisChangeRequest) => { this.#processObsAndEmit( this._manualRedactionService.bulkForce( annotations.map(a => ({ ...request, annotationId: a.id })), @@ -99,12 +90,11 @@ export class AnnotationActionsService { }); } - changeLegalBasis($event: MouseEvent, annotations: AnnotationWrapper[]) { + changeLegalBasis(annotations: AnnotationWrapper[]) { const { dossierId, fileId } = this._state; this._dialogService.openDialog( 'changeLegalBasis', - $event, - { annotations, dossier: this._dossier }, + { annotations, dossier: this._state.dossier }, (data: { comment: string; legalBasis: string; section: string; value: string }) => { const body = annotations.map(annotation => ({ annotationId: annotation.id, @@ -119,15 +109,15 @@ export class AnnotationActionsService { ); } - removeOrSuggestRemoveAnnotation($event: MouseEvent, annotations: AnnotationWrapper[], removeFromDictionary: boolean) { + removeOrSuggestRemoveAnnotation(annotations: AnnotationWrapper[], removeFromDictionary: boolean) { const data = { annotationsToRemove: annotations, removeFromDictionary, - dossier: this._dossier, + dossier: this._state.dossier, hint: annotations[0].hintDictionary, }; const { dossierId, fileId } = this._state; - this._dialogService.openDialog('removeAnnotations', $event, data, (result: { comment: string }) => { + this._dialogService.openDialog('removeAnnotations', data, (result: { comment: string }) => { const body = annotations.map(annotation => ({ annotationId: annotation.id, removeFromDictionary, @@ -139,10 +129,10 @@ export class AnnotationActionsService { }); } - recategorizeImages($event: MouseEvent, annotations: AnnotationWrapper[]) { - const data = { annotations, dossier: this._dossier }; + recategorizeImages(annotations: AnnotationWrapper[]) { + const data = { annotations, dossier: this._state.dossier }; const { dossierId, fileId } = this._state; - this._dialogService.openDialog('recategorizeImage', $event, data, ({ comment, type }: { type: string; comment: string }) => { + this._dialogService.openDialog('recategorizeImage', data, ({ comment, type }: { type: string; comment: string }) => { const body: List = annotations.map(({ annotationId }) => ({ annotationId, type, @@ -152,9 +142,7 @@ export class AnnotationActionsService { }); } - undoDirectAction($event: MouseEvent, annotations: AnnotationWrapper[]) { - $event?.stopPropagation(); - + undoDirectAction(annotations: AnnotationWrapper[]) { const { dossierId, fileId } = this._state; const modifyDictionary = annotations[0].isModifyDictionary; this.#processObsAndEmit( @@ -167,9 +155,7 @@ export class AnnotationActionsService { ); } - convertRecommendationToAnnotation($event: any, recommendations: AnnotationWrapper[]) { - $event?.stopPropagation(); - + convertRecommendationToAnnotation(recommendations: AnnotationWrapper[]) { const { dossierId, fileId } = this._state; const dialogRef = this._dialog.open( AcceptRecommendationDialogComponent, @@ -179,19 +165,16 @@ export class AnnotationActionsService { const dialogClosed = dialogRef.afterClosed().pipe(filter(value => !!value && !!value.annotations)); dialogClosed.subscribe(({ annotations, comment: commentText }) => { if (isJustOne(annotations) && this._annotationManager.resizingAnnotationId === annotations[0].id) { - this.cancelResize(null, annotations[0]).then(); + this.cancelResize(annotations[0]).then(); } const comment = commentText ? { text: commentText } : undefined; this.#processObsAndEmit(this._manualRedactionService.addRecommendation(annotations, dossierId, fileId, comment)); }); } - async resize($event: MouseEvent, annotationWrapper: AnnotationWrapper) { - $event?.stopPropagation(); - + async resize(annotationWrapper: AnnotationWrapper) { this._annotationManager.resizingAnnotationId = annotationWrapper.id; - const viewerAnnotation = this._annotationManager.get(annotationWrapper); if (annotationWrapper.rectangle || annotationWrapper.imported || annotationWrapper.isImage) { this._annotationManager.delete(annotationWrapper); const rectangleAnnotation = this.#generateRectangle(annotationWrapper); @@ -199,6 +182,7 @@ export class AnnotationActionsService { return; } + const viewerAnnotation = this._annotationManager.get(annotationWrapper); viewerAnnotation.ReadOnly = false; viewerAnnotation.Hidden = false; viewerAnnotation.disableRotationControl(); @@ -206,7 +190,7 @@ export class AnnotationActionsService { this._annotationManager.select(viewerAnnotation); } - async acceptResize($event: MouseEvent, annotation: AnnotationWrapper): Promise { + async acceptResize(annotation: AnnotationWrapper): Promise { const textAndPositions = await this.#extractTextAndPositions(annotation.id); if (annotation.isRecommendation) { const recommendation = { @@ -214,14 +198,14 @@ export class AnnotationActionsService { value: textAndPositions.text, positions: textAndPositions.positions, } as AnnotationWrapper; - return this.convertRecommendationToAnnotation($event, [recommendation]); + return this.convertRecommendationToAnnotation([recommendation]); } const isImageText = annotation.isImage ? 'Image' : textAndPositions.text; const text = annotation.rectangle ? annotation.value : isImageText; const data = { annotation, text }; - this._dialogService.openDialog('resizeAnnotation', $event, data, (result: { comment: string; updateDictionary: boolean }) => { + this._dialogService.openDialog('resizeAnnotation', data, (result: { comment: string; updateDictionary: boolean }) => { const resizeRequest: IResizeRequest = { annotationId: annotation.id, comment: result.comment, @@ -230,7 +214,7 @@ export class AnnotationActionsService { updateDictionary: result.updateDictionary, }; - this.cancelResize(null, annotation).then(); + this.cancelResize(annotation).then(); const { fileId, dossierId } = this._state; const request = this._manualRedactionService.resizeOrSuggestResize([resizeRequest], dossierId, fileId); @@ -238,20 +222,15 @@ export class AnnotationActionsService { }); } - async cancelResize($event: MouseEvent, annotationWrapper: AnnotationWrapper) { - $event?.stopPropagation(); - + async cancelResize(annotationWrapper: AnnotationWrapper) { this._annotationManager.resizingAnnotationId = undefined; - this._annotationManager.delete(annotationWrapper); await this._annotationDrawService.draw([annotationWrapper], this._skippedService.hideSkipped, this._state.dossierTemplateId); this._annotationManager.deselect(); await this._fileDataService.annotationsChanged(); } - markAsFalsePositive($event: MouseEvent, annotations: AnnotationWrapper[]) { - $event?.stopPropagation(); - + markAsFalsePositive(annotations: AnnotationWrapper[]) { const requests: List = annotations.map(annotation => ({ sourceId: annotation.id, value: this._getFalsePositiveText(annotation), @@ -301,6 +280,7 @@ export class AnnotationActionsService { } #processObsAndEmit(obs: Observable) { + // TODO: remove observables and use promises instead obs.subscribe({ next: () => this._fileDataService.annotationsChanged(), error: () => this._fileDataService.annotationsChanged(), diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts index f1bc826ef..9feac270f 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts @@ -1,7 +1,7 @@ import { inject, Injectable, NgZone } from '@angular/core'; -import { AnnotationWrapper } from '../../../models/file/annotation.wrapper'; -import { AnnotationPermissions } from '../../../models/file/annotation.permissions'; -import { PermissionsService } from '../../../services/permissions.service'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; +import { AnnotationPermissions } from '@models/file/annotation.permissions'; +import { PermissionsService } from '@services/permissions.service'; import { FilePreviewStateService } from './file-preview-state.service'; import { TranslateService } from '@ngx-translate/core'; import { AnnotationActionsService } from './annotation-actions.service'; @@ -32,17 +32,17 @@ export class PdfAnnotationActionsService { // if we already entered resize-mode previously if (firstAnnotation.id === this.#annotationManager.resizingAnnotationId) { const acceptResizeButton = this.#getButton('check', _('annotation-actions.resize-accept.label'), () => - this.#annotationActionsService.acceptResize(null, firstAnnotation), + this.#annotationActionsService.acceptResize(firstAnnotation), ); const cancelResizeButton = this.#getButton('close', _('annotation-actions.resize-cancel.label'), () => - this.#annotationActionsService.cancelResize(null, firstAnnotation), + this.#annotationActionsService.cancelResize(firstAnnotation), ); return [acceptResizeButton, cancelResizeButton]; } const resizeButton = this.#getButton('resize', _('annotation-actions.resize.label'), () => - this.#annotationActionsService.resize(null, firstAnnotation), + this.#annotationActionsService.resize(firstAnnotation), ); availableActions.push(resizeButton); @@ -50,14 +50,14 @@ export class PdfAnnotationActionsService { if (permissions.canChangeLegalBasis) { const editButton = this.#getButton('edit', _('annotation-actions.edit-reason.label'), () => - this.#annotationActionsService.changeLegalBasis(null, annotations), + this.#annotationActionsService.changeLegalBasis(annotations), ); availableActions.push(editButton); } if (permissions.canRecategorizeImage) { const recategorizeButton = this.#getButton('thumb-down', _('annotation-actions.recategorize-image'), () => - this.#annotationActionsService.recategorizeImages(null, annotations), + this.#annotationActionsService.recategorizeImages(annotations), ); availableActions.push(recategorizeButton); } @@ -66,56 +66,56 @@ export class PdfAnnotationActionsService { const removeFromDictButton = this.#getButton( 'remove-from-dict', _('annotation-actions.remove-annotation.remove-from-dict'), - () => this.#annotationActionsService.removeOrSuggestRemoveAnnotation(null, annotations, true), + () => this.#annotationActionsService.removeOrSuggestRemoveAnnotation(annotations, true), ); availableActions.push(removeFromDictButton); } if (permissions.canAcceptRecommendation) { const acceptRecommendationButton = this.#getButton('check', _('annotation-actions.accept-recommendation.label'), () => - this.#annotationActionsService.convertRecommendationToAnnotation(null, annotations), + this.#annotationActionsService.convertRecommendationToAnnotation(annotations), ); availableActions.push(acceptRecommendationButton); } if (permissions.canAcceptSuggestion) { const acceptSuggestionButton = this.#getButton('check', _('annotation-actions.accept-suggestion.label'), () => - this.#annotationActionsService.acceptSuggestion(null, annotations), + this.#annotationActionsService.acceptSuggestion(annotations), ); availableActions.push(acceptSuggestionButton); } if (permissions.canUndo) { const undoButton = this.#getButton('undo', _('annotation-actions.undo'), () => - this.#annotationActionsService.undoDirectAction(null, annotations), + this.#annotationActionsService.undoDirectAction(annotations), ); availableActions.push(undoButton); } if (permissions.canMarkAsFalsePositive) { const markAsFalsePositiveButton = this.#getButton('thumb-down', _('annotation-actions.remove-annotation.false-positive'), () => - this.#annotationActionsService.markAsFalsePositive(null, annotations), + this.#annotationActionsService.markAsFalsePositive(annotations), ); availableActions.push(markAsFalsePositiveButton); } if (permissions.canForceRedaction) { const forceRedactionButton = this.#getButton('thumb-up', _('annotation-actions.force-redaction.label'), () => - this.#annotationActionsService.forceAnnotation(null, annotations), + this.#annotationActionsService.forceAnnotation(annotations), ); availableActions.push(forceRedactionButton); } if (permissions.canForceHint) { const forceHintButton = this.#getButton('thumb-up', _('annotation-actions.force-hint.label'), () => - this.#annotationActionsService.forceAnnotation(null, annotations, true), + this.#annotationActionsService.forceAnnotation(annotations, true), ); availableActions.push(forceHintButton); } if (permissions.canRejectSuggestion) { const rejectSuggestionButton = this.#getButton('close', _('annotation-actions.reject-suggestion'), () => - this.#annotationActionsService.rejectSuggestion(null, annotations), + this.#annotationActionsService.rejectSuggestion(annotations), ); availableActions.push(rejectSuggestionButton); } @@ -124,7 +124,7 @@ export class PdfAnnotationActionsService { const removeOrSuggestToRemoveOnlyHereButton = this.#getButton( 'trash', _('annotation-actions.remove-annotation.only-here'), - () => this.#annotationActionsService.removeOrSuggestRemoveAnnotation(null, annotations, false), + () => this.#annotationActionsService.removeOrSuggestRemoveAnnotation(annotations, false), ); availableActions.push(removeOrSuggestToRemoveOnlyHereButton); } diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts index b283a4e07..e3c3c2045 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts @@ -191,7 +191,7 @@ export class PdfProxyService { return; } - this._annotationsActionsService.cancelResize(null, wrapper).then(); + this._annotationsActionsService.cancelResize(wrapper).then(); } #configureAnnotationSpecificActions(viewerAnnotations: Annotation[]) { diff --git a/apps/red-ui/src/app/modules/file-preview/services/skipped.service.ts b/apps/red-ui/src/app/modules/file-preview/services/skipped.service.ts index fa6e81fde..a59e962c9 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/skipped.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/skipped.service.ts @@ -21,9 +21,7 @@ export class SkippedService { return this.#hideSkipped$.value; } - toggleSkipped($event): void { - $event.stopPropagation(); - $event.preventDefault(); + toggleSkipped(): void { this.#hideSkipped$.next(!this.hideSkipped); } diff --git a/apps/red-ui/src/app/modules/pdf-viewer/components/compare-file-input/compare-file-input.component.ts b/apps/red-ui/src/app/modules/pdf-viewer/components/compare-file-input/compare-file-input.component.ts index aaa5c0ad2..1ec58135e 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/components/compare-file-input/compare-file-input.component.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/components/compare-file-input/compare-file-input.component.ts @@ -83,7 +83,6 @@ export class CompareFileInputComponent { #askForConfirmation(fileName: string, currentDocumentPageCount: number, compareDocumentPageCount: number) { const ref: MatDialogRef = this._dialogService.openDialog( 'confirm', - null, new ConfirmationDialogInput({ title: _('confirmation-dialog.compare-file.title'), question: _('confirmation-dialog.compare-file.question'), diff --git a/apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html b/apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html index d4e9ea51f..8c52a91f4 100644 --- a/apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html +++ b/apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html @@ -22,7 +22,7 @@ {{ 'search-screen.missing' | translate }}: {{ term }}. {{ 'search-screen.must-contain' | translate }}: -  {{ term }} diff --git a/apps/red-ui/src/app/modules/search/search.module.ts b/apps/red-ui/src/app/modules/search/search.module.ts index 94862be23..160d2a5bb 100644 --- a/apps/red-ui/src/app/modules/search/search.module.ts +++ b/apps/red-ui/src/app/modules/search/search.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchScreenComponent } from './search-screen/search-screen.component'; import { RouterModule } from '@angular/router'; -import { IqserListingModule, IqserUsersModule, StatusBarComponent } from '@iqser/common-ui'; +import { IqserListingModule, IqserUsersModule, StatusBarComponent, StopPropagationDirective } from '@iqser/common-ui'; import { SharedModule } from '@shared/shared.module'; import { TranslateModule } from '@ngx-translate/core'; import { SearchItemTemplateComponent } from './search-item-template/search-item-template.component'; @@ -19,6 +19,7 @@ const routes = [{ path: '', component: SearchScreenComponent }]; TranslateModule, IqserListingModule, StatusBarComponent, + StopPropagationDirective, ], }) export class SearchModule {} diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html index 6661fb648..dd634a0c5 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -1,6 +1,6 @@
{ - $event.stopPropagation(); + async reanalyseDossier(dossier: Dossier): Promise { await this._reanalysisService.reanalyzeDossier(dossier); } } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index e693b56d4..17ac0c541 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -125,7 +125,7 @@ export class FileActionsComponent implements OnChanges { { id: 'delete-file-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._openDeleteFileDialog($event), + action: () => this._openDeleteFileDialog(), tooltip: _('dossier-overview.delete.action'), icon: 'iqser:trash', show: this.showDelete, @@ -133,7 +133,7 @@ export class FileActionsComponent implements OnChanges { { id: 'assign-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._assign($event), + action: () => this._assign(), tooltip: this.assignTooltip, icon: 'red:assign', show: this.showAssign, @@ -141,7 +141,7 @@ export class FileActionsComponent implements OnChanges { { id: 'assign-to-me-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._assignToMe($event), + action: () => this._assignToMe(), tooltip: _('dossier-overview.assign-me'), icon: 'red:assign-me', show: this.showAssignToSelf, @@ -149,7 +149,7 @@ export class FileActionsComponent implements OnChanges { { id: 'open-import-redactions-dialog-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._openImportRedactionsDialog($event), + action: () => this._openImportRedactionsDialog(), tooltip: _('dossier-overview.import-redactions'), icon: 'red:import_redactions', show: this.showImportRedactions && !this._iqserPermissionsService.has(ROLES.getRss), @@ -188,7 +188,7 @@ export class FileActionsComponent implements OnChanges { { id: 'set-file-to-new-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this.#setToNew($event), + action: () => this.#setToNew(), tooltip: _('dossier-overview.back-to-new'), icon: 'red:undo', show: this.showSetToNew, @@ -196,7 +196,7 @@ export class FileActionsComponent implements OnChanges { { id: 'set-file-under-approval-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._setFileUnderApproval($event), + action: () => this._setFileUnderApproval(), tooltip: _('dossier-overview.under-approval'), icon: 'red:ready-for-approval', show: this.showUnderApproval, @@ -204,7 +204,7 @@ export class FileActionsComponent implements OnChanges { { id: 'set-file-under-review-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._setFileUnderReview($event), + action: () => this._setFileUnderReview(), tooltip: _('dossier-overview.under-review'), icon: 'red:undo', show: this.showUnderReview, @@ -212,7 +212,7 @@ export class FileActionsComponent implements OnChanges { { id: 'set-file-approved-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this.setFileApproved($event), + action: () => this.setFileApproved(), tooltip: this.file.canBeApproved ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'), icon: 'red:approved', disabled: !this.file.canBeApproved, @@ -221,7 +221,7 @@ export class FileActionsComponent implements OnChanges { { id: 'toggle-automatic-analysis-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._toggleAutomaticAnalysis($event), + action: () => this._toggleAutomaticAnalysis(), tooltip: _('dossier-overview.stop-auto-analysis'), icon: 'red:disable-analysis', show: this.canDisableAutoAnalysis, @@ -229,7 +229,7 @@ export class FileActionsComponent implements OnChanges { { id: 'reanalyse-file-preview-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._reanalyseFile($event), + action: () => this._reanalyseFile(), tooltip: _('file-preview.reanalyse-notification'), tooltipClass: 'small', icon: 'iqser:refresh', @@ -239,7 +239,7 @@ export class FileActionsComponent implements OnChanges { { id: 'toggle-automatic-analysis-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._toggleAutomaticAnalysis($event), + action: () => this._toggleAutomaticAnalysis(), tooltip: _('dossier-overview.start-auto-analysis'), buttonType: this.isFilePreview ? CircleButtonTypes.warn : CircleButtonTypes.default, icon: 'red:enable-analysis', @@ -248,7 +248,7 @@ export class FileActionsComponent implements OnChanges { { id: 'set-under-approval-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._setFileUnderApproval($event), + action: () => this._setFileUnderApproval(), tooltip: _('dossier-overview.under-approval'), icon: 'red:undo', show: this.showUndoApproval, @@ -256,7 +256,7 @@ export class FileActionsComponent implements OnChanges { { id: 'ocr-file-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._ocrFile($event), + action: () => this._ocrFile(), tooltip: _('dossier-overview.ocr-file'), icon: 'iqser:ocr', show: this.showOCR, @@ -264,7 +264,7 @@ export class FileActionsComponent implements OnChanges { { id: 'reanalyse-file-btn-' + fileId, type: ActionTypes.circleBtn, - action: ($event: MouseEvent) => this._reanalyseFile($event), + action: () => this._reanalyseFile(), tooltip: _('dossier-overview.reanalyse.action'), icon: 'iqser:refresh', show: this.showReanalyseDossierOverview, @@ -292,8 +292,7 @@ export class FileActionsComponent implements OnChanges { } } - async setFileApproved($event: MouseEvent) { - $event.stopPropagation(); + async setFileApproved() { if (!this.file.analysisRequired && !this.file.hasUpdates) { await this.#setFileApproved(); return; @@ -301,7 +300,6 @@ export class FileActionsComponent implements OnChanges { this._dialogService.openDialog( 'confirm', - $event, new ConfirmationDialogInput({ title: this.file.analysisRequired ? _('confirmation-dialog.approve-file-without-analysis.title') @@ -330,18 +328,17 @@ export class FileActionsComponent implements OnChanges { denyText: _('ocr.confirmation-dialog.cancel'), }); - const ref = this._dialogService.openDialog('confirm', null, data); + const ref = this._dialogService.openDialog('confirm', data); return ref.afterClosed(); } - private _openImportRedactionsDialog($event: MouseEvent) { - this._dialogService.openDialog('importRedactions', $event, { dossierId: this.file.dossierId, fileId: this.file.fileId }); + private _openImportRedactionsDialog() { + this._dialogService.openDialog('importRedactions', { dossierId: this.file.dossierId, fileId: this.file.fileId }); } - private _openDeleteFileDialog($event: MouseEvent) { + private _openDeleteFileDialog() { this._dialogService.openDialog( 'confirm', - $event, new ConfirmationDialogInput({ title: _('confirmation-dialog.delete-file.title'), question: _('confirmation-dialog.delete-file.question'), @@ -360,21 +357,19 @@ export class FileActionsComponent implements OnChanges { ); } - private _assign($event: MouseEvent) { + private _assign() { const files = [this.file]; const targetStatus = this.file.workflowStatus; const withCurrentUserAsDefault = true; const withUnassignedOption = true; - this._dialogService.openDialog('assignFile', $event, { targetStatus, files, withCurrentUserAsDefault, withUnassignedOption }); + this._dialogService.openDialog('assignFile', { targetStatus, files, withCurrentUserAsDefault, withUnassignedOption }); } - private async _assignToMe($event: MouseEvent) { - $event.stopPropagation(); + private async _assignToMe() { await this._fileAssignService.assignToMe([this.file]); } - private async _reanalyseFile($event?: MouseEvent) { - $event?.stopPropagation(); + private async _reanalyseFile() { const params: ReanalyzeQueryParams = { force: true, triggeredByUser: true, @@ -382,20 +377,17 @@ export class FileActionsComponent implements OnChanges { await firstValueFrom(this._reanalysisService.reanalyzeFilesForDossier([this.file], this.file.dossierId, params)); } - private async _toggleAutomaticAnalysis($event: MouseEvent) { - $event.stopPropagation(); + private async _toggleAutomaticAnalysis() { this._loadingService.start(); await firstValueFrom(this._reanalysisService.toggleAutomaticAnalysis(this.file.dossierId, [this.file])); this._loadingService.stop(); } - private async _setFileUnderApproval($event: MouseEvent) { - $event.stopPropagation(); - await this._fileAssignService.assignApprover($event, this.file, true); + private async _setFileUnderApproval() { + await this._fileAssignService.assignApprover(this.file, true); } - private async _ocrFile($event: MouseEvent) { - $event.stopPropagation(); + private async _ocrFile() { if (this.file.lastManualChangeDate) { const confirm = await firstValueFrom(this.#showOCRConfirmationDialog()); if (!confirm) { @@ -413,8 +405,8 @@ export class FileActionsComponent implements OnChanges { this._loadingService.stop(); } - private async _setFileUnderReview($event: MouseEvent) { - await this._fileAssignService.assignReviewer($event, this.file, true); + private async _setFileUnderReview() { + await this._fileAssignService.assignReviewer(this.file, true); } private async _toggleAnalysis() { @@ -475,8 +467,7 @@ export class FileActionsComponent implements OnChanges { this._loadingService.stop(); } - async #setToNew($event: MouseEvent) { - $event.stopPropagation(); + async #setToNew() { this._loadingService.start(); await this._filesService.setToNew(this.file); this._loadingService.stop(); diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts index 63a7e45e7..32660e26c 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts @@ -74,7 +74,7 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa openEditDetailsDialog(): void { const data = { dictionary: this.dossierDictionary, dossierId: this.dossier.id, readOnly: !this.canEdit }; - this._dialogService.openDialog('editDictionaryDetails', null, data, async () => { + this._dialogService.openDialog('editDictionaryDetails', data, async () => { await this._updateDossierDictionary(); }); } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html index b4d769083..2ed9ecb93 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html @@ -62,9 +62,10 @@
{ + this._dialogService.openDialog('confirm', data, async () => { this._loadingService.start(); await firstValueFrom(this._trashService.deleteDossier(this.dossier)); this._editDossierDialogRef.close(); @@ -165,7 +165,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti checkboxes: [{ value: false, label: _('confirm-archive-dossier.checkbox.documents') }], toastMessage: _('confirm-archive-dossier.toast-error'), }); - this._dialogService.openDialog('confirm', null, data, async result => { + this._dialogService.openDialog('confirm', data, async result => { if (result === ConfirmOptions.CONFIRM) { this._loadingService.start(); await firstValueFrom(this._archivedDossiersService.archive([this.dossier])); diff --git a/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts b/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts index c378a33a0..c08092eae 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts @@ -40,24 +40,22 @@ export class FileAssignService { ? _('confirmation-dialog.assign-file-to-me.question.single') : _('confirmation-dialog.assign-file-to-me.question.multiple'), }); - const ref = this._dialogService.openDialog('confirm', null, dialogInput, assignReq); + const ref = this._dialogService.openDialog('confirm', dialogInput, assignReq); return firstValueFrom(ref.afterClosed()); } return assignReq(); } - async assignReviewer($event: MouseEvent, file: File, ignoreChanged = false): Promise { - await this._assignFile(WorkflowFileStatuses.UNDER_REVIEW, $event, file, ignoreChanged); + async assignReviewer(file: File, ignoreChanged = false): Promise { + await this._assignFile(WorkflowFileStatuses.UNDER_REVIEW, file, ignoreChanged); } - async assignApprover($event: MouseEvent, file: File, ignoreChanged = false): Promise { - await this._assignFile(WorkflowFileStatuses.UNDER_APPROVAL, $event, file, ignoreChanged); + async assignApprover(file: File, ignoreChanged = false): Promise { + await this._assignFile(WorkflowFileStatuses.UNDER_APPROVAL, file, ignoreChanged); } - private async _assignFile(targetStatus: WorkflowFileStatus, $event: MouseEvent, file: File, ignoreChanged = false): Promise { - $event?.stopPropagation(); - + private async _assignFile(targetStatus: WorkflowFileStatus, file: File, ignoreChanged = false): Promise { const currentUserId = this.currentUser.id; const currentDossier = this._activeDossiersService.find(file.dossierId); const eligibleUsersIds = this._getUserIds(targetStatus, currentDossier); @@ -71,14 +69,14 @@ export class FileAssignService { await this._makeAssignFileRequest(eligibleUsersIds[0], targetStatus, [file]); } else { const data = { targetStatus, files: [file], ignoreChanged }; - this._dialogService.openDialog('assignFile', null, data); + this._dialogService.openDialog('assignFile', data); } } else { if (eligibleUsersIds.length === 1) { await this._makeAssignFileRequest(eligibleUsersIds[0], targetStatus, [file]); } else { const data = { targetStatus, files: [file], ignoreChanged, withCurrentUserAsDefault: true }; - this._dialogService.openDialog('assignFile', null, data); + this._dialogService.openDialog('assignFile', data); } } } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts index e4538aff3..4d588cdd8 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -24,6 +24,7 @@ import { SideNavComponent, SmallChipComponent, StatusBarComponent, + StopPropagationDirective, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingActionsComponent } from './components/dossiers-listing-actions/dossiers-listing-actions.component'; @@ -61,6 +62,7 @@ const services = [FileAssignService]; SmallChipComponent, StatusBarComponent, SideNavComponent, + StopPropagationDirective, ], }) export class SharedDossiersModule {} diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html index ffeba8738..2df56956c 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html +++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html @@ -1,5 +1,5 @@ (DownloadDialogComponent, { ...defaultDialogConfig, data: { dossier: this.dossier, files: this.files }, diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html index 39f50ccd1..65c3a6068 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html @@ -29,7 +29,6 @@
diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts index 62f6e255f..abf7722c2 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts @@ -70,7 +70,7 @@ export class ExpandableFileActionsComponent implements OnChanges { // Patch download button const downloadBtn = this.actions.find(btn => btn.type === ActionTypes.downloadBtn); if (downloadBtn) { - downloadBtn.action = ($event: MouseEvent) => this._downloadFiles($event, downloadBtn.files, downloadBtn.dossier); + downloadBtn.action = () => this._downloadFiles(downloadBtn.files, downloadBtn.dossier); downloadBtn.disabled = !this._permissionsService.canDownloadFiles(downloadBtn.files, downloadBtn.dossier); } } @@ -81,8 +81,8 @@ export class ExpandableFileActionsComponent implements OnChanges { this.matMenu.closeMenu(); } - private async _downloadFiles($event: MouseEvent, files: File[], dossier: Dossier) { - $event.stopPropagation(); + // TODO: this doesn't look like its called + private async _downloadFiles(files: File[], dossier: Dossier) { const ref = this._dialog.open(DownloadDialogComponent, { ...defaultDialogConfig, data: { dossier, files }, diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.html b/apps/red-ui/src/app/modules/shared/components/select/select.component.html index fc01a781b..ebdd68eaf 100644 --- a/apps/red-ui/src/app/modules/shared/components/select/select.component.html +++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.html @@ -1,11 +1,18 @@
{{ label }}
-
+
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts index 89a498516..58c32dd71 100644 --- a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts @@ -85,8 +85,7 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor { this.disabled = isDisabled; } - selectAll($event) { - $event.stopPropagation(); + selectAll() { this.chipList._chips.forEach(chip => { if (!chip.selected) { chip.toggleSelected(true); @@ -94,8 +93,7 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor { }); } - deselectAll($event?) { - $event?.stopPropagation(); + deselectAll() { this.chipList._chips.forEach(chip => { if (chip.selected) { chip.toggleSelected(true); diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.ts b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.ts index f558da526..0cb3ffa41 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.ts @@ -51,6 +51,6 @@ export class TeamMembersComponent { openEditDossierDialog(): void { const data = { dossierId: this.dossierId, section: 'members' }; - this._dialogService.openDialog('editDossier', null, data); + this._dialogService.openDialog('editDossier', data); } } diff --git a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 9ef2c57f5..fb048bf13 100644 --- a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -84,7 +84,7 @@ export class AddDossierDialogComponent extends BaseDialogComponent implements On if (savedDossier) { await this._router.navigate([savedDossier.routerLink]); if (options?.addMembers) { - this._dialogService.openDialog('editDossier', null, { + this._dialogService.openDialog('editDossier', { dossierId: savedDossier.id, section: 'members', }); 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 c423823d2..c36db9458 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -16,6 +16,7 @@ import { IqserScrollbarModule, IqserUsersModule, SmallChipComponent, + StopPropagationDirective, } from '@iqser/common-ui'; import { SelectComponent } from './components/select/select.component'; import { NavigateLastDossiersScreenDirective } from './directives/navigate-last-dossiers-screen.directive'; @@ -95,6 +96,7 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; CircleButtonComponent, IconButtonComponent, SmallChipComponent, + StopPropagationDirective, ], exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone], providers: [ diff --git a/apps/red-ui/src/app/modules/trash/services/trash-dialog.service.ts b/apps/red-ui/src/app/modules/trash/services/trash-dialog.service.ts index 9ef73d9d6..f325f5636 100644 --- a/apps/red-ui/src/app/modules/trash/services/trash-dialog.service.ts +++ b/apps/red-ui/src/app/modules/trash/services/trash-dialog.service.ts @@ -41,7 +41,8 @@ export class TrashDialogService extends DialogService { itemsCount: items.length, }, }); - this.openDialog('confirm', null, data, async () => { + + this.openDialog('confirm', data, async () => { this._loadingService.start(); await firstValueFrom(this._trashService.hardDelete(items)); this._loadingService.stop(); diff --git a/libs/common-ui b/libs/common-ui index 655874989..a2e40583e 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 655874989bafa3b7017ceb94e1088c7f9fddd0a5 +Subproject commit a2e40583e3b3f731cee202bd621545994a87ff7f From fbce1df248edb0809e041a62aab1bd996a67b4f7 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sat, 18 Mar 2023 01:20:14 +0100 Subject: [PATCH 56/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3442 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f4fa1d0cb..0502ac906 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.11.0", + "version": "4.12.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 8b0d5f4bba1de712e9140863d18544feb963967b..9dc8f3d7448d8ecf1e471bf975deea8f71c02534 100644 GIT binary patch delta 3325 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 Date: Sun, 19 Mar 2023 12:06:25 +0200 Subject: [PATCH 57/99] RED-3800: make inputs standalone --- apps/red-ui/src/app/app.module.ts | 4 ++++ .../red-ui/src/app/modules/admin/admin.module.ts | 14 ++++++++++---- .../dossier-templates-listing.module.ts | 4 ++-- .../admin/screens/entities/entities.module.ts | 4 ++-- .../screens/info/dossier-template-info.module.ts | 4 ++-- .../justifications/justifications.module.ts | 4 ++-- .../admin/screens/reports/reports.module.ts | 4 ++-- .../admin/screens/watermark/watermark.module.ts | 4 ++-- .../dossier-overview/dossier-overview.module.ts | 8 ++++---- .../dossiers-listing/dossiers-listing.module.ts | 4 ++-- .../document-info-dialog.component.html | 9 ++++----- .../modules/file-preview/file-preview.module.ts | 16 ++++++++++++---- .../edit-dossier-attributes.component.html | 5 ++--- .../shared-dossiers/shared-dossiers.module.ts | 12 ++++++++---- .../src/app/modules/shared/shared.module.ts | 4 ++-- .../file-upload-download.module.ts | 12 ++++++++++-- libs/common-ui | 2 +- 17 files changed, 71 insertions(+), 43 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 347ef2b86..783877a51 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -13,6 +13,7 @@ import { CommonUiModule, EmptyStateComponent, HiddenActionDirective, + InputWithActionComponent, IqserHelpModeModule, IqserLoadingModule, IqserPermissionsModule, @@ -22,6 +23,7 @@ import { LanguageService, LogoComponent, MAX_RETRIES_ON_SERVER_ERROR, + RoundCheckboxComponent, SERVER_ERROR_SKIP_PATHS, ServerErrorInterceptor, SkeletonComponent, @@ -163,6 +165,8 @@ export const appModuleFactory = (config: AppConfig) => { LogoComponent, HiddenActionDirective, StopPropagationDirective, + InputWithActionComponent, + RoundCheckboxComponent, ], providers: [ { diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index c054923e9..08845970a 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -44,16 +44,19 @@ import { KmsSignatureConfigurationComponent } from './dialogs/configure-digital- import { ChevronButtonComponent, CircleButtonComponent, + DetailsRadioComponent, + EditableInputComponent, EmptyStateComponent, + HasScrollbarDirective, HumanizePipe, IconButtonComponent, + InputWithActionComponent, IqserHelpModeModule, - IqserInputsModule, IqserListingModule, IqserPermissionsModule, - IqserScrollbarModule, IqserUploadFileModule, IqserUsersModule, + RoundCheckboxComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { AuditInfoDialogComponent } from './dialogs/audit-info-dialog/audit-info-dialog.component'; @@ -115,8 +118,6 @@ const components = [ TranslateModule, HumanizePipe, IqserListingModule, - IqserScrollbarModule, - IqserInputsModule, IqserUploadFileModule, IqserHelpModeModule, IqserPermissionsModule, @@ -127,6 +128,11 @@ const components = [ CircleButtonComponent, ChevronButtonComponent, EmptyStateComponent, + HasScrollbarDirective, + RoundCheckboxComponent, + InputWithActionComponent, + EditableInputComponent, + DetailsRadioComponent, ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts index 82f18874d..acec7996e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts @@ -7,8 +7,8 @@ import { DossierTemplatesListingScreenComponent } from './dossier-templates-list import { CircleButtonComponent, IconButtonComponent, + InputWithActionComponent, IqserHelpModeModule, - IqserInputsModule, IqserListingModule, IqserPermissionsModule, IqserUsersModule, @@ -26,13 +26,13 @@ const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }] SharedModule, IqserUsersModule, TranslateModule, - IqserInputsModule, IqserListingModule, IqserHelpModeModule, IqserPermissionsModule, DossierTemplateActionsComponent, CircleButtonComponent, IconButtonComponent, + InputWithActionComponent, ], }) export class DossierTemplatesListingModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts index ca43a2617..28f7cba75 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts @@ -7,7 +7,7 @@ import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { EntityInfoComponent } from './screens/entity-info/entity-info.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { TranslateModule } from '@ngx-translate/core'; -import { IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; +import { HasScrollbarDirective, IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; const routes: Routes = [ { path: '', redirectTo: 'info', pathMatch: 'full' }, @@ -41,10 +41,10 @@ const routes: Routes = [ SharedModule, MonacoEditorModule, TranslateModule, - IqserScrollbarModule, IqserHelpModeModule, IqserPermissionsModule, IconButtonComponent, + HasScrollbarDirective, ], }) export class EntitiesModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts index fc4f7af02..f4ad7c25d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { DossierTemplateInfoScreenComponent } from './info-screen/dossier-template-info-screen.component'; import { RouterModule } from '@angular/router'; import { SharedModule } from '@shared/shared.module'; -import { IqserHelpModeModule, IqserScrollbarModule, IqserUsersModule } from '@iqser/common-ui'; +import { HasScrollbarDirective, IqserHelpModeModule, IqserUsersModule } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }]; @@ -16,8 +16,8 @@ const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }]; SharedModule, IqserUsersModule, TranslateModule, - IqserScrollbarModule, IqserHelpModeModule, + HasScrollbarDirective, ], }) export class DossierTemplateInfoModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts index 91f85d329..a831eca7d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts @@ -7,7 +7,7 @@ import { TableItemComponent } from './table-item/table-item.component'; import { JustificationsDialogService } from './justifications-dialog.service'; import { AddEditJustificationDialogComponent } from './add-edit-justification-dialog/add-edit-justification-dialog.component'; import { TranslateModule } from '@ngx-translate/core'; -import { CircleButtonComponent, IconButtonComponent, IqserListingModule, IqserScrollbarModule } from '@iqser/common-ui'; +import { CircleButtonComponent, HasScrollbarDirective, IconButtonComponent, IqserListingModule } from '@iqser/common-ui'; const routes = [{ path: '', component: JustificationsScreenComponent }]; @@ -21,7 +21,7 @@ const routes = [{ path: '', component: JustificationsScreenComponent }]; IqserListingModule, IconButtonComponent, CircleButtonComponent, - IqserScrollbarModule, + HasScrollbarDirective, ], providers: [JustificationsDialogService], }) diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts index 437cdf0ac..7d0cf0bb4 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { ReportsScreenComponent } from './reports-screen/reports-screen.component'; import { TranslateModule } from '@ngx-translate/core'; -import { CircleButtonComponent, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; +import { CircleButtonComponent, HasScrollbarDirective, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; const routes = [{ path: '', component: ReportsScreenComponent }]; @@ -13,10 +13,10 @@ const routes = [{ path: '', component: ReportsScreenComponent }]; RouterModule.forChild(routes), CommonModule, TranslateModule, - IqserScrollbarModule, IqserHelpModeModule, IqserPermissionsModule, CircleButtonComponent, + HasScrollbarDirective, ], }) export class ReportsModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts index fd6827ae1..378bd04dc 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts @@ -6,12 +6,12 @@ import { WatermarksListingScreenComponent } from './watermarks-listing/watermark import { CircleButtonComponent, CompositeRouteGuard, + HasScrollbarDirective, IconButtonComponent, IqserAuthGuard, IqserHelpModeModule, IqserListingModule, IqserPermissionsModule, - IqserScrollbarModule, IqserUsersModule, } from '@iqser/common-ui'; import { RedRoleGuard } from '@users/red-role.guard'; @@ -60,7 +60,6 @@ const routes = [ IqserUsersModule, TranslateModule, IqserListingModule, - IqserScrollbarModule, IqserHelpModeModule, IqserPermissionsModule, MatIconModule, @@ -70,6 +69,7 @@ const routes = [ ColorPickerModule, MatLegacySlideToggleModule, CircleButtonComponent, + HasScrollbarDirective, ], }) export class WatermarkModule {} diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 1be5feb5f..e5118465f 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -3,12 +3,12 @@ import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; import { CircleButtonComponent, + DynamicInputComponent, + HasScrollbarDirective, IqserHelpModeModule, - IqserInputsModule, IqserListingModule, IqserLoadingModule, IqserPermissionsModule, - IqserScrollbarModule, IqserUsersModule, StatusBarComponent, StopPropagationDirective, @@ -60,13 +60,13 @@ const routes: Routes = [ IqserUsersModule, IqserListingModule, IqserLoadingModule, - IqserScrollbarModule, IqserPermissionsModule, - IqserInputsModule, SharedModule, CircleButtonComponent, StatusBarComponent, StopPropagationDirective, + HasScrollbarDirective, + DynamicInputComponent, ], }) export class DossierOverviewModule {} diff --git a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts index 51e67e566..d04138d48 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts @@ -2,10 +2,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CompositeRouteGuard, + HasScrollbarDirective, IqserHelpModeModule, IqserListingModule, IqserPermissionsModule, - IqserScrollbarModule, IqserUsersModule, StatusBarComponent, } from '@iqser/common-ui'; @@ -50,9 +50,9 @@ const routes: Routes = [ IqserHelpModeModule, IqserUsersModule, IqserListingModule, - IqserScrollbarModule, IqserPermissionsModule, StatusBarComponent, + HasScrollbarDirective, ], }) export class DossiersListingModule {} diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html index 51a1f6d89..9848ee289 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html @@ -5,29 +5,28 @@
- + >
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 61bc007a8..6fa629b1c 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 @@ -3,16 +3,20 @@ import { CommonModule } from '@angular/common'; import { CapitalizePipe, CircleButtonComponent, + DetailsRadioComponent, + DynamicInputComponent, + EditableInputComponent, EmptyStateComponent, + HasScrollbarDirective, IconButtonComponent, + InputWithActionComponent, IqserFiltersModule, IqserHelpModeModule, - IqserInputsModule, IqserPermissionsModule, - IqserScrollbarModule, IqserUploadFileModule, IqserUsersModule, PreventDefaultDirective, + RoundCheckboxComponent, StatusBarComponent, StopPropagationDirective, } from '@iqser/common-ui'; @@ -115,10 +119,8 @@ const components = [ IqserHelpModeModule, IqserUsersModule, CapitalizePipe, - IqserInputsModule, IqserUploadFileModule, IqserFiltersModule, - IqserScrollbarModule, IqserPermissionsModule, SharedModule, CircleButtonComponent, @@ -128,6 +130,12 @@ const components = [ StatusBarComponent, StopPropagationDirective, PreventDefaultDirective, + HasScrollbarDirective, + EditableInputComponent, + DetailsRadioComponent, + DynamicInputComponent, + InputWithActionComponent, + RoundCheckboxComponent, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard, SuggestionsService], }) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html index 5595207f9..508eac389 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html @@ -12,13 +12,12 @@ - + >
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts index 4d588cdd8..cb9ab3626 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -14,13 +14,15 @@ import { FileAssignService } from './services/file-assign.service'; import { DictionaryDetailsDialogComponent } from './dialogs/edit-dossier-dialog/dictionary/dictionary-details-dialog/dictionary-details-dialog.component'; import { CircleButtonComponent, + DynamicInputComponent, EmptyStateComponent, + HasScrollbarDirective, IconButtonComponent, + InputWithActionComponent, IqserHelpModeModule, - IqserInputsModule, IqserPermissionsModule, - IqserScrollbarModule, IqserUsersModule, + RoundCheckboxComponent, SideNavComponent, SmallChipComponent, StatusBarComponent, @@ -53,8 +55,6 @@ const services = [FileAssignService]; IqserHelpModeModule, IqserUsersModule, TranslateModule, - IqserInputsModule, - IqserScrollbarModule, IqserPermissionsModule, IconButtonComponent, CircleButtonComponent, @@ -63,6 +63,10 @@ const services = [FileAssignService]; StatusBarComponent, SideNavComponent, StopPropagationDirective, + HasScrollbarDirective, + RoundCheckboxComponent, + InputWithActionComponent, + DynamicInputComponent, ], }) export class SharedDossiersModule {} 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 c36db9458..b85d04404 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -10,10 +10,10 @@ import { AnnotationIconComponent } from './components/annotation-icon/annotation import { DonutChartComponent } from './components/donut-chart/donut-chart.component'; import { CircleButtonComponent, + HasScrollbarDirective, IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule, - IqserScrollbarModule, IqserUsersModule, SmallChipComponent, StopPropagationDirective, @@ -90,13 +90,13 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; RouterModule, IqserHelpModeModule, IqserUsersModule, - IqserScrollbarModule, IqserPermissionsModule, ...deleteThisWhenAllComponentsAreStandalone, CircleButtonComponent, IconButtonComponent, SmallChipComponent, StopPropagationDirective, + HasScrollbarDirective, ], exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone], providers: [ diff --git a/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts b/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts index 7d703bde9..cd38be314 100644 --- a/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts +++ b/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts @@ -11,10 +11,18 @@ import { StatusOverlayService } from './services/status-overlay.service'; import { FileDropOverlayService } from './services/file-drop-overlay.service'; import { UploadDownloadDialogService } from './services/upload-download-dialog.service'; import { TranslateModule } from '@ngx-translate/core'; -import { CircleButtonComponent, IconButtonComponent, IqserInputsModule } from '@iqser/common-ui'; +import { CircleButtonComponent, DetailsRadioComponent, IconButtonComponent } from '@iqser/common-ui'; @NgModule({ - imports: [CommonModule, SharedModule, OverlayModule, TranslateModule, IqserInputsModule, CircleButtonComponent, IconButtonComponent], + imports: [ + CommonModule, + SharedModule, + OverlayModule, + TranslateModule, + CircleButtonComponent, + IconButtonComponent, + DetailsRadioComponent, + ], declarations: [FileDropComponent, UploadStatusOverlayComponent, OverwriteFilesDialogComponent], providers: [UploadDownloadDialogService, FileUploadService, FileDownloadService, StatusOverlayService, FileDropOverlayService], exports: [FileDropComponent, UploadStatusOverlayComponent], diff --git a/libs/common-ui b/libs/common-ui index a2e40583e..c9c2f3e0f 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit a2e40583e3b3f731cee202bd621545994a87ff7f +Subproject commit c9c2f3e0f978eb819e0890d49da503d4d878484b From e45ec9813d3594d10de526650222fa08957f4c11 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sun, 19 Mar 2023 15:00:35 +0200 Subject: [PATCH 58/99] RED-3800: update jest & some directives --- .eslintignore | 7 + .prettierignore | 4 +- apps/red-ui/jest.config.ts | 25 +++ apps/red-ui/src/app/app.module.ts | 6 +- .../src/app/modules/admin/admin.module.ts | 6 +- .../dossier-templates-listing.module.ts | 7 +- .../admin/screens/entities/entities.module.ts | 4 +- .../admin/screens/reports/reports.module.ts | 6 +- .../screens/watermark/watermark.module.ts | 7 +- .../src/app/modules/archive/archive.module.ts | 8 +- .../app/modules/dashboard/dashboard.module.ts | 14 +- .../dossier-overview.module.ts | 9 +- .../dossiers-listing.module.ts | 7 +- .../file-preview/file-preview.module.ts | 11 +- .../shared-dossiers/shared-dossiers.module.ts | 9 +- .../src/app/modules/shared/shared.module.ts | 6 +- jest.config.ts | 5 + jest.preset.js | 3 + libs/common-ui | 2 +- package.json | 17 +- tsconfig.spec.json | 4 +- yarn.lock | 208 ++++++++++++++++++ 22 files changed, 306 insertions(+), 69 deletions(-) create mode 100644 .eslintignore create mode 100644 apps/red-ui/jest.config.ts create mode 100644 jest.config.ts create mode 100644 jest.preset.js diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..c194ecc1a --- /dev/null +++ b/.eslintignore @@ -0,0 +1,7 @@ +.angular +.dev +.husky +dist +coverage +node_modules +bamboo-specs diff --git a/.prettierignore b/.prettierignore index 81d117d52..b8ec6a7f0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,7 @@ # Add files here to ignore them from prettier formatting - +/.angular +/.dev +/.husky /dist /coverage /node_modules diff --git a/apps/red-ui/jest.config.ts b/apps/red-ui/jest.config.ts new file mode 100644 index 000000000..fa9e1b508 --- /dev/null +++ b/apps/red-ui/jest.config.ts @@ -0,0 +1,25 @@ +import type { Config } from 'jest'; + +const config: Config = { + displayName: 'red-ui', + preset: '../../jest.preset.js', + setupFilesAfterEnv: ['jest-preset-angular/setup-jest.js', 'jest-extended/all'], + coverageDirectory: '../../coverage/apps/angular-jest', + transform: { + '^.+\\.(ts|mjs|js|html)$': [ + 'jest-preset-angular', + { + tsconfig: '../../tsconfig.spec.json', + stringifyContentPathRegex: '\\.(html|svg)$', + }, + ], + }, + transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], + snapshotSerializers: [ + 'jest-preset-angular/build/serializers/no-ng-attributes', + 'jest-preset-angular/build/serializers/ng-snapshot', + 'jest-preset-angular/build/serializers/html-comment', + ], +}; + +export default config; diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 783877a51..08368aca3 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -14,9 +14,10 @@ import { EmptyStateComponent, HiddenActionDirective, InputWithActionComponent, + IqserAllowDirective, + IqserDenyDirective, IqserHelpModeModule, IqserLoadingModule, - IqserPermissionsModule, IqserPermissionsService, IqserTranslateModule, IqserUsersModule, @@ -120,7 +121,6 @@ export const appModuleFactory = (config: AppConfig) => { }), IqserTranslateModule.forRoot({ pathPrefix: config.BASE_TRANSLATIONS_DIRECTORY || '/assets/i18n/redact/' }), IqserLoadingModule.forRoot(), - IqserPermissionsModule.forRoot(), ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }), LoggerModule.forRoot(undefined, { ruleProvider: { @@ -167,6 +167,8 @@ export const appModuleFactory = (config: AppConfig) => { StopPropagationDirective, InputWithActionComponent, RoundCheckboxComponent, + IqserAllowDirective, + IqserDenyDirective, ], providers: [ { diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 08845970a..215a8529b 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -51,9 +51,10 @@ import { HumanizePipe, IconButtonComponent, InputWithActionComponent, + IqserAllowDirective, + IqserDenyDirective, IqserHelpModeModule, IqserListingModule, - IqserPermissionsModule, IqserUploadFileModule, IqserUsersModule, RoundCheckboxComponent, @@ -120,7 +121,6 @@ const components = [ IqserListingModule, IqserUploadFileModule, IqserHelpModeModule, - IqserPermissionsModule, AdminSideNavComponent, DossierTemplateActionsComponent, DossierTemplateBreadcrumbsComponent, @@ -133,6 +133,8 @@ const components = [ InputWithActionComponent, EditableInputComponent, DetailsRadioComponent, + IqserAllowDirective, + IqserDenyDirective, ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts index acec7996e..5334b90e3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts @@ -8,15 +8,16 @@ import { CircleButtonComponent, IconButtonComponent, InputWithActionComponent, + IqserAllowDirective, IqserHelpModeModule, IqserListingModule, - IqserPermissionsModule, + IqserRoutes, IqserUsersModule, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossierTemplateActionsComponent } from '../../shared/components/dossier-template-actions/dossier-template-actions.component'; -const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }]; +const routes: IqserRoutes = [{ path: '', component: DossierTemplatesListingScreenComponent }]; @NgModule({ declarations: [TableItemComponent, DossierTemplatesListingScreenComponent], @@ -28,11 +29,11 @@ const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }] TranslateModule, IqserListingModule, IqserHelpModeModule, - IqserPermissionsModule, DossierTemplateActionsComponent, CircleButtonComponent, IconButtonComponent, InputWithActionComponent, + IqserAllowDirective, ], }) export class DossierTemplatesListingModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts index 28f7cba75..5eeddef83 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts @@ -7,7 +7,7 @@ import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { EntityInfoComponent } from './screens/entity-info/entity-info.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { TranslateModule } from '@ngx-translate/core'; -import { HasScrollbarDirective, IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; +import { HasScrollbarDirective, IconButtonComponent, IqserDenyDirective, IqserHelpModeModule } from '@iqser/common-ui'; const routes: Routes = [ { path: '', redirectTo: 'info', pathMatch: 'full' }, @@ -42,9 +42,9 @@ const routes: Routes = [ MonacoEditorModule, TranslateModule, IqserHelpModeModule, - IqserPermissionsModule, IconButtonComponent, HasScrollbarDirective, + IqserDenyDirective, ], }) export class EntitiesModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts index 7d0cf0bb4..9175eae4b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts @@ -3,9 +3,9 @@ import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { ReportsScreenComponent } from './reports-screen/reports-screen.component'; import { TranslateModule } from '@ngx-translate/core'; -import { CircleButtonComponent, HasScrollbarDirective, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; +import { CircleButtonComponent, HasScrollbarDirective, IqserAllowDirective, IqserHelpModeModule, IqserRoutes } from '@iqser/common-ui'; -const routes = [{ path: '', component: ReportsScreenComponent }]; +const routes: IqserRoutes = [{ path: '', component: ReportsScreenComponent }]; @NgModule({ declarations: [ReportsScreenComponent], @@ -14,9 +14,9 @@ const routes = [{ path: '', component: ReportsScreenComponent }]; CommonModule, TranslateModule, IqserHelpModeModule, - IqserPermissionsModule, CircleButtonComponent, HasScrollbarDirective, + IqserAllowDirective, ], }) export class ReportsModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts index 378bd04dc..9bd69ecab 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts @@ -8,10 +8,11 @@ import { CompositeRouteGuard, HasScrollbarDirective, IconButtonComponent, + IqserAllowDirective, IqserAuthGuard, IqserHelpModeModule, IqserListingModule, - IqserPermissionsModule, + IqserRoutes, IqserUsersModule, } from '@iqser/common-ui'; import { RedRoleGuard } from '@users/red-role.guard'; @@ -25,7 +26,7 @@ import { MatLegacySliderModule } from '@angular/material/legacy-slider'; import { ColorPickerModule } from 'ngx-color-picker'; import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; -const routes = [ +const routes: IqserRoutes = [ { path: '', component: WatermarksListingScreenComponent, @@ -61,7 +62,6 @@ const routes = [ TranslateModule, IqserListingModule, IqserHelpModeModule, - IqserPermissionsModule, MatIconModule, IconButtonComponent, ReactiveFormsModule, @@ -70,6 +70,7 @@ const routes = [ MatLegacySlideToggleModule, CircleButtonComponent, HasScrollbarDirective, + IqserAllowDirective, ], }) export class WatermarkModule {} diff --git a/apps/red-ui/src/app/modules/archive/archive.module.ts b/apps/red-ui/src/app/modules/archive/archive.module.ts index 7fe6e071a..32f4c7725 100644 --- a/apps/red-ui/src/app/modules/archive/archive.module.ts +++ b/apps/red-ui/src/app/modules/archive/archive.module.ts @@ -4,16 +4,13 @@ import { ArchivedDossiersScreenComponent } from './screens/archived-dossiers-scr import { ArchiveRoutingModule } from './archive-routing.module'; import { TableItemComponent } from './components/table-item/table-item.component'; import { ConfigService } from './services/config.service'; -import { IqserHelpModeModule, IqserListingModule, IqserPermissionsModule, IqserUsersModule } from '@iqser/common-ui'; +import { IqserHelpModeModule, IqserListingModule, IqserUsersModule } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { SharedModule } from '@shared/shared.module'; import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; -const components = [TableItemComponent]; -const screens = [ArchivedDossiersScreenComponent]; - @NgModule({ - declarations: [...components, ...screens], + declarations: [TableItemComponent, ArchivedDossiersScreenComponent], imports: [ CommonModule, ArchiveRoutingModule, @@ -21,7 +18,6 @@ const screens = [ArchivedDossiersScreenComponent]; IqserUsersModule, TranslateModule, IqserListingModule, - IqserPermissionsModule, SharedModule, SharedDossiersModule, ], diff --git a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts index 8bc4f730f..c89c1929b 100644 --- a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts +++ b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts @@ -6,9 +6,9 @@ import { SharedModule } from '@shared/shared.module'; import { TemplateStatsComponent } from './components/template-stats/template-stats.component'; import { BreadcrumbTypes } from '@red/domain'; import { TranslateModule } from '@ngx-translate/core'; -import { IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, IqserRoutes } from '@iqser/common-ui'; -const routes = [ +const routes: IqserRoutes = [ { path: '', component: DashboardScreenComponent, @@ -20,14 +20,6 @@ const routes = [ @NgModule({ declarations: [DashboardScreenComponent, TemplateStatsComponent], - imports: [ - RouterModule.forChild(routes), - CommonModule, - SharedModule, - TranslateModule, - IqserHelpModeModule, - IqserPermissionsModule, - IconButtonComponent, - ], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule, IqserHelpModeModule, IconButtonComponent], }) export class DashboardModule {} diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index e5118465f..8f23b68c9 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -1,14 +1,15 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { RouterModule, Routes } from '@angular/router'; +import { RouterModule } from '@angular/router'; import { CircleButtonComponent, DynamicInputComponent, HasScrollbarDirective, + IqserAllowDirective, IqserHelpModeModule, IqserListingModule, IqserLoadingModule, - IqserPermissionsModule, + IqserRoutes, IqserUsersModule, StatusBarComponent, StopPropagationDirective, @@ -27,7 +28,7 @@ import { ViewModeSelectionComponent } from './components/view-mode-selection/vie import { FileAttributeComponent } from './components/table-item/file-attribute/file-attribute.component'; import { SharedModule } from '@shared/shared.module'; -const routes: Routes = [ +const routes: IqserRoutes = [ { path: '', component: DossierOverviewScreenComponent, @@ -60,13 +61,13 @@ const routes: Routes = [ IqserUsersModule, IqserListingModule, IqserLoadingModule, - IqserPermissionsModule, SharedModule, CircleButtonComponent, StatusBarComponent, StopPropagationDirective, HasScrollbarDirective, DynamicInputComponent, + IqserAllowDirective, ], }) export class DossierOverviewModule {} diff --git a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts index d04138d48..5033d8fe1 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts @@ -5,13 +5,13 @@ import { HasScrollbarDirective, IqserHelpModeModule, IqserListingModule, - IqserPermissionsModule, + IqserRoutes, IqserUsersModule, StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingScreenComponent } from './screen/dossiers-listing-screen.component'; -import { RouterModule, Routes } from '@angular/router'; +import { RouterModule } from '@angular/router'; import { SharedModule } from '@shared/shared.module'; import { DossiersListingDetailsComponent } from './components/dossiers-listing-details/dossiers-listing-details.component'; import { ConfigService } from './config.service'; @@ -22,7 +22,7 @@ import { DossierDocumentsStatusComponent } from './components/dossier-documents- import { DossierFilesGuard } from '@guards/dossier-files-guard'; import { ACTIVE_DOSSIERS_SERVICE } from '../../tokens'; -const routes: Routes = [ +const routes: IqserRoutes = [ { path: '', component: DossiersListingScreenComponent, @@ -50,7 +50,6 @@ const routes: Routes = [ IqserHelpModeModule, IqserUsersModule, IqserListingModule, - IqserPermissionsModule, StatusBarComponent, HasScrollbarDirective, ], 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 6fa629b1c..ab604c7af 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 @@ -10,9 +10,11 @@ import { HasScrollbarDirective, IconButtonComponent, InputWithActionComponent, + IqserAllowDirective, + IqserDenyDirective, IqserFiltersModule, IqserHelpModeModule, - IqserPermissionsModule, + IqserRoutes, IqserUploadFileModule, IqserUsersModule, PreventDefaultDirective, @@ -21,7 +23,7 @@ import { StopPropagationDirective, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; -import { RouterModule, Routes } from '@angular/router'; +import { RouterModule } from '@angular/router'; import { FilePreviewScreenComponent } from './file-preview-screen.component'; import { FileWorkloadComponent } from './components/file-workload/file-workload.component'; import { AnnotationDetailsComponent } from './components/annotation-details/annotation-details.component'; @@ -62,7 +64,7 @@ import { PagesComponent } from './components/pages/pages.component'; import { SharedModule } from '@shared/shared.module'; import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; -const routes: Routes = [ +const routes: IqserRoutes = [ { path: '', component: FilePreviewScreenComponent, @@ -121,7 +123,6 @@ const components = [ CapitalizePipe, IqserUploadFileModule, IqserFiltersModule, - IqserPermissionsModule, SharedModule, CircleButtonComponent, SharedDossiersModule, @@ -136,6 +137,8 @@ const components = [ DynamicInputComponent, InputWithActionComponent, RoundCheckboxComponent, + IqserAllowDirective, + IqserDenyDirective, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard, SuggestionsService], }) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts index cb9ab3626..6e1627e3b 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -19,8 +19,9 @@ import { HasScrollbarDirective, IconButtonComponent, InputWithActionComponent, + IqserAllowDirective, + IqserDenyDirective, IqserHelpModeModule, - IqserPermissionsModule, IqserUsersModule, RoundCheckboxComponent, SideNavComponent, @@ -43,19 +44,17 @@ const components = [ DossiersListingActionsComponent, ]; const dialogs = [EditDossierDialogComponent, AssignReviewerApproverDialogComponent, DictionaryDetailsDialogComponent]; -const services = [FileAssignService]; @NgModule({ declarations: [...components, ...dialogs], exports: [...components, ...dialogs], - providers: [...services], + providers: [FileAssignService], imports: [ CommonModule, SharedModule, IqserHelpModeModule, IqserUsersModule, TranslateModule, - IqserPermissionsModule, IconButtonComponent, CircleButtonComponent, EmptyStateComponent, @@ -67,6 +66,8 @@ const services = [FileAssignService]; RoundCheckboxComponent, InputWithActionComponent, DynamicInputComponent, + IqserAllowDirective, + IqserDenyDirective, ], }) export class SharedDossiersModule {} 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 b85d04404..4009a8470 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -12,8 +12,9 @@ import { CircleButtonComponent, HasScrollbarDirective, IconButtonComponent, + IqserAllowDirective, + IqserDenyDirective, IqserHelpModeModule, - IqserPermissionsModule, IqserUsersModule, SmallChipComponent, StopPropagationDirective, @@ -90,13 +91,14 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; RouterModule, IqserHelpModeModule, IqserUsersModule, - IqserPermissionsModule, ...deleteThisWhenAllComponentsAreStandalone, CircleButtonComponent, IconButtonComponent, SmallChipComponent, StopPropagationDirective, HasScrollbarDirective, + IqserAllowDirective, + IqserDenyDirective, ], exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone], providers: [ diff --git a/jest.config.ts b/jest.config.ts new file mode 100644 index 000000000..9ec4b7265 --- /dev/null +++ b/jest.config.ts @@ -0,0 +1,5 @@ +import { getJestProjects } from '@nrwl/jest'; + +export default { + projects: getJestProjects(), +}; diff --git a/jest.preset.js b/jest.preset.js new file mode 100644 index 000000000..e6c8ebea0 --- /dev/null +++ b/jest.preset.js @@ -0,0 +1,3 @@ +const nxPreset = require('@nrwl/jest/preset').default; + +module.exports = { ...nxPreset }; diff --git a/libs/common-ui b/libs/common-ui index c9c2f3e0f..39e862b12 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit c9c2f3e0f978eb819e0890d49da503d4d878484b +Subproject commit 39e862b1298ba1930bde9e71f39778bc51c5185f diff --git a/package.json b/package.json index 0502ac906..a45949dd1 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "@bartholomej/ngx-translate-extract": "^8.0.2", "@nrwl/cli": "15.6.3", "@nrwl/eslint-plugin-nx": "15.6.3", + "@nrwl/jest": "^15.8.7", "@nrwl/linter": "15.6.3", "@nrwl/workspace": "15.6.3", "@types/jest": "^29.4.0", @@ -105,21 +106,5 @@ "webpack": "^5.76.1", "webpack-bundle-analyzer": "^4.8.0", "xliff": "^6.1.0" - }, - "jest": { - "preset": "jest-preset-angular", - "setupFilesAfterEnv": [ - "jest-preset-angular/setup-jest.js", - "jest-extended/all" - ], - "testPathIgnorePatterns": [ - "/node_modules/", - "/dist/" - ], - "globals": { - "ts-jest": { - "tsconfig": "/tsconfig.spec.json" - } - } } } diff --git a/tsconfig.spec.json b/tsconfig.spec.json index d9599d486..79f2a84c5 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -2,8 +2,10 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./dist/out-tsc/spec", + "module": "commonjs", "types": ["jest", "node"], "esModuleInterop": true }, - "include": ["./libs/**/*.spec.ts", "./libs/**/*.d.ts"] + "files": ["src/test-setup.ts"], + "include": ["jest.config.ts", "./libs/**/*.spec.ts", "./libs/**/*.d.ts"] } diff --git a/yarn.lock b/yarn.lock index 253eb4bfb..ec676e067 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3348,6 +3348,13 @@ dependencies: nx "15.6.3" +"@nrwl/cli@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.8.7.tgz#1de7ba802de24edac64e8cb4cac1459a3f403505" + integrity sha512-G1NEy4jGuZJ/7KjhLQNOe11XmoTgwJS82FW8Tbo4iceq2ItSEbe7bkA8xTSK/AzUixZIMimztb9Oyxw/n1ajGQ== + dependencies: + nx "15.8.7" + "@nrwl/cypress@15.6.3": version "15.6.3" resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-15.6.3.tgz#a9213555eb1581ad36f3df512ef5f32f77af9089" @@ -3371,6 +3378,18 @@ semver "7.3.4" tslib "^2.3.0" +"@nrwl/devkit@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-15.8.7.tgz#98e881e993c1314a20c050926df1466154782e58" + integrity sha512-A99nZrA5KN9wRn2uYX2vKByA+t2XEGoZBR5TU/bpXbPYrh92qAHkIJ8ke3ImGQOlzk4iIaZ5Me0k7k1p9Zx4wA== + dependencies: + "@phenomnomnominal/tsquery" "4.1.1" + ejs "^3.1.7" + ignore "^5.0.4" + semver "7.3.4" + tmp "~0.2.1" + tslib "^2.3.0" + "@nrwl/eslint-plugin-nx@15.6.3": version "15.6.3" resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-15.6.3.tgz#a365de151783e90eccd8af8d49b13fd011f64943" @@ -3400,6 +3419,25 @@ resolve.exports "1.1.0" tslib "^2.3.0" +"@nrwl/jest@^15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-15.8.7.tgz#010adedc3e8852c53c1a87afca76eef8aec37792" + integrity sha512-olTRYD/m1qu/sAaw/z7XOp0amsTKDa6hJvQDK26/1BkJiuKaYLSW/Ec7f39Ilw/zrde+fNg3YUOGiXxuQ10k4g== + dependencies: + "@jest/reporters" "28.1.1" + "@jest/test-result" "28.1.1" + "@nrwl/devkit" "15.8.7" + "@nrwl/js" "15.8.7" + "@phenomnomnominal/tsquery" "4.1.1" + chalk "^4.1.0" + dotenv "~10.0.0" + identity-obj-proxy "3.0.0" + jest-config "28.1.1" + jest-resolve "28.1.1" + jest-util "28.1.1" + resolve.exports "1.1.0" + tslib "^2.3.0" + "@nrwl/js@15.6.3": version "15.6.3" resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-15.6.3.tgz#82c831ab2bf620c3cd376515ff861c9041341d5c" @@ -3428,6 +3466,34 @@ tree-kill "1.2.2" tslib "^2.3.0" +"@nrwl/js@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-15.8.7.tgz#17e413b0cb15e90a2fc7250e42d03338dba1d3de" + integrity sha512-FPOtTSIVHXnQG2uPzgvgtjBlMaHnxPKwG+3Qv1gQN9uHxd9e59TryARS+Q7/Y/qSP6woQjSVEcxkp1zJ2DhFFA== + dependencies: + "@babel/core" "^7.15.0" + "@babel/plugin-proposal-class-properties" "^7.14.5" + "@babel/plugin-proposal-decorators" "^7.14.5" + "@babel/plugin-transform-runtime" "^7.15.0" + "@babel/preset-env" "^7.15.0" + "@babel/preset-typescript" "^7.15.0" + "@babel/runtime" "^7.14.8" + "@nrwl/devkit" "15.8.7" + "@nrwl/workspace" "15.8.7" + "@phenomnomnominal/tsquery" "4.1.1" + babel-plugin-const-enum "^1.0.1" + babel-plugin-macros "^2.8.0" + babel-plugin-transform-typescript-metadata "^0.3.1" + chalk "^4.1.0" + fast-glob "3.2.7" + fs-extra "^11.1.0" + ignore "^5.0.4" + js-tokens "^4.0.0" + minimatch "3.0.5" + source-map-support "0.5.19" + tree-kill "1.2.2" + tslib "^2.3.0" + "@nrwl/linter@15.6.3": version "15.6.3" resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-15.6.3.tgz#9cffa150109c604827c06ce0ccd5c925d4cd7c01" @@ -3438,6 +3504,62 @@ tmp "~0.2.1" tslib "^2.3.0" +"@nrwl/linter@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-15.8.7.tgz#b4418c9bc7f1dcace14fe3ef951d1198a04e7083" + integrity sha512-s0RDjpGCkBZ83GuJfNGf3yTLb+KXzOz68BUEBPW2iw4ziMcMfQ5ep6zj7/5nzblaUMGslPBldqQ2N23JoiAo4w== + dependencies: + "@nrwl/devkit" "15.8.7" + "@nrwl/js" "15.8.7" + "@phenomnomnominal/tsquery" "4.1.1" + tmp "~0.2.1" + tslib "^2.3.0" + +"@nrwl/nx-darwin-arm64@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.8.7.tgz#1fed566b5206afd710309079644782997ccb7895" + integrity sha512-+cu8J337gRxUHjz2TGwS/2Oh3yw8d3/T6SoBfvee1DY72VQaeYd8UTz0doOhDtmc/zowvRu7ZVsW0ytNB0jIXQ== + +"@nrwl/nx-darwin-x64@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.8.7.tgz#7aaee9f56fa526e7049fa5a9829fa72044b35055" + integrity sha512-VqHJEP0wgFu1MU0Bo1vKZ5/s7ThRfYkX8SyGUxjVTzR02CrsjC4rNxFoKD8Cc4YkUn44U/F78toGf+i2gRcjSQ== + +"@nrwl/nx-linux-arm-gnueabihf@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.8.7.tgz#379a77ea46e0f741c487eeedd3389eafab26dcae" + integrity sha512-4F/8awwqPTt7zKQolvjBNrcR1wYicPjGchLOdaqnfMxn/iRRUdh0hD11mEP5zHNv9gZs/nOIvhdBUErNjFkplQ== + +"@nrwl/nx-linux-arm64-gnu@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.8.7.tgz#201a41c0c8531de94169faa48bd9a49bed04ec4b" + integrity sha512-3ZTSZx02Vv5emQOpaDROIcLtQucoXAe73zGKYDTXB95mxbOPSjjQJ8Rtx+BeqWq9JQoZZyRcD0qnBkTTy1aLRg== + +"@nrwl/nx-linux-arm64-musl@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.8.7.tgz#f6bbf2e7a1941952c25387a36be6cfa88079975d" + integrity sha512-SZxTomiHxAh8El+swbmGSGcaA0vGbHb/rmhFAixo19INu1wBJfD6hjkVJt17h6PyEO7BIYPOpRia6Poxnyv8hA== + +"@nrwl/nx-linux-x64-gnu@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.8.7.tgz#76a88784858224a720c5a28e40ad513704f45722" + integrity sha512-BlNC6Zz1/x6CFbBFTVrgRGMOPqb7zWh5cOjBVNpoBXYTEth1UXb2r1U+gpuQ4xdUqG+uXoWhy6BHJjqBIjzLJA== + +"@nrwl/nx-linux-x64-musl@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.8.7.tgz#dd906423fa129d0c55633ebe80572bdd6be4d57f" + integrity sha512-FNYX/IKy8SUbw6bJpvwZrup2YQBYmSJwP6Rw76Vf7c32XHk7uA6AjiPWMIrZCSndXcry8fnwXvR+J2Dnyo82nQ== + +"@nrwl/nx-win32-arm64-msvc@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.8.7.tgz#145e415950d8ff507dcfbd7879f9c37477e7a620" + integrity sha512-sZALEzazjPAeLlw6IbFWsMidCZ4ZM3GKWZZ6rsAqG2y7I9t4nlUPH/y/Isl9MuLBvrBCBXbVnD20wh6EhtuwTw== + +"@nrwl/nx-win32-x64-msvc@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.8.7.tgz#66aa3cda4b9ae7b676d2282fbac129ce7a3c15d0" + integrity sha512-VMdDptI2rqkLQRCvertF29QeA/V/MnFtHbsmVzMCEv5EUfrkHbA5LLxV66LLfngmkDT1FHktffztlsMpbxvhRw== + "@nrwl/tao@15.6.3": version "15.6.3" resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.6.3.tgz#b24e11345375dea96bc386c60b9b1102a7584932" @@ -3445,6 +3567,13 @@ dependencies: nx "15.6.3" +"@nrwl/tao@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.8.7.tgz#ea0bd4bc1784a2578dfb7cfb93f42d98504344cb" + integrity sha512-wA7QIEh0VwWcyo32Y/xSCTwnQTGcZupe933nResXv8mAb36W8MoR5SXRx+Wdd8fJ1eWlm2tuotIrslhN+lYx/Q== + dependencies: + nx "15.8.7" + "@nrwl/webpack@15.6.3": version "15.6.3" resolved "https://registry.yarnpkg.com/@nrwl/webpack/-/webpack-15.6.3.tgz#65b6d68a7a7c8580b8b97e8e4676dba5c5153090" @@ -3525,6 +3654,34 @@ yargs "^17.6.2" yargs-parser "21.1.1" +"@nrwl/workspace@15.8.7": + version "15.8.7" + resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-15.8.7.tgz#c98b811214719a1fa2fe60bffdbc125b082bdb3f" + integrity sha512-ltJn5tLj8eCTNwJbKE9tWgiT/MKZ8f8jFld4YlG7H6i1mPc6d8rk+iNwoN8LZbHHss3x2g9lVnx2Sg5ZoDLNGA== + dependencies: + "@nrwl/devkit" "15.8.7" + "@nrwl/linter" "15.8.7" + "@parcel/watcher" "2.0.4" + chalk "^4.1.0" + chokidar "^3.5.1" + cli-cursor "3.1.0" + cli-spinners "2.6.1" + dotenv "~10.0.0" + figures "3.2.0" + flat "^5.0.2" + glob "7.1.4" + ignore "^5.0.4" + minimatch "3.0.5" + npm-run-path "^4.0.1" + nx "15.8.7" + open "^8.4.0" + rxjs "^6.5.4" + semver "7.3.4" + tmp "~0.2.1" + tslib "^2.3.0" + yargs "^17.6.2" + yargs-parser "21.1.1" + "@parcel/watcher@2.0.4": version "2.0.4" resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b" @@ -9578,6 +9735,57 @@ nx@15.6.3: yargs "^17.6.2" yargs-parser "21.1.1" +nx@15.8.7: + version "15.8.7" + resolved "https://registry.yarnpkg.com/nx/-/nx-15.8.7.tgz#a89156244f6f94407d7603375ae2f52733c7aff4" + integrity sha512-u6p/1gU20WU61orxK7hcXBsVspPHy3X66XVAAakkYcaOBlsJhJrR7Og191qIyjEkqEWmcekiDQVw3D6XfagL4Q== + dependencies: + "@nrwl/cli" "15.8.7" + "@nrwl/tao" "15.8.7" + "@parcel/watcher" "2.0.4" + "@yarnpkg/lockfile" "^1.1.0" + "@yarnpkg/parsers" "^3.0.0-rc.18" + "@zkochan/js-yaml" "0.0.6" + axios "^1.0.0" + chalk "^4.1.0" + cli-cursor "3.1.0" + cli-spinners "2.6.1" + cliui "^7.0.2" + dotenv "~10.0.0" + enquirer "~2.3.6" + fast-glob "3.2.7" + figures "3.2.0" + flat "^5.0.2" + fs-extra "^11.1.0" + glob "7.1.4" + ignore "^5.0.4" + js-yaml "4.1.0" + jsonc-parser "3.2.0" + lines-and-columns "~2.0.3" + minimatch "3.0.5" + npm-run-path "^4.0.1" + open "^8.4.0" + semver "7.3.4" + string-width "^4.2.3" + strong-log-transformer "^2.1.0" + tar-stream "~2.2.0" + tmp "~0.2.1" + tsconfig-paths "^4.1.2" + tslib "^2.3.0" + v8-compile-cache "2.3.0" + yargs "^17.6.2" + yargs-parser "21.1.1" + optionalDependencies: + "@nrwl/nx-darwin-arm64" "15.8.7" + "@nrwl/nx-darwin-x64" "15.8.7" + "@nrwl/nx-linux-arm-gnueabihf" "15.8.7" + "@nrwl/nx-linux-arm64-gnu" "15.8.7" + "@nrwl/nx-linux-arm64-musl" "15.8.7" + "@nrwl/nx-linux-x64-gnu" "15.8.7" + "@nrwl/nx-linux-x64-musl" "15.8.7" + "@nrwl/nx-win32-arm64-msvc" "15.8.7" + "@nrwl/nx-win32-x64-msvc" "15.8.7" + object-assign@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" From 535e30cd25e1c27515c6b5ec81d26b4a6784e3f6 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sun, 19 Mar 2023 16:03:47 +0200 Subject: [PATCH 59/99] RED-3800: update common-ui --- apps/red-ui/jest.config.ts | 9 +++++---- apps/red-ui/src/app/app.module.ts | 2 ++ .../downloads-list-screen.component.html | 5 +++-- libs/common-ui | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/jest.config.ts b/apps/red-ui/jest.config.ts index fa9e1b508..d48e080e9 100644 --- a/apps/red-ui/jest.config.ts +++ b/apps/red-ui/jest.config.ts @@ -1,6 +1,8 @@ import type { Config } from 'jest'; +import { defaults } from 'jest-config'; -const config: Config = { +export default { + ...defaults, displayName: 'red-ui', preset: '../../jest.preset.js', setupFilesAfterEnv: ['jest-preset-angular/setup-jest.js', 'jest-extended/all'], @@ -14,12 +16,11 @@ const config: Config = { }, ], }, + testEnvironment: 'jest-environment-jsdom', transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], snapshotSerializers: [ 'jest-preset-angular/build/serializers/no-ng-attributes', 'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/html-comment', ], -}; - -export default config; +} as Config; diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 08368aca3..dd6efcb22 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -17,6 +17,7 @@ import { IqserAllowDirective, IqserDenyDirective, IqserHelpModeModule, + IqserListingModule, IqserLoadingModule, IqserPermissionsService, IqserTranslateModule, @@ -169,6 +170,7 @@ export const appModuleFactory = (config: AppConfig) => { RoundCheckboxComponent, IqserAllowDirective, IqserDenyDirective, + IqserListingModule, ], providers: [ { diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html index 9915adfb9..78c12e1ac 100644 --- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html +++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html @@ -5,11 +5,11 @@
@@ -26,6 +26,7 @@ > +
@@ -42,7 +43,7 @@
- {{ download.creationDate | date: 'd MMM yyyy, hh:mm a' }} + {{ download.creationDate | date : 'd MMM yyyy, hh:mm a' }}
diff --git a/libs/common-ui b/libs/common-ui index 39e862b12..cb8a0ddcf 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 39e862b1298ba1930bde9e71f39778bc51c5185f +Subproject commit cb8a0ddcf9a3858ec698e52488a51fabaff55849 From 3c378eb3c725006cbf7db810737e94d6f9dcd99a Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sun, 19 Mar 2023 15:08:05 +0100 Subject: [PATCH 60/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3442 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a45949dd1..328290717 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.12.0", + "version": "4.13.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 9dc8f3d7448d8ecf1e471bf975deea8f71c02534..9ec500355028fc81e839d6f0f8c9c763b111beb0 100644 GIT binary patch delta 3358 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 delta 3356 zcmV+%4de3k8uA*DcYnAxe663@jvd(U6BPU;*bG`zGh89`b1e1W*p|Bd<&T=(XQcjE z+VF7sd+vI5mjBPuj>^9xF^-t*TSj&LVQX*!ulyp(JdV77H6n{CZm%F0aWdxVBUPi_K z8Wh6)b%OUayZ_>kCCPvF4bJN=WjI^h?NavAUU;_s++O(NGZ3FE@wpbC8~Aj@7)Ok8 z#2816al{yhkNIUx>oUXlU(|QFyu5mTvE=yS%t{H4NrnD?fzVrv<}rD*Mb2~hl@bc; zZ;>C^<(uah?|%j}w%d>-MMcES5J$JWs%Y}qii)hLw&mwkw)Fmn&2u*1tNR= z#=4_1O97T`tH8DhH>}{l%c7=?7VxGb8D{h~ISqT+et%mDC0Q(1lB+nj{TT-u78U0s za>_TTE;1UUr%@D<*gJGu6^?0B1LZAV20kZA@<3d+TTq0Eq(#;Vz9?}-+5HyT%k=|+ zEgrY>P+K&;aHL*nI^b;P2zJc;62~#kcL2Zzemm<~P(qfslY9B&5Jc55!tttFjD(&Z zz;kgrlYjDJ6>RSkS0rc8jr2!NRr6P6L32hbgD%)y8^oVIkA!Vnyq5enC{P^xaUdXF zyxfzRVpQbWJ*uOMkR0JWM$eQjvgZ5kO29JjYfXZ_+w#G@w+E69wCNPr#24=Cu9 zDnI1QTHkvdD`}dI_KCpU@!J6ow?HDv|OGCVAl7de@=D?9B82JXN{P5{XMqIK?= z4}YG|h}1ufWRzuOF?%Xlvq-#QMbyq6is}()Ap9squ+fe`3ZK?qJq|0y=8bKv*i|u! ziVC+@9aMo-+!#Fs^9iXa=Fi>C3~aoWv^F!BZnE)S?Kjzj)FGo9B)|76v*&LUTGh;o zQYt;IW`^vC5eDEgY=Sn5>*mv^YiMVT^?yiXWr#Ff|KUp+)b6n0$5Fe~M_{V*`P&0{ zs>bRv5$Md}2e49M9L-ZwQ8waT{~nyx_2=jn%`-w-lkd>y*B48GYyk-*vm6z(-pgG6 zEwSzOWjFh;MRl8G#ob`8J2`g~^mG3L%x-GP&ECS|5YOl!yeSZleba;ZlH?70OMj|8 z$>0CTWrnP>DiWFvfcbN10bn>vD;lMY?o22JlTZ?`hw@DmrAd?Dia11{znaFv?dQJ= zNe(O19P!AlBd`cbm1OUKh*ARYYxK3KT>Js&ct@&wu+DmF9oOIV>wH~g8LY#3_9dyv zB+;8`QTjcw-xhUE0bRg_ksdB=w|_gFu@T6dNs#ME0eRc(c}Rmo2$w@pQO=b;dKFVv zR6||0C$%MrMp#0k5TzL<@Bbwcg$>d0;3

d5Ekty$_s&B7P+$UcdhlBvo@A8p4_0 z6CUp2{4N6=@rb<1&0xFn0f*oG>EHkOXN{hv?|*0#x+CbT3e+RN8bX`i4S#{8NY7NP ziquWUref&CPl9CK&XW^3P)xhHRl2|4Q8>2r6i3$ST_#TxAiA?#-*?eua*cLut>gz2 z;p#&}Qq@O#Zj0z>)sD~rOs(t5~eYX#{_L;H9cD@lNDBw z14mV}4{M|ESF|uG3MPWv8rUR%srjc+iQ_WS(*730G3a{VC`9Ww%3xfZ6AloaN)!(} zNo=H*-|=pCkY!pNa`Vs42tbFvgAF|C#xA3xyce|^Gps|uTBQqk;(rNp3yb((ytgd+ zeGLLCD+;7T{3Nzym^C7&9Q0b%E(GFSdx2a}eE6nO?iN9O0uE8_#8D({I3*(J8=??C3m>Wc}E<^wuXS9!a$55!$3{eD%NOxO~CG8 z#`h(#5I=L>6|m6Va6SSv?d8ptI(%1=dk9a}v{CP}q0e)?*e9dDwULve%Y!bAaTI!^ zu7Dd1FAicn>hg`;6kRJLH$|7L_{~Ar#wfoXFZl_gZ97TqA%FJJ$3X@W32wC2S{)V> zlVoE%8UgnZs}*;$Gu(Kgq0===UUs%yDF7Kco0|pFhVZP#(UL5+M}T!!&dS#nr)hEZ zH|qg!M3*bNq8mdOmtGLwtmAOh#YN<;{b=Kiy0~DYAohqhtEBmD%N55BVoixsl9l@+ zCI?$1xUUXT?SHD*+SPu|1{{0dJ5^_G>^=>kccQ-DEoQbSRuItD#hxIwtp6GV&4{I# zp*k%ZNaI6-xJ9UF%p>2s6h0t!gW$2Lz;;7YDUL=jHCtDfR*v`N6D%fqveAj|$4J*c zGCSZ)!T44^*H(@W0Md-c(*3Ssfce-*8`1^30?4reU4MY*`X)?hKJdYV0o=%2hv1R> zbv+d1j2(`D$FHr?X4ec^SG*pLTtYvMAR^0ewH&>jCJp2$ zad(vD?j&_et|ddK6Nnr?4DA9sBM=<%lYhuPhJSQ@Fd)4&Eh`3ER?Dw(7=gUt_1F$V z$HR;yYECsZsmYE_@9GgVrXL67_Z1jcL}t_#w3)6r40%?4FQ`$-@%HQI$4oz%=N| zBY(IfQyz0rF%4GbRt^E|R54@^Y(%(XG}4YT)nn>mZhs+9+XnYB)cZL75UxeMZdBqO zk&jx*Lc02{!UHp(>NLGTMo_710A?#L>|zP=I%GnxDY+B(ztn;4WukYZF?7Eh7oNJo z7fZhKSmQj~sK(vv0q-P`cBd}1pZqLo#(x2s>5A6MP;ql^l#2_Z+Lsg+Al8&6sUlpH zA$GH?gv$B7p=zj6*dHJd=v0*cn2JB(-i}(}i&7HZX0&F!DoB7$73M_Gyg($RDk1S& z2=E68$P32r3G~6}g4fs^4hfzZEysG{n)SjR=!H-+u@A)4>O^SNGhJHtL$GyFmw$;1 zG?Ey393W{r{OUHM>c@7=Lc+cO8uO%Mw*reZ@n7*u^Kt8C&4NGkGVWNGx_= zlB;pZ+NZJN##<472SiR^UQh>h*814FPG{JZU<49NzSlTY_!S~if%NSK#2pK?3V8X^ z@vlaUf#gb!`3940R&Mo_h+ihA(EvT+ta7dcLl%IE1jmfC4rr5uH9NTNB7a-755r3+ znjci|#(erKVDEH%OgFLA{#nyXiw!D58VKZnRsX7cD!cD$ zmGN%;NFH&=0E_PXhapQt?QhLnrgV{}OsPR)-#z(u>kuHzo#)st{65=@gJm%5F6ti3GI%ntNlK_$;YNoE+eCq!QJhyW@ mw{ttUb33HrS>1}iKcx3Pyhhp>xn-A From d827ef171a3be9fa9bdbce20049f7f18ad1736e4 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 20 Mar 2023 00:04:59 +0200 Subject: [PATCH 61/99] RED-3800: update confirmation dialog stuff --- .../src/app/guards/can-deactivate.guard.ts | 37 +++++++++--------- .../justifications-dialog.service.ts | 6 +-- .../reports-screen.component.ts | 11 +++--- .../watermarks-listing-screen.component.ts | 7 ++-- .../admin/services/admin-dialog.service.ts | 10 ++--- .../services/bulk-actions.service.ts | 10 ++--- .../view-switch/view-switch.component.ts | 6 +-- .../file-preview-screen.component.ts | 13 ++++--- .../compare-file-input.component.ts | 23 +++++------ .../services/page-rotation.service.ts | 9 +++-- .../file-actions/file-actions.component.ts | 38 +++++++++---------- .../edit-dossier-general-info.component.ts | 12 +++--- .../services/file-assign.service.ts | 6 +-- .../trash/services/trash-dialog.service.ts | 6 +-- .../dossier-templates.service.ts | 3 ++ libs/common-ui | 2 +- 16 files changed, 102 insertions(+), 97 deletions(-) diff --git a/apps/red-ui/src/app/guards/can-deactivate.guard.ts b/apps/red-ui/src/app/guards/can-deactivate.guard.ts index df72bc9c3..f71225068 100644 --- a/apps/red-ui/src/app/guards/can-deactivate.guard.ts +++ b/apps/red-ui/src/app/guards/can-deactivate.guard.ts @@ -1,6 +1,6 @@ import { CanDeactivate } from '@angular/router'; import { Injectable } from '@angular/core'; -import { map, Observable } from 'rxjs'; +import { map } from 'rxjs'; import { ConfirmationDialogService, ConfirmOptions } from '@iqser/common-ui'; export interface ComponentCanDeactivate { @@ -15,23 +15,24 @@ export interface ComponentCanDeactivate { export class PendingChangesGuard implements CanDeactivate { constructor(private _dialogService: ConfirmationDialogService) {} - canDeactivate(component: ComponentCanDeactivate): boolean | Observable { - if (component.changed) { - component.isLeavingPage = true; - - const dialogRef = this._dialogService.openDialog({ disableConfirm: component.valid === false }); - return dialogRef.afterClosed().pipe( - map(result => { - if (result === ConfirmOptions.CONFIRM) { - component.save().then(); - } else { - component.discard?.().then(); - } - component.isLeavingPage = false; - return !!result; - }), - ); + canDeactivate(component: ComponentCanDeactivate) { + if (!component.changed) { + return true; } - return true; + + component.isLeavingPage = true; + + const dialogRef = this._dialogService.open({ disableConfirm: component.valid === false }); + return dialogRef.afterClosed().pipe( + map(result => { + if (result === ConfirmOptions.CONFIRM) { + component.save().then(); + } else { + component.discard?.().then(); + } + component.isLeavingPage = false; + return !!result; + }), + ); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts index 36563c498..b774bbef6 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ConfirmationDialogComponent, - ConfirmationDialogInput, DialogConfig, DialogService, + IConfirmationDialogData, LoadingService, TitleColors, } from '@iqser/common-ui'; @@ -39,7 +39,7 @@ export class JustificationsDialogService extends DialogService { } confirmDelete(justifications: Justification[], dossierTemplateId: string) { - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('confirmation-dialog.delete-justification.title'), titleColor: TitleColors.WARN, question: _('confirmation-dialog.delete-justification.question'), @@ -47,7 +47,7 @@ export class JustificationsDialogService extends DialogService { count: justifications.length, justificationName: justifications[0].name, }, - }); + }; this.openDialog('confirm', data, async () => { this._loadingService.start(); diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts index cd8c8ad85..39c650687 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { DOSSIER_TEMPLATE_ID, IPlaceholdersResponse, IReportTemplate, User } from '@red/domain'; import { download } from '@utils/file-download-utils'; -import { ConfirmationDialogInput, getCurrentUser, getParam, LoadingService, Toaster } from '@iqser/common-ui'; +import { getCurrentUser, getParam, IConfirmationDialogData, LoadingService, Toaster } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; import { generalPlaceholdersDescriptionsTranslations, @@ -80,7 +80,7 @@ export class ReportsScreenComponent implements OnInit { return; } - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('confirmation-dialog.upload-report-template.title'), question: _('confirmation-dialog.upload-report-template.question'), confirmationText: _('confirmation-dialog.upload-report-template.confirmation-text'), @@ -89,7 +89,8 @@ export class ReportsScreenComponent implements OnInit { translateParams: { fileName: file.name, }, - }); + }; + this._dialogService.openDialog('confirm', data, null, async result => { if (result) { const multiFileReport = result > 1; @@ -119,7 +120,7 @@ export class ReportsScreenComponent implements OnInit { } private async _openOverwriteConfirmationDialog(file: File, multiFileReport: boolean): Promise { - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('confirmation-dialog.report-template-same-name.title'), question: _('confirmation-dialog.report-template-same-name.question'), confirmationText: _('confirmation-dialog.report-template-same-name.confirmation-text'), @@ -127,7 +128,7 @@ export class ReportsScreenComponent implements OnInit { translateParams: { fileName: file.name, }, - }); + }; this._dialogService.openDialog('confirm', data, null, async result => { if (result) { diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.ts index 7a5547055..86c073f31 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.ts @@ -1,10 +1,10 @@ import { Component } from '@angular/core'; import { CircleButtonTypes, - ConfirmationDialogInput, getCurrentUser, getParam, IconButtonTypes, + IConfirmationDialogData, IqserPermissionsService, ListingComponent, listingProvidersFactory, @@ -54,9 +54,10 @@ export class WatermarksListingScreenComponent extends ListingComponent { await this._deleteWatermark(watermark); }); 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 91c7017d3..13be04637 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,10 +10,10 @@ import { FileAttributesCsvImportDialogComponent } from '../dialogs/file-attribut import { AddEditDossierAttributeDialogComponent } from '../dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component'; import { ConfirmationDialogComponent, - ConfirmationDialogInput, ConfirmOptions, DialogConfig, DialogService, + IConfirmationDialogData, largeDialogConfig, LoadingService, TitleColors, @@ -109,7 +109,7 @@ export class AdminDialogService extends DialogService { } deleteUsers(userIds: string[], cb?: () => Promise | void): void { - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('confirm-delete-users.title'), question: _('confirm-delete-users.warning'), confirmationText: _('confirm-delete-users.delete'), @@ -121,7 +121,7 @@ export class AdminDialogService extends DialogService { { value: false, label: _('confirm-delete-users.impacted-documents') }, ], toastMessage: _('confirm-delete-users.toast-error'), - }); + }; this.openDialog('confirm', data, async result => { if (result === ConfirmOptions.CONFIRM) { @@ -149,7 +149,7 @@ export class AdminDialogService extends DialogService { const uniqueTemplates = Array.from(templateIds).map(id => templates.find(t => t.templateId === id)); this._loadingService.stop(); - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('confirm-delete-attribute.title'), question: _('confirm-delete-attribute.warning'), confirmationText: _('confirm-delete-attribute.delete'), @@ -173,7 +173,7 @@ export class AdminDialogService extends DialogService { ], toastMessage: _('confirm-delete-attribute.toast-error'), translateParams: { reportsCount: uniqueTemplates.length, count: attributes.length, name: attributes[0].label }, - }); + }; if (templates.length) { data.checkboxes.push({ diff --git a/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts index 53903e51b..c092aad30 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Dossier, File, WorkflowFileStatus, WorkflowFileStatuses } from '@red/domain'; import { DossiersDialogService } from '../../shared-dossiers/services/dossiers-dialog.service'; -import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; +import { IConfirmationDialogData, LoadingService } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { FilesService } from '@services/files/files.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -47,10 +47,10 @@ export class BulkActionsService { delete(files: File[]) { this._dialogService.openDialog( 'confirm', - new ConfirmationDialogInput({ + { title: _('confirmation-dialog.delete-file.title'), question: _('confirmation-dialog.delete-file.question'), - }), + } as IConfirmationDialogData, async () => { this._loadingService.start(); await firstValueFrom(this._fileManagementService.delete(files, files[0].dossierId)); @@ -97,7 +97,7 @@ export class BulkActionsService { if (foundAnalysisRequiredFile || foundUpdatedFile) { this._dialogService.openDialog( 'confirm', - new ConfirmationDialogInput({ + { title: foundAnalysisRequiredFile ? _('confirmation-dialog.approve-multiple-files-without-analysis.title') : _('confirmation-dialog.approve-multiple-files.title'), @@ -108,7 +108,7 @@ export class BulkActionsService { ? _('confirmation-dialog.approve-multiple-files-without-analysis.confirmationText') : null, denyText: foundAnalysisRequiredFile ? _('confirmation-dialog.approve-multiple-files-without-analysis.denyText') : null, - }), + } as IConfirmationDialogData, async () => { this._loadingService.start(); await this._filesService.setApproved(files); diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts index 027169d21..ba927b32e 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts @@ -5,7 +5,7 @@ import { FilePreviewStateService } from '../../services/file-preview-state.servi import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { FileDataService } from '../../services/file-data.service'; -import { BASE_HREF, ConfirmationDialogInput, ConfirmOptions, Toaster } from '@iqser/common-ui'; +import { BASE_HREF, ConfirmOptions, IConfirmationDialogData, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserPreferenceService } from '@users/user-preference.service'; import { FilePreviewDialogService } from '../../services/file-preview-dialog.service'; @@ -66,7 +66,7 @@ export class ViewSwitchComponent { const question = displaySuggestionsInPreview ? _('unapproved-suggestions.confirmation-dialog.displayed-question') : _('unapproved-suggestions.confirmation-dialog.not-displayed-question'); - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('unapproved-suggestions.confirmation-dialog.title'), question: question, confirmationText: _('unapproved-suggestions.confirmation-dialog.confirmation-text'), @@ -78,7 +78,7 @@ export class ViewSwitchComponent { }, ], checkboxesValidation: false, - }); + }; return this._dialogService.openDialog('confirm', data, result => { if (!result) { diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 26becd816..432ecd4e1 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -15,13 +15,14 @@ import { AutoUnsubscribe, bool, CircleButtonTypes, - ConfirmationDialogInput, + ConfirmOption, ConfirmOptions, CustomError, Debounce, ErrorService, FilterService, HelpModeService, + IConfirmationDialogData, List, LoadingService, NestedFilter, @@ -644,11 +645,12 @@ export class FilePreviewScreenComponent filter(event => event.type === ViewerEvents.LOAD_ALL_ANNOTATIONS), switchMap(() => this._fileDataService.annotations), switchMap>(annotations => { + // TODO: this switchMap is ugly, to be refactored const showWarning = !this.userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning); const annotationsExceedThreshold = annotations.length >= this.configService.values.ANNOTATIONS_THRESHOLD; if (annotationsExceedThreshold && showWarning) { - const data = new ConfirmationDialogInput({ + const data = { question: _('load-all-annotations-threshold-exceeded'), checkboxes: [ { @@ -660,17 +662,18 @@ export class FilePreviewScreenComponent translateParams: { threshold: this.configService.values.ANNOTATIONS_THRESHOLD, }, - }); + } as IConfirmationDialogData; const ref = this._dialogService.openDialog('confirm', data); return ref.afterClosed().pipe( - switchMap(async (result: ConfirmOptions) => { + switchMap(async (result: ConfirmOption) => { const doNotShowWarningAgain = result === ConfirmOptions.SECOND_CONFIRM; if (doNotShowWarningAgain) { await this.userPreferenceService.save(PreferencesKeys.loadAllAnnotationsWarning, 'true'); await this.userPreferenceService.reload(); } - const shouldLoad = [ConfirmOptions.CONFIRM, ConfirmOptions.SECOND_CONFIRM].includes(result); + const validOptions: number[] = [ConfirmOptions.CONFIRM, ConfirmOptions.SECOND_CONFIRM]; + const shouldLoad = validOptions.includes(result); return [shouldLoad, annotations] as const; }), ); diff --git a/apps/red-ui/src/app/modules/pdf-viewer/components/compare-file-input/compare-file-input.component.ts b/apps/red-ui/src/app/modules/pdf-viewer/components/compare-file-input/compare-file-input.component.ts index 1ec58135e..c11b5eed4 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/components/compare-file-input/compare-file-input.component.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/components/compare-file-input/compare-file-input.component.ts @@ -1,6 +1,6 @@ import { Component, ElementRef, ViewChild } from '@angular/core'; import { HeaderElements } from '../../../file-preview/utils/constants'; -import { ConfirmationDialogInput, ConfirmOptions, LoadingService } from '@iqser/common-ui'; +import { ConfirmOption, ConfirmOptions, IConfirmationDialogData, LoadingService } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesMapService } from '@services/files/files-map.service'; import { SharedDialogService } from '@shared/services/dialog.service'; @@ -81,18 +81,15 @@ export class CompareFileInputComponent { } #askForConfirmation(fileName: string, currentDocumentPageCount: number, compareDocumentPageCount: number) { - const ref: MatDialogRef = this._dialogService.openDialog( - 'confirm', - new ConfirmationDialogInput({ - title: _('confirmation-dialog.compare-file.title'), - question: _('confirmation-dialog.compare-file.question'), - translateParams: { - fileName, - currentDocumentPageCount, - compareDocumentPageCount, - }, - }), - ); + const ref: MatDialogRef = this._dialogService.openDialog('confirm', { + title: _('confirmation-dialog.compare-file.title'), + question: _('confirmation-dialog.compare-file.question'), + translateParams: { + fileName, + currentDocumentPageCount, + compareDocumentPageCount, + }, + } as IConfirmationDialogData); return firstValueFrom(ref.afterClosed()); } diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/page-rotation.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/page-rotation.service.ts index ada27f747..e56d9afd1 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/page-rotation.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/page-rotation.service.ts @@ -5,9 +5,10 @@ import { FileManagementService } from '@services/files/file-management.service'; import { distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; import { ConfirmationDialogComponent, - ConfirmationDialogInput, + ConfirmOption, ConfirmOptions, defaultDialogConfig, + IConfirmationDialogData, LoadingService, } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -93,15 +94,15 @@ export class PageRotationService { #showConfirmationDialog() { const ref = this._injector.get(MatDialog).open(ConfirmationDialogComponent, { ...defaultDialogConfig, - data: new ConfirmationDialogInput({ + data: { title: _('page-rotation.confirmation-dialog.title'), question: _('page-rotation.confirmation-dialog.question'), confirmationText: _('page-rotation.apply'), discardChangesText: _('page-rotation.discard'), - }), + } as IConfirmationDialogData, }); - const closed$ = ref.afterClosed().pipe(map((option: ConfirmOptions) => option === ConfirmOptions.CONFIRM)); + const closed$ = ref.afterClosed().pipe(map((option: ConfirmOption) => option === ConfirmOptions.CONFIRM)); return closed$.pipe(tap(apply => (apply ? this.applyRotation() : this.discardRotation()))); } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index 17ac0c541..76c53c310 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -5,8 +5,8 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { CircleButtonType, CircleButtonTypes, - ConfirmationDialogInput, getCurrentUser, + IConfirmationDialogData, IqserPermissionsService, IqserTooltipPosition, LoadingService, @@ -298,22 +298,18 @@ export class FileActionsComponent implements OnChanges { return; } - this._dialogService.openDialog( - 'confirm', - new ConfirmationDialogInput({ - title: this.file.analysisRequired - ? _('confirmation-dialog.approve-file-without-analysis.title') - : _('confirmation-dialog.approve-file.title'), - question: this.file.analysisRequired - ? _('confirmation-dialog.approve-file-without-analysis.question') - : _('confirmation-dialog.approve-file.question'), - confirmationText: this.file.analysisRequired - ? _('confirmation-dialog.approve-file-without-analysis.confirmationText') - : null, - denyText: this.file.analysisRequired ? _('confirmation-dialog.approve-file-without-analysis.denyText') : null, - }), - () => this.#setFileApproved(), - ); + const data: IConfirmationDialogData = { + title: this.file.analysisRequired + ? _('confirmation-dialog.approve-file-without-analysis.title') + : _('confirmation-dialog.approve-file.title'), + question: this.file.analysisRequired + ? _('confirmation-dialog.approve-file-without-analysis.question') + : _('confirmation-dialog.approve-file.question'), + confirmationText: this.file.analysisRequired ? _('confirmation-dialog.approve-file-without-analysis.confirmationText') : null, + denyText: this.file.analysisRequired ? _('confirmation-dialog.approve-file-without-analysis.denyText') : null, + }; + + this._dialogService.openDialog('confirm', data, () => this.#setFileApproved()); } forceReanalysisAction($event: LongPressEvent) { @@ -322,11 +318,11 @@ export class FileActionsComponent implements OnChanges { } #showOCRConfirmationDialog(): Observable { - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('ocr.confirmation-dialog.title'), question: _('ocr.confirmation-dialog.question'), denyText: _('ocr.confirmation-dialog.cancel'), - }); + }; const ref = this._dialogService.openDialog('confirm', data); return ref.afterClosed(); @@ -339,10 +335,10 @@ export class FileActionsComponent implements OnChanges { private _openDeleteFileDialog() { this._dialogService.openDialog( 'confirm', - new ConfirmationDialogInput({ + { title: _('confirmation-dialog.delete-file.title'), question: _('confirmation-dialog.delete-file.question'), - }), + } as IConfirmationDialogData, async () => { this._loadingService.start(); try { diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index b37e1b80c..a3fb03445 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -7,7 +7,7 @@ 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 { ConfirmationDialogInput, ConfirmOptions, IconButtonTypes, LoadingService, TitleColors, Toaster } from '@iqser/common-ui'; +import { ConfirmOptions, IconButtonTypes, IConfirmationDialogData, LoadingService, TitleColors, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; @@ -127,7 +127,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } deleteDossier() { - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('confirmation-dialog.delete-dossier.title'), titleColor: TitleColors.WARN, question: _('confirmation-dialog.delete-dossier.question'), @@ -138,7 +138,8 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti dossierName: this.dossier.dossierName, dossiersCount: 1, }, - }); + }; + this._dialogService.openDialog('confirm', data, async () => { this._loadingService.start(); await firstValueFrom(this._trashService.deleteDossier(this.dossier)); @@ -154,7 +155,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } archiveDossier() { - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('confirm-archive-dossier.title'), details: _('confirm-archive-dossier.details'), question: _('confirm-archive-dossier.warning'), @@ -164,7 +165,8 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti translateParams: { ...this.dossier }, checkboxes: [{ value: false, label: _('confirm-archive-dossier.checkbox.documents') }], toastMessage: _('confirm-archive-dossier.toast-error'), - }); + }; + this._dialogService.openDialog('confirm', data, async result => { if (result === ConfirmOptions.CONFIRM) { this._loadingService.start(); diff --git a/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts b/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts index c08092eae..06a9f335b 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts @@ -3,7 +3,7 @@ import { Dossier, File, User, WorkflowFileStatus, WorkflowFileStatuses } from '@ import { DossiersDialogService } from './dossiers-dialog.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '@services/files/files.service'; -import { ConfirmationDialogInput, getCurrentUser, LoadingService, Toaster } from '@iqser/common-ui'; +import { getCurrentUser, IConfirmationDialogData, LoadingService, Toaster } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { firstValueFrom } from 'rxjs'; @@ -33,13 +33,13 @@ export class FileAssignService { }; if (atLeastOneAssignee(files)) { - const dialogInput = new ConfirmationDialogInput({ + const dialogInput: IConfirmationDialogData = { title: _('confirmation-dialog.assign-file-to-me.title'), question: files.length === 1 ? _('confirmation-dialog.assign-file-to-me.question.single') : _('confirmation-dialog.assign-file-to-me.question.multiple'), - }); + }; const ref = this._dialogService.openDialog('confirm', dialogInput, assignReq); return firstValueFrom(ref.afterClosed()); } diff --git a/apps/red-ui/src/app/modules/trash/services/trash-dialog.service.ts b/apps/red-ui/src/app/modules/trash/services/trash-dialog.service.ts index f325f5636..41daa010a 100644 --- a/apps/red-ui/src/app/modules/trash/services/trash-dialog.service.ts +++ b/apps/red-ui/src/app/modules/trash/services/trash-dialog.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ConfirmationDialogComponent, - ConfirmationDialogInput, DialogConfig, DialogService, + IConfirmationDialogData, LoadingService, TitleColors, } from '@iqser/common-ui'; @@ -32,7 +32,7 @@ export class TrashDialogService extends DialogService { } confirmHardDelete(items: TrashItem[]): void { - const data = new ConfirmationDialogInput({ + const data: IConfirmationDialogData = { title: _('confirmation-dialog.delete-items.title'), titleColor: TitleColors.WARN, question: _('confirmation-dialog.delete-items.question'), @@ -40,7 +40,7 @@ export class TrashDialogService extends DialogService { name: items[0].name, itemsCount: items.length, }, - }); + }; this.openDialog('confirm', data, async () => { this._loadingService.start(); diff --git a/apps/red-ui/src/app/services/dossier-templates/dossier-templates.service.ts b/apps/red-ui/src/app/services/dossier-templates/dossier-templates.service.ts index d30033833..c63a833d4 100644 --- a/apps/red-ui/src/app/services/dossier-templates/dossier-templates.service.ts +++ b/apps/red-ui/src/app/services/dossier-templates/dossier-templates.service.ts @@ -45,8 +45,11 @@ export class DossierTemplatesService extends EntitiesService templates)); } diff --git a/libs/common-ui b/libs/common-ui index cb8a0ddcf..a1d11cd9e 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit cb8a0ddcf9a3858ec698e52488a51fabaff55849 +Subproject commit a1d11cd9eb91cebe729a70cf57a778b385edcca0 From 3dee599e59af1ea1df30598d278d532d5dfcbc3a Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sun, 19 Mar 2023 23:21:32 +0100 Subject: [PATCH 62/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3441 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 328290717..b38e5ff63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.13.0", + "version": "4.14.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 9ec500355028fc81e839d6f0f8c9c763b111beb0..32039f334a21fda23e427be7e6f2f633b43e7867 100644 GIT binary patch delta 3415 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 t|3~1toXfeK%ekD(xtz-yxtz2#W; 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 E016m`8~^|S From 52e5d9cc89ebceb81e0213aaf75abc01ef412fd7 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 20 Mar 2023 15:30:24 +0200 Subject: [PATCH 63/99] RED-6443 & RED-6445: fix stop propagation --- .../file-preview/components/comments/comments.component.html | 1 - libs/common-ui | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html index 36f9b2e3e..2bec686eb 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html @@ -14,7 +14,6 @@ [size]="20" class="pointer" icon="iqser:trash" - stopPropagation >

diff --git a/libs/common-ui b/libs/common-ui index a1d11cd9e..a60a9d828 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit a1d11cd9eb91cebe729a70cf57a778b385edcca0 +Subproject commit a60a9d828e9624b615f2298a52b134f9a1fa27f4 From cad7d85a3a79855ae90b8f8a93e29207725f06c0 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 20 Mar 2023 14:33:21 +0100 Subject: [PATCH 64/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3441 -> 3446 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b38e5ff63..0c13d1d7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.14.0", + "version": "4.15.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 32039f334a21fda23e427be7e6f2f633b43e7867..3569f9dc4b63666604fcd09572ad8416bd7c365f 100644 GIT binary patch delta 3420 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 delta 3397 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 Date: Mon, 20 Mar 2023 15:57:31 +0200 Subject: [PATCH 65/99] RED-6154: add some ids --- .../components/file-actions/file-actions.component.html | 1 + .../expandable-file-actions.component.html | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html index 0fffc25b6..a31bbe1b3 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html @@ -20,6 +20,7 @@ From 0584b1b4c9a0b79e7fddbc7c4a57df3b698c16af Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 20 Mar 2023 15:00:04 +0100 Subject: [PATCH 66/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3446 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c13d1d7b..5a54e1d19 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.15.0", + "version": "4.16.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 3569f9dc4b63666604fcd09572ad8416bd7c365f..00fa87dbef19e76ca04f7377c2231063aded1686 100644 GIT binary patch delta 3357 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 delta 3359 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 Date: Mon, 20 Mar 2023 16:53:41 +0200 Subject: [PATCH 67/99] RED-6154: update ids --- .../dossier-template-actions.component.html | 8 ++-- .../file-actions/file-actions.component.ts | 37 +++++++++---------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html index 3e96c6552..4b8099c03 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html @@ -1,8 +1,8 @@ -
+
this._openDeleteFileDialog(), tooltip: _('dossier-overview.delete.action'), @@ -131,7 +130,7 @@ export class FileActionsComponent implements OnChanges { show: this.showDelete, }, { - id: 'assign-btn-' + fileId, + id: 'assign-btn', type: ActionTypes.circleBtn, action: () => this._assign(), tooltip: this.assignTooltip, @@ -139,7 +138,7 @@ export class FileActionsComponent implements OnChanges { show: this.showAssign, }, { - id: 'assign-to-me-btn-' + fileId, + id: 'assign-to-me-btn', type: ActionTypes.circleBtn, action: () => this._assignToMe(), tooltip: _('dossier-overview.assign-me'), @@ -147,7 +146,7 @@ export class FileActionsComponent implements OnChanges { show: this.showAssignToSelf, }, { - id: 'open-import-redactions-dialog-btn-' + fileId, + id: 'open-import-redactions-dialog-btn', type: ActionTypes.circleBtn, action: () => this._openImportRedactionsDialog(), tooltip: _('dossier-overview.import-redactions'), @@ -155,7 +154,7 @@ export class FileActionsComponent implements OnChanges { show: this.showImportRedactions && !this._iqserPermissionsService.has(ROLES.getRss), }, { - id: 'download-file-btn-' + fileId, + id: 'download-file-btn', type: ActionTypes.downloadBtn, files: [this.file], dossier: this.dossier, @@ -164,7 +163,7 @@ export class FileActionsComponent implements OnChanges { disabled: this.file.processingStatus === ProcessingFileStatuses.ERROR, }, { - id: 'toggle-document-info-btn-' + fileId, + id: 'toggle-document-info-btn', type: ActionTypes.circleBtn, action: () => this._documentInfoService.toggle(), tooltip: _('file-preview.document-info'), @@ -173,7 +172,7 @@ export class FileActionsComponent implements OnChanges { show: !!this._documentInfoService, }, { - id: 'toggle-exclude-pages-btn-' + fileId, + id: 'toggle-exclude-pages-btn', type: ActionTypes.circleBtn, action: () => this._excludedPagesService.toggle(), tooltip: _('file-preview.exclude-pages'), @@ -186,7 +185,7 @@ export class FileActionsComponent implements OnChanges { !this._iqserPermissionsService.has(ROLES.getRss), }, { - id: 'set-file-to-new-btn-' + fileId, + id: 'set-file-to-new-btn', type: ActionTypes.circleBtn, action: () => this.#setToNew(), tooltip: _('dossier-overview.back-to-new'), @@ -194,7 +193,7 @@ export class FileActionsComponent implements OnChanges { show: this.showSetToNew, }, { - id: 'set-file-under-approval-btn-' + fileId, + id: 'set-file-under-approval-btn', type: ActionTypes.circleBtn, action: () => this._setFileUnderApproval(), tooltip: _('dossier-overview.under-approval'), @@ -202,7 +201,7 @@ export class FileActionsComponent implements OnChanges { show: this.showUnderApproval, }, { - id: 'set-file-under-review-btn-' + fileId, + id: 'set-file-under-review-btn', type: ActionTypes.circleBtn, action: () => this._setFileUnderReview(), tooltip: _('dossier-overview.under-review'), @@ -210,7 +209,7 @@ export class FileActionsComponent implements OnChanges { show: this.showUnderReview, }, { - id: 'set-file-approved-btn-' + fileId, + id: 'set-file-approved-btn', type: ActionTypes.circleBtn, action: () => this.setFileApproved(), tooltip: this.file.canBeApproved ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'), @@ -219,7 +218,7 @@ export class FileActionsComponent implements OnChanges { show: this.showApprove, }, { - id: 'toggle-automatic-analysis-btn-' + fileId, + id: 'toggle-automatic-analysis-btn', type: ActionTypes.circleBtn, action: () => this._toggleAutomaticAnalysis(), tooltip: _('dossier-overview.stop-auto-analysis'), @@ -227,7 +226,7 @@ export class FileActionsComponent implements OnChanges { show: this.canDisableAutoAnalysis, }, { - id: 'reanalyse-file-preview-btn-' + fileId, + id: 'reanalyse-file-preview-btn', type: ActionTypes.circleBtn, action: () => this._reanalyseFile(), tooltip: _('file-preview.reanalyse-notification'), @@ -237,7 +236,7 @@ export class FileActionsComponent implements OnChanges { disabled: this.file.isProcessing, }, { - id: 'toggle-automatic-analysis-btn-' + fileId, + id: 'toggle-automatic-analysis-btn', type: ActionTypes.circleBtn, action: () => this._toggleAutomaticAnalysis(), tooltip: _('dossier-overview.start-auto-analysis'), @@ -246,7 +245,7 @@ export class FileActionsComponent implements OnChanges { show: this.canEnableAutoAnalysis, }, { - id: 'set-under-approval-btn-' + fileId, + id: 'set-under-approval-btn', type: ActionTypes.circleBtn, action: () => this._setFileUnderApproval(), tooltip: _('dossier-overview.under-approval'), @@ -254,7 +253,7 @@ export class FileActionsComponent implements OnChanges { show: this.showUndoApproval, }, { - id: 'ocr-file-btn-' + fileId, + id: 'ocr-file-btn', type: ActionTypes.circleBtn, action: () => this._ocrFile(), tooltip: _('dossier-overview.ocr-file'), @@ -262,7 +261,7 @@ export class FileActionsComponent implements OnChanges { show: this.showOCR, }, { - id: 'reanalyse-file-btn-' + fileId, + id: 'reanalyse-file-btn', type: ActionTypes.circleBtn, action: () => this._reanalyseFile(), tooltip: _('dossier-overview.reanalyse.action'), @@ -270,7 +269,7 @@ export class FileActionsComponent implements OnChanges { show: this.showReanalyseDossierOverview, }, { - id: 'toggle-analysis-btn-' + fileId, + id: 'toggle-analysis-btn', type: ActionTypes.toggle, action: () => this._toggleAnalysis(), disabled: !this.canToggleAnalysis, From ba984838f8f9b25119eeb8341e436ee7e86fda8a Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 20 Mar 2023 15:56:10 +0100 Subject: [PATCH 68/99] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a54e1d19..910dd2f5a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.16.0", + "version": "4.17.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 00fa87dbef19e76ca04f7377c2231063aded1686..83c5096d3c424fe53003da6ee9d52afdd0b5c6d3 100644 GIT binary patch delta 3162 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 A{Qv*} delta 3162 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 Date: Mon, 20 Mar 2023 17:59:46 +0200 Subject: [PATCH 69/99] RED-3800: move file attributes stuff to its own module --- .../app/modules/admin/admin-routing.module.ts | 6 +- .../src/app/modules/admin/admin.module.ts | 10 +-- ...ase-dossier-template-screen.component.html | 1 + ...ssier-states-listing-screen.component.html | 65 +++++----------- ...ssier-states-listing-screen.component.scss | 4 + .../active-fields-listing.component.html | 0 .../active-fields-listing.component.scss | 0 .../active-fields-listing.component.ts | 0 ...-edit-file-attribute-dialog.component.html | 0 ...-edit-file-attribute-dialog.component.scss | 0 ...dd-edit-file-attribute-dialog.component.ts | 2 +- ...butes-configurations-dialog.component.html | 0 ...ributes-configurations-dialog.component.ts | 15 ++-- ...ttributes-csv-import-dialog.component.html | 0 ...ttributes-csv-import-dialog.component.scss | 0 ...-attributes-csv-import-dialog.component.ts | 2 +- ...e-attributes-listing-screen.component.html | 51 ++++--------- ...ile-attributes-listing-screen.component.ts | 76 +++++++++++++------ .../file-attributes-listing.module.ts | 72 ++++++++++++++++++ .../admin/services/admin-dialog.service.ts | 18 ----- 20 files changed, 178 insertions(+), 144 deletions(-) rename apps/red-ui/src/app/modules/admin/{dialogs/file-attributes-csv-import-dialog => screens/file-attributes-listing}/active-fields-listing/active-fields-listing.component.html (100%) rename apps/red-ui/src/app/modules/admin/{dialogs/file-attributes-csv-import-dialog => screens/file-attributes-listing}/active-fields-listing/active-fields-listing.component.scss (100%) rename apps/red-ui/src/app/modules/admin/{dialogs/file-attributes-csv-import-dialog => screens/file-attributes-listing}/active-fields-listing/active-fields-listing.component.ts (100%) rename apps/red-ui/src/app/modules/admin/{dialogs => screens/file-attributes-listing}/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html (100%) rename apps/red-ui/src/app/modules/admin/{dialogs => screens/file-attributes-listing}/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/admin/{dialogs => screens/file-attributes-listing}/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts (98%) rename apps/red-ui/src/app/modules/admin/{dialogs => screens/file-attributes-listing}/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html (100%) rename apps/red-ui/src/app/modules/admin/{dialogs => screens/file-attributes-listing}/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts (81%) rename apps/red-ui/src/app/modules/admin/{dialogs => screens/file-attributes-listing}/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html (100%) rename apps/red-ui/src/app/modules/admin/{dialogs => screens/file-attributes-listing}/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/admin/{dialogs => screens/file-attributes-listing}/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts (99%) create mode 100644 apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing.module.ts diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index 71a10eb67..68703dac6 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts @@ -3,7 +3,6 @@ import { CompositeRouteGuard, IqserAuthGuard, IqserPermissionsGuard, IqserRoutes import { RedRoleGuard } from '@users/red-role.guard'; import { EntitiesListingScreenComponent } from './screens/entities-listing/entities-listing-screen.component'; import { PendingChangesGuard } from '@guards/can-deactivate.guard'; -import { FileAttributesListingScreenComponent } from './screens/file-attributes-listing/file-attributes-listing-screen.component'; import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component'; import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component'; import { DigitalSignatureScreenComponent } from './screens/digital-signature/digital-signature-screen.component'; @@ -64,7 +63,9 @@ const dossierTemplateIdRoutes: IqserRoutes = [ }, { path: 'file-attributes', - component: FileAttributesListingScreenComponent, + component: BaseDossierTemplateScreenComponent, + loadChildren: () => + import('./screens/file-attributes-listing/file-attributes-listing.module').then(m => m.FileAttributesListingModule), canActivate: [CompositeRouteGuard], data: { routeGuards: [IqserAuthGuard, RedRoleGuard], @@ -97,6 +98,7 @@ const dossierTemplateIdRoutes: IqserRoutes = [ }, { path: 'dossier-states', + component: BaseDossierTemplateScreenComponent, loadChildren: () => import('./screens/dossier-states-listing/dossier-states-listing.module').then(m => m.DossierStatesListingModule), canActivate: [CompositeRouteGuard], diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 215a8529b..edecbf01c 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -6,10 +6,9 @@ import { AuditScreenComponent } from './screens/audit/audit-screen.component'; import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component'; import { EntitiesListingScreenComponent } from './screens/entities-listing/entities-listing-screen.component'; import { DigitalSignatureScreenComponent } from './screens/digital-signature/digital-signature-screen.component'; -import { FileAttributesListingScreenComponent } from './screens/file-attributes-listing/file-attributes-listing-screen.component'; import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component'; import { DossierTemplateBreadcrumbsComponent } from './shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component'; -import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; +import { AddEditFileAttributeDialogComponent } from './screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; import { AddEditCloneDossierTemplateDialogComponent } from './dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component'; import { AddEntityDialogComponent } from './dialogs/add-entity-dialog/add-entity-dialog.component'; import { EditColorDialogComponent } from './dialogs/edit-color-dialog/edit-color-dialog.component'; @@ -18,8 +17,6 @@ import { GeneralConfigScreenComponent } from './screens/general-config/general-c import { SmtpAuthDialogComponent } from './dialogs/smtp-auth-dialog/smtp-auth-dialog.component'; import { AddEditUserDialogComponent } from './dialogs/add-edit-user-dialog/add-edit-user-dialog.component'; import { UsersStatsComponent } from './components/users-stats/users-stats.component'; -import { FileAttributesCsvImportDialogComponent } from './dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component'; -import { ActiveFieldsListingComponent } from './dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component'; import { ResetPasswordComponent } from './dialogs/add-edit-user-dialog/reset-password/reset-password.component'; import { UserDetailsComponent } from './dialogs/add-edit-user-dialog/user-details/user-details.component'; import { AddEditDossierAttributeDialogComponent } from './dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component'; @@ -32,7 +29,6 @@ import { SmtpConfigService } from './services/smtp-config.service'; import { UploadDictionaryDialogComponent } from './dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component'; import { GeneralConfigFormComponent } from './screens/general-config/general-config-form/general-config-form.component'; import { SmtpFormComponent } from './screens/general-config/smtp-form/smtp-form.component'; -import { FileAttributesConfigurationsDialogComponent } from './dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component'; import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component'; import { A11yModule } from '@angular/cdk/a11y'; import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component'; @@ -70,8 +66,6 @@ const dialogs = [ EditColorDialogComponent, SmtpAuthDialogComponent, AddEditUserDialogComponent, - FileAttributesConfigurationsDialogComponent, - FileAttributesCsvImportDialogComponent, AddEditDossierAttributeDialogComponent, UploadDictionaryDialogComponent, ConfigureCertificateDialogComponent, @@ -83,7 +77,6 @@ const screens = [ DefaultColorsScreenComponent, EntitiesListingScreenComponent, DigitalSignatureScreenComponent, - FileAttributesListingScreenComponent, UserListingScreenComponent, GeneralConfigScreenComponent, DossierAttributesListingScreenComponent, @@ -91,7 +84,6 @@ const screens = [ const components = [ UsersStatsComponent, - ActiveFieldsListingComponent, ResetPasswordComponent, UserDetailsComponent, BaseAdminScreenComponent, diff --git a/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html index ee08d19cc..84f9dc06e 100644 --- a/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html @@ -10,6 +10,7 @@ diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html index 92bc9e700..f87e63f8b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.html @@ -1,48 +1,25 @@ -
-
- +
+ +
-
- - - -
-
- -
-
- - - -
- -
- -
- -
-
-
+
+ +
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.scss index 9c456907d..a1aa8713e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.scss @@ -1,3 +1,7 @@ +:host { + flex-direction: row !important; +} + .right-container { padding: 50px 26px 0; width: 250px; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.html diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.scss diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.ts diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.scss b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.scss rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.scss diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts similarity index 98% rename from apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts index 4c83ffc7c..6d2a89186 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts @@ -30,7 +30,7 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent { }; constructor( - protected readonly _dialogRef: MatDialogRef, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: AddEditFileAttributeDialogData, ) { super(_dialogRef, !!data.fileAttribute); diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.html diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts similarity index 81% rename from apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts index 1d2d34bcb..97a94b1f2 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { UntypedFormGroup, Validators } from '@angular/forms'; +import { Validators } from '@angular/forms'; import { FileAttributeEncodingTypes, IFileAttributesConfig } from '@red/domain'; import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations'; import { BaseDialogComponent } from '@iqser/common-ui'; @@ -12,12 +12,9 @@ import { BaseDialogComponent } from '@iqser/common-ui'; export class FileAttributesConfigurationsDialogComponent extends BaseDialogComponent { readonly encodingTypeOptions = Object.keys(FileAttributeEncodingTypes); readonly translations = fileAttributeEncodingTypesTranslations; - readonly #configuration = this._data.config; + readonly #configuration = inject(MAT_DIALOG_DATA); - constructor( - protected readonly _dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) private readonly _data: { config: IFileAttributesConfig; dossierTemplateId: string }, - ) { + constructor(protected readonly _dialogRef: MatDialogRef) { super(_dialogRef, true); this.form = this.#getForm(); this.initialFormValue = this.form.getRawValue(); @@ -39,7 +36,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo this._dialogRef.close(this.#getConfiguration()); } - #getConfiguration() { + #getConfiguration(): IFileAttributesConfig { const supportCsvMapping = this.form.get('supportCsvMapping').value; if (supportCsvMapping) { return { @@ -56,7 +53,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo }; } - #getForm(): UntypedFormGroup { + #getForm() { return this._formBuilder.group({ supportCsvMapping: [!!this.#configuration.filenameMappingColumnHeaderName], keyColumn: [this.#configuration.filenameMappingColumnHeaderName || '', [Validators.required]], diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts similarity index 99% rename from apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts index f84139d14..bac130bfe 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts @@ -10,7 +10,7 @@ import { FileAttributeConfig, FileAttributeConfigTypes, FileAttributeEncodingTyp import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations'; -interface IFileAttributesCSVImportData { +export interface IFileAttributesCSVImportData { readonly csv: File; readonly dossierTemplateId: string; readonly existingConfiguration: IFileAttributesConfig; 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 f1f991fc8..d563cb36a 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 @@ -1,41 +1,18 @@ -
-
- +
+ +
-
- - - -
-
- -
-
- - - -
- -
- -
-
-
+