Merge branch 'RED10758' into 'master'

RED-10758: Fix remove and recategorize request in applicationType DocuMine

See merge request redactmanager/red-ui!767

apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts

@@ -57,6 +57,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo
         if (supportCsvMapping) {
             return {
                 ...this.#configuration,
+                keyColumn: this.form.get('keyColumn').value,
                 filenameMappingColumnHeaderName: this.form.get('keyColumn').value,
                 delimiter: this.form.get('delimiter').value,
                 encoding: this.form.get('encodingType').value,
@@ -66,13 +67,14 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo
         return {
             ...this.#configuration,
             filenameMappingColumnHeaderName: '',
+            keyColumn: this.form.get('keyColumn').value,
         };
     }
 
     #getForm() {
         return this._formBuilder.group({
             supportCsvMapping: [!!this.#configuration.filenameMappingColumnHeaderName],
-            keyColumn: [this.#configuration.filenameMappingColumnHeaderName || '', [Validators.required]],
+            keyColumn: [this.#configuration.filenameMappingColumnHeaderName || this.#configuration.keyColumn || '', [Validators.required]],
             delimiter: [this.#configuration.delimiter || '', [Validators.required]],
             encodingType: [this.#configuration.encoding || FileAttributeEncodingTypes['UTF-8'], [Validators.required]],
         });

apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts

@@ -85,6 +85,7 @@ export default class FileAttributesListingScreenComponent extends ListingCompone
         },
     ];
     readonly roles = Roles;
+    keyColumnValue: string = '';
 
     constructor(
         readonly permissionsService: PermissionsService,
@@ -171,13 +172,13 @@ export default class FileAttributesListingScreenComponent extends ListingCompone
             FileAttributesConfigurationsDialogComponent,
             {
                 ...defaultDialogConfig,
-                data: this.#existingConfiguration,
+                data: { ...this.#existingConfiguration, keyColumn: this.keyColumnValue },
             },
         );
 
         const configuration = await firstValueFrom(ref.afterClosed());
-
         if (configuration) {
+            this.keyColumnValue = configuration.keyColumn;
             await this.#setConfigAndLoadData(configuration);
         }
     }

apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts

@@ -22,6 +22,8 @@ import { ConfigureCertificateDialogComponent } from '../dialogs/configure-digita
 import { EditColorDialogComponent } from '../dialogs/edit-color-dialog/edit-color-dialog.component';
 import { SmtpAuthDialogComponent } from '../dialogs/smtp-auth-dialog/smtp-auth-dialog.component';
 import { UploadDictionaryDialogComponent } from '../dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component';
+import { UserStatsService } from './user-stats.service';
+import { result } from 'lodash-es';
 
 type DialogType =
     | 'confirm'
@@ -73,19 +75,26 @@ export class AdminDialogService extends DialogService<DialogType> {
         private readonly _activeDossiersService: ActiveDossiersService,
         private readonly _loadingService: LoadingService,
         private readonly _userService: UserService,
+        private readonly _userStatsService: UserStatsService,
         private readonly _reportTemplateService: ReportTemplateService,
     ) {
         super(_dialog);
     }
 
-    deleteUsers(userIds: string[], cb?: () => Promise<void> | void): void {
+    async deleteUsers(userIds: string[], cb?: () => Promise<void> | void): Promise<void> {
+        const userStats = await firstValueFrom(this._userStatsService.getOne(userIds[0]));
+
         const data: IConfirmationDialogData = {
             title: _('confirm-delete-users.title'),
             question: _('confirm-delete-users.warning'),
             confirmationText: _('confirm-delete-users.delete'),
             denyText: _('confirm-delete-users.cancel'),
             titleColor: TitleColors.WARN,
-            translateParams: { usersCount: 1, dossiersCount: this._getUsersDossiersCount(userIds) },
+            translateParams: {
+                usersCount: 1,
+                dossiersCount: userStats.numberOfDossierOwnerships,
+                documentsCount: userStats.numberOfAssignedFiles,
+            },
             checkboxes: [
                 { value: false, label: _('confirm-delete-users.impacted-dossiers') },
                 { value: false, label: _('confirm-delete-users.impacted-documents') },

apps/red-ui/src/app/modules/admin/services/user-stats.service.ts

@@ -0,0 +1,10 @@
+import { StatsService } from '@iqser/common-ui';
+import { IUserStats, USER_ID, UserStats } from '@red/domain';
+import { Injectable } from '@angular/core';
+
+@Injectable({ providedIn: 'root' })
+export class UserStatsService extends StatsService<UserStats, IUserStats> {
+    protected readonly _primaryKey = USER_ID;
+    protected readonly _entityClass = UserStats;
+    protected readonly _defaultModelPath = 'user-stats';
+}

apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html

@@ -27,7 +27,9 @@
         <redaction-file-attribute [dossier]="dossier" [fileAttribute]="config" [file]="file"></redaction-file-attribute>
     </div>
 
-    <redaction-file-workload [file]="file"></redaction-file-workload>
+    @if (!isDocumine) {
+        <redaction-file-workload [file]="file"></redaction-file-workload>
+    }
 
     <div class="file-actions overflow-visible">
         <redaction-processing-indicator [file]="file" class="mr-8"></redaction-processing-indicator>

apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.ts

@@ -1,5 +1,5 @@
-import { ChangeDetectorRef, Component, computed, ElementRef, Input, OnInit, Optional, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, ElementRef, Input, OnInit, Optional, ViewChild } from '@angular/core';
-import { DisableStopPropagationDirective, HelpModeService } from '@iqser/common-ui';
+import { DisableStopPropagationDirective, getConfig, HelpModeService } from '@iqser/common-ui';
 import { Debounce, trackByFactory } from '@iqser/common-ui/lib/utils';
 import { Dossier, File, IFileAttributeConfig } from '@red/domain';
 import { FileAttributesService } from '@services/entity-services/file-attributes.service';
@@ -36,6 +36,7 @@ import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
 export class WorkflowItemComponent implements OnInit {
     @ViewChild('actionsWrapper', { static: true }) private _actionsWrapper: ElementRef;
     width: number;
+    readonly isDocumine = getConfig().IS_DOCUMINE;
     readonly trackBy = trackByFactory();
     @Input({ required: true }) file: File;
     @Input({ required: true }) dossier: Dossier;

apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss

@@ -58,9 +58,9 @@ redaction-pdf-viewer.hidden {
 }
 
 .resize {
-    background: #444857;
+    background: var(--iqser-grey-4);
     height: 100%;
-    width: 14px;
+    width: 10px;
     cursor: col-resize;
     position: relative;
     z-index: 10;
@@ -74,7 +74,7 @@ redaction-pdf-viewer.hidden {
     transform: translate(-50%, -50%);
     width: 3px;
     height: 15px;
-    border-inline: 1px solid #fff;
+    border-inline: 1px solid var(--iqser-grey-1);
 }
 
 @media only screen and (max-width: 1015px) {

apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts

@@ -122,6 +122,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     readonly fileId = this.state.fileId;
     readonly dossierId = this.state.dossierId;
     readonly resizeHandle = viewChild<ElementRef>('resize');
+    #overlayElement: HTMLDivElement | null = null;
 
     constructor(
         readonly pdf: PdfViewer,
@@ -177,16 +178,13 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
             this._fileDataService.loadAnnotations(file).then();
         }
 
-        effect(
+        effect(() => {
-            () => {
+            if (this._documentViewer.loaded()) {
-                if (this._documentViewer.loaded()) {
+                this._pageRotationService.clearRotations();
-                    this._pageRotationService.clearRotations();
+                this._viewerHeaderService.disable(ROTATION_ACTION_BUTTONS);
-                    this._viewerHeaderService.disable(ROTATION_ACTION_BUTTONS);
+                this.viewerReady().then();
-                    this.viewerReady().then();
+            }
-                }
+        });
-            },
-            { allowSignalWrites: true },
-        );
 
         effect(() => {
             this.state.updateExcludedPagesStyle();
@@ -252,10 +250,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     onDragStart(event: CdkDragStart) {
         event.event.preventDefault();
         if (!this.isDocumine) return;
-        const contentInnerElement = document.body.getElementsByClassName('content-inner').item(0) as HTMLElement;
+        this.#createDragOverlay();
-        if (contentInnerElement) {
-            contentInnerElement.classList.add('dragging');
-        }
     }
 
     onDragMove(event: CdkDragMove) {
@@ -269,10 +264,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     onDragEnd(event: CdkDragEnd) {
         event.event.preventDefault();
         if (!this.isDocumine) return;
-        const contentInnerElement = document.body.getElementsByClassName('content-inner').item(0) as HTMLElement;
+        this.#removeDragOverlay();
-        if (contentInnerElement) {
-            contentInnerElement.classList.remove('dragging');
-        }
     }
 
     deleteEarmarksOnViewChange$() {
@@ -311,7 +303,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
 
     handleEscInsideViewer($event: KeyboardEvent) {
         $event.preventDefault();
-        if (!!this._annotationManager.selected[0]) {
+        if (this._annotationManager.selected[0]) {
             const doesHaveWrapper = this._fileDataService.find(this._annotationManager.selected[0]?.Id);
             if (!doesHaveWrapper) {
                 this._annotationManager.delete(this._annotationManager.selected[0]?.Id);
@@ -332,24 +324,17 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     @Bind()
     handleViewerClick(event: MouseEvent) {
         this._ngZone.run(() => {
-            if (event.isTrusted) {
+            if (!event.isTrusted) return;
-                const clickedElement = event.target as HTMLElement;
+            const clickedElement = event.target as HTMLElement;
-                const actionIconClicked = ANNOTATION_ACTION_ICONS.some(action =>
+            const actionIconClicked = ANNOTATION_ACTION_ICONS.some(action => (clickedElement as HTMLImageElement).src?.includes(action));
-                    (clickedElement as HTMLImageElement).src?.includes(action),
+            const actionClicked = ANNOTATION_ACTIONS.some(action => clickedElement.getAttribute('aria-label')?.includes(action));
-                );
+            if (!this._multiSelectService.active() || actionIconClicked || actionClicked) return;
-                const actionClicked = ANNOTATION_ACTIONS.some(action => clickedElement.getAttribute('aria-label')?.includes(action));
+            if (clickedElement.querySelector('#selectionrect') || clickedElement.id === `pageWidgetContainer${this.pdf.currentPage()}`) {
-                if (this._multiSelectService.active() && !actionIconClicked && !actionClicked) {
+                if (!this._annotationManager.selected.length) {
-                    if (
+                    this._multiSelectService.deactivate();
-                        clickedElement.querySelector('#selectionrect') ||
-                        clickedElement.id === `pageWidgetContainer${this.pdf.currentPage()}`
-                    ) {
-                        if (!this._annotationManager.selected.length) {
-                            this._multiSelectService.deactivate();
-                        }
-                    } else {
-                        this._multiSelectService.deactivate();
-                    }
                 }
+            } else {
+                this._multiSelectService.deactivate();
             }
         });
     }
@@ -471,7 +456,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     }
 
     #getPixelsInPercentage(pixels: number) {
-        return (pixels / window.screen.width) * 100;
+        return (pixels / document.body.getBoundingClientRect().width) * 100;
     }
 
     async #updateViewMode(): Promise<void> {
@@ -902,32 +887,30 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         const components = this._componentLogService.all;
         const filteredComponentIds = untracked(this.state.componentReferenceIds);
 
-        if (filteredComponentIds && annotationFilters) {
+        if (!filteredComponentIds || !annotationFilters) return annotationFilters;
-            const filteredComponentIdsSet = new Set(filteredComponentIds);
 
-            const references = new Set<string>();
+        const filteredComponentIdsSet = new Set(filteredComponentIds);
-            for (const component of components) {
+
-                for (const componentValue of component.componentValues) {
+        const references = new Set<string>();
-                    for (const reference of componentValue.entityReferences) {
+        for (const component of components) {
-                        if (filteredComponentIdsSet.has(reference.id)) {
+            for (const componentValue of component.componentValues) {
-                            references.add(reference.type);
+                for (const reference of componentValue.entityReferences) {
-                        }
+                    if (filteredComponentIdsSet.has(reference.id)) {
+                        references.add(reference.type);
                     }
                 }
             }
-
-            return annotationFilters
-                .map(filter => {
-                    const filteredChildren = filter.children.filter(c => references.has(c.label.replace(/ /g, '_').toLowerCase()));
-                    if (filteredChildren.length) {
-                        return { ...filter, children: filteredChildren };
-                    }
-                    return null;
-                })
-                .filter(f => f !== null);
         }
 
-        return annotationFilters;
+        return annotationFilters
+            .map(filter => {
+                const filteredChildren = filter.children.filter(c => references.has(c.label.replace(/ /g, '_').toLowerCase()));
+                if (filteredChildren.length) {
+                    return { ...filter, children: filteredChildren };
+                }
+                return null;
+            })
+            .filter(f => f !== null);
     }
 
     #updateViewerPosition() {
@@ -942,4 +925,27 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         }
         document.getElementById('viewer')?.classList?.add('redaction-viewer');
     }
+
+    #createDragOverlay() {
+        if (this.#overlayElement || document.body.contains(this.#overlayElement)) {
+            return;
+        }
+
+        this.#overlayElement = document.createElement('div');
+        this.#overlayElement.style.position = 'fixed';
+        this.#overlayElement.style.top = '0';
+        this.#overlayElement.style.left = '0';
+        this.#overlayElement.style.width = '100%';
+        this.#overlayElement.style.height = '100%';
+        this.#overlayElement.style.zIndex = '9999';
+        this.#overlayElement.style.background = 'transparent';
+        this.#overlayElement.style.pointerEvents = 'all';
+        document.body.appendChild(this.#overlayElement);
+    }
+
+    #removeDragOverlay() {
+        if (!this.#overlayElement || !document.body.contains(this.#overlayElement)) return;
+        document.body.removeChild(this.#overlayElement);
+        this.#overlayElement = null;
+    }
 }

apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts

@@ -137,7 +137,11 @@ export class AnnotationActionsService {
 
         let recategorizeBody: List<IRecategorizationRequest> | IBulkRecategorizationRequest;
 
-        if (result.option === RedactOrHintOptions.ONLY_HERE || result.option === RectangleRedactOptions.ONLY_THIS_PAGE) {
+        if (
+            result.option === RedactOrHintOptions.ONLY_HERE ||
+            result.option === RectangleRedactOptions.ONLY_THIS_PAGE ||
+            this.#isDocumine
+        ) {
             recategorizeBody = annotations.map(annotation => {
                 const body: IRecategorizationRequest = {
                     annotationId: annotation.id,
@@ -167,6 +171,7 @@ export class AnnotationActionsService {
             };
         }
 
+        result.pageNumbers = result.pageNumbers || [];
         await this.#processObsAndEmit(
             this._manualRedactionService.recategorizeRedactions(
                 recategorizeBody,
@@ -606,6 +611,7 @@ export class AnnotationActionsService {
         redactions: AnnotationWrapper[],
         dialogResult: RemoveRedactionResult,
     ): List<IRemoveRedactionRequest | IBulkLocalRemoveRequest> {
+        dialogResult.pageNumbers = dialogResult.pageNumbers || [];
         if (dialogResult.bulkLocal || !!dialogResult.pageNumbers.length) {
             return dialogResult.positions.map((position, index) => ({
                 value: redactions[index].value,

apps/red-ui/src/app/services/dossiers/dossier-stats.service.ts

@@ -1,6 +1,6 @@
 import { inject, Injectable } from '@angular/core';
 import { StatsService } from '@iqser/common-ui';
-import { DashboardStats, DOSSIER_ID, DossierStats, IDossierStats } from '@red/domain';
+import { DOSSIER_ID, DossierStats, IDossierStats } from '@red/domain';
 import { Observable, of } from 'rxjs';
 import { UserService } from '@users/user.service';
 import { NGXLogger } from 'ngx-logger';

apps/red-ui/src/assets/i18n/redact/en.json

@@ -642,7 +642,7 @@
   "confirm-delete-users": {
     "cancel": "Keep {usersCount, plural, one{user} other{users}}",
     "delete": "Delete {usersCount, plural, one{user} other{users}}",
-    "impacted-documents": "All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted",
+    "impacted-documents": "{documentsCount} {documentsCount, plural, one{document} other{documents}} will be impacted",
     "impacted-dossiers": "{dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted",
     "title": "Delete {usersCount, plural, one{user} other{users}} from workspace",
     "toast-error": "Please confirm that you understand the consequences of this action.",

apps/red-ui/src/assets/i18n/scm/en.json

@@ -642,7 +642,7 @@
   "confirm-delete-users": {
     "cancel": "Keep {usersCount, plural, one{user} other{users}}",
     "delete": "Delete {usersCount, plural, one{user} other{users}}",
-    "impacted-documents": "All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted",
+    "impacted-documents": "{documentsCount} {documentsCount, plural, one{document} other{documents}} will be impacted",
     "impacted-dossiers": "{dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted",
     "title": "Delete {usersCount, plural, one{user} other{users}} from workspace",
     "toast-error": "Please confirm that you understand the consequences of this action.",

libs/common-ui

@@ -1 +1 @@
-Subproject commit 58382ddfeed1d6d4d61f03abd1bbb0dd840afa94
+Subproject commit 7f13fa62d3d2b346c609bc4978cff75f37f1ee6b

libs/red-domain/src/lib/users/constants.ts

@@ -0,0 +1 @@
+export const USER_ID = 'userId';

libs/red-domain/src/lib/users/index.ts

@@ -1,3 +1,6 @@
 export * from './user.model';
 export * from './profile';
 export * from './types';
+export * from './user-stats';
+export * from './user-stats.model';
+export * from './constants';

libs/red-domain/src/lib/users/user-stats.model.ts

@@ -0,0 +1,13 @@
+import { IUserStats } from './user-stats';
+
+export class UserStats implements IUserStats {
+    readonly numberOfDossierMemberships: number;
+    readonly numberOfDossierOwnerships: number;
+    readonly numberOfAssignedFiles: number;
+
+    constructor(userStats: IUserStats) {
+        this.numberOfAssignedFiles = userStats.numberOfAssignedFiles;
+        this.numberOfDossierOwnerships = userStats.numberOfAssignedFiles;
+        this.numberOfAssignedFiles = userStats.numberOfAssignedFiles;
+    }
+}

libs/red-domain/src/lib/users/user-stats.ts

@@ -0,0 +1,5 @@
+export interface IUserStats {
+    numberOfDossierMemberships: number;
+    numberOfDossierOwnerships: number;
+    numberOfAssignedFiles: number;
+}