RED-10592: replace hostListener with Bind; fix listener on file header.

RED-10084: All members of a dossier are able to reanalyse files in error...

See merge request redactmanager/red-ui!596

apps/red-ui/src/app/app.module.ts

@@ -258,6 +258,7 @@ export const appModuleFactory = (config: AppConfig) => {
                 provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
                 useValue: {
                     disableTooltipInteractivity: true,
+                    showDelay: 1,
                 },
             },
             BaseDatePipe,

apps/red-ui/src/app/components/base-screen/base-screen.component.html

@@ -9,7 +9,7 @@
         <redaction-breadcrumbs></redaction-breadcrumbs>
     </div>
 
-    <a [matTooltip]="'top-bar.navigation-items.back-to-dashboard' | translate" [routerLink]="['/']" class="logo">
+    <a [matTooltip]="'top-bar.navigation-items.back-to-dashboard' | translate" [routerLink]="['/main']" class="logo">
         <div [attr.help-mode-key]="'home'" class="actions">
             <iqser-logo (iqserHiddenAction)="userPreferenceService.toggleDevFeatures()" icon="iqser:logo"></iqser-logo>
             <div class="app-name">{{ titleService.getTitle() }}</div>

apps/red-ui/src/app/components/notifications/notifications.component.scss

@@ -22,7 +22,7 @@
         }
 
         .mat-mdc-menu-item.notification {
-            padding: 8px 26px 10px 8px;
+            padding: 8px 26px 10px 8px !important;
             margin: 2px 0 0 0;
             height: fit-content;
             position: relative;

apps/red-ui/src/app/guards/dossier-template-exists.guard.ts

@@ -11,7 +11,9 @@ import { DictionaryService } from '@services/entity-services/dictionary.service'
 import { DefaultColorsService } from '@services/entity-services/default-colors.service';
 import { WatermarkService } from '@services/entity-services/watermark.service';
 import { FileAttributesService } from '@services/entity-services/file-attributes.service';
-import { getConfig } from '@iqser/common-ui';
+import { getConfig, Toaster } from '@iqser/common-ui';
+import { RulesService } from '../modules/admin/services/rules.service';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 
 export function templateExistsWhenEnteringAdmin(): CanActivateFn {
     return async function (route: ActivatedRouteSnapshot): Promise<boolean> {
@@ -21,12 +23,14 @@ export function templateExistsWhenEnteringAdmin(): CanActivateFn {
         const defaultColorsService = inject(DefaultColorsService);
         const watermarksService = inject(WatermarkService);
         const router = inject(Router);
+        const rulesService = inject(RulesService);
         const isDocumine = getConfig().IS_DOCUMINE;
 
         const dossierTemplate = inject(DossierTemplateStatsService).get(dossierTemplateId);
         await firstValueFrom(fileAttributesService.loadFileAttributesConfig(dossierTemplateId));
         await firstValueFrom(dictionaryService.loadDictionaryDataForDossierTemplate(dossierTemplateId));
         await firstValueFrom(defaultColorsService.loadForDossierTemplate(dossierTemplateId));
+        await firstValueFrom(rulesService.getFor(dossierTemplateId));
         if (!isDocumine) {
             await firstValueFrom(watermarksService.loadForDossierTemplate(dossierTemplateId));
         }
@@ -50,6 +54,8 @@ export function templateExistsWhenEnteringDossierList(): CanActivateFn {
         const dictionaryService = inject(DictionaryService);
         const defaultColorsService = inject(DefaultColorsService);
         const watermarksService = inject(WatermarkService);
+        const rulesService = inject(RulesService);
+        const toaster = inject(Toaster);
         const isDocumine = getConfig().IS_DOCUMINE;
 
         await firstValueFrom(dashboardStatsService.loadForTemplate(dossierTemplateId));
@@ -64,6 +70,10 @@ export function templateExistsWhenEnteringDossierList(): CanActivateFn {
         await firstValueFrom(fileAttributesService.loadFileAttributesConfig(dossierTemplateId));
         await firstValueFrom(dictionaryService.loadDictionaryDataForDossierTemplate(dossierTemplateId));
         await firstValueFrom(defaultColorsService.loadForDossierTemplate(dossierTemplateId));
+        const rules = await firstValueFrom(rulesService.getFor(dossierTemplateId));
+        if (rules.timeoutDetected) {
+            toaster.error(_('dossier-listing.rules.timeoutError'));
+        }
         if (!isDocumine) {
             await firstValueFrom(watermarksService.loadForDossierTemplate(dossierTemplateId));
         }

apps/red-ui/src/app/models/file/annotation-permissions.utils.ts

@@ -1,6 +1,6 @@
 import { AnnotationPermissions } from '@models/file/annotation.permissions';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { Dictionary, LogEntryEngines, SuperTypes } from '@red/domain';
+import { Dictionary, SuperTypes } from '@red/domain';
 
 export const canUndo = (annotation: AnnotationWrapper, isApprover: boolean) => !isApprover && annotation.pending;
 
@@ -17,8 +17,9 @@ export const canAcceptRecommendation = (annotation: AnnotationWrapper) => annota
 
 export const canMarkAsFalsePositive = (annotation: AnnotationWrapper, annotationEntity: Dictionary) =>
     annotation.canBeMarkedAsFalsePositive &&
-    !annotation.hasBeenForcedRedaction &&
     !annotation.hasBeenResizedLocally &&
+    !annotation.isRemovedLocally &&
+    !annotation.hasBeenForcedRedaction &&
     annotationEntity?.hasDictionary;
 
 export const canRemoveOnlyHere = (annotation: AnnotationWrapper, canAddRedaction: boolean, autoAnalysisDisabled: boolean) =>
@@ -30,7 +31,7 @@ export const canRemoveFromDictionary = (annotation: AnnotationWrapper, autoAnaly
     annotation.isModifyDictionary &&
     (annotation.isRedacted || annotation.isSkipped || annotation.isHint || (annotation.isIgnoredHint && !annotation.isRuleBased)) &&
     (autoAnalysisDisabled || !annotation.pending) &&
-    [LogEntryEngines.DICTIONARY, LogEntryEngines.DOSSIER_DICTIONARY].some(engine => annotation.engines.includes(engine));
+    annotation.isDictBased;
 
 export const canRemoveRedaction = (annotation: AnnotationWrapper, permissions: AnnotationPermissions) =>
     (!annotation.isIgnoredHint || !annotation.isRuleBased) &&

apps/red-ui/src/app/models/file/annotation.wrapper.ts

@@ -74,7 +74,7 @@ export class AnnotationWrapper implements IListable {
     }
 
     get isDictBased() {
-        return this.engines.includes(LogEntryEngines.DICTIONARY);
+        return [LogEntryEngines.DICTIONARY, LogEntryEngines.DOSSIER_DICTIONARY].some(engine => this.engines.includes(engine));
     }
 
     get isRedactedImageHint() {

apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html

@@ -37,6 +37,11 @@
                             {{ 'preferences-screen.form.help-mode-dialog' | translate }}
                         </mat-checkbox>
                     </div>
+                    <div class="iqser-input-group">
+                        <mat-checkbox color="primary" formControlName="overwriteFileOption">
+                            {{ 'preferences-screen.form.overwrite-file-option' | translate }}
+                        </mat-checkbox>
+                    </div>
                 </ng-container>
             </div>
         </div>

apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import {
@@ -28,6 +28,7 @@ interface PreferencesForm {
     // warnings preferences
     loadAllAnnotationsWarning: boolean;
     helpModeDialog: boolean;
+    overwriteFileOption: boolean;
 
     [k: string]: any;
 }
@@ -58,6 +59,12 @@ const Screens = {
     ],
 })
 export class PreferencesComponent extends BaseFormComponent implements OnInit {
+    readonly #formBuilder = inject(FormBuilder);
+    readonly #permissionsService = inject(IqserPermissionsService);
+    readonly #changeRef = inject(ChangeDetectorRef);
+    readonly #loadingService = inject(LoadingService);
+    readonly #userPreferenceService = inject(UserPreferenceService);
+
     readonly form: FormGroup<AsControl<PreferencesForm>>;
     readonly currentScreen: Screen;
     readonly screens = Screens;
@@ -66,81 +73,92 @@ export class PreferencesComponent extends BaseFormComponent implements OnInit {
     readonly config = getConfig();
     readonly isIqserDevMode = isIqserDevMode();
 
-    constructor(
+    get #isOverwriteFileOptionActive() {
-        route: ActivatedRoute,
+        return !(this.#userPreferenceService.getOverwriteFileOption() === 'undefined');
-        readonly userPreferenceService: UserPreferenceService,
+    }
-        private readonly _formBuilder: FormBuilder,
+
-        private readonly _permissionsService: IqserPermissionsService,
+    constructor(route: ActivatedRoute) {
-        private readonly _changeRef: ChangeDetectorRef,
-        private readonly _loadingService: LoadingService,
-    ) {
         super();
-        this.form = this._formBuilder.group({
+        this.form = this.#formBuilder.group({
             // preferences
-            autoExpandFiltersOnActions: [this.userPreferenceService.getAutoExpandFiltersOnActions()],
+            autoExpandFiltersOnActions: [this.#userPreferenceService.getAutoExpandFiltersOnActions()],
-            openScmDialogByDefault: [this.userPreferenceService.getOpenScmDialogByDefault()],
+            openScmDialogByDefault: [this.#userPreferenceService.getOpenScmDialogByDefault()],
-            tableExtractionType: [this.userPreferenceService.getTableExtractionType()],
+            tableExtractionType: [this.#userPreferenceService.getTableExtractionType()],
             // warnings preferences
-            loadAllAnnotationsWarning: [this.userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning)],
+            loadAllAnnotationsWarning: [this.#userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning)],
-            helpModeDialog: [this.userPreferenceService.getBool(KEYS.helpModeDialog)],
+            helpModeDialog: [this.#userPreferenceService.getBool(KEYS.helpModeDialog)],
+            overwriteFileOption: [this.#isOverwriteFileOptionActive],
         });
 
-        if (!this._permissionsService.has(Roles.managePreferences)) {
+        if (!this.#permissionsService.has(Roles.managePreferences)) {
             this.form.disable();
         }
 
-        if (!this._permissionsService.has(Roles.getTables)) {
+        if (!this.#permissionsService.has(Roles.getTables)) {
             this.form.controls.tableExtractionType.disable();
         }
 
+        if (!this.#isOverwriteFileOptionActive) {
+            this.form.controls.overwriteFileOption.disable();
+        }
+
         this.initialFormValue = this.form.getRawValue();
         this.currentScreen = route.snapshot.data.screen;
     }
 
     ngOnInit() {
-        this._loadingService.stop();
+        this.#loadingService.stop();
     }
 
     async save(): Promise<any> {
-        if (this.form.controls.autoExpandFiltersOnActions.value !== this.userPreferenceService.getAutoExpandFiltersOnActions()) {
+        if (this.form.controls.autoExpandFiltersOnActions.value !== this.#userPreferenceService.getAutoExpandFiltersOnActions()) {
-            await this.userPreferenceService.toggleAutoExpandFiltersOnActions();
+            await this.#userPreferenceService.toggleAutoExpandFiltersOnActions();
         }
-        if (this.form.controls.openScmDialogByDefault.value !== this.userPreferenceService.getOpenScmDialogByDefault()) {
+        if (this.form.controls.openScmDialogByDefault.value !== this.#userPreferenceService.getOpenScmDialogByDefault()) {
-            await this.userPreferenceService.toggleOpenScmDialogByDefault();
+            await this.#userPreferenceService.toggleOpenScmDialogByDefault();
         }
 
-        if (this.form.controls.tableExtractionType.value !== this.userPreferenceService.getTableExtractionType()) {
+        if (this.form.controls.tableExtractionType.value !== this.#userPreferenceService.getTableExtractionType()) {
-            await this.userPreferenceService.save(PreferencesKeys.tableExtractionType, this.form.controls.tableExtractionType.value);
+            await this.#userPreferenceService.save(PreferencesKeys.tableExtractionType, this.form.controls.tableExtractionType.value);
         }
 
         if (
             this.form.controls.loadAllAnnotationsWarning.value !==
-            this.userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning)
+            this.#userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning)
         ) {
-            await this.userPreferenceService.save(
+            await this.#userPreferenceService.save(
                 PreferencesKeys.loadAllAnnotationsWarning,
                 String(this.form.controls.loadAllAnnotationsWarning.value),
             );
         }
 
-        if (this.form.controls.helpModeDialog.value !== this.userPreferenceService.getBool(KEYS.helpModeDialog)) {
+        if (this.form.controls.helpModeDialog.value !== this.#userPreferenceService.getBool(KEYS.helpModeDialog)) {
-            await this.userPreferenceService.save(KEYS.helpModeDialog, String(this.form.controls.helpModeDialog.value));
+            await this.#userPreferenceService.save(KEYS.helpModeDialog, String(this.form.controls.helpModeDialog.value));
         }
 
-        await this.userPreferenceService.reload();
+        if (this.form.controls.overwriteFileOption.enabled && !this.form.controls.overwriteFileOption.value) {
+            await this.#userPreferenceService.saveOverwriteFileOption('undefined');
+        }
+
+        await this.#userPreferenceService.reload();
         this.#patchValues();
 
         this.initialFormValue = this.form.getRawValue();
-        this._changeRef.markForCheck();
+        this.#changeRef.markForCheck();
     }
 
     #patchValues() {
         this.form.patchValue({
-            autoExpandFiltersOnActions: this.userPreferenceService.getAutoExpandFiltersOnActions(),
+            autoExpandFiltersOnActions: this.#userPreferenceService.getAutoExpandFiltersOnActions(),
-            openScmDialogByDefault: this.userPreferenceService.getOpenScmDialogByDefault(),
+            openScmDialogByDefault: this.#userPreferenceService.getOpenScmDialogByDefault(),
-            tableExtractionType: this.userPreferenceService.getTableExtractionType(),
+            tableExtractionType: this.#userPreferenceService.getTableExtractionType(),
-            loadAllAnnotationsWarning: this.userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning),
+            loadAllAnnotationsWarning: this.#userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning),
-            helpModeDialog: this.userPreferenceService.getBool(KEYS.helpModeDialog),
+            helpModeDialog: this.#userPreferenceService.getBool(KEYS.helpModeDialog),
+            overwriteFileOption: this.#isOverwriteFileOptionActive,
         });
+
+        if (!this.#isOverwriteFileOptionActive) {
+            this.form.controls.overwriteFileOption.disable();
+        }
     }
 }

apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html

@@ -1,6 +1,6 @@
 <div
     [translateParams]="{
-        type: user ? 'edit' : 'create'
+        type: !!user() ? 'edit' : 'create',
     }"
     [translate]="'add-edit-user.title'"
     class="dialog-header heading-l"
@@ -37,9 +37,17 @@
             </div>
         </div>
 
+        @if (!user()) {
+            <div class="iqser-input-group">
+                <label [translate]="'add-edit-user.form.account-setup'"></label>
+                <mat-checkbox formControlName="sendSetPasswordMail">{{ 'add-edit-user.form.send-email' | translate }}</mat-checkbox>
+                <span [translate]="'add-edit-user.form.send-email-explanation'" class="hint"></span>
+            </div>
+        }
+
         <div
             (click)="toggleResetPassword.emit()"
-            *ngIf="!!user"
+            *ngIf="!!user()"
             [translate]="'add-edit-user.form.reset-password'"
             class="mt-24 fit-content link-action"
         ></div>
@@ -48,14 +56,14 @@
     <div class="dialog-actions">
         <iqser-icon-button
             [disabled]="form.invalid || !changed"
-            [label]="(user ? 'add-edit-user.actions.save-changes' : 'add-edit-user.actions.save') | translate"
+            [label]="(user() ? 'add-edit-user.actions.save-changes' : 'add-edit-user.actions.save') | translate"
             [submit]="true"
             [type]="iconButtonTypes.primary"
         ></iqser-icon-button>
 
         <iqser-icon-button
             (action)="delete()"
-            *ngIf="user && !disabledDelete(user)"
+            *ngIf="user() && !disabledDelete(user())"
             [label]="'add-edit-user.actions.delete' | translate"
             [type]="iconButtonTypes.dark"
             icon="iqser:trash"

apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.scss

@@ -5,3 +5,7 @@
     margin-top: 8px;
     width: 300px;
 }
+
+.hint {
+    margin-left: 23px;
+}

apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
+import { Component, input, OnInit, output } from '@angular/core';
 import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { AdminDialogService } from '../../../services/admin-dialog.service';
 import { BaseFormComponent, IconButtonComponent, LoadingService, Toaster } from '@iqser/common-ui';
@@ -20,15 +20,15 @@ import { NgForOf, NgIf } from '@angular/common';
     standalone: true,
     imports: [TranslateModule, ReactiveFormsModule, MatCheckbox, NgForOf, IconButtonComponent, NgIf],
 })
-export class UserDetailsComponent extends BaseFormComponent implements OnChanges {
+export class UserDetailsComponent extends BaseFormComponent implements OnInit {
-    /** e.g. a RED_ADMIN is automatically a RED_USER_ADMIN => can't disable RED_USER_ADMIN as long as RED_ADMIN is checked */
+    user = input<User>();
-    private readonly _ROLE_REQUIREMENTS = { RED_MANAGER: 'RED_USER', RED_ADMIN: 'RED_USER_ADMIN' };
+    readonly toggleResetPassword = output();
-    @Input() user: User;
+    readonly closeDialog = output<boolean>();
-    @Output() readonly toggleResetPassword = new EventEmitter();
+    readonly cancel = output();
-    @Output() readonly closeDialog = new EventEmitter();
-    @Output() readonly cancel = new EventEmitter();
     readonly ROLES = ['RED_USER', 'RED_MANAGER', 'RED_USER_ADMIN', 'RED_ADMIN'];
     readonly translations = rolesTranslations;
+    /** e.g. a RED_ADMIN is automatically a RED_USER_ADMIN => can't disable RED_USER_ADMIN as long as RED_ADMIN is checked */
+    readonly #ROLE_REQUIREMENTS = { RED_MANAGER: 'RED_USER', RED_ADMIN: 'RED_USER_ADMIN' };
 
     constructor(
         private readonly _formBuilder: UntypedFormBuilder,
@@ -49,13 +49,17 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges
         }, []);
     }
 
-    private get _rolesControls(): any {
+    get sendSetPasswordMail() {
+        return !this.form.controls.sendSetPasswordMail.value;
+    }
+
+    get #rolesControls() {
         return this.ROLES.reduce(
             (prev, role) => ({
                 ...prev,
                 [role]: [
                     {
-                        value: this.user && this.user.has(role),
+                        value: this.user() && this.user().has(role),
                         disabled: this.shouldBeDisabled(role),
                     },
                 ],
@@ -64,20 +68,20 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges
         );
     }
 
-    ngOnChanges() {
+    ngOnInit() {
-        this.form = this._getForm();
+        this.form = this.#getForm();
         this.initialFormValue = this.form.getRawValue();
     }
 
     shouldBeDisabled(role: string): boolean {
-        const isCurrentAdminUser = this.user && this.user.isAdmin && this.user.id === this._userService.currentUser.id;
+        const isCurrentAdminUser = this.user() && this.user().isAdmin && this.user().id === this._userService.currentUser.id;
         return (
             // RED_ADMIN can't remove own RED_ADMIN role
             (role === 'RED_ADMIN' && isCurrentAdminUser) ||
             // only RED_ADMINs can edit RED_ADMIN roles
             (role === 'RED_ADMIN' && !this._userService.currentUser.isAdmin) ||
-            Object.keys(this._ROLE_REQUIREMENTS).reduce(
+            Object.keys(this.#ROLE_REQUIREMENTS).reduce(
-                (value, key) => value || (role === this._ROLE_REQUIREMENTS[key] && this.user?.roles.includes(key)),
+                (value, key) => value || (role === this.#ROLE_REQUIREMENTS[key] && this.user()?.roles.includes(key)),
                 false,
             )
         );
@@ -85,9 +89,13 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges
 
     async save() {
         this._loadingService.start();
-        const userData: IProfileUpdateRequest = { ...this.form.getRawValue(), roles: this.activeRoles };
+        const userData: IProfileUpdateRequest = {
+            ...this.form.getRawValue(),
+            roles: this.activeRoles,
+            sendSetPasswordMail: this.sendSetPasswordMail,
+        };
 
-        if (!this.user) {
+        if (!this.user()) {
             await firstValueFrom(this._userService.create(userData))
                 .then(() => {
                     this.closeDialog.emit(true);
@@ -101,22 +109,22 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges
                     this._loadingService.stop();
                 });
         } else {
-            await firstValueFrom(this._userService.updateProfile(userData, this.user.id));
+            await firstValueFrom(this._userService.updateProfile(userData, this.user().id));
             this.closeDialog.emit(true);
         }
     }
 
     delete() {
-        this._dialogService.deleteUsers([this.user.id], () => this.closeDialog.emit(true));
+        this._dialogService.deleteUsers([this.user().id], () => this.closeDialog.emit(true));
     }
 
     setRolesRequirements(checked: boolean, role: string): void {
-        if (Object.keys(this._ROLE_REQUIREMENTS).includes(role)) {
+        if (Object.keys(this.#ROLE_REQUIREMENTS).includes(role)) {
             if (checked) {
-                this.form.patchValue({ [this._ROLE_REQUIREMENTS[role]]: true });
+                this.form.patchValue({ [this.#ROLE_REQUIREMENTS[role]]: true });
-                this.form.controls[this._ROLE_REQUIREMENTS[role]].disable();
+                this.form.controls[this.#ROLE_REQUIREMENTS[role]].disable();
             } else {
-                this.form.controls[this._ROLE_REQUIREMENTS[role]].enable();
+                this.form.controls[this.#ROLE_REQUIREMENTS[role]].enable();
             }
         }
     }
@@ -127,18 +135,19 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges
         return user.id === this._userService.currentUser.id || (userAdmin && !currentUserAdmin);
     }
 
-    private _getForm(): UntypedFormGroup {
+    #getForm(): UntypedFormGroup {
         return this._formBuilder.group({
-            firstName: [this.user?.firstName, Validators.required],
+            firstName: [this.user()?.firstName, Validators.required],
-            lastName: [this.user?.lastName, Validators.required],
+            lastName: [this.user()?.lastName, Validators.required],
             email: [
                 {
-                    value: this.user?.email,
+                    value: this.user()?.email,
-                    disabled: !!this.user?.email,
+                    disabled: !!this.user()?.email,
                 },
                 [Validators.required, Validators.email],
             ],
-            ...this._rolesControls,
+            ...this.#rolesControls,
+            sendSetPasswordMail: [false],
         });
     }
 }

apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html

@@ -1,7 +1,7 @@
 <div class="content-container" iqserHasScrollbar>
     <div class="dialog">
         <div class="dialog-header">
-            <div [translate]="'entity.info.heading'" [attr.help-mode-key]="'entity_info'" class="heading-l"></div>
+            <div [translate]="'entity.info.heading'" [attr.help-mode-key]="'entity_info'" class="heading-l w-full"></div>
 
             <div *ngIf="!permissionsService.canEditEntities()" class="read-only-indicator all-caps-label primary">
                 <mat-icon class="mr-8" svgIcon="red:read-only"></mat-icon>
@@ -26,8 +26,6 @@
             ></iqser-icon-button>
 
             <div (click)="revert()" [translate]="'entity.info.actions.revert'" class="all-caps-label cancel"></div>
-
-            <iqser-help-button *ngIf="!config.IS_DOCUMINE"></iqser-help-button>
         </div>
     </div>
 </div>

apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.scss

@@ -26,3 +26,7 @@
         min-height: unset;
     }
 }
+
+.w-full {
+    width: 100%;
+}

apps/red-ui/src/app/modules/admin/screens/info/dossier-template-details/dossier-template-details.component.html

@@ -34,6 +34,20 @@
                     <span [innerHTML]="'dossier-template-info-screen.created-on' | translate: { date: createdOn }"></span>
                 </div>
 
+                <div *ngIf="areRulesLocked()">
+                    <mat-icon
+                        (click)="resetRules()"
+                        [matTooltip]="
+                            currentUser.isAdmin
+                                ? ('dossier-template-info-screen.rules-reset.tooltip' | translate)
+                                : ('dossier-template-info-screen.rules-reset.disabled-action' | translate)
+                        "
+                        [class.action-icon]="currentUser.isAdmin"
+                        svgIcon="iqser:alert-circle"
+                    ></mat-icon>
+                    <span class="error">{{ 'dossier-template-info-screen.rules-reset.label' | translate }}</span>
+                </div>
+
                 <div>
                     <mat-icon svgIcon="red:entries"></mat-icon>
                     {{ 'dossier-template-info-screen.entries' | translate: { count: ctx.stats.numberOfEntries } }}

apps/red-ui/src/app/modules/admin/screens/info/dossier-template-details/dossier-template-details.component.scss

@@ -18,3 +18,11 @@
     padding-right: 24px;
     margin-right: 24px;
 }
+
+.error {
+    color: var(--iqser-primary);
+}
+
+.action-icon {
+    cursor: pointer;
+}

apps/red-ui/src/app/modules/admin/screens/info/dossier-template-details/dossier-template-details.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, computed, Input, OnInit } from '@angular/core';
 import { ContextComponent } from '@iqser/common-ui/lib/utils';
 import { type DossierTemplate, type DossierTemplateStats } from '@red/domain';
 import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
@@ -9,6 +9,12 @@ import { MatIcon } from '@angular/material/icon';
 import { TranslateModule } from '@ngx-translate/core';
 import { InitialsAvatarComponent } from '@common-ui/users';
 import { DatePipe } from '@shared/pipes/date.pipe';
+import { RulesService } from '../../../services/rules.service';
+import { Toaster } from '@iqser/common-ui';
+import { MatTooltip } from '@angular/material/tooltip';
+import { firstValueFrom } from 'rxjs';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { getCurrentUser } from '@users/user.service';
 
 interface Context {
     readonly dossierTemplate: DossierTemplate;
@@ -20,16 +26,21 @@ interface Context {
     templateUrl: './dossier-template-details.component.html',
     styleUrls: ['./dossier-template-details.component.scss'],
     standalone: true,
-    imports: [NgIf, AsyncPipe, MatIcon, TranslateModule, DatePipe, InitialsAvatarComponent],
+    imports: [NgIf, AsyncPipe, MatIcon, TranslateModule, DatePipe, InitialsAvatarComponent, MatTooltip],
 })
 export class DossierTemplateDetailsComponent extends ContextComponent<Context> implements OnInit {
     readonly translations = dossierTemplateStatusTranslations;
-
     @Input({ required: true }) dossierTemplateId: string;
+    readonly areRulesLocked = computed(() => {
+        return this._rulesService.currentTemplateRules().timeoutDetected;
+    });
+    readonly currentUser = getCurrentUser();
 
     constructor(
         private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _dossierTemplateStatsService: DossierTemplateStatsService,
+        private readonly _rulesService: RulesService,
+        private readonly _toaster: Toaster,
     ) {
         super();
     }
@@ -40,4 +51,15 @@ export class DossierTemplateDetailsComponent extends ContextComponent<Context> i
             stats: this._dossierTemplateStatsService.watch$(this.dossierTemplateId),
         });
     }
+
+    async resetRules() {
+        if (!this.currentUser.isAdmin) return;
+        try {
+            await firstValueFrom(this._rulesService.reset(this.dossierTemplateId));
+            this._toaster.success(_('dossier-template-info-screen.rules-reset.success'));
+            await firstValueFrom(this._rulesService.getFor(this.dossierTemplateId));
+        } catch (error) {
+            this._toaster.rawError(error.error.message);
+        }
+    }
 }

apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts

@@ -27,7 +27,7 @@ import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatIcon } from '@angular/material/icon';
 import { SelectComponent } from '@shared/components/select/select.component';
 
-const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(type => ({
+const downloadTypes = ['ORIGINAL', 'PREVIEW', 'OPTIMIZED_PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(type => ({
     key: type,
     label: downloadTypesTranslations[type],
 }));

apps/red-ui/src/app/modules/admin/screens/license/components/license-analysis-capacity-usage/license-analysis-capacity-usage.component.ts

@@ -3,7 +3,7 @@ import { LicenseService } from '@services/license.service';
 import { map } from 'rxjs/operators';
 import { ChartDataset } from 'chart.js';
 import { ChartBlue, ChartGreen, ChartRed } from '../../utils/constants';
-import { getDataUntilCurrentMonth, getLabelsFromLicense, getLineConfig, isCurrentMonthAndYear } from '../../utils/functions';
+import { getDataUntilCurrentMonth, getLabelsFromLicense, getLineConfig, isCurrentMonth } from '../../utils/functions';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { size } from '@iqser/common-ui/lib/utils';
@@ -43,7 +43,7 @@ export class LicenseAnalysisCapacityUsageComponent {
     #getCapacityDatasets(): ChartDataset[] {
         const monthlyData = [...this.licenseService.selectedLicenseReport.monthlyData];
         const dataUntilCurrentMonth = getDataUntilCurrentMonth(monthlyData);
-        if (monthlyData.length === 1 || isCurrentMonthAndYear(monthlyData[0].startDate)) {
+        if (monthlyData.length === 1 || isCurrentMonth(monthlyData[0].startDate)) {
             const empty = { analysedFilesBytes: null } as ILicenseData;
             dataUntilCurrentMonth.splice(0, 0, empty);
             monthlyData.splice(0, 0, empty);
@@ -60,11 +60,8 @@ export class LicenseAnalysisCapacityUsageComponent {
             },
 
             {
-                data: dataUntilCurrentMonth.map((month, monthIndex) =>
+                data: dataUntilCurrentMonth.map((_, monthIndex) =>
-                    month.analysedFilesBytes
+                    monthlyData.slice(0, monthIndex + 1).reduce((acc, curr) => acc + (curr.analysedFilesBytes ?? 0), 0),
-                        ? month.analysedFilesBytes +
-                          monthlyData.slice(0, monthIndex).reduce((acc, curr) => acc + (curr.analysedFilesBytes ?? 0), 0)
-                        : 0,
                 ),
                 label: this._translateService.instant('license-info-screen.analysis-capacity-usage.analyzed-cumulative'),
                 yAxisID: 'y1',

apps/red-ui/src/app/modules/admin/screens/license/components/license-page-usage/license-page-usage.component.ts

@@ -3,7 +3,7 @@ import { LicenseService } from '@services/license.service';
 import { map } from 'rxjs/operators';
 import { ChartDataset } from 'chart.js';
 import { ChartBlue, ChartGreen, ChartRed } from '../../utils/constants';
-import { getDataUntilCurrentMonth, getLabelsFromLicense, getLineConfig, isCurrentMonthAndYear } from '../../utils/functions';
+import { getDataUntilCurrentMonth, getLabelsFromLicense, getLineConfig, isCurrentMonth } from '../../utils/functions';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ILicenseData } from '@red/domain';
@@ -40,7 +40,7 @@ export class LicensePageUsageComponent {
     #getPagesDatasets(): ChartDataset[] {
         const monthlyData = [...this.licenseService.selectedLicenseReport.monthlyData];
         const dataUntilCurrentMonth = getDataUntilCurrentMonth(monthlyData);
-        if (monthlyData.length === 1 || isCurrentMonthAndYear(monthlyData[0].startDate)) {
+        if (monthlyData.length === 1 || isCurrentMonth(monthlyData[0].startDate)) {
             const empty = { numberOfAnalyzedPages: null } as ILicenseData;
             dataUntilCurrentMonth.splice(0, 0, empty);
             monthlyData.splice(0, 0, empty);
@@ -63,11 +63,8 @@ export class LicensePageUsageComponent {
                 order: 1,
             },
             {
-                data: dataUntilCurrentMonth.map((month, monthIndex) =>
+                data: dataUntilCurrentMonth.map((_, monthIndex) =>
-                    month.numberOfAnalyzedPages
+                    monthlyData.slice(0, monthIndex + 1).reduce((acc, curr) => acc + (curr.numberOfAnalyzedPages ?? 0), 0),
-                        ? month.numberOfAnalyzedPages +
-                          monthlyData.slice(0, monthIndex).reduce((acc, curr) => acc + (curr.numberOfAnalyzedPages ?? 0), 0)
-                        : 0,
                 ),
                 label: this._translateService.instant('license-info-screen.page-usage.cumulative-pages'),
                 yAxisID: 'y1',

apps/red-ui/src/app/modules/admin/screens/license/utils/functions.ts

@@ -6,7 +6,6 @@ import { ComplexFillTarget } from 'chart.js/dist/types';
 
 const monthNames = dayjs.monthsShort();
 const currentMonth = dayjs(Date.now()).month();
-const currentYear = dayjs(Date.now()).year();
 
 export const verboseDate = (date: Dayjs) => `${monthNames[date.month()]} ${date.year()}`;
 
@@ -45,7 +44,7 @@ export const getLabelsFromLicense = (license: ILicenseReport) => {
         monthIterator = monthIterator.add(1, 'month');
     }
 
-    if (startMonth.month() === endMonth.month() || startMonth.month() === currentMonth) {
+    if (startMonth.isSame(endMonth, 'month') || isCurrentMonth(startMonth.toDate())) {
         result.splice(0, 0, '');
     }
 
@@ -53,9 +52,9 @@ export const getLabelsFromLicense = (license: ILicenseReport) => {
 };
 
 export const getDataUntilCurrentMonth = (monthlyData: ILicenseData[]) => {
-    return monthlyData.filter(data => dayjs(data.startDate).month() <= currentMonth && dayjs(data.startDate).year() <= currentYear);
+    return monthlyData.filter(data => dayjs(data.startDate).isSameOrBefore(dayjs(Date.now()), 'month'));
 };
 
-export const isCurrentMonthAndYear = (date: Date | string) => {
+export const isCurrentMonth = (date: Date | string) => {
-    return dayjs(date).month() === currentMonth && dayjs(date).year() === currentYear;
+    return dayjs(date).isSame(dayjs(Date.now()), 'month');
 };

apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts

@@ -4,7 +4,6 @@ import { ChangeDetectorRef, Component, ElementRef, inject, OnInit, ViewChild } f
 import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { MatIcon } from '@angular/material/icon';
 import { MatSlider, MatSliderThumb } from '@angular/material/slider';
-import { MatTooltip } from '@angular/material/tooltip';
 import { Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { environment } from '@environments/environment';
@@ -46,6 +45,7 @@ import { ColorPickerModule } from 'ngx-color-picker';
 import { BehaviorSubject, firstValueFrom, Observable, of } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { PaginatorComponent } from '../paginator/paginator.component';
+import { MatTooltip } from '@angular/material/tooltip';
 
 export const DEFAULT_WATERMARK: Partial<IWatermark> = {
     text: 'Watermark',
@@ -85,11 +85,11 @@ interface WatermarkForm {
         HasScrollbarDirective,
         NgForOf,
         NgClass,
-        MatTooltip,
         MatIcon,
         MatSlider,
         ColorPickerModule,
         MatSliderThumb,
+        MatTooltip,
     ],
 })
 export class WatermarkScreenComponent implements OnInit {
@@ -269,7 +269,7 @@ export class WatermarkScreenComponent implements OnInit {
         });
 
         if (environment.production) {
-            this.instance.Core.setCustomFontURL('https://' + window.location.host + this.#convertPath('/assets/pdftron'));
+            this.instance.Core.setCustomFontURL(window.location.origin + this.#convertPath('/assets/pdftron/fonts'));
         }
 
         this.#disableElements();

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

@@ -1,9 +1,25 @@
 import { Injectable } from '@angular/core';
-import { GenericService } from '@iqser/common-ui';
+import { EntitiesService, QueryParam } from '@iqser/common-ui';
-import { IRules } from '@red/domain';
+import { IRules, Rules } from '@red/domain';
+import { map, Observable, tap } from 'rxjs';
+import { List } from '@common-ui/utils';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { distinctUntilChanged, filter } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
-export class RulesService extends GenericService<IRules> {
+export class RulesService extends EntitiesService<IRules, Rules> {
+    readonly currentTemplateRules = toSignal(
+        this.all$.pipe(
+            filter(all => !!all.length),
+            map(rules => rules[0]),
+            distinctUntilChanged(
+                (prev, curr) =>
+                    prev.rules === curr.rules &&
+                    prev.timeoutDetected === curr.timeoutDetected &&
+                    prev.dossierTemplateId === curr.dossierTemplateId,
+            ),
+        ),
+    );
     protected readonly _defaultModelPath = 'rules';
 
     download(dossierTemplateId: string, ruleFileType: IRules['ruleFileType'] = 'ENTITY') {
@@ -13,4 +29,12 @@ export class RulesService extends GenericService<IRules> {
     uploadRules(body: IRules) {
         return this._post<unknown>({ ...body, ruleFileType: body.ruleFileType ?? 'ENTITY' });
     }
+
+    getFor<R = IRules>(entityId: string, queryParams?: List<QueryParam>): Observable<R> {
+        return super.getFor<R>(entityId, queryParams).pipe(tap(rules => this.setEntities([rules as Rules])));
+    }
+
+    reset(dossierTemplateId: string, ruleFileType: IRules['ruleFileType'] = 'ENTITY') {
+        return this._put(null, `${this._defaultModelPath}/${dossierTemplateId}/${ruleFileType}/reset`);
+    }
 }

apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts

@@ -158,6 +158,7 @@ export class AdminSideNavComponent implements OnInit {
             {
                 screen: 'info',
                 label: _('admin-side-nav.entity-info'),
+                helpModeKey: 'entity_info',
                 show: true,
             },
             {

apps/red-ui/src/app/modules/admin/translations/digital-signature-dialog-translations.ts

@@ -3,7 +3,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 export const digitalSignatureDialogTranslations = {
     title: {
         beforeConfiguration: _('digital-signature-dialog.title.before-configuration'),
-        pkcs: _('digital-signature-dialog.title.pkcs'),
+        PKCS: _('digital-signature-dialog.title.pkcs'),
-        kms: _('digital-signature-dialog.title.kms'),
+        KMS: _('digital-signature-dialog.title.kms'),
     },
 } as const;

apps/red-ui/src/app/modules/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.html

@@ -1,8 +1,8 @@
-<ng-container (longPress)="forceReanalysisAction($event)" *ngIf="selectedFiles.length" redactionLongPress>
+<ng-container (longPress)="forceReanalysisAction($event)" *ngIf="selectedFiles().length" redactionLongPress>
     <redaction-expandable-file-actions
-        [actions]="buttons"
+        [actions]="buttons()"
-        [buttonType]="buttonType"
+        [buttonType]="buttonType()"
-        [maxWidth]="maxWidth"
+        [maxWidth]="maxWidth()"
         [tooltipPosition]="IqserTooltipPositions.above"
     >
     </redaction-expandable-file-actions>

apps/red-ui/src/app/modules/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts

@@ -1,6 +1,6 @@
-import { Component, Input, OnChanges } from '@angular/core';
+import { Component, computed, input, signal } from '@angular/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { CircleButtonType, CircleButtonTypes } from '@iqser/common-ui';
+import { CircleButtonType, CircleButtonTypes, Toaster } from '@iqser/common-ui';
 import { Action, ActionTypes, Dossier, File, ProcessingFileStatuses } from '@red/domain';
 import { PermissionsService } from '@services/permissions.service';
 import { LongPressDirective, LongPressEvent } from '@shared/directives/long-press.directive';
@@ -9,6 +9,8 @@ import { BulkActionsService } from '../../services/bulk-actions.service';
 import { ExpandableFileActionsComponent } from '@shared/components/expandable-file-actions/expandable-file-actions.component';
 import { IqserTooltipPositions } from '@common-ui/utils';
 import { NgIf } from '@angular/common';
+import { RulesService } from '../../../admin/services/rules.service';
+import { firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-dossier-overview-bulk-actions [dossier] [selectedFiles]',
@@ -17,218 +19,194 @@ import { NgIf } from '@angular/common';
     standalone: true,
     imports: [LongPressDirective, ExpandableFileActionsComponent, NgIf],
 })
-export class DossierOverviewBulkActionsComponent implements OnChanges {
+export class DossierOverviewBulkActionsComponent {
-    #analysisForced: boolean;
+    readonly dossier = input<Dossier>();
-    #canAssignToSelf: boolean;
+    readonly selectedFiles = input<File[]>();
-    #canAssign: boolean;
+    readonly buttonType = input<CircleButtonType>(CircleButtonTypes.default);
-    #canDelete: boolean;
+    readonly maxWidth = input<number>();
-    #canReanalyse: boolean;
+    readonly buttons = computed(() => this.#buttons);
-    #canDisableAutoAnalysis: boolean;
-    #canEnableAutoAnalysis: boolean;
-    #canOcr: boolean;
-    #canSetToNew: boolean;
-    #canSetToUnderReview: boolean;
-    #canSetToUnderApproval: boolean;
-    #isReadyForApproval: boolean;
-    #canApprove: boolean;
-    #canUndoApproval: boolean;
-    #canToggleAnalysis: boolean;
-    #assignTooltip: string;
-    #toggleAnalysisTooltip: string;
-    #allFilesAreExcluded: boolean;
-    #canMoveToSameState: boolean;
-    @Input() dossier: Dossier;
-    @Input() selectedFiles: File[];
-    @Input() buttonType: CircleButtonType = CircleButtonTypes.default;
-    @Input() maxWidth: number;
-    buttons: Action[];
     readonly IqserTooltipPositions = IqserTooltipPositions;
+    readonly #areRulesLocked = computed(() => this._rulesService.currentTemplateRules().timeoutDetected);
+    readonly #allFilesAreUnderReviewOrUnassigned = computed(() =>
+        this.selectedFiles().reduce((acc, file) => acc && (file.isUnderReview || file.isNew), true),
+    );
+    readonly #allFilesAreUnderApproval = computed(() => this.selectedFiles().reduce((acc, file) => acc && file.isUnderApproval, true));
+    readonly #allFilesAreExcluded = computed(() => this.selectedFiles().reduce((acc, file) => acc && file.excluded, true));
+    readonly #allFilesAreApproved = computed(() => this.selectedFiles().reduce((acc, file) => acc && file.isApproved, true));
+    readonly #canMoveToSameState = computed(
+        () => this.#allFilesAreUnderReviewOrUnassigned() || this.#allFilesAreUnderApproval() || this.#allFilesAreApproved(),
+    );
+    readonly #canAssign = computed(
+        () =>
+            this.#canMoveToSameState() &&
+            (this._permissionsService.canAssignUser(this.selectedFiles(), this.dossier()) ||
+                this._permissionsService.canUnassignUser(this.selectedFiles(), this.dossier())),
+    );
+    readonly #canAssignToSelf = computed(
+        () => this.#canMoveToSameState() && this._permissionsService.canAssignToSelf(this.selectedFiles(), this.dossier()),
+    );
+    readonly #canDelete = computed(() => this._permissionsService.canSoftDeleteFile(this.selectedFiles(), this.dossier()));
+    readonly #canReanalyse = computed(() => this._permissionsService.canReanalyseFile(this.selectedFiles(), this.dossier()));
+    readonly #canDisableAutoAnalysis = computed(() =>
+        this._permissionsService.canDisableAutoAnalysis(this.selectedFiles(), this.dossier()),
+    );
+    readonly #canEnableAutoAnalysis = computed(() => this._permissionsService.canEnableAutoAnalysis(this.selectedFiles(), this.dossier()));
+    readonly #canToggleAnalysis = computed(() => this._permissionsService.canToggleAnalysis(this.selectedFiles(), this.dossier()));
+    readonly #canOcr = computed(() => this._permissionsService.canOcrFile(this.selectedFiles(), this.dossier()));
+    readonly #canSetToNew = computed(() => this._permissionsService.canSetToNew(this.selectedFiles(), this.dossier()));
+    readonly #canSetToUnderReview = computed(() => this._permissionsService.canSetUnderReview(this.selectedFiles(), this.dossier()));
+    readonly #canSetToUnderApproval = computed(() => this._permissionsService.canSetUnderApproval(this.selectedFiles(), this.dossier()));
+    readonly #isReadyForApproval = computed(() => this._permissionsService.isReadyForApproval(this.selectedFiles(), this.dossier()));
+    readonly #canApprove = computed(() => this._permissionsService.canBeApproved(this.selectedFiles(), this.dossier()));
+    readonly #canUndoApproval = computed(() => this._permissionsService.canUndoApproval(this.selectedFiles(), this.dossier()));
+    readonly #assignTooltip = computed(() =>
+        this.#allFilesAreUnderApproval() ? _('dossier-overview.assign-approver') : _('dossier-overview.assign-reviewer'),
+    );
+    readonly #toggleAnalysisTooltip = computed(() =>
+        this.#allFilesAreExcluded() ? _('file-preview.toggle-analysis.enable') : _('file-preview.toggle-analysis.disable'),
+    );
+    readonly #analysisForced = signal(false);
 
     constructor(
         private readonly _permissionsService: PermissionsService,
         private readonly _userPreferenceService: UserPreferenceService,
         private readonly _bulkActionsService: BulkActionsService,
+        private readonly _rulesService: RulesService,
+        private readonly _toaster: Toaster,
     ) {}
 
-    private get _buttons(): Action[] {
+    get #buttons(): Action[] {
         const actions: Action[] = [
             {
                 id: 'delete-files-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.delete(this.selectedFiles),
+                action: () => this._bulkActionsService.delete(this.selectedFiles()),
                 tooltip: _('dossier-overview.bulk.delete'),
                 icon: 'iqser:trash',
-                show: this.#canDelete,
+                show: this.#canDelete(),
             },
             {
                 id: 'assign-files-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.assign(this.selectedFiles),
+                action: () => this._bulkActionsService.assign(this.selectedFiles()),
-                tooltip: this.#assignTooltip,
+                tooltip: this.#assignTooltip(),
                 icon: 'red:assign',
-                show: this.#canAssign,
+                show: this.#canAssign(),
             },
             {
                 id: 'assign-files-to-me-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.assignToMe(this.selectedFiles),
+                action: () => this._bulkActionsService.assignToMe(this.selectedFiles()),
                 tooltip: _('dossier-overview.assign-me'),
                 icon: 'red:assign-me',
-                show: this.#canAssignToSelf,
+                show: this.#canAssignToSelf(),
             },
             {
                 id: 'to-new-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.setToNew(this.selectedFiles),
+                action: () => this._bulkActionsService.setToNew(this.selectedFiles()),
                 tooltip: _('dossier-overview.back-to-new'),
                 icon: 'red:undo',
-                show: this.#canSetToNew,
+                show: this.#canSetToNew(),
             },
             {
                 id: 'to-under-approval-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.setToUnderApproval(this.selectedFiles),
+                action: () => this._bulkActionsService.setToUnderApproval(this.selectedFiles()),
                 tooltip: _('dossier-overview.under-approval'),
                 icon: 'red:ready-for-approval',
-                show: this.#canSetToUnderApproval,
+                show: this.#canSetToUnderApproval(),
             },
             {
                 id: 'to-under-review-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.backToUnderReview(this.selectedFiles),
+                action: () => this._bulkActionsService.backToUnderReview(this.selectedFiles()),
                 tooltip: _('dossier-overview.under-review'),
                 icon: 'red:undo',
-                show: this.#canSetToUnderReview,
+                show: this.#canSetToUnderReview(),
             },
             {
                 id: 'download-files-btn',
                 type: ActionTypes.downloadBtn,
-                show: !this.selectedFiles.some(file => file.processingStatus === ProcessingFileStatuses.ERROR || !file.lastProcessed),
+                show: !this.selectedFiles().some(file => file.processingStatus === ProcessingFileStatuses.ERROR || !file.lastProcessed),
-                files: this.selectedFiles,
+                files: this.selectedFiles(),
-                dossier: this.dossier,
+                dossier: this.dossier(),
             },
             {
                 id: 'approve-files-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.approve(this.selectedFiles),
+                action: () => this._bulkActionsService.approve(this.selectedFiles()),
                 disabled: !this.#canApprove,
                 tooltip: this.#canApprove ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'),
                 icon: 'red:approved',
-                show: this.#isReadyForApproval,
+                show: this.#isReadyForApproval(),
             },
             {
                 id: 'set-under-approval-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.setToUnderApproval(this.selectedFiles),
+                action: () => this._bulkActionsService.setToUnderApproval(this.selectedFiles()),
                 tooltip: _('dossier-overview.under-approval'),
                 icon: 'red:undo',
-                show: this.#canUndoApproval,
+                show: this.#canUndoApproval(),
             },
             {
                 id: 'ocr-files-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.ocr(this.selectedFiles),
+                action: () => this._bulkActionsService.ocr(this.selectedFiles()),
                 tooltip: _('dossier-overview.ocr-file'),
                 icon: 'iqser:ocr',
-                show: this.#canOcr,
+                show: this.#canOcr(),
             },
             {
                 id: 'reanalyse-files-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.reanalyse(this.selectedFiles),
+                action: () => this.#reanalyseBulk(this.selectedFiles()),
-                tooltip: _('dossier-overview.bulk.reanalyse'),
+                tooltip: this.#areRulesLocked() ? _('dossier-listing.rules.timeoutError') : _('dossier-overview.bulk.reanalyse'),
                 icon: 'iqser:refresh',
+                disabled: this.#areRulesLocked(),
                 show:
-                    this.#canReanalyse &&
+                    this.#canReanalyse() &&
-                    (this.#analysisForced || this.#canEnableAutoAnalysis || this.selectedFiles.every(file => file.isError)),
+                    (this.#analysisForced() || this.#canEnableAutoAnalysis() || this.selectedFiles().every(file => file.isError)),
             },
             {
                 id: 'stop-automatic-analysis-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles),
+                action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles()),
                 tooltip: _('dossier-overview.stop-auto-analysis'),
                 icon: 'red:disable-analysis',
-                show: this.#canDisableAutoAnalysis,
+                show: this.#canDisableAutoAnalysis(),
             },
             {
                 id: 'start-automatic-analysis-btn',
                 type: ActionTypes.circleBtn,
-                action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles),
+                action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles()),
                 tooltip: _('dossier-overview.start-auto-analysis'),
                 icon: 'red:enable-analysis',
-                show: this.#canEnableAutoAnalysis,
+                show: this.#canEnableAutoAnalysis(),
             },
             {
                 id: 'toggle-analysis-btn',
                 type: ActionTypes.toggle,
-                action: () => this._bulkActionsService.toggleAnalysis(this.selectedFiles, !this.#allFilesAreExcluded),
+                action: () => this._bulkActionsService.toggleAnalysis(this.selectedFiles(), !this.#allFilesAreExcluded()),
-                tooltip: this.#toggleAnalysisTooltip,
+                tooltip: this.#toggleAnalysisTooltip(),
-                checked: !this.#allFilesAreExcluded,
+                checked: !this.#allFilesAreExcluded(),
-                show: this.#canToggleAnalysis,
+                show: this.#canToggleAnalysis(),
             },
         ];
 
         return actions.filter(btn => btn.show);
     }
 
-    ngOnChanges() {
-        this._setup();
-    }
-
     forceReanalysisAction($event: LongPressEvent) {
-        this.#analysisForced = !$event.touchEnd && this._userPreferenceService.isIqserDevMode;
+        this.#analysisForced.set(!$event.touchEnd && this._userPreferenceService.isIqserDevMode);
-        this._setup();
     }
 
-    private _setup() {
+    async #reanalyseBulk(selectedFiles: File[]) {
-        if (!this.selectedFiles.length) {
+        const rules = await firstValueFrom(this._rulesService.getFor(this.dossier().dossierTemplateId));
+        if (rules.timeoutDetected) {
+            this._toaster.error(_('dossier-listing.rules.timeoutError'));
             return;
         }
-        const allFilesAreUnderReviewOrUnassigned = this.selectedFiles.reduce(
+        await this._bulkActionsService.reanalyse(selectedFiles);
-            (acc, file) => acc && (file.isUnderReview || file.isNew),
-            true,
-        );
-        const allFilesAreUnderApproval = this.selectedFiles.reduce((acc, file) => acc && file.isUnderApproval, true);
-        const allFilesAreApproved = this.selectedFiles.reduce((acc, file) => acc && file.isApproved, true);
-        this.#allFilesAreExcluded = this.selectedFiles.reduce((acc, file) => acc && file.excluded, true);
-        this.#canMoveToSameState = allFilesAreUnderReviewOrUnassigned || allFilesAreUnderApproval || allFilesAreApproved;
-
-        this.#canAssign =
-            this.#canMoveToSameState &&
-            (this._permissionsService.canAssignUser(this.selectedFiles, this.dossier) ||
-                this._permissionsService.canUnassignUser(this.selectedFiles, this.dossier));
-        this.#canAssignToSelf = this.#canMoveToSameState && this._permissionsService.canAssignToSelf(this.selectedFiles, this.dossier);
-
-        this.#canDelete = this._permissionsService.canSoftDeleteFile(this.selectedFiles, this.dossier);
-
-        this.#canReanalyse = this._permissionsService.canReanalyseFile(this.selectedFiles, this.dossier);
-
-        this.#canDisableAutoAnalysis = this._permissionsService.canDisableAutoAnalysis(this.selectedFiles, this.dossier);
-
-        this.#canEnableAutoAnalysis = this._permissionsService.canEnableAutoAnalysis(this.selectedFiles, this.dossier);
-
-        this.#canToggleAnalysis = this._permissionsService.canToggleAnalysis(this.selectedFiles, this.dossier);
-
-        this.#canOcr = this._permissionsService.canOcrFile(this.selectedFiles, this.dossier);
-
-        this.#canSetToNew = this._permissionsService.canSetToNew(this.selectedFiles, this.dossier);
-
-        this.#canSetToUnderReview = this._permissionsService.canSetUnderReview(this.selectedFiles, this.dossier);
-
-        this.#canSetToUnderApproval = this._permissionsService.canSetUnderApproval(this.selectedFiles, this.dossier);
-
-        this.#isReadyForApproval = this._permissionsService.isReadyForApproval(this.selectedFiles, this.dossier);
-
-        this.#canApprove = this._permissionsService.canBeApproved(this.selectedFiles, this.dossier);
-
-        this.#canUndoApproval = this._permissionsService.canUndoApproval(this.selectedFiles, this.dossier);
-
-        this.#assignTooltip = allFilesAreUnderApproval ? _('dossier-overview.assign-approver') : _('dossier-overview.assign-reviewer');
-
-        this.#toggleAnalysisTooltip = this.#allFilesAreExcluded
-            ? _('file-preview.toggle-analysis.enable')
-            : _('file-preview.toggle-analysis.disable');
-
-        this.buttons = this._buttons;
     }
 }

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

@@ -61,7 +61,8 @@
                 *ngFor="let config of statusConfig"
                 [attr.help-mode-key]="'dashboard_in_dossier'"
                 [config]="config"
-                filterKey="processingTypeFilters"
+                [class.indent]="!!PendingTypes[config.id]"
+                [filterKey]="PendingTypes[config.id] ? 'pendingTypeFilters' : 'processingTypeFilters'"
             ></iqser-progress-bar>
         </div>
 

apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.scss

@@ -45,3 +45,7 @@
 iqser-progress-bar:not(:last-child) {
     margin-bottom: 10px;
 }
+
+.indent {
+    margin-left: 32px;
+}

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

@@ -21,7 +21,9 @@ import {
     DossierAttributeWithValue,
     DossierStats,
     File,
+    FileErrorCodes,
     IDossierRequest,
+    PendingTypes,
     ProcessingTypes,
     StatusSorter,
     User,
@@ -58,7 +60,6 @@ interface DossierDetailsContext {
         NgIf,
         AsyncPipe,
         CircleButtonComponent,
-        IqserAllowDirective,
         TranslateModule,
         DonutChartComponent,
         IqserLoadingModule,
@@ -68,12 +69,14 @@ interface DossierDetailsContext {
         AssignUserDropdownComponent,
         InitialsAvatarComponent,
         TeamMembersComponent,
+        IqserAllowDirective,
     ],
 })
 export class DossierDetailsComponent extends ContextComponent<DossierDetailsContext> {
     #currentChartSubtitleIndex = 0;
     readonly #dossierId = getParam(DOSSIER_ID);
     protected readonly circleButtonTypes = CircleButtonTypes;
+    protected readonly PendingTypes = PendingTypes;
     @Input() dossierAttributes: DossierAttributeWithValue[];
     @Output() readonly toggleCollapse = new EventEmitter();
     editingOwner = false;
@@ -97,14 +100,17 @@ export class DossierDetailsComponent extends ContextComponent<DossierDetailsCont
         super();
         const dossier$ = _dossiersService.getEntityChanged$(this.#dossierId).pipe(shareLast());
         const filesChanged$ = _filesMapService.watchChanged$(this.#dossierId).pipe(shareLast());
+        const files$ = _filesMapService.get$(this.#dossierId).pipe(shareLast());
         const dossierStats$ = dossierStatsService.watch$(this.#dossierId).pipe(shareLast());
         const dossierStatsWithEffects$ = dossierStats$.pipe(
             combineLatestWith(filesChanged$),
             tap(([stats]) => this.#calculateChartConfig(stats)),
             map(([stats]) => stats),
         );
-        const statusConfig$ = dossierStats$.pipe(map(stats => this.#calculateStatusConfig(stats)));
+        const statusConfig$ = dossierStats$.pipe(
-
+            combineLatestWith(files$),
+            map(([stats, files]) => this.#calculateStatusConfig(stats, files)),
+        );
         super._initContext({
             needsWorkFilters: filterService.getFilterModels$('needsWorkFilters'),
             dossier: dossier$,
@@ -152,7 +158,8 @@ export class DossierDetailsComponent extends ContextComponent<DossierDetailsCont
             .reduce((sum: number, file: File) => sum + file.numberOfPages, 0);
     }
 
-    #calculateStatusConfig(stats: DossierStats): ProgressBarConfigModel[] {
+    #calculateStatusConfig(stats: DossierStats, files: File[]): ProgressBarConfigModel[] {
+        const numberOfTimeoutFiles = files.filter(file => file.errorCode === FileErrorCodes.RULES_EXECUTION_TIMEOUT).length;
         return [
             {
                 id: ProcessingTypes.pending,
@@ -161,6 +168,13 @@ export class DossierDetailsComponent extends ContextComponent<DossierDetailsCont
                 count: stats.processingStats.pending,
                 icon: 'red:reanalyse',
             },
+            {
+                id: PendingTypes.timeout,
+                label: _('processing-status.pending-timeout'),
+                total: stats.numberOfFiles,
+                count: numberOfTimeoutFiles,
+                icon: 'red:reanalyse',
+            },
             {
                 id: ProcessingTypes.ocr,
                 label: _('processing-status.ocr'),

apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html

@@ -1,6 +1,6 @@
 <iqser-page-header
-    (closeAction)="router.navigate([dossier.dossiersListRouterLink])"
+    (closeAction)="router.navigate([dossier().dossiersListRouterLink])"
-    [actionConfigs]="actionConfigs"
+    [actionConfigs]="actionConfigs()"
     [helpModeKey]="'document'"
     [showCloseButton]="true"
     [viewModeSelection]="viewModeSelection"
@@ -23,35 +23,43 @@
             [attr.help-mode-key]="'download_dossier_in_dossier'"
             [buttonId]="'download-files-btn'"
             [disabled]="downloadFilesDisabled$ | async"
-            [dossier]="dossier"
+            [dossier]="dossier()"
             [files]="entitiesService.all$ | async"
+            [iqserDisableStopPropagation]="shouldDisableStopPropagation()"
+            dossierDownload
         ></redaction-file-download-btn>
 
         <iqser-circle-button
             (action)="downloadDossierAsCSV()"
-            *ngIf="permissionsService.canDownloadCsvReport(dossier)"
+            *ngIf="permissionsService.canDownloadCsvReport(dossier())"
             [attr.help-mode-key]="'download_csv'"
             [disabled]="listingService.areSomeSelected$ | async"
             [icon]="'iqser:csv'"
+            [iqserDisableStopPropagation]="shouldDisableStopPropagation()"
             [tooltip]="'dossier-overview.header-actions.download-csv' | translate"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="reanalyseDossier()"
-            *ngIf="permissionsService.displayReanalyseBtn(dossier)"
+            *ngIf="permissionsService.displayReanalyseBtn(dossier())"
-            [disabled]="listingService.areSomeSelected$ | async"
+            [disabled]="(listingService.areSomeSelected$ | async) || areRulesLocked()"
             [icon]="'iqser:refresh'"
+            [iqserDisableStopPropagation]="shouldDisableStopPropagation()"
             [tooltipClass]="'small warn'"
-            [tooltip]="'dossier-overview.new-rule.toast.actions.reanalyse-all' | translate"
+            [tooltip]="
+                (areRulesLocked() ? 'dossier-listing.rules.timeoutError' : 'dossier-overview.new-rule.toast.actions.reanalyse-all')
+                    | translate
+            "
             [type]="circleButtonTypes.warn"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="upload.emit()"
-            *ngIf="permissionsService.canUploadFiles(dossier)"
+            *ngIf="permissionsService.canUploadFiles(dossier())"
             [attr.help-mode-key]="'upload_document'"
             [buttonId]="'upload-document-btn'"
             [icon]="'iqser:upload'"
+            [iqserDisableStopPropagation]="shouldDisableStopPropagation()"
             [tooltip]="'dossier-overview.header-actions.upload-document' | translate"
             [type]="circleButtonTypes.primary"
             class="ml-14"

apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts

@@ -1,6 +1,5 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, EventEmitter, input, Output } from '@angular/core';
 import {
-    ActionConfig,
     CircleButtonComponent,
     CircleButtonTypes,
     DisableStopPropagationDirective,
@@ -24,13 +23,16 @@ import { PrimaryFileAttributeService } from '@services/primary-file-attribute.se
 import { Router } from '@angular/router';
 import { Roles } from '@users/roles';
 import { SortingService } from '@iqser/common-ui/lib/sorting';
-import { List, some } from '@iqser/common-ui/lib/utils';
+import { some } from '@iqser/common-ui/lib/utils';
-import { ComponentLogService } from '@services/files/component-log.service';
-import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
 import { AsyncPipe, NgIf } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { FileDownloadBtnComponent } from '@shared/components/buttons/file-download-btn/file-download-btn.component';
 import { ViewModeSelectionComponent } from '../view-mode-selection/view-mode-selection.component';
+import { RulesService } from '../../../admin/services/rules.service';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { FileAttributesService } from '@services/entity-services/file-attributes.service';
+import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
+import { ComponentLogService } from '@services/files/component-log.service';
 
 @Component({
     selector: 'redaction-dossier-overview-screen-header [dossier] [upload]',
@@ -39,27 +41,33 @@ import { ViewModeSelectionComponent } from '../view-mode-selection/view-mode-sel
     imports: [
         IqserListingModule,
         CircleButtonComponent,
-        MatMenuTrigger,
-        IqserAllowDirective,
         AsyncPipe,
         TranslateModule,
         FileDownloadBtnComponent,
         NgIf,
         ViewModeSelectionComponent,
         DisableStopPropagationDirective,
+        MatMenuTrigger,
+        IqserAllowDirective,
         MatMenu,
         MatMenuItem,
     ],
+    changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DossierOverviewScreenHeaderComponent implements OnInit {
+export class DossierOverviewScreenHeaderComponent {
-    @Input() dossier: Dossier;
+    readonly dossier = input<Dossier>();
     @Output() readonly upload = new EventEmitter<void>();
     readonly circleButtonTypes = CircleButtonTypes;
     readonly roles = Roles;
-    actionConfigs: List<ActionConfig>;
     readonly downloadFilesDisabled$: Observable<boolean>;
     readonly downloadComponentLogsDisabled$: Observable<boolean>;
     readonly isDocumine = getConfig().IS_DOCUMINE;
+    readonly areSomeSelected = toSignal(this.listingService.areSomeSelected$);
+    readonly actionConfigs = computed(() => this.configService.actionConfig(this.dossier().id, this.areSomeSelected()));
+    readonly areRulesLocked = computed(() => {
+        return this._rulesService.currentTemplateRules().timeoutDetected;
+    });
+    readonly shouldDisableStopPropagation = computed(() => this._fileAttributesService.isEditingFileAttribute());
 
     constructor(
         private readonly _toaster: Toaster,
@@ -74,6 +82,8 @@ export class DossierOverviewScreenHeaderComponent implements OnInit {
         private readonly _loadingService: LoadingService,
         private readonly _primaryFileAttributeService: PrimaryFileAttributeService,
         private readonly _componentLogService: ComponentLogService,
+        private readonly _rulesService: RulesService,
+        private readonly _fileAttributesService: FileAttributesService,
     ) {
         const someNotProcessed$ = this.entitiesService.all$.pipe(some(file => !file.lastProcessed));
         this.downloadFilesDisabled$ = combineLatest([this.listingService.areSomeSelected$, someNotProcessed$]).pipe(
@@ -84,14 +94,16 @@ export class DossierOverviewScreenHeaderComponent implements OnInit {
         );
     }
 
-    ngOnInit() {
-        this.actionConfigs = this.configService.actionConfig(this.dossier.id, this.listingService.areSomeSelected$);
-    }
-
     async reanalyseDossier() {
         this._loadingService.start();
+        const rules = await firstValueFrom(this._rulesService.getFor(this.dossier().dossierTemplateId));
+        if (rules.timeoutDetected) {
+            this._toaster.error(_('dossier-listing.rules.timeoutError'));
+            this._loadingService.stop();
+            return;
+        }
         try {
-            await this._reanalysisService.reanalyzeDossier(this.dossier, true);
+            await this._reanalysisService.reanalyzeDossier(this.dossier(), true);
             this._toaster.success(_('dossier-overview.reanalyse-dossier.success'));
         } catch (e) {
             this._toaster.error(_('dossier-overview.reanalyse-dossier.error'));
@@ -102,12 +114,12 @@ export class DossierOverviewScreenHeaderComponent implements OnInit {
     async downloadDossierAsCSV() {
         const displayedEntities = await firstValueFrom(this.listingService.displayed$);
         const entities = this.sortingService.defaultSort(displayedEntities);
-        const fileName = this.dossier.dossierName + '.export.csv';
+        const fileName = this.dossier().dossierName + '.export.csv';
         const mapper = (file?: File) => ({
             ...file,
             hasAnnotations: file.hasRedactions,
             assignee: this._userService.getName(file.assignee) || '-',
-            primaryAttribute: this._primaryFileAttributeService.getPrimaryFileAttributeValue(file, this.dossier.dossierTemplateId),
+            primaryAttribute: this._primaryFileAttributeService.getPrimaryFileAttributeValue(file, this.dossier().dossierTemplateId),
         });
         const documineOnlyFields = ['hasAnnotations'];
         const redactionOnlyFields = ['hasHints', 'hasImages', 'hasUpdates', 'hasRedactions'];
@@ -130,10 +142,10 @@ export class DossierOverviewScreenHeaderComponent implements OnInit {
     }
 
     downloadComponentAsJSON() {
-        return firstValueFrom(this._componentLogService.exportJSON(this.dossier.dossierTemplateId, this.dossier.dossierId));
+        return firstValueFrom(this._componentLogService.exportJSON(this.dossier().dossierTemplateId, this.dossier().dossierId));
     }
 
     async downloadComponentAsXML() {
-        return firstValueFrom(this._componentLogService.exportXML(this.dossier.dossierTemplateId, this.dossier.dossierId));
+        return firstValueFrom(this._componentLogService.exportXML(this.dossier().dossierTemplateId, this.dossier().dossierId));
     }
 }

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

@@ -39,7 +39,12 @@
 </ng-container>
 
 <div [class.extend-cols]="file.isError" class="status-container cell">
-    <div *ngIf="file.isError" class="small-label error" translate="dossier-overview.file-listing.file-entry.file-error"></div>
+    <div
+        *ngIf="file.isError"
+        class="small-label error"
+        translate="dossier-overview.file-listing.file-entry.file-error"
+        [translateParams]="{ errorCode: file.errorCode }"
+    ></div>
 
     <div *ngIf="file.isUnprocessed" class="small-label" translate="dossier-overview.file-listing.file-entry.file-pending"></div>
 
@@ -61,8 +66,8 @@
             [configs]="[
                 {
                     color: file.workflowStatus,
-                    length: 1
+                    length: 1,
-                }
+                },
             ]"
         ></iqser-status-bar>
     </ng-template>

apps/red-ui/src/app/modules/dossier-overview/config.service.ts

@@ -24,6 +24,7 @@ import {
     FileAttributeConfigType,
     FileAttributeConfigTypes,
     IFileAttributeConfig,
+    PendingType,
     ProcessingType,
     StatusSorter,
     User,
@@ -46,6 +47,7 @@ import { annotationFilterChecker, RedactionFilterSorter, sortArray, sortByName }
 import { EditDossierDialogComponent } from '../shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component';
 import { DossiersDialogService } from '../shared-dossiers/services/dossiers-dialog.service';
 import { BulkActionsService } from './services/bulk-actions.service';
+import { FileAttributesService } from '@services/entity-services/file-attributes.service';
 
 @Injectable()
 export class ConfigService {
@@ -67,6 +69,7 @@ export class ConfigService {
         private readonly _userPreferenceService: UserPreferenceService,
         private readonly _dossiersService: DossiersService,
         private readonly _iqserPermissionsService: IqserPermissionsService,
+        private readonly _fileAttributesService: FileAttributesService,
     ) {
         const previousListingMode = this._userPreferenceService.getFilesListingMode();
         const listingMode = previousListingMode ? previousListingMode : ListingModes.table;
@@ -112,16 +115,17 @@ export class ConfigService {
         };
     }
 
-    actionConfig(dossierId: string, disabled$: Observable<boolean>): List<ActionConfig> {
+    actionConfig(dossierId: string, disabled: boolean): List<ActionConfig> {
         return [
             {
                 id: 'editDossier',
-                label: this._translateService.instant('dossier-overview.header-actions.edit'),
+                label: _('dossier-overview.header-actions.edit'),
                 action: () => this.#openEditDossierDialog(dossierId),
                 icon: 'iqser:edit',
                 hide: !this.#currentUser.isManager && !this._iqserPermissionsService.has(Roles.dossiers.edit),
                 helpModeKey: 'edit_dossier',
-                disabled$,
+                disableStopPropagation: this._fileAttributesService.isEditingFileAttribute(),
+                disabled,
             },
         ];
     }
@@ -184,6 +188,7 @@ export class ConfigService {
         const allDistinctPeople = new Set<string>();
         const allDistinctNeedsWork = new Set<string>();
         const allDistinctProcessingTypes = new Set<ProcessingType>();
+        const allDistinctPendingTypes = new Set<PendingType>();
 
         const dynamicFilters = new Map<string, { type: FileAttributeConfigType; filterValue: Set<string> }>();
 
@@ -216,6 +221,7 @@ export class ConfigService {
             }
 
             allDistinctProcessingTypes.add(file.processingType);
+            allDistinctPendingTypes.add(file.pendingType);
 
             // extract values for dynamic filters
             fileAttributeConfigs.forEach(config => {
@@ -317,6 +323,14 @@ export class ConfigService {
             hide: true,
         });
 
+        const pendingTypesFilters = [...allDistinctPendingTypes].map(item => new NestedFilter({ id: item, label: item }));
+        filterGroups.push({
+            slug: 'pendingTypeFilters',
+            filters: pendingTypesFilters,
+            checker: (file: File, filter: INestedFilter) => file.pendingType === filter.id,
+            hide: true,
+        });
+
         dynamicFilters.forEach((value: { filterValue: Set<string>; type: FileAttributeConfigType }, filterKey: string) => {
             const id = filterKey.split(':')[0];
             const key = filterKey.split(':')[1];

apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html

@@ -56,7 +56,7 @@
                 </iqser-workflow>
             </div>
 
-            <div *ngIf="dossierAttributes$ | async" [class.collapsed]="collapsedDetails" class="right-container" iqserHasScrollbar>
+            <div *ngIf="dossierAttributes$ | async" [class.collapsed]="collapsedDetails" class="right-container">
                 <redaction-dossier-details
                     (toggleCollapse)="collapsedDetails = !collapsedDetails"
                     [dossierAttributes]="dossierAttributes"

apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.scss

@@ -25,10 +25,7 @@
     width: 375px;
     min-width: 375px;
     padding: 16px 24px 16px 24px;
-
+    overflow-y: auto;
-    &.has-scrollbar:hover {
-        padding-right: 13px;
-    }
 
     redaction-dossier-details {
         width: 100%;

apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.ts

@@ -41,7 +41,7 @@ import { Roles } from '@users/roles';
 import { UserPreferenceService } from '@users/user-preference.service';
 import { convertFiles, Files, handleFileDrop } from '@utils/index';
 import { merge, Observable } from 'rxjs';
-import { filter, skip, switchMap, tap } from 'rxjs/operators';
+import { filter, map, skip, switchMap, tap } from 'rxjs/operators';
 import { ConfigService } from '../config.service';
 import { BulkActionsService } from '../services/bulk-actions.service';
 import { DossiersCacheService } from '@services/dossiers/dossiers-cache.service';
@@ -145,8 +145,9 @@ export default class DossierOverviewScreenComponent extends ListingComponent<Fil
 
     get #dossierFilesChange$() {
         return this._dossiersService.dossierFileChanges$.pipe(
-            filter(dossierId => dossierId === this.dossierId && !!this._dossiersCacheService.get(dossierId)),
+            map(changes => changes[this.dossierId]),
-            switchMap(dossierId => this._filesService.loadAll(dossierId)),
+            filter(changes => !!changes && !!this._dossiersCacheService.get(this.dossierId)),
+            switchMap(changes => this._filesService.loadByIds({ [this.dossierId]: changes }).pipe(map(files => files[this.dossierId]))),
         );
     }
 

apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts

@@ -147,13 +147,13 @@ export class AnnotationActionsComponent implements OnChanges {
     hideAnnotation() {
         this._annotationManager.hide(this.viewerAnnotations);
         this._annotationManager.deselect();
-        this._annotationManager.addToHidden(this.viewerAnnotations[0].Id);
+        this.viewerAnnotations.forEach(a => this._annotationManager.addToHidden(a.Id));
     }
 
     showAnnotation() {
         this._annotationManager.show(this.viewerAnnotations);
         this._annotationManager.deselect();
-        this._annotationManager.removeFromHidden(this.viewerAnnotations[0].Id);
+        this.viewerAnnotations.forEach(a => this._annotationManager.removeFromHidden(a.Id));
     }
 
     resize() {

apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss

@@ -2,7 +2,7 @@
     display: flex;
     position: absolute;
     top: 6px;
-    right: 19px;
+    right: 8px;
 }
 
 .popover {

apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss

@@ -3,21 +3,13 @@
 :host {
     width: 100%;
     position: relative;
-    overflow: hidden;
+    overflow-y: auto;
-
+    @include common-mixins.scroll-bar;
-    &:hover {
-        overflow-y: auto;
-        @include common-mixins.scroll-bar;
-    }
 
     &.has-scrollbar:hover redaction-annotation-wrapper::ng-deep,
     &::ng-deep.documine-wrapper {
         .annotation {
             padding-right: 5px;
         }
-
-        redaction-annotation-details {
-            right: 8px;
-        }
     }
 }

apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts

@@ -15,6 +15,7 @@ import { NgForOf, NgIf } from '@angular/common';
 import { HighlightsSeparatorComponent } from '../highlights-separator/highlights-separator.component';
 import { AnnotationWrapperComponent } from '../annotation-wrapper/annotation-wrapper.component';
 import { AnnotationReferencesListComponent } from '../annotation-references-list/annotation-references-list.component';
+import { isTargetInput } from '@utils/functions';
 
 @Component({
     selector: 'redaction-annotations-list',
@@ -53,7 +54,7 @@ export class AnnotationsListComponent extends HasScrollbarDirective {
             console.log('Selected Annotation:', annotation);
         }
 
-        if (($event?.target as IqserEventTarget)?.localName === 'input') {
+        if (isTargetInput($event)) {
             return;
         }
 
@@ -69,6 +70,7 @@ export class AnnotationsListComponent extends HasScrollbarDirective {
             this._multiSelectService.activate();
         }
         this._listingService.selectAnnotations(annotation);
+        this._annotationManager.setSelectedFromWorkload();
     }
 
     referenceClicked(annotation: AnnotationWrapper): void {

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

@@ -4,7 +4,6 @@ import {
     Component,
     computed,
     ElementRef,
-    HostListener,
     Input,
     NgZone,
     OnDestroy,
@@ -51,6 +50,7 @@ import { ALL_HOTKEYS } from '../../utils/constants';
 import { AnnotationDrawService } from '../../../pdf-viewer/services/annotation-draw.service';
 import { FileManagementService } from '@services/files/file-management.service';
 import { MatDialog } from '@angular/material/dialog';
+import { isTargetInput, isTargetTextArea } from '@utils/functions';
 
 @Component({
     selector: 'redaction-file-header',
@@ -105,6 +105,7 @@ export class FileHeaderComponent implements OnInit, AfterViewInit, OnDetach, OnD
 
     ngOnInit() {
         document.documentElement.addEventListener('fullscreenchange', this.fullscreenListener);
+        this._pdf.instance.UI.iframeWindow.addEventListener('keyup', this.handleKeyEvent);
     }
 
     ngAfterViewInit() {
@@ -116,10 +117,12 @@ export class FileHeaderComponent implements OnInit, AfterViewInit, OnDetach, OnD
 
     ngOnDetach() {
         document.documentElement.removeEventListener('fullscreenchange', this.fullscreenListener);
+        this._pdf.instance.UI.iframeWindow.removeEventListener('keyup', this.handleKeyEvent);
     }
 
     ngOnDestroy() {
         document.documentElement.removeEventListener('fullscreenchange', this.fullscreenListener);
+        this._pdf.instance.UI.iframeWindow.removeEventListener('keyup', this.handleKeyEvent);
     }
 
     async downloadOriginalFile({ cacheIdentifier, dossierId, fileId, filename }: File) {
@@ -177,7 +180,7 @@ export class FileHeaderComponent implements OnInit, AfterViewInit, OnDetach, OnD
         }
     }
 
-    @HostListener('document:keyup', ['$event'])
+    @Bind()
     handleKeyEvent($event: KeyboardEvent) {
         if (this._router.url.indexOf('/file/') < 0) {
             return;
@@ -208,19 +211,20 @@ export class FileHeaderComponent implements OnInit, AfterViewInit, OnDetach, OnD
             this._changeRef.markForCheck();
         }
 
+        if ($event.key === 'F5') {
+            window.location.reload();
+        }
+
+        if (isTargetInput($event) || isTargetTextArea($event)) {
+            return;
+        }
+
         if (!$event.ctrlKey && !$event.metaKey && ['f', 'F'].includes($event.key)) {
-            // if you type in an input, don't toggle full-screen
-            if ($event.target instanceof HTMLInputElement || $event.target instanceof HTMLTextAreaElement) {
-                return;
-            }
             this.toggleFullScreen();
             return;
         }
 
         if (['h', 'H'].includes($event.key)) {
-            if ($event.target instanceof HTMLInputElement || $event.target instanceof HTMLTextAreaElement) {
-                return;
-            }
             this._ngZone.run(() => {
                 window.focus();
                 this._helpModeService.activateHelpMode(false);

apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html

@@ -129,7 +129,7 @@
                         ></iqser-circle-button>
 
                         <span
-                            [translateParams]="{ page: pdf.currentPage(), count: activeAnnotations.length }"
+                            [translateParams]="{ page: pdf.currentPage(), count: activeAnnotations().length }"
                             [translate]="'page'"
                             class="all-caps-label"
                         ></span>
@@ -160,7 +160,7 @@
                 id="annotations-list"
                 tabindex="1"
             >
-                <ng-container *ngIf="pdf.currentPage() && !displayedAnnotations.get(pdf.currentPage())?.length">
+                <ng-container *ngIf="pdf.currentPage() && !displayedAnnotations().get(pdf.currentPage())?.length">
                     <iqser-empty-state
                         [horizontalPadding]="24"
                         [text]="'file-preview.no-data.title' | translate"

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

@@ -1,5 +1,17 @@
 import { AsyncPipe, NgIf, NgTemplateOutlet } from '@angular/common';
-import { ChangeDetectorRef, Component, computed, effect, ElementRef, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import {
+    ChangeDetectorRef,
+    Component,
+    computed,
+    effect,
+    ElementRef,
+    HostListener,
+    OnDestroy,
+    OnInit,
+    signal,
+    untracked,
+    ViewChild,
+} from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatIcon } from '@angular/material/icon';
 import { MatTooltip } from '@angular/material/tooltip';
@@ -46,6 +58,7 @@ import { PageExclusionComponent } from '../page-exclusion/page-exclusion.compone
 import { PagesComponent } from '../pages/pages.component';
 import { ReadonlyBannerComponent } from '../readonly-banner/readonly-banner.component';
 import { DocumentInfoComponent } from '../document-info/document-info.component';
+import { getLast, isTargetInput } from '@utils/functions';
 
 const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape'];
 const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
@@ -90,7 +103,8 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
     protected readonly currentPageIsExcluded = computed(() => this.state.file().excludedPages.includes(this.pdf.currentPage()));
     protected readonly translations = workloadTranslations;
     protected readonly isDocumine = getConfig().IS_DOCUMINE;
-    displayedAnnotations = new Map<number, AnnotationWrapper[]>();
+    displayedAnnotations = signal(new Map<number, AnnotationWrapper[]>());
+    readonly activeAnnotations = computed(() => this.displayedAnnotations().get(this.pdf.currentPage()) || []);
     displayedPages: number[] = [];
     pagesPanelActive = true;
 
@@ -155,10 +169,6 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         );
     }
 
-    get activeAnnotations(): AnnotationWrapper[] {
-        return this.displayedAnnotations.get(this.pdf.currentPage()) || [];
-    }
-
     get showAnalysisDisabledBanner() {
         const file = this.state.file();
         return this.isDocumine && file.excludedFromAutomaticAnalysis && file.workflowStatus !== WorkflowFileStatuses.APPROVED;
@@ -215,21 +225,19 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
     }
 
     selectAllOnActivePage() {
-        this.listingService.selectAnnotations(this.activeAnnotations);
+        const activeAnnotations = untracked(this.activeAnnotations);
+        this.listingService.selectAnnotations(activeAnnotations);
     }
 
     deselectAllOnActivePage(): void {
-        this.listingService.deselect(this.activeAnnotations);
+        const activeAnnotations = untracked(this.activeAnnotations);
-        this.annotationManager.deselect(this.activeAnnotations);
+        this.listingService.deselect(activeAnnotations);
+        this.annotationManager.deselect(activeAnnotations);
     }
 
     @HostListener('window:keyup', ['$event'])
     handleKeyEvent($event: KeyboardEvent): void {
-        if (
+        if (!ALL_HOTKEY_ARRAY.includes($event.key) || this._dialog.openDialogs.length || isTargetInput($event)) {
-            !ALL_HOTKEY_ARRAY.includes($event.key) ||
-            this._dialog.openDialogs.length ||
-            ($event.target as IqserEventTarget).localName === 'input'
-        ) {
             return;
         }
 
@@ -309,7 +317,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
     }
 
     preventKeyDefault($event: KeyboardEvent): void {
-        if (COMMAND_KEY_ARRAY.includes($event.key) && !(($event.target as any).localName === 'input')) {
+        if (COMMAND_KEY_ARRAY.includes($event.key) && !isTargetInput($event)) {
             $event.preventDefault();
         }
     }
@@ -322,31 +330,33 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         this.pdf.navigateTo(this.#nextPageWithAnnotations());
     }
 
+    @Debounce(15)
     navigateAnnotations($event: KeyboardEvent) {
         const currentPage = this.pdf.currentPage();
+        const activeAnnotations = untracked(this.activeAnnotations);
         if (!this._firstSelectedAnnotation || currentPage !== this._firstSelectedAnnotation.pageNumber) {
             if (this.displayedPages.indexOf(currentPage) !== -1) {
                 // Displayed page has annotations
-                return this.listingService.selectAnnotations(this.activeAnnotations ? this.activeAnnotations[0] : null);
+                return this.listingService.selectAnnotations(activeAnnotations ? activeAnnotations[0] : null);
             }
             // Displayed page doesn't have annotations
             if ($event.key === 'ArrowDown') {
                 const nextPage = this.#nextPageWithAnnotations();
 
-                return this.listingService.selectAnnotations(this.displayedAnnotations.get(nextPage)[0]);
+                return this.listingService.selectAnnotations(this.displayedAnnotations().get(nextPage)[0]);
             }
 
             const prevPage = this.#prevPageWithAnnotations();
-            const prevPageAnnotations = this.displayedAnnotations.get(prevPage);
+            const prevPageAnnotations = this.displayedAnnotations().get(prevPage);
 
-            return this.listingService.selectAnnotations(prevPageAnnotations[prevPageAnnotations.length - 1]);
+            return this.listingService.selectAnnotations(getLast(prevPageAnnotations));
         }
 
         const page = this._firstSelectedAnnotation.pageNumber;
         const pageIdx = this.displayedPages.indexOf(page);
         const nextPageIdx = pageIdx + 1;
         const previousPageIdx = pageIdx - 1;
-        const annotationsOnPage = this.displayedAnnotations.get(page);
+        const annotationsOnPage = this.displayedAnnotations().get(page);
         const idx = annotationsOnPage.findIndex(a => a.id === this._firstSelectedAnnotation.id);
 
         if ($event.key === 'ArrowDown') {
@@ -356,7 +366,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
             } else if (nextPageIdx < this.displayedPages.length) {
                 // If not last page
                 for (let i = nextPageIdx; i < this.displayedPages.length; i++) {
-                    const nextPageAnnotations = this.displayedAnnotations.get(this.displayedPages[i]);
+                    const nextPageAnnotations = this.displayedAnnotations().get(this.displayedPages[i]);
                     if (nextPageAnnotations) {
                         this.listingService.selectAnnotations(nextPageAnnotations[0]);
                         break;
@@ -374,9 +384,9 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         if (pageIdx) {
             // If not first page
             for (let i = previousPageIdx; i >= 0; i--) {
-                const prevPageAnnotations = this.displayedAnnotations.get(this.displayedPages[i]);
+                const prevPageAnnotations = this.displayedAnnotations().get(this.displayedPages[i]);
                 if (prevPageAnnotations) {
-                    this.listingService.selectAnnotations(prevPageAnnotations[prevPageAnnotations.length - 1]);
+                    this.listingService.selectAnnotations(getLast(prevPageAnnotations));
                     break;
                 }
             }
@@ -413,8 +423,8 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
             annotations = annotations.filter(a => !a.isOCR);
         }
 
-        this.displayedAnnotations = this._annotationProcessingService.filterAndGroupAnnotations(annotations, primary, secondary);
+        this.displayedAnnotations.set(this._annotationProcessingService.filterAndGroupAnnotations(annotations, primary, secondary));
-        const pagesThatDisplayAnnotations = [...this.displayedAnnotations.keys()];
+        const pagesThatDisplayAnnotations = [...this.displayedAnnotations().keys()];
         const enabledFilters = this.filterService.enabledFlatFilters;
         if (enabledFilters.some(f => f.id === 'pages-without-annotations')) {
             if (enabledFilters.length === 1 && !onlyPageWithAnnotations) {
@@ -422,7 +432,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
             } else {
                 this.displayedPages = [];
             }
-            this.displayedAnnotations.clear();
+            this.displayedAnnotations().clear();
         } else if (enabledFilters.length || onlyPageWithAnnotations) {
             this.displayedPages = pagesThatDisplayAnnotations;
         } else {
@@ -430,17 +440,18 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         }
         this.displayedPages.sort((a, b) => a - b);
 
-        return this.displayedAnnotations;
+        return this.displayedAnnotations();
     }
 
     #selectFirstAnnotationOnCurrentPageIfNecessary() {
         const currentPage = this.pdf.currentPage();
+        const activeAnnotations = untracked(this.activeAnnotations);
         if (
             (!this._firstSelectedAnnotation || currentPage !== this._firstSelectedAnnotation.pageNumber) &&
             this.displayedPages.indexOf(currentPage) >= 0 &&
-            this.activeAnnotations.length > 0
+            activeAnnotations.length > 0
         ) {
-            this.listingService.selectAnnotations(this.activeAnnotations[0]);
+            this.listingService.selectAnnotations(activeAnnotations[0]);
         }
     }
 
@@ -479,7 +490,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
     #nextPageWithAnnotations() {
         let idx = 0;
         for (const page of this.displayedPages) {
-            if (page > this.pdf.currentPage() && this.displayedAnnotations.get(page)) {
+            if (page > this.pdf.currentPage() && this.displayedAnnotations().get(page)) {
                 break;
             }
             ++idx;
@@ -491,7 +502,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         let idx = this.displayedPages.length - 1;
         const reverseDisplayedPages = [...this.displayedPages].reverse();
         for (const page of reverseDisplayedPages) {
-            if (page < this.pdf.currentPage() && this.displayedAnnotations.get(page)) {
+            if (page < this.pdf.currentPage() && this.displayedAnnotations().get(page)) {
                 break;
             }
             --idx;
@@ -520,4 +531,16 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
         });
         return listItemsMap;
     }
+
+    @HostListener('click', ['$event'])
+    clickInsideWorkloadView($event: MouseEvent) {
+        $event?.stopPropagation();
+    }
+
+    @HostListener('document: click')
+    clickOutsideWorkloadView() {
+        if (this.multiSelectService.active() && !this._dialog.openDialogs.length) {
+            this.multiSelectService.deactivate();
+        }
+    }
 }

apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.scss

@@ -1,3 +1,5 @@
+@use 'common-mixins';
+
 .components-header {
     display: flex;
     flex-direction: row;
@@ -26,6 +28,7 @@ mat-icon {
     font-size: 12px;
     overflow: scroll;
     height: calc(100% - 40px);
+    @include common-mixins.scroll-bar;
 
     .component-row {
         display: flex;
@@ -47,6 +50,7 @@ mat-icon {
             &:not(:last-child) {
                 border-bottom: 1px solid var(--iqser-separator);
             }
+
             border-bottom: 1px solid var(--iqser-separator);
             margin-left: 26px;
             margin-right: 26px;

apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts

@@ -27,7 +27,7 @@ export class ViewSwitchComponent {
     });
     protected readonly canSwitchToRedactedView = computed(() => {
         const file = this._state.file();
-        return !file.analysisRequired && !file.excluded && !file.isError;
+        return !file.excluded && !file.isError;
     });
     protected readonly canSwitchToEarmarksView = computed(() => {
         const file = this._state.file();

apps/red-ui/src/app/modules/file-preview/dialogs/add-hint-dialog/add-hint-dialog.component.html

@@ -3,9 +3,56 @@
         <div [translate]="'add-hint.dialog.title'" class="dialog-header heading-l"></div>
 
         <div class="dialog-content redaction">
-            <div class="iqser-input-group w-450">
+            <div class="iqser-input-group w-full selected-text-group">
-                <label class="selected-text" [translate]="'add-hint.dialog.content.selected-text'"></label>
+                <div
-                {{ form.get('selectedText').value }}
+                    [class.fixed-height-36]="dictionaryRequest"
+                    [ngClass]="isEditingSelectedText ? 'flex relative' : 'flex-align-items-center'"
+                >
+                    <div class="table">
+                        <label>Value</label>
+                        <div class="row">
+                            <span
+                                *ngIf="!isEditingSelectedText"
+                                [innerHTML]="form.controls.selectedText.value"
+                                [ngStyle]="{
+                                    'min-width': textWidth > maximumSelectedTextWidth ? '95%' : 'unset',
+                                    'max-width': textWidth > maximumSelectedTextWidth ? 0 : 'unset',
+                                }"
+                            ></span>
+                            <textarea
+                                *ngIf="isEditingSelectedText"
+                                [rows]="selectedTextRows"
+                                [ngStyle]="{ width: maximumTextAreaWidth + 'px' }"
+                                formControlName="selectedText"
+                                iqserHasScrollbar
+                                name="value"
+                                type="text"
+                            ></textarea>
+
+                            <iqser-circle-button
+                                (action)="toggleEditingSelectedText()"
+                                *ngIf="dictionaryRequest && !isEditingSelectedText"
+                                [tooltip]="'redact-text.dialog.content.edit-text' | translate"
+                                [size]="20"
+                                [iconSize]="13"
+                                icon="iqser:edit"
+                                tooltipPosition="below"
+                            ></iqser-circle-button>
+
+                            <iqser-circle-button
+                                (action)="undoTextChange(); toggleEditingSelectedText()"
+                                *ngIf="isEditingSelectedText"
+                                [showDot]="initialText !== form.get('selectedText').value"
+                                [tooltip]="'redact-text.dialog.content.revert-text' | translate"
+                                [size]="20"
+                                [iconSize]="13"
+                                class="undo-button"
+                                icon="red:undo"
+                                tooltipPosition="below"
+                            ></iqser-circle-button>
+                        </div>
+                    </div>
+                </div>
             </div>
 
             <iqser-details-radio

apps/red-ui/src/app/modules/file-preview/dialogs/add-hint-dialog/add-hint-dialog.component.scss

@@ -1,3 +1,67 @@
 .dialog-content {
-    height: 400px;
+    height: 493px;
+    overflow-y: auto;
+}
+
+.selected-text-group > div {
+    gap: 0.5rem;
+
+    span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+
+iqser-circle-button {
+    padding-left: 10px;
+
+    &.undo-button {
+        margin-left: 8px;
+    }
+
+    ::ng-deep mat-icon {
+        padding: 2px;
+    }
+}
+
+.w-full {
+    width: 100%;
+}
+
+.fixed-height-36 {
+    min-height: 36px;
+}
+
+textarea[name='value'] {
+    margin-top: 0;
+    min-height: 0;
+    line-height: 1;
+}
+
+.table {
+    display: flex;
+    flex-direction: column;
+    min-width: calc(100% - 26px);
+    padding: 0 13px;
+
+    label {
+        opacity: 0.7;
+        font-weight: normal;
+    }
+
+    .row {
+        display: inline-flex;
+        flex-direction: row;
+        align-items: center;
+        background-color: var(--iqser-alt-background);
+        min-width: 100%;
+
+        span {
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            list-style-position: inside;
+            overflow: hidden;
+        }
+    }
 }

apps/red-ui/src/app/modules/file-preview/dialogs/add-hint-dialog/add-hint-dialog.component.ts

@@ -1,4 +1,4 @@
-import { NgForOf, NgIf } from '@angular/common';
+import { NgClass, NgForOf, NgIf, NgStyle } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormBuilder, ReactiveFormsModule, UntypedFormGroup } from '@angular/forms';
@@ -23,12 +23,14 @@ import { ActiveDossiersService } from '@services/dossiers/active-dossiers.servic
 import { DictionaryService } from '@services/entity-services/dictionary.service';
 import { Roles } from '@users/roles';
 import { UserPreferenceService } from '@users/user-preference.service';
-import { stringToBoolean } from '@utils/functions';
+import { calcTextWidthInPixels, stringToBoolean } from '@utils/functions';
 import { tap } from 'rxjs/operators';
 import { SystemDefaultOption, SystemDefaults } from '../../../account/utils/dialog-defaults';
 import { getRedactOrHintOptions } from '../../utils/dialog-options';
 import { AddHintData, AddHintResult, RedactOrHintOption, RedactOrHintOptions } from '../../utils/dialog-types';
 
+const MAXIMUM_TEXT_AREA_WIDTH = 421;
+
 @Component({
     templateUrl: './add-hint-dialog.component.html',
     styleUrls: ['./add-hint-dialog.component.scss'],
@@ -49,6 +51,8 @@ import { AddHintData, AddHintResult, RedactOrHintOption, RedactOrHintOptions } f
         CircleButtonComponent,
         MatDialogClose,
         NgForOf,
+        NgClass,
+        NgStyle,
     ],
 })
 export class AddHintDialogComponent extends IqserDialogComponent<AddHintDialogComponent, AddHintData, AddHintResult> implements OnInit {
@@ -58,9 +62,15 @@ export class AddHintDialogComponent extends IqserDialogComponent<AddHintDialogCo
     readonly roles = Roles;
     readonly iconButtonTypes = IconButtonTypes;
     readonly options: DetailsRadioOption<RedactOrHintOption>[];
+    readonly initialText = this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value;
+    readonly maximumTextAreaWidth = MAXIMUM_TEXT_AREA_WIDTH;
+    readonly maximumSelectedTextWidth = 567;
     dictionaryRequest = false;
     dictionaries: Dictionary[] = [];
     form!: UntypedFormGroup;
+    isEditingSelectedText = false;
+    selectedTextRows = 1;
+    textWidth: number;
 
     constructor(
         private readonly _activeDossiersService: ActiveDossiersService,
@@ -83,6 +93,7 @@ export class AddHintDialogComponent extends IqserDialogComponent<AddHintDialogCo
         );
 
         this.form = this.#getForm();
+        this.textWidth = calcTextWidthInPixels(this.form.controls.selectedText.value);
 
         this.form
             .get('option')
@@ -97,6 +108,18 @@ export class AddHintDialogComponent extends IqserDialogComponent<AddHintDialogCo
             .subscribe();
     }
 
+    toggleEditingSelectedText() {
+        this.isEditingSelectedText = !this.isEditingSelectedText;
+        if (this.isEditingSelectedText) {
+            const width = calcTextWidthInPixels(this.form.controls.selectedText.value);
+            this.selectedTextRows = Math.ceil(width / MAXIMUM_TEXT_AREA_WIDTH);
+        }
+    }
+
+    undoTextChange() {
+        this.form.patchValue({ selectedText: this.initialText });
+    }
+
     get displayedDictionaryLabel() {
         const dictType = this.form.get('dictionary').value;
         if (dictType) {

apps/red-ui/src/app/modules/file-preview/dialogs/redact-recommendation-dialog/redact-recommendation-dialog.component.ts

@@ -160,7 +160,11 @@ export class RedactRecommendationDialogComponent
     }
 
     #setDictionaries() {
-        this.dictionaries = this._dictionaryService.getRedactTextDictionaries(this.#dossier.dossierId, !this.#applyToAllDossiers);
+        this.dictionaries = this._dictionaryService.getRedactTextDictionaries(
+            this.#dossier.dossierId,
+            !this.#applyToAllDossiers,
+            this.#dossier.dossierTemplateId,
+        );
     }
 
     #selectReason() {

apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts

@@ -203,7 +203,11 @@ export class RedactTextDialogComponent
     }
 
     #setDictionaries() {
-        this.dictionaries = this._dictionaryService.getRedactTextDictionaries(this.#dossier.dossierId, !this.#applyToAllDossiers);
+        this.dictionaries = this._dictionaryService.getRedactTextDictionaries(
+            this.#dossier.dossierId,
+            !this.#applyToAllDossiers,
+            this.#dossier.dossierTemplateId,
+        );
     }
 
     #getForm(): FormGroup {

apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html

@@ -30,7 +30,7 @@
                 <mat-form-field>
                     <mat-select formControlName="dictionary">
                         <mat-select-trigger>{{ displayedDictionaryLabel }}</mat-select-trigger>
-                        <mat-option [value]="entity.type">
+                        <mat-option [value]="entity?.type">
                             <span> {{ redaction.typeLabel }} </span>
                         </mat-option>
                     </mat-select>

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

@@ -1,9 +1,8 @@
-import { ActivatedRouteSnapshot, NavigationExtras, Router, RouterLink } from '@angular/router';
+import { ActivatedRouteSnapshot, NavigationExtras, Router } from '@angular/router';
-import { ChangeDetectorRef, Component, effect, NgZone, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, effect, NgZone, OnDestroy, OnInit, TemplateRef, untracked, ViewChild } from '@angular/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ComponentCanDeactivate } from '@guards/can-deactivate.guard';
 import {
-    CircleButtonComponent,
     CircleButtonTypes,
     ConfirmOption,
     ConfirmOptions,
@@ -12,7 +11,6 @@ import {
     ErrorService,
     getConfig,
     IConfirmationDialogData,
-    IqserAllowDirective,
     IqserDialog,
     LoadingService,
     Toaster,
@@ -60,17 +58,13 @@ import { ViewModeService } from './services/view-mode.service';
 import { RedactTextData } from './utils/dialog-types';
 import { MultiSelectService } from './services/multi-select.service';
 import { NgIf } from '@angular/common';
-import { ViewSwitchComponent } from './components/view-switch/view-switch.component';
-import { ProcessingIndicatorComponent } from '@shared/components/processing-indicator/processing-indicator.component';
-import { UserManagementComponent } from './components/user-management/user-management.component';
 import { TranslateModule } from '@ngx-translate/core';
-import { InitialsAvatarComponent } from '@common-ui/users';
-import { FileActionsComponent } from '../shared-dossiers/components/file-actions/file-actions.component';
 import { FilePreviewRightContainerComponent } from './components/right-container/file-preview-right-container.component';
 import { TypeFilterComponent } from '@shared/components/type-filter/type-filter.component';
 import { FileHeaderComponent } from './components/file-header/file-header.component';
 import { StructuredComponentManagementComponent } from './components/structured-component-management/structured-component-management.component';
 import { DocumentInfoService } from './services/document-info.service';
+import { ANNOTATION_ACTION_ICONS, ANNOTATION_ACTIONS } from './utils/constants';
 
 @Component({
     templateUrl: './file-preview-screen.component.html',
@@ -79,16 +73,8 @@ import { DocumentInfoService } from './services/document-info.service';
     standalone: true,
     imports: [
         NgIf,
-        ViewSwitchComponent,
-        ProcessingIndicatorComponent,
-        UserManagementComponent,
         TranslateModule,
-        InitialsAvatarComponent,
-        CircleButtonComponent,
-        IqserAllowDirective,
-        FileActionsComponent,
         DisableStopPropagationDirective,
-        RouterLink,
         FilePreviewRightContainerComponent,
         TypeFilterComponent,
         FileHeaderComponent,
@@ -100,13 +86,13 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     readonly roles = Roles;
     readonly fileId = this.state.fileId;
     readonly dossierId = this.state.dossierId;
+    protected readonly isDocumine = getConfig().IS_DOCUMINE;
     @ViewChild('annotationFilterTemplate', {
         read: TemplateRef,
         static: false,
     })
     private readonly _filterTemplate: TemplateRef<unknown>;
     #loadAllAnnotationsEnabled = false;
-    protected readonly isDocumine = getConfig().IS_DOCUMINE;
 
     constructor(
         readonly pdf: PdfViewer,
@@ -152,6 +138,13 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
             this._fileDataService.loadAnnotations(file).then();
         });
 
+        effect(() => {
+            const file = this.state.file();
+            if (file.analysisRequired && !file.excludedFromAutomaticAnalysis) {
+                this._reanalysisService.reanalyzeFilesForDossier([file], file.dossierId, { force: true }).then();
+            }
+        });
+
         effect(
             () => {
                 if (this._documentViewer.loaded()) {
@@ -172,6 +165,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
 
         effect(() => {
             this._viewModeService.viewMode();
+            this.pdf.currentPage();
             this.updateViewMode().then();
         });
 
@@ -243,7 +237,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
 
         switch (this._viewModeService.viewMode()) {
             case ViewModes.STANDARD: {
-                const wrappers = this._fileDataService.annotations();
+                const wrappers = untracked(this._fileDataService.annotations);
+                const multiSelectActive = untracked(this._multiSelectService.active);
                 const ocrAnnotationIds = wrappers.filter(a => a.isOCR).map(a => a.id);
                 const standardEntries = annotations
                     .filter(a => !bool(a.getCustomData('changeLogRemoved')) && !this._annotationManager.isHidden(a.Id))
@@ -257,7 +252,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
                 this._readableRedactionsService.setAnnotationsColor(standardEntries, 'annotationColor');
                 this._readableRedactionsService.setAnnotationsOpacity(standardEntries, true);
                 this._annotationManager.show(standardEntries);
-                this._annotationManager.hide(nonStandardEntries);
+                this._annotationManager.hide(nonStandardEntries, multiSelectActive);
                 break;
             }
             case ViewModes.DELTA: {
@@ -295,15 +290,16 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         this._viewerHeaderService.enableLoadAllAnnotations(); // Reset the button state (since the viewer is reused between files)
         super.ngOnDetach();
         this.pdf.instance.UI.hotkeys.off('esc');
+        this.pdf.instance.UI.iframeWindow.document.removeEventListener('click', this.handleViewerClick);
         this._changeRef.markForCheck();
     }
 
     ngOnDestroy() {
         this.pdf.instance.UI.hotkeys.off('esc');
+        this.pdf.instance.UI.iframeWindow.document.removeEventListener('click', this.handleViewerClick);
         super.ngOnDestroy();
     }
 
-    @Bind()
     handleEscInsideViewer($event: KeyboardEvent) {
         $event.preventDefault();
         if (!!this._annotationManager.selected[0]) {
@@ -324,6 +320,31 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         }
     }
 
+    @Bind()
+    handleViewerClick(event: MouseEvent) {
+        this._ngZone.run(() => {
+            if (event.isTrusted) {
+                const clickedElement = event.target as HTMLElement;
+                const actionIconClicked = ANNOTATION_ACTION_ICONS.some(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) {
+                    if (
+                        clickedElement.querySelector('#selectionrect') ||
+                        clickedElement.id === `pageWidgetContainer${this.pdf.currentPage()}`
+                    ) {
+                        if (!this._annotationManager.selected.length) {
+                            this._multiSelectService.deactivate();
+                        }
+                    } else {
+                        this._multiSelectService.deactivate();
+                    }
+                }
+            }
+        });
+    }
+
     async ngOnAttach(previousRoute: ActivatedRouteSnapshot) {
         if (!this.state.file().canBeOpened) {
             return this.#navigateToDossier();
@@ -350,14 +371,18 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         this.userPreferenceService.saveLastOpenedFileForDossier(this.dossierId, this.fileId).then();
         this.#subscribeToFileUpdates();
 
-        if (file?.analysisRequired && !file.excludedFromAutomaticAnalysis) {
-            await this._reanalysisService.reanalyzeFilesForDossier([file], this.dossierId, { force: true });
-        }
-
         this.pdfProxyService.configureElements();
         this.#restoreOldFilters();
-        this.pdf.instance.UI.hotkeys.on('esc', this.handleEscInsideViewer);
+        this.pdf.instance.UI.hotkeys.on('esc', {
+            keydown: (e: KeyboardEvent) => this.pdf.escKeyHandler.keydown(e),
+            keyup: (e: KeyboardEvent) => {
+                this.pdf.escKeyHandler.keyup(e);
+                this.handleEscInsideViewer(e);
+            },
+        });
         this._viewerHeaderService.resetLayers();
+        this.pdf.instance.UI.iframeWindow.document.removeEventListener('click', this.handleViewerClick);
+        this.pdf.instance.UI.iframeWindow.document.addEventListener('click', this.handleViewerClick);
     }
 
     openManualAnnotationDialog(manualRedactionEntryWrapper: ManualRedactionEntryWrapper) {

apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts

@@ -1,17 +1,16 @@
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { Injectable, OnDestroy } from '@angular/core';
+import { effect, Injectable, untracked } from '@angular/core';
 import { EntitiesService, ListingService, SearchService } from '@iqser/common-ui';
-import { filter, tap } from 'rxjs/operators';
 import { MultiSelectService } from './multi-select.service';
 import { PdfViewer } from '../../pdf-viewer/services/pdf-viewer.service';
 import { REDAnnotationManager } from '../../pdf-viewer/services/annotation-manager.service';
-import { Subscription } from 'rxjs';
 import { FilterService } from '@iqser/common-ui/lib/filtering';
 import { SortingService } from '@iqser/common-ui/lib/sorting';
+import { toSignal } from '@angular/core/rxjs-interop';
 
 @Injectable()
-export class AnnotationsListingService extends ListingService<AnnotationWrapper> implements OnDestroy {
+export class AnnotationsListingService extends ListingService<AnnotationWrapper> {
-    readonly #subscriptions: Subscription;
+    readonly selectedLength = toSignal(this.selectedLength$);
 
     constructor(
         protected readonly _filterService: FilterService,
@@ -24,23 +23,22 @@ export class AnnotationsListingService extends ListingService<AnnotationWrapper>
     ) {
         super(_filterService, _searchService, _entitiesService, _sortingService);
 
-        this.#subscriptions = this.selectedLength$
+        effect(
-            .pipe(
+            () => {
-                filter(length => length > 1),
+                if (this.selectedLength() > 1) {
-                tap(() => this._multiSelectService.activate()),
+                    this._multiSelectService.activate();
-            )
+                }
-            .subscribe();
+            },
-    }
+            { allowSignalWrites: true },
-
+        );
-    ngOnDestroy() {
-        this.#subscriptions.unsubscribe();
     }
 
     selectAnnotations(annotations: AnnotationWrapper[] | AnnotationWrapper) {
         annotations = Array.isArray(annotations) ? annotations : [annotations];
         const pageNumber = annotations[annotations.length - 1].pageNumber;
 
-        const annotationsToSelect = this._multiSelectService.active() ? [...this.selected, ...annotations] : annotations;
+        const multiSelectActive = untracked(this._multiSelectService.active);
+        const annotationsToSelect = multiSelectActive ? [...this.selected, ...annotations] : annotations;
         this.#selectAnnotations(annotationsToSelect, pageNumber);
     }
 
@@ -49,16 +47,18 @@ export class AnnotationsListingService extends ListingService<AnnotationWrapper>
             return;
         }
 
-        if (this._multiSelectService.inactive()) {
+        const multiSelectInactive = untracked(this._multiSelectService.inactive);
+        if (multiSelectInactive) {
             this._annotationManager.deselect();
         }
 
-        if (pageNumber === this._pdf.currentPage()) {
+        const currentPage = untracked(this._pdf.currentPage);
+        if (pageNumber === currentPage) {
             return this._annotationManager.jumpAndSelect(annotations);
         }
 
         this._pdf.navigateTo(pageNumber);
         // wait for page to be loaded and to draw annotations
-        setTimeout(() => this._annotationManager.jumpAndSelect(annotations), 300);
+        setTimeout(() => this._annotationManager.jumpAndSelect(annotations), 10);
     }
 }

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

@@ -137,7 +137,7 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
 
         this.#logger.info('[REDACTION_LOG] Redaction log loaded', redactionLog);
         let annotations = await this.#convertData(redactionLog);
-        this.#checkMissingTypes();
+        if (!this.#annotations().length && annotations.length !== this.missingTypes.size) this.#checkMissingTypes();
         annotations = this.#isIqserDevMode ? annotations : annotations.filter(a => !a.isFalsePositive);
         this.#annotations.set(annotations);
     }
@@ -270,7 +270,7 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
         const viewTime = timestampOf(viewedPage.viewedTime) - DELTA_VIEW_TIME;
         let changeOccurredAfterPageIsViewed = lastChange && timestampOf(lastChange.dateTime) > viewTime;
 
-        if (changeOccurredAfterPageIsViewed) {
+        if (changeOccurredAfterPageIsViewed !== undefined) {
             this.#markPageAsUnseenIfNeeded(viewedPage, lastChange.dateTime);
             return lastChange?.type;
         }
@@ -281,7 +281,7 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
         const processedTime = lastManualChange?.processedDate;
         changeOccurredAfterPageIsViewed = processedTime && timestampOf(processedTime) > viewTime;
 
-        if (changeOccurredAfterPageIsViewed) {
+        if (changeOccurredAfterPageIsViewed !== undefined) {
             this.#markPageAsUnseenIfNeeded(viewedPage, processedTime);
             return ChangeTypes.CHANGED;
         }

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

@@ -121,7 +121,8 @@ export class FilePreviewStateService {
 
     get #dossierFilesChange$() {
         return this._dossiersService.dossierFileChanges$.pipe(
-            filter(dossierId => dossierId === this.dossierId),
+            map(changes => changes[this.dossierId]),
+            filter(fileIds => fileIds && fileIds.length > 0),
             map(() => true),
         );
     }

apps/red-ui/src/app/modules/file-preview/services/multi-select.service.ts

@@ -1,4 +1,4 @@
-import { computed, Injectable, Signal, signal } from '@angular/core';
+import { computed, Injectable, Signal, signal, untracked } from '@angular/core';
 import { ViewModeService } from './view-mode.service';
 import { FilePreviewStateService } from './file-preview-state.service';
 import { ViewMode, ViewModes } from '@red/domain';
@@ -13,13 +13,17 @@ export class MultiSelectService {
 
     readonly #active = signal(false);
 
-    constructor(protected readonly _viewModeService: ViewModeService, protected readonly _state: FilePreviewStateService) {
+    constructor(
+        protected readonly _viewModeService: ViewModeService,
+        protected readonly _state: FilePreviewStateService,
+    ) {
         this.active = this.#active.asReadonly();
         this.inactive = computed(() => !this.#active());
     }
 
     activate() {
-        if (this.enabled()) {
+        const enabled = untracked(this.enabled);
+        if (enabled) {
             this.#active.set(true);
         }
     }

apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts

@@ -1,4 +1,4 @@
-import { computed, effect, inject, Injectable, NgZone } from '@angular/core';
+import { computed, effect, inject, Injectable, NgZone, untracked } from '@angular/core';
 import { getConfig, IqserPermissionsService } from '@iqser/common-ui';
 import { getCurrentUser } from '@iqser/common-ui/lib/users';
 import { isJustOne, shareDistinctLast, UI_ROOT_PATH_FN } from '@iqser/common-ui/lib/utils';
@@ -387,10 +387,10 @@ export class PdfProxyService {
                     this._ngZone.run(() => {
                         if (allAreVisible) {
                             this._annotationManager.hide(viewerAnnotations);
-                            this._annotationManager.addToHidden(viewerAnnotations[0].Id);
+                            viewerAnnotations.forEach(a => this._annotationManager.addToHidden(a.Id));
                         } else {
                             this._annotationManager.show(viewerAnnotations);
-                            this._annotationManager.removeFromHidden(viewerAnnotations[0].Id);
+                            viewerAnnotations.forEach(a => this._annotationManager.removeFromHidden(a.Id));
                         }
                         this._annotationManager.deselect();
                     });
@@ -402,11 +402,14 @@ export class PdfProxyService {
 
         const annotationChangesAllowed = !this.#isDocumine || !this._state.file().excludedFromAutomaticAnalysis;
         const somePending = annotationWrappers.some(a => a.pending);
+        const selectedFromWorkload = untracked(this._annotationManager.selectedFromWorkload);
+
         actions =
-            this._multiSelectService.inactive() && !this._documentViewer.selectedText.length && !somePending
+            (this._multiSelectService.inactive() || !selectedFromWorkload) && !this._documentViewer.selectedText.length && !somePending
                 ? [...actions, ...this._pdfAnnotationActionsService.get(annotationWrappers, annotationChangesAllowed)]
                 : [];
         this._pdf.instance.UI.annotationPopup.update(actions);
+        this._annotationManager.resetSelectedFromWorkload();
     }
 
     #getTitle(type: ManualRedactionEntryType) {

apps/red-ui/src/app/modules/file-preview/utils/constants.ts

@@ -55,3 +55,31 @@ export const TextPopups = {
 } as const;
 
 export const HIDE_SKIPPED = 'hide-skipped';
+
+export const ANNOTATION_ACTION_ICONS = [
+    'resize',
+    'edit',
+    'trash',
+    'check',
+    'thumb-up',
+    'pdftron-action-add-redaction',
+    'visibility-off',
+] as const;
+export const ANNOTATION_ACTIONS = [
+    'Resize',
+    'Größe ändern',
+    'Edit',
+    'Bearbeiten',
+    'Remove',
+    'Entfernen',
+    'Accept recommendation',
+    'Empfehlung annehmen',
+    'Force redaction',
+    'Schwärzung erzwingen',
+    'Force hint',
+    'Hinweis erzwingen',
+    'Redact',
+    'Schwärzen',
+    'Hide',
+    'Ausblenden',
+] as const;

apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts

@@ -152,6 +152,7 @@ export const getRemoveRedactionOptions = (
             descriptionParams: {
                 value: redactions[0].value,
                 type: redactions[0].HINT ? 'hint' : redactions[0].typeLabel,
+                isImage: redactions[0].isImage ? 'image' : redactions[0].typeLabel,
             },
             icon: PIN_ICON,
             value: RemoveRedactionOptions.ONLY_HERE,
@@ -161,7 +162,11 @@ export const getRemoveRedactionOptions = (
         options.push({
             label: isBulk ? translations.IN_DOSSIER.labelBulk : translations.IN_DOSSIER.label,
             description: isBulk ? translations.IN_DOSSIER.descriptionBulk : translations.IN_DOSSIER.description,
-            descriptionParams: { value: redactions[0].value, type: redactions[0].HINT ? 'hint' : redactions[0].typeLabel },
+            descriptionParams: {
+                value: redactions[0].value,
+                type: redactions[0].HINT ? 'hint' : redactions[0].typeLabel,
+                isImage: redactions[0].isImage ? 'image' : redactions[0].typeLabel,
+            },
             icon: FOLDER_ICON,
             value: RemoveRedactionOptions.IN_DOSSIER,
             extraOption: !isDocumine
@@ -182,6 +187,7 @@ export const getRemoveRedactionOptions = (
                     value: redactions[0].value,
                     type: redactions[0].typeLabel,
                     context: falsePositiveContext[0],
+                    isImage: redactions[0].isImage ? 'image' : redactions[0].typeLabel,
                 },
                 icon: FOLDER_ICON,
                 value: RemoveRedactionOptions.DO_NOT_RECOMMEND,
@@ -201,6 +207,7 @@ export const getRemoveRedactionOptions = (
                     value: redactions[0].value,
                     type: redactions[0].typeLabel,
                     context: falsePositiveContext[0],
+                    isImage: redactions[0].isImage ? 'image' : redactions[0].typeLabel,
                 },
                 icon: REMOVE_FROM_DICT_ICON,
                 value: RemoveRedactionOptions.FALSE_POSITIVE,

apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts

@@ -1,5 +1,5 @@
 import { inject, Injectable, signal } from '@angular/core';
-import { bool, List } from '@iqser/common-ui/lib/utils';
+import { bool, Debounce, List } from '@iqser/common-ui/lib/utils';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { Core } from '@pdftron/webviewer';
 import { getLast, urlFileId } from '@utils/functions';
@@ -20,6 +20,7 @@ const MOVE_OPTION = 'move';
 @Injectable()
 export class REDAnnotationManager {
     readonly #hidden = signal(new Set<string>());
+    readonly #selectedFromWorkload = signal(false);
     #manager: AnnotationManager;
     readonly #logger = inject(NGXLogger);
     readonly #annotationSelected$ = new Subject<[Annotation[], string]>();
@@ -27,6 +28,7 @@ export class REDAnnotationManager {
     resizingAnnotationId?: string = undefined;
     annotationHasBeenResized?: boolean = false;
     readonly hidden = this.#hidden.asReadonly();
+    readonly selectedFromWorkload = this.#selectedFromWorkload.asReadonly();
 
     get selected() {
         return this.#manager.getSelectedAnnotations();
@@ -104,7 +106,11 @@ export class REDAnnotationManager {
         this.deselect(this.selected.map(annotation => annotation.Id));
     }
 
-    hide(annotations: Annotation[]): void {
+    hide(annotations: Annotation[], multiSelectActive = false): void {
+        if (multiSelectActive) {
+            annotations.forEach(a => (a['Opacity'] = 0));
+            return;
+        }
         this.#manager.hideAnnotations(annotations);
     }
 
@@ -161,6 +167,15 @@ export class REDAnnotationManager {
         });
     }
 
+    setSelectedFromWorkload() {
+        this.#selectedFromWorkload.set(true);
+    }
+
+    @Debounce()
+    resetSelectedFromWorkload() {
+        this.#selectedFromWorkload.set(false);
+    }
+
     #getById(annotation: AnnotationWrapper | string) {
         return this.#manager.getAnnotationById(getId(annotation));
     }

apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts

@@ -14,6 +14,7 @@ import { PdfViewer } from './pdf-viewer.service';
 import Color = Core.Annotations.Color;
 import DocumentViewer = Core.DocumentViewer;
 import Quad = Core.Math.Quad;
+import { isTargetInput } from '@utils/functions';
 
 @Injectable()
 export class REDDocumentViewer {
@@ -71,14 +72,14 @@ export class REDDocumentViewer {
         return fromEvent<KeyboardEvent>(this.#document, 'keyUp').pipe(
             tap(stopAndPreventIfNotAllowed),
             filter($event => {
-                if (($event.target as HTMLElement)?.tagName?.toLowerCase() === 'input') {
+                if (isTargetInput($event)) {
                     if ($event.key === 'Escape') {
                         return true;
                     }
                 }
-                return ($event.target as HTMLElement)?.tagName?.toLowerCase() !== 'input';
+                return isTargetInput($event);
             }),
-            filter($event => $event.key.startsWith('Arrow') || ['f', 'h', 'H', 'Escape'].includes($event.key)),
+            filter($event => $event.key.startsWith('Arrow') || ['f', 'h', 'H', 'Escape', 'Shift'].includes($event.key)),
             tap<KeyboardEvent>(stopAndPrevent),
             log('[PDF] Keyboard shortcut'),
         );

apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts

@@ -13,7 +13,7 @@ import { UserPreferenceService } from '@users/user-preference.service';
 import { NGXLogger } from 'ngx-logger';
 import { combineLatest, fromEvent, Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
-import { DISABLED_HOTKEYS, DOCUMENT_LOADING_ERROR, USELESS_ELEMENTS } from '../utils/constants';
+import { DISABLED_HOTKEYS, DOCUMENT_LOADING_ERROR, SelectionModes, USELESS_ELEMENTS } from '../utils/constants';
 import { asList } from '../utils/functions';
 import { Rgb } from '../utils/types';
 import { REDAnnotationManager } from './annotation-manager.service';
@@ -65,6 +65,21 @@ export class PdfViewer {
     };
     selectedText = '';
 
+    readonly escKeyHandler = {
+        keydown: (e: KeyboardEvent) => {
+            e.preventDefault();
+            this.#clickSelectToolButton();
+        },
+        keyup: (e: KeyboardEvent) => {
+            e.preventDefault();
+            if (this.#isElementActive('searchPanel') && !this._annotationManager.resizingAnnotationId) {
+                this.#focusViewer();
+                this.deactivateSearch();
+            }
+            this.#clickSelectToolButton();
+        },
+    };
+
     constructor(
         private readonly _logger: NGXLogger,
         private readonly _errorService: ErrorService,
@@ -114,6 +129,11 @@ export class PdfViewer {
         return page$.pipe(map(page => this.#adjustPage(page)));
     }
 
+    get #searchInput() {
+        const iframeWindow = this.#instance.UI.iframeWindow;
+        return iframeWindow.document.getElementById('SearchPanel__input') as HTMLInputElement;
+    }
+
     activateSearch() {
         this.#instance.UI.searchTextFull('', this.searchOptions);
     }
@@ -147,7 +167,7 @@ export class PdfViewer {
         this.#instance = await this.#getInstance(htmlElement);
 
         if (environment.production) {
-            this.#instance.Core.setCustomFontURL('https://' + window.location.host + this.#convertPath('/assets/pdftron'));
+            this.#instance.Core.setCustomFontURL(window.location.origin + this.#convertPath('/assets/pdftron/fonts'));
         }
 
         await this.runWithCleanup(async () => {
@@ -158,12 +178,12 @@ export class PdfViewer {
 
             this.pageChanged$ = this.#pageChanged$.pipe(shareDistinctLast());
             this.#totalPages$.pipe(takeUntilDestroyed(this.#destroyRef)).subscribe(pages => this.#totalPages.set(pages));
-            this.#setSelectionMode();
+            this.#setSelectionMode(this.#config.SELECTION_MODE);
             this.#configureElements();
             this.#disableHotkeys();
             this.#getSelectedText();
             this.#listenForCommandF();
-            this.#listenForEsc();
+            this.#listenForShift();
             this.#clearSearchResultsWhenVisibilityChanged();
         });
 
@@ -256,7 +276,7 @@ export class PdfViewer {
     }
 
     #listenForCommandF() {
-        this.#instance.UI.hotkeys.on('command+f, ctrl+f', e => {
+        this.#instance.UI.hotkeys.on('command+f, ctrl+f', (e: KeyboardEvent) => {
             e.preventDefault();
             if (this.#isElementActive('searchPanel')) {
                 this.#updateSearchOptions();
@@ -270,20 +290,18 @@ export class PdfViewer {
         });
     }
 
-    #listenForEsc() {
+    #listenForShift() {
-        this.#instance.UI.hotkeys.on('esc', {
+        this.#instance.UI.iframeWindow.addEventListener('keydown', e => {
-            keydown: e => {
+            if (e.target === this.#searchInput) return;
-                e.preventDefault();
+            if (e.key === 'Shift') {
-                this.#clickSelectToolButton();
+                this.#setSelectionMode(SelectionModes.RECTANGULAR);
-            },
+            }
-            keyup: e => {
+        });
-                e.preventDefault();
+        this.#instance.UI.iframeWindow.addEventListener('keyup', e => {
-                if (this.#isElementActive('searchPanel') && !this._annotationManager.resizingAnnotationId) {
+            if (e.target === this.#searchInput) return;
-                    this.#focusViewer();
+            if (e.key === 'Shift') {
-                    this.deactivateSearch();
+                this.#setSelectionMode(SelectionModes.STRUCTURAL);
-                }
+            }
-                this.#clickSelectToolButton();
-            },
         });
     }
 
@@ -348,9 +366,9 @@ export class PdfViewer {
         this.#instance.UI.disableElements(USELESS_ELEMENTS);
     }
 
-    #setSelectionMode(): void {
+    #setSelectionMode(selectionMode: string): void {
         const textTool = this.#instance.Core.Tools.TextTool as unknown as TextTool;
-        textTool.SELECTION_MODE = this.#config.SELECTION_MODE;
+        textTool.SELECTION_MODE = selectionMode;
     }
 
     #getInstance(htmlElement: HTMLElement) {
@@ -373,13 +391,11 @@ export class PdfViewer {
         if (this.#isElementActive('textPopup')) {
             this.#instance.UI.closeElements(['textPopup']);
         }
-        const iframeWindow = this.#instance.UI.iframeWindow;
+        if (this.#searchInput) {
-        const input = iframeWindow.document.getElementById('SearchPanel__input') as HTMLInputElement;
+            this.#searchInput.focus();
-        if (input) {
-            input.focus();
         }
-        if (input?.value?.length > 0) {
+        if (this.#searchInput?.value?.length > 0) {
-            input.select();
+            this.#searchInput.select();
         }
     }
 

apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts

@@ -87,3 +87,8 @@ export const DISABLED_HOTKEYS = [
 export const AnnotationToolNames = {
     AnnotationCreateRectangle: 'AnnotationCreateRectangle',
 } as const;
+
+export const SelectionModes = {
+    RECTANGULAR: 'rectangular',
+    STRUCTURAL: 'structural',
+} as const;

apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html

@@ -1,25 +1,25 @@
-<div *ngIf="isDossierOverviewList && fileAttributesService.isEditingFileAttribute() === false" class="action-buttons">
+<div *ngIf="isDossierOverviewList() && fileAttributesService.isEditingFileAttribute() === false" class="action-buttons">
     <ng-container *ngTemplateOutlet="actions"></ng-container>
 
-    <redaction-processing-indicator *ngIf="showStatusBar" [file]="file"></redaction-processing-indicator>
+    <redaction-processing-indicator *ngIf="showStatusBar()" [file]="file()"></redaction-processing-indicator>
 
-    <iqser-status-bar *ngIf="showStatusBar" [configs]="[{ color: file.workflowStatus, length: 1 }]"></iqser-status-bar>
+    <iqser-status-bar *ngIf="showStatusBar()" [configs]="[{ color: file().workflowStatus, length: 1 }]"></iqser-status-bar>
 </div>
 
-<ng-container *ngIf="isFilePreview || isDossierOverviewWorkflow">
+<ng-container *ngIf="isFilePreview() || isDossierOverviewWorkflow()">
     <ng-container *ngTemplateOutlet="actions"></ng-container>
 </ng-container>
 
 <ng-template #actions (longPress)="forceReanalysisAction($event)" redactionLongPress>
     <div class="file-actions">
         <redaction-expandable-file-actions
-            [actions]="buttons"
+            [actions]="buttons()"
-            [id]="'actions-for-' + file.fileId"
+            [id]="'actions-for-' + file().fileId"
-            [maxWidth]="maxWidth"
+            [maxWidth]="maxWidth()"
-            [minWidth]="minWidth"
+            [minWidth]="minWidth()"
             [tooltipPosition]="tooltipPosition"
-            [helpModeKeyPrefix]="helpModeKeyPrefix"
+            [helpModeKeyPrefix]="helpModeKeyPrefix()"
-            [isDossierOverviewWorkflow]="isDossierOverviewWorkflow"
+            [isDossierOverviewWorkflow]="isDossierOverviewWorkflow()"
         ></redaction-expandable-file-actions>
     </div>
 </ng-template>

apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, HostBinding, Injector, Input, OnChanges, Optional, ViewChild } from '@angular/core';
+import { Component, computed, HostBinding, Injector, input, Optional, signal, ViewChild } from '@angular/core';
 import { toObservable } from '@angular/core/rxjs-interop';
 import { Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
@@ -36,6 +36,7 @@ import { FileAssignService } from '../../services/file-assign.service';
 import { ProcessingIndicatorComponent } from '@shared/components/processing-indicator/processing-indicator.component';
 import { StatusBarComponent } from '@common-ui/shared';
 import { NgIf, NgTemplateOutlet } from '@angular/common';
+import { RulesService } from '../../../admin/services/rules.service';
 
 @Component({
     selector: 'redaction-file-actions',
@@ -44,51 +45,92 @@ import { NgIf, NgTemplateOutlet } from '@angular/common';
     standalone: true,
     imports: [ProcessingIndicatorComponent, StatusBarComponent, LongPressDirective, ExpandableFileActionsComponent, NgTemplateOutlet, NgIf],
 })
-export class FileActionsComponent implements OnChanges {
+export class FileActionsComponent {
-    @Input({ required: true }) file: File;
-    @Input({ required: true }) dossier: Dossier;
-    @Input({ required: true }) type: 'file-preview' | 'dossier-overview-list' | 'dossier-overview-workflow';
-    @Input() maxWidth: number;
-    @Input() minWidth: number;
-    @Input() helpModeKeyPrefix: 'dossier' | 'editor' = 'dossier';
-    readonly currentUser = getCurrentUser<User>();
-    toggleTooltip?: string;
-    assignTooltip?: string;
-    showDownload = false;
-    showSetToNew = false;
-    showUndoApproval = false;
-    showAssignToSelf = false;
-    showImportRedactions = false;
-    showAssign = false;
-    showDelete = false;
-    showOCR = false;
-    canReanalyse = false;
-    canDisableAutoAnalysis = false;
-    canEnableAutoAnalysis = false;
-    showUnderReview = false;
-    showUnderApproval = false;
-    showApprove = false;
-    canToggleAnalysis = false;
-    showToggleAnalysis = false;
-    showStatusBar = false;
-    showReanalyseFilePreview = false;
-    showReanalyseDossierOverview = false;
-    analysisForced = false;
-    isDossierOverview = false;
-    isDossierOverviewList = false;
-    isDossierOverviewWorkflow = false;
-    isFilePreview = false;
-    isDossierMember = false;
-    tooltipPosition = IqserTooltipPositions.above;
-    buttons: Action[];
     @ViewChild(ExpandableFileActionsComponent)
     private readonly _expandableActionsComponent: ExpandableFileActionsComponent;
+    readonly file = input.required<File>();
+    readonly dossier = input.required<Dossier>();
+    readonly type = input.required<'file-preview' | 'dossier-overview-list' | 'dossier-overview-workflow'>();
+    readonly maxWidth = input<number>();
+    readonly minWidth = input<number>();
+    readonly helpModeKeyPrefix = input<'dossier' | 'editor'>('dossier');
+    readonly singleEntityAction = input(false);
+    readonly currentUser = getCurrentUser<User>();
+    readonly tooltipPosition = IqserTooltipPositions.above;
+
+    readonly isDossierOverview = computed(() => this.type().startsWith('dossier-overview'));
+    readonly isDossierOverviewList = computed(() => this.type() === 'dossier-overview-list');
+    readonly isDossierOverviewWorkflow = computed(() => this.type() === 'dossier-overview-workflow');
+    readonly isFilePreview = computed(() => this.type() === 'file-preview');
+    readonly buttons = computed(() => this.#buttons);
+    readonly showStatusBar = computed(() => !this.file().isError && !this.file().isUnprocessed && this.isDossierOverviewList());
+    readonly #assignTooltip? = computed(() =>
+        this.file().isUnderApproval ? _('dossier-overview.assign-approver') : _('dossier-overview.assign-reviewer'),
+    );
+    readonly #showSetToNew = computed(
+        () => this._permissionsService.canSetToNew(this.file(), this.dossier()) && !this.isDossierOverviewWorkflow(),
+    );
+    readonly #showUndoApproval = computed(
+        () => this._permissionsService.canUndoApproval(this.file(), this.dossier()) && !this.isDossierOverviewWorkflow(),
+    );
+    readonly #showAssignToSelf = computed(
+        () => this._permissionsService.canAssignToSelf(this.file(), this.dossier()) && this.isDossierOverview(),
+    );
+    readonly #showImportRedactions = computed(() => this._permissionsService.canImportRedactions(this.file(), this.dossier()));
+    readonly #showAssign = computed(
+        () =>
+            (this._permissionsService.canAssignUser(this.file(), this.dossier()) ||
+                this._permissionsService.canUnassignUser(this.file(), this.dossier())) &&
+            this.isDossierOverview(),
+    );
+    readonly #showDelete = computed(() => this._permissionsService.canSoftDeleteFile(this.file(), this.dossier()));
+    readonly #showOCR = computed(() => this._permissionsService.canOcrFile(this.file(), this.dossier()));
+    readonly #canReanalyse = computed(() => this._permissionsService.canReanalyseFile(this.file(), this.dossier()));
+    readonly #canEnableAutoAnalysis = computed(() => this._permissionsService.canEnableAutoAnalysis([this.file()], this.dossier()));
+    readonly #showUnderReview = computed(
+        () => this._permissionsService.canSetUnderReview(this.file(), this.dossier()) && !this.isDossierOverviewWorkflow(),
+    );
+    readonly #showUnderApproval = computed(
+        () => this._permissionsService.canSetUnderApproval(this.file(), this.dossier()) && !this.isDossierOverviewWorkflow(),
+    );
+    readonly #showApprove = computed(
+        () => this._permissionsService.isReadyForApproval(this.file(), this.dossier()) && !this.isDossierOverviewWorkflow(),
+    );
+    readonly #canToggleAnalysis = computed(() => this._permissionsService.canToggleAnalysis(this.file(), this.dossier()));
+    readonly #toggleTooltip? = computed(() => {
+        if (!this.#canToggleAnalysis()) {
+            return _('file-preview.toggle-analysis.only-managers');
+        }
+        return this.file()?.excluded ? _('file-preview.toggle-analysis.enable') : _('file-preview.toggle-analysis.disable');
+    });
+    readonly #showToggleAnalysis = computed(
+        () => !!this.file().lastProcessed && this._permissionsService.showToggleAnalysis(this.dossier()),
+    );
+    readonly #analysisForced = signal(false);
+    readonly #showReanalyse = computed(
+        () => (this.#canReanalyse() || this.file().excludedFromAutomaticAnalysis || this.#analysisForced()) && !this.file().dossierArchived,
+    );
+    readonly #isDossierMember = computed(() => this._permissionsService.isDossierMember(this.dossier()));
+    readonly #showDownload = computed(
+        () => this._permissionsService.canDownloadRedactedFile() && !!this.file().lastProcessed && this.#isDossierMember(),
+    );
+    readonly #showReanalyseFilePreview = computed(
+        () => this.#showReanalyse() && this.isFilePreview() && !this.file().isApproved && this.#isDossierMember(),
+    );
+    readonly #showReanalyseDossierOverview = computed(
+        () => this.#showReanalyse() && this.isDossierOverview() && !this.file().isApproved && this.#isDossierMember(),
+    );
+    readonly #ariaExpanded$ = toObservable(this._documentInfoService?.shown);
+    readonly #areRulesLocked = computed(() => this._rulesService.currentTemplateRules().timeoutDetected);
+
     readonly #isDocumine = getConfig().IS_DOCUMINE;
+    readonly #canDisableAutoAnalysis = computed(
+        () => !this.#isDocumine && this._permissionsService.canDisableAutoAnalysis([this.file()], this.dossier()),
+    );
 
     constructor(
         private readonly _injector: Injector,
         private readonly _filesService: FilesService,
-        private readonly _changeRef: ChangeDetectorRef,
         private readonly _loadingService: LoadingService,
         private readonly _dialogService: DossiersDialogService,
         private readonly _iqserDialog: IqserDialog,
@@ -99,6 +141,8 @@ export class FileActionsComponent implements OnChanges {
         private readonly _activeDossiersService: ActiveDossiersService,
         private readonly _fileManagementService: FileManagementService,
         private readonly _userPreferenceService: UserPreferenceService,
+        private readonly _rulesService: RulesService,
+        private readonly _toasterService: Toaster,
         readonly fileAttributesService: FileAttributesService,
         @Optional() private readonly _documentInfoService: DocumentInfoService,
         @Optional() private readonly _excludedPagesService: ExcludedPagesService,
@@ -109,15 +153,7 @@ export class FileActionsComponent implements OnChanges {
         return !!this._expandableActionsComponent?.expanded;
     }
 
-    private get _toggleTooltip(): string {
+    get #buttons() {
-        if (!this.canToggleAnalysis) {
-            return _('file-preview.toggle-analysis.only-managers');
-        }
-
-        return this.file?.excluded ? _('file-preview.toggle-analysis.enable') : _('file-preview.toggle-analysis.disable');
-    }
-
-    private get _buttons(): Action[] {
         const actions: Action[] = [
             {
                 id: 'btn-delete_file',
@@ -125,16 +161,16 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#openDeleteFileDialog(),
                 tooltip: _('dossier-overview.delete.action'),
                 icon: 'iqser:trash',
-                show: this.showDelete,
+                show: this.#showDelete(),
                 helpModeKey: 'delete_file',
             },
             {
                 id: 'btn-assign',
                 type: ActionTypes.circleBtn,
                 action: () => this.#assign(),
-                tooltip: this.assignTooltip,
+                tooltip: this.#assignTooltip(),
                 icon: 'red:assign',
-                show: this.showAssign,
+                show: this.#showAssign(),
                 helpModeKey: 'assign_user',
             },
             {
@@ -143,7 +179,7 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#assignToMe(),
                 tooltip: _('dossier-overview.assign-me'),
                 icon: 'red:assign-me',
-                show: this.showAssignToSelf,
+                show: this.#showAssignToSelf(),
                 helpModeKey: 'assign_user',
             },
             {
@@ -152,17 +188,17 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#openImportRedactionsDialog(),
                 tooltip: _('dossier-overview.import-redactions'),
                 icon: 'red:import_redactions',
-                show: this.showImportRedactions && !this._iqserPermissionsService.has(Roles.getRss),
+                show: this.#showImportRedactions() && !this._iqserPermissionsService.has(Roles.getRss),
                 helpModeKey: 'import_redactions',
             },
             {
                 id: 'btn-download_file',
                 type: ActionTypes.downloadBtn,
-                files: [this.file],
+                files: [this.file()],
-                dossier: this.dossier,
+                dossier: this.dossier(),
                 tooltipClass: 'small',
-                show: this.showDownload,
+                show: this.#showDownload(),
-                disabled: this.file.processingStatus === ProcessingFileStatuses.ERROR,
+                disabled: this.file().processingStatus === ProcessingFileStatuses.ERROR,
                 helpModeKey: 'download',
             },
             {
@@ -170,7 +206,7 @@ export class FileActionsComponent implements OnChanges {
                 type: ActionTypes.circleBtn,
                 action: () => this.#toggleDocumentInfo(),
                 tooltip: _('file-preview.document-info'),
-                ariaExpanded: toObservable(this._documentInfoService?.shown, { injector: this._injector }),
+                ariaExpanded: this.#ariaExpanded$,
                 icon: 'red:status-info',
                 show: !!this._documentInfoService,
                 helpModeKey: 'document_info',
@@ -180,10 +216,10 @@ export class FileActionsComponent implements OnChanges {
                 type: ActionTypes.circleBtn,
                 action: () => this.#toggleExcludePages(),
                 tooltip: _('file-preview.exclude-pages'),
-                ariaExpanded: toObservable(this._excludedPagesService?.shown, { injector: this._injector }),
+                ariaExpanded: this.#ariaExpanded$,
-                showDot: !!this.file.excludedPages?.length,
+                showDot: !!this.file().excludedPages?.length,
                 icon: 'red:exclude-pages',
-                show: !!this._excludedPagesService && this._permissionsService.canExcludePages(this.file, this.dossier),
+                show: !!this._excludedPagesService && this._permissionsService.canExcludePages(this.file(), this.dossier()),
                 helpModeKey: 'exclude_pages',
             },
             {
@@ -192,7 +228,7 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#setToNew(),
                 tooltip: _('dossier-overview.back-to-new'),
                 icon: 'red:undo',
-                show: this.showSetToNew,
+                show: this.#showSetToNew(),
                 helpModeKey: 'change_status',
             },
             {
@@ -201,7 +237,7 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#setFileUnderApproval(),
                 tooltip: _('dossier-overview.under-approval'),
                 icon: 'red:ready-for-approval',
-                show: this.showUnderApproval,
+                show: this.#showUnderApproval(),
                 helpModeKey: 'change_status',
             },
             {
@@ -210,17 +246,17 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#setFileUnderReview(),
                 tooltip: _('dossier-overview.under-review'),
                 icon: 'red:undo',
-                show: this.showUnderReview,
+                show: this.#showUnderReview(),
                 helpModeKey: 'change_status',
             },
             {
                 id: 'btn-set_file_approved',
                 type: ActionTypes.circleBtn,
                 action: () => this.setFileApproved(),
-                tooltip: this.file.canBeApproved ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'),
+                tooltip: this.file().canBeApproved ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'),
                 icon: 'red:approved',
-                disabled: !this.file.canBeApproved,
+                disabled: !this.file().canBeApproved,
-                show: this.showApprove,
+                show: this.#showApprove(),
                 helpModeKey: 'change_status',
             },
             {
@@ -229,18 +265,17 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#toggleAutomaticAnalysis(),
                 tooltip: _('dossier-overview.stop-auto-analysis'),
                 icon: 'red:disable-analysis',
-                show: this.canDisableAutoAnalysis,
+                show: this.#canDisableAutoAnalysis(),
                 helpModeKey: 'stop_analysis',
             },
             {
                 id: 'btn-reanalyse_file_preview',
                 type: ActionTypes.circleBtn,
                 action: () => this.#reanalyseFile(),
-                tooltip: _('file-preview.reanalyse-notification'),
+                tooltip: this.#areRulesLocked() ? _('dossier-listing.rules.timeoutError') : _('file-preview.reanalyse-notification'),
-                tooltipClass: 'small',
                 icon: 'iqser:refresh',
-                show: this.showReanalyseFilePreview,
+                show: this.#showReanalyseFilePreview(),
-                disabled: this.file.isProcessing,
+                disabled: this.file().isProcessing || this.#areRulesLocked(),
                 helpModeKey: 'stop_analysis',
             },
             {
@@ -248,9 +283,9 @@ export class FileActionsComponent implements OnChanges {
                 type: ActionTypes.circleBtn,
                 action: () => this.#toggleAutomaticAnalysis(),
                 tooltip: _('dossier-overview.start-auto-analysis'),
-                buttonType: this.isFilePreview ? CircleButtonTypes.warn : CircleButtonTypes.default,
+                buttonType: this.isFilePreview() ? CircleButtonTypes.warn : CircleButtonTypes.default,
                 icon: 'red:enable-analysis',
-                show: this.canEnableAutoAnalysis,
+                show: this.#canEnableAutoAnalysis(),
                 helpModeKey: 'stop_analysis',
             },
             {
@@ -259,7 +294,7 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#setFileUnderApproval(),
                 tooltip: _('dossier-overview.under-approval'),
                 icon: 'red:undo',
-                show: this.showUndoApproval,
+                show: this.#showUndoApproval(),
                 helpModeKey: 'change_status',
             },
             {
@@ -268,27 +303,28 @@ export class FileActionsComponent implements OnChanges {
                 action: () => this.#ocrFile(),
                 tooltip: _('dossier-overview.ocr-file'),
                 icon: 'iqser:ocr',
-                show: this.showOCR,
+                show: this.#showOCR(),
                 helpModeKey: 'automatic_text_recognition',
             },
             {
                 id: 'btn-reanalyse_file',
                 type: ActionTypes.circleBtn,
                 action: () => this.#reanalyseFile(),
-                tooltip: _('dossier-overview.reanalyse.action'),
+                tooltip: this.#areRulesLocked() ? _('dossier-listing.rules.timeoutError') : _('dossier-overview.reanalyse.action'),
                 icon: 'iqser:refresh',
-                show: this.showReanalyseDossierOverview,
+                show: this.#showReanalyseDossierOverview(),
+                disabled: this.#areRulesLocked(),
                 helpModeKey: 'stop_analysis',
             },
             {
                 id: 'btn-toggle_analysis',
                 type: ActionTypes.toggle,
                 action: () => this.#toggleAnalysis(),
-                disabled: !this.canToggleAnalysis,
+                disabled: !this.#canToggleAnalysis(),
-                tooltip: this.toggleTooltip,
+                tooltip: this.#toggleTooltip(),
-                class: { 'mr-24': this.isDossierOverviewList },
+                class: { 'mr-24': this.isDossierOverviewList() },
-                checked: !this.file.excluded,
+                checked: !this.file().excluded,
-                show: this.showToggleAnalysis && this.isDossierMember,
+                show: this.#showToggleAnalysis() && this.#isDossierMember(),
                 helpModeKey: 'disable_extraction',
             },
         ];
@@ -296,33 +332,28 @@ export class FileActionsComponent implements OnChanges {
         return actions.filter(btn => btn.show);
     }
 
-    ngOnChanges() {
-        this.#setup();
-    }
-
     async setFileApproved() {
-        if (!this.file.analysisRequired && !this.file.hasUpdates) {
+        if (!this.file().analysisRequired && !this.file().hasUpdates) {
             await this.#setFileApproved();
             return;
         }
 
         const data: IConfirmationDialogData = {
-            title: this.file.analysisRequired
+            title: this.file().analysisRequired
                 ? _('confirmation-dialog.approve-file-without-analysis.title')
                 : _('confirmation-dialog.approve-file.title'),
-            question: this.file.analysisRequired
+            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,
+            confirmationText: this.file().analysisRequired ? _('confirmation-dialog.approve-file-without-analysis.confirmationText') : null,
-            denyText: this.file.analysisRequired ? _('confirmation-dialog.approve-file-without-analysis.denyText') : null,
+            denyText: this.file().analysisRequired ? _('confirmation-dialog.approve-file-without-analysis.denyText') : null,
         };
 
         this._dialogService.openDialog('confirm', data, () => this.#setFileApproved());
     }
 
     forceReanalysisAction($event: LongPressEvent) {
-        this.analysisForced = !$event.touchEnd && this._userPreferenceService.isIqserDevMode;
+        this.#analysisForced.set(!$event.touchEnd && this._userPreferenceService.isIqserDevMode);
-        this.#setup();
     }
 
     #showOCRConfirmationDialog(): Observable<boolean> {
@@ -337,7 +368,7 @@ export class FileActionsComponent implements OnChanges {
     }
 
     #openImportRedactionsDialog() {
-        this._dialogService.openDialog('importRedactions', { dossierId: this.file.dossierId, fileId: this.file.fileId });
+        this._dialogService.openDialog('importRedactions', { dossierId: this.file().dossierId, fileId: this.file().fileId });
     }
 
     #openDeleteFileDialog() {
@@ -350,8 +381,8 @@ export class FileActionsComponent implements OnChanges {
             async () => {
                 this._loadingService.start();
                 try {
-                    const dossier = this._activeDossiersService.find(this.file.dossierId);
+                    const dossier = this._activeDossiersService.find(this.file().dossierId);
-                    await firstValueFrom(this._fileManagementService.delete([this.file], this.file.dossierId));
+                    await firstValueFrom(this._fileManagementService.delete([this.file()], this.file().dossierId));
                     await this._injector.get(Router).navigate([dossier.routerLink]);
                 } catch (error) {
                     this._injector.get(Toaster).error(_('error.http.generic'), { params: error });
@@ -362,8 +393,8 @@ export class FileActionsComponent implements OnChanges {
     }
 
     #assign() {
-        const files = [this.file];
+        const files = [this.file()];
-        const targetStatus = this.file.workflowStatus;
+        const targetStatus = this.file().workflowStatus;
         const withCurrentUserAsDefault = true;
         const withUnassignedOption = true;
         this._iqserDialog.openDefault(AssignReviewerApproverDialogComponent, {
@@ -377,29 +408,34 @@ export class FileActionsComponent implements OnChanges {
     }
 
     async #assignToMe() {
-        await this._fileAssignService.assignToMe([this.file]);
+        await this._fileAssignService.assignToMe([this.file()]);
     }
 
     async #reanalyseFile() {
+        const rules = await firstValueFrom(this._rulesService.getFor(this.dossier().dossierTemplateId));
+        if (rules.timeoutDetected) {
+            this._toasterService.error(_('dossier-listing.rules.timeoutError'));
+            return;
+        }
         const params: ReanalyzeQueryParams = {
             force: true,
             triggeredByUser: true,
         };
-        await this._reanalysisService.reanalyzeFilesForDossier([this.file], this.file.dossierId, params);
+        await this._reanalysisService.reanalyzeFilesForDossier([this.file()], this.file().dossierId, params);
     }
 
     async #toggleAutomaticAnalysis() {
         this._loadingService.start();
-        await firstValueFrom(this._reanalysisService.toggleAutomaticAnalysis(this.file.dossierId, [this.file]));
+        await firstValueFrom(this._reanalysisService.toggleAutomaticAnalysis(this.file().dossierId, [this.file()]));
         this._loadingService.stop();
     }
 
     async #setFileUnderApproval() {
-        await this._fileAssignService.assignApprover(this.file, true);
+        await this._fileAssignService.assignApprover(this.file(), true);
     }
 
     async #ocrFile() {
-        if (this.file.lastManualChangeDate) {
+        if (this.file().lastManualChangeDate) {
             const confirm = await firstValueFrom(this.#showOCRConfirmationDialog());
             if (!confirm) {
                 return;
@@ -412,92 +448,47 @@ export class FileActionsComponent implements OnChanges {
         viewerHeaderService.disableRotationButtons();
 
         this._loadingService.start();
-        await this._reanalysisService.ocrFiles([this.file], this.file.dossierId);
+        await this._reanalysisService.ocrFiles([this.file()], this.file().dossierId);
         this._loadingService.stop();
     }
 
     async #setFileUnderReview() {
-        await this._fileAssignService.assignReviewer(this.file, true);
+        await this._fileAssignService.assignReviewer(this.file(), true);
     }
 
     async #toggleAnalysis() {
         this._loadingService.start();
-        await this._reanalysisService.toggleAnalysis(this.file.dossierId, [this.file], !this.file.excluded);
+        await this._reanalysisService.toggleAnalysis(this.file().dossierId, [this.file()], !this.file().excluded);
         this._loadingService.stop();
     }
 
-    #setup() {
-        this.isDossierOverviewList = this.type === 'dossier-overview-list';
-        this.isDossierOverviewWorkflow = this.type === 'dossier-overview-workflow';
-        this.isDossierOverview = this.type.startsWith('dossier-overview');
-        this.isFilePreview = this.type === 'file-preview';
-
-        this.assignTooltip = this.file.isUnderApproval ? _('dossier-overview.assign-approver') : _('dossier-overview.assign-reviewer');
-        this.showAssign =
-            (this._permissionsService.canAssignUser(this.file, this.dossier) ||
-                this._permissionsService.canUnassignUser(this.file, this.dossier)) &&
-            this.isDossierOverview;
-
-        this.showAssignToSelf = this._permissionsService.canAssignToSelf(this.file, this.dossier) && this.isDossierOverview;
-        this.showImportRedactions = this._permissionsService.canImportRedactions(this.file, this.dossier);
-
-        this.showSetToNew = this._permissionsService.canSetToNew(this.file, this.dossier) && !this.isDossierOverviewWorkflow;
-        this.showUndoApproval = this._permissionsService.canUndoApproval(this.file, this.dossier) && !this.isDossierOverviewWorkflow;
-        this.showUnderReview = this._permissionsService.canSetUnderReview(this.file, this.dossier) && !this.isDossierOverviewWorkflow;
-        this.showUnderApproval = this._permissionsService.canSetUnderApproval(this.file, this.dossier) && !this.isDossierOverviewWorkflow;
-        this.showApprove = this._permissionsService.isReadyForApproval(this.file, this.dossier) && !this.isDossierOverviewWorkflow;
-
-        this.canToggleAnalysis = this._permissionsService.canToggleAnalysis(this.file, this.dossier);
-        this.showToggleAnalysis = !!this.file.lastProcessed && this._permissionsService.showToggleAnalysis(this.dossier);
-        this.toggleTooltip = this._toggleTooltip;
-        this.isDossierMember = this._permissionsService.isDossierMember(this.dossier);
-
-        this.showDelete = this._permissionsService.canSoftDeleteFile(this.file, this.dossier);
-        this.showOCR = this._permissionsService.canOcrFile(this.file, this.dossier);
-        this.canReanalyse = this._permissionsService.canReanalyseFile(this.file, this.dossier);
-        this.canDisableAutoAnalysis = !this.#isDocumine && this._permissionsService.canDisableAutoAnalysis([this.file], this.dossier);
-        this.canEnableAutoAnalysis = this._permissionsService.canEnableAutoAnalysis([this.file], this.dossier);
-
-        this.showStatusBar = !this.file.isError && !this.file.isUnprocessed && this.isDossierOverviewList;
-
-        const showReanalyse = this.canReanalyse || this.file.excludedFromAutomaticAnalysis || this.analysisForced;
-
-        this.showReanalyseFilePreview = showReanalyse && this.isFilePreview && !this.file.isApproved && this.isDossierMember;
-        this.showReanalyseDossierOverview = showReanalyse && this.isDossierOverview && !this.file.isApproved && this.isDossierMember;
-
-        this.showDownload = this._permissionsService.canDownloadRedactedFile() && !!this.file.lastProcessed && this.isDossierMember;
-        this.buttons = this._buttons;
-
-        this._changeRef.markForCheck();
-    }
-
     async #setFileApproved() {
         this._loadingService.start();
-        await this._filesService.setApproved(this.file);
+        await this._filesService.setApproved(this.file());
         this._loadingService.stop();
     }
 
     async #setToNew() {
         this._loadingService.start();
-        await this._filesService.setToNew(this.file);
+        await this._filesService.setToNew(this.file());
         this._loadingService.stop();
     }
 
     #toggleExcludePages() {
         this._excludedPagesService.toggle();
         const shown = this._excludedPagesService.shown();
-        setLocalStorageDataByFileId(this.file.id, 'show-exclude-pages', shown);
+        setLocalStorageDataByFileId(this.file().id, 'show-exclude-pages', shown);
         if (shown) {
-            setLocalStorageDataByFileId(this.file.id, 'show-document-info', false);
+            setLocalStorageDataByFileId(this.file().id, 'show-document-info', false);
         }
     }
 
     #toggleDocumentInfo() {
         this._documentInfoService.toggle();
         const shown = this._documentInfoService.shown();
-        setLocalStorageDataByFileId(this.file.id, 'show-document-info', shown);
+        setLocalStorageDataByFileId(this.file().id, 'show-document-info', shown);
         if (shown) {
-            setLocalStorageDataByFileId(this.file.id, 'show-exclude-pages', false);
+            setLocalStorageDataByFileId(this.file().id, 'show-exclude-pages', false);
         }
     }
 }

apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts

@@ -42,12 +42,16 @@ export class EditDossierDownloadPackageComponent
 {
     #existsWatermarks$: Observable<boolean>;
     form: FormGroup;
-    downloadTypes: { key: DownloadFileType; label: string }[] = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(
+    downloadTypes: { key: DownloadFileType; label: string }[] = [
-        (type: DownloadFileType) => ({
+        'ORIGINAL',
-            key: type,
+        'PREVIEW',
-            label: downloadTypesTranslations[type],
+        'OPTIMIZED_PREVIEW',
-        }),
+        'DELTA_PREVIEW',
-    );
+        'REDACTED',
+    ].map((type: DownloadFileType) => ({
+        key: type,
+        label: downloadTypesTranslations[type],
+    }));
     availableReportTypes: IReportTemplate[] = [];
     readonly roles = Roles;
     @Input() dossier: Dossier;

apps/red-ui/src/app/modules/shared/CustomDateAdapter.ts

@@ -10,6 +10,7 @@ import utc from 'dayjs/plugin/utc';
 import localeData from 'dayjs/plugin/localeData';
 import localizedFormat from 'dayjs/plugin/localizedFormat';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 
 export interface DayJsDateAdapterOptions {
     /**
@@ -232,6 +233,7 @@ export class CustomDateAdapter extends DateAdapter<Dayjs> {
         dayjs.extend(localizedFormat);
         dayjs.extend(customParseFormat);
         dayjs.extend(localeData);
+        dayjs.extend(isSameOrBefore);
 
         this.setLocale(dateLocale);
     }

apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.html

@@ -1,7 +1,5 @@
 <ng-container *ngIf="!filter.icon">
-    <div *ngIf="filter.id === 'comment'">
+    <mat-icon *ngIf="filter.id === 'comment'" svgIcon="red:comment"></mat-icon>
-        <mat-icon svgIcon="red:comment"></mat-icon>
-    </div>
 
     <redaction-annotation-icon
         *ngIf="filter.id !== 'comment'"

apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.scss

@@ -12,6 +12,6 @@
         height: 16px;
         margin-right: 8px;
         opacity: 50%;
-        line-height: 16px;
+        line-height: 8px;
     }
 }

apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts

@@ -71,12 +71,16 @@ export class AddDossierDialogComponent extends BaseDialogComponent implements On
     readonly roles = Roles;
     readonly iconButtonTypes = IconButtonTypes;
     hasDueDate = false;
-    readonly downloadTypes: { key: DownloadFileType; label: string }[] = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(
+    readonly downloadTypes: { key: DownloadFileType; label: string }[] = [
-        (type: DownloadFileType) => ({
+        'ORIGINAL',
-            key: type,
+        'PREVIEW',
-            label: downloadTypesTranslations[type],
+        'OPTIMIZED_PREVIEW',
-        }),
+        'DELTA_PREVIEW',
-    );
+        'REDACTED',
+    ].map((type: DownloadFileType) => ({
+        key: type,
+        label: downloadTypesTranslations[type],
+    }));
     dossierTemplates: IDossierTemplate[];
     availableReportTypes: IReportTemplate[] = [];
     dossierTemplateId: string;

apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.ts

@@ -90,7 +90,7 @@ export class DownloadDialogComponent extends IqserDialogComponent<DownloadDialog
     }
 
     get #formDownloadTypes() {
-        return ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED']
+        return ['ORIGINAL', 'PREVIEW', 'OPTIMIZED_PREVIEW', 'DELTA_PREVIEW', 'REDACTED']
             .map((type: DownloadFileType) => ({
                 key: type,
                 label: downloadTypesForDownloadTranslations[type],

apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts

@@ -15,6 +15,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { HeadersConfiguration } from '@iqser/common-ui/lib/utils';
 import { LicenseService } from '@services/license.service';
 import { LicenseFeatures } from '../../admin/screens/license/utils/constants';
+import { UserPreferenceService } from '@users/user-preference.service';
 
 export interface ActiveUpload {
     subscription: Subscription;
@@ -43,6 +44,7 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
         private readonly _errorMessageService: ErrorMessageService,
         private readonly _licenseService: LicenseService,
         private readonly _toaster: Toaster,
+        private readonly _userPreferenceService: UserPreferenceService,
     ) {
         super();
         const fileFetch$ = this.#fetchFiles$.pipe(
@@ -76,7 +78,7 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
         const maxSizeBytes = maxSizeMB * 1024 * 1024;
         const dossierFiles = this._filesMapService.get(dossierId);
         const supportMsOfficeFormats = this._licenseService.getFeature(LicenseFeatures.SUPPORT_MS_OFFICE_FORMATS)?.value as boolean;
-        let option: OverwriteFileOption = localStorage.getItem('overwriteFileOption') as OverwriteFileOption;
+        let option: OverwriteFileOption | 'undefined' = this._userPreferenceService.getOverwriteFileOption();
         for (let idx = 0; idx < files.length; ++idx) {
             const file = files[idx];
             let currentOption = option;
@@ -95,14 +97,14 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
                     }
                 }
             } else if (dossierFiles.find(pf => pf.filename === file.file.name)) {
-                if (!option) {
+                if (option === 'undefined') {
                     const res = await this._dialogService.openOverwriteFileDialog(file.file.name);
                     if (res.cancel) {
                         return;
                     }
 
                     if (res.rememberChoice) {
-                        localStorage.setItem('overwriteFileOption', res.option);
+                        await this._userPreferenceService.saveOverwriteFileOption(res.option);
                     }
 
                     currentOption = res.option;

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

@@ -1,58 +1,56 @@
-import { GenericService, LAST_CHECKED_OFFSET, QueryParam, ROOT_CHANGES_KEY } from '@iqser/common-ui';
+import { GenericService, LAST_CHECKED_OFFSET, ROOT_CHANGES_KEY } from '@iqser/common-ui';
-import { Dossier, DossierStats, IDossierChanges } from '@red/domain';
+import { Dossier, IChangesDetails } from '@red/domain';
-import { forkJoin, Observable, of, Subscription, throwError, timer } from 'rxjs';
+import { forkJoin, Observable, Subscription, timer } from 'rxjs';
-import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { filter, map, switchMap, take, tap } from 'rxjs/operators';
-import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
 import { NGXLogger } from 'ngx-logger';
 import { ActiveDossiersService } from './active-dossiers.service';
 import { ArchivedDossiersService } from './archived-dossiers.service';
 import { inject, Injectable, OnDestroy } from '@angular/core';
 import { DashboardStatsService } from '../dossier-templates/dashboard-stats.service';
 import { CHANGED_CHECK_INTERVAL } from '@utils/constants';
-import { List } from '@iqser/common-ui/lib/utils';
 import { Router } from '@angular/router';
 import { filterEventsOnPages } from '@utils/operators';
+import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 
 @Injectable({ providedIn: 'root' })
 export class DossiersChangesService extends GenericService<Dossier> implements OnDestroy {
+    protected readonly _defaultModelPath = 'dossier';
     readonly #subscription = new Subscription();
     readonly #activeDossiersService = inject(ActiveDossiersService);
     readonly #archivedDossiersService = inject(ArchivedDossiersService);
     readonly #dashboardStatsService = inject(DashboardStatsService);
+    readonly #dossierStatsService = inject(DossierStatsService);
     readonly #logger = inject(NGXLogger);
     readonly #router = inject(Router);
-    protected readonly _defaultModelPath = 'dossier';
 
-    loadOnlyChanged(): Observable<IDossierChanges> {
+    loadOnlyChanged(): Observable<IChangesDetails> {
-        const removeIfNotFound = (id: string) =>
+        const load = (changes: IChangesDetails) => this.#load(changes.dossierChanges.map(d => d.dossierId));
-            catchError((error: unknown) => {
-                if (error instanceof HttpErrorResponse && error.status === HttpStatusCode.NotFound) {
-                    this.#activeDossiersService.remove(id);
-                    this.#archivedDossiersService.remove(id);
-                    return of([]);
-                }
-                return throwError(() => error);
-            });
 
-        const load = (changes: IDossierChanges) =>
+        const loadStats = (change: IChangesDetails) => {
-            changes.map(change => this.#load(change.dossierId).pipe(removeIfNotFound(change.dossierId)));
+            const dossierStatsToLoad = new Set<string>();
+            change.dossierChanges.forEach(dossierChange => dossierStatsToLoad.add(dossierChange.dossierId));
+            change.fileChanges.forEach(fileChange => dossierStatsToLoad.add(fileChange.dossierId));
+            return this.#dossierStatsService.getFor(Array.from(dossierStatsToLoad));
+        };
 
         return this.hasChangesDetails$().pipe(
             tap(changes => this.#logger.info('[DOSSIERS_CHANGES] Found changes', changes)),
             switchMap(dossierChanges =>
-                forkJoin([...load(dossierChanges), this.#dashboardStatsService.loadAll().pipe(take(1))]).pipe(map(() => dossierChanges)),
+                forkJoin([load(dossierChanges), loadStats(dossierChanges), this.#dashboardStatsService.loadAll().pipe(take(1))]).pipe(
+                    map(() => dossierChanges),
+                ),
             ),
         );
     }
 
-    hasChangesDetails$(): Observable<IDossierChanges> {
+    hasChangesDetails$(): Observable<IChangesDetails> {
         const body = { value: this._lastCheckedForChanges.get(ROOT_CHANGES_KEY) };
         const dateBeforeRequest = new Date(Date.now() - LAST_CHECKED_OFFSET).toISOString();
 
         this.#logger.info('[DOSSIERS_CHANGES] Check with Last Checked Date', body.value);
 
-        return this._post<IDossierChanges>(body, `${this._defaultModelPath}/changes/details`).pipe(
+        return this._post<IChangesDetails>(body, `${this._defaultModelPath}/changes/details/v2`).pipe(
-            filter(changes => changes.length > 0),
+            filter(changes => changes.dossierChanges.length > 0 || changes.fileChanges.length > 0),
             tap(() => this._lastCheckedForChanges.set(ROOT_CHANGES_KEY, dateBeforeRequest)),
             tap(() => this.#logger.info('[DOSSIERS_CHANGES] Save Last Checked Date value', dateBeforeRequest)),
         );
@@ -75,17 +73,27 @@ export class DossiersChangesService extends GenericService<Dossier> implements O
         this.#subscription.unsubscribe();
     }
 
-    #load(id: string): Observable<DossierStats[]> {
+    getByIds(ids: string[]) {
-        const queryParams: List<QueryParam> = [{ key: 'includeArchived', value: true }];
+        return super._post<Record<string, Dossier>>({ value: ids }, `${this._defaultModelPath}/by-id`);
-        return super._getOne([id], this._defaultModelPath, queryParams).pipe(
+    }
-            map(entity => new Dossier(entity)),
+
-            switchMap((dossier: Dossier) => {
+    #load(ids: string[]): Observable<Dossier[]> {
-                if (dossier.isArchived) {
+        return this.getByIds(ids).pipe(
-                    this.#activeDossiersService.remove(dossier.id);
+            map(entity => {
-                    return this.#archivedDossiersService.updateDossier(dossier);
+                return Object.values(entity).map(dossier => new Dossier(dossier));
-                }
+            }),
-                this.#archivedDossiersService.remove(dossier.id);
+            map((dossiers: Dossier[]) => {
-                return this.#activeDossiersService.updateDossier(dossier);
+                const archivedDossiers = dossiers.filter(dossier => dossier.isArchived);
+                const deletedDossiers = dossiers.filter(dossier => dossier.isSoftDeleted);
+                const activeDossiers = dossiers.filter(dossier => !dossier.isArchived && !dossier.isSoftDeleted);
+
+                archivedDossiers.forEach(dossier => this.#activeDossiersService.remove(dossier.id));
+                activeDossiers.forEach(dossier => this.#archivedDossiersService.remove(dossier.id));
+                deletedDossiers.forEach(dossier => this.#activeDossiersService.remove(dossier.id));
+
+                this.#activeDossiersService.updateDossiers(activeDossiers);
+                this.#archivedDossiersService.updateDossiers(archivedDossiers);
+                return dossiers;
             }),
         );
     }

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

@@ -1,5 +1,5 @@
 import { EntitiesService, Toaster } from '@iqser/common-ui';
-import { Dossier, DossierStats, IDossier, IDossierChanges, IDossierRequest } from '@red/domain';
+import { Dossier, DossierFileChanges, DossierStats, IChangesDetails, IDossier, IDossierRequest } from '@red/domain';
 import { Observable, of, Subject } from 'rxjs';
 import { catchError, map, switchMap, tap } from 'rxjs/operators';
 import { inject } from '@angular/core';
@@ -17,7 +17,7 @@ export abstract class DossiersService extends EntitiesService<IDossier, Dossier>
     protected readonly _toaster = inject(Toaster);
     protected readonly _entityClass = Dossier;
     protected abstract readonly _defaultModelPath: string;
-    readonly dossierFileChanges$ = new Subject<string>();
+    readonly dossierFileChanges$ = new Subject<DossierFileChanges>();
     abstract readonly routerPath: string;
 
     createOrUpdate(dossier: IDossierRequest): Observable<Dossier> {
@@ -52,7 +52,18 @@ export abstract class DossiersService extends EntitiesService<IDossier, Dossier>
         return this._dossierStatsService.getFor([dossier.id]);
     }
 
-    emitFileChanges(dossierChanges: IDossierChanges): void {
+    updateDossiers(dossier: Dossier[]): void {
-        dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId));
+        dossier.forEach(d => this.replace(d));
+    }
+
+    emitFileChanges(changes: IChangesDetails): void {
+        const changeModel: DossierFileChanges = {};
+        changes.fileChanges.forEach(change => {
+            if (!changeModel[change.dossierId]) {
+                changeModel[change.dossierId] = [];
+            }
+            changeModel[change.dossierId].push(change.fileId);
+        });
+        this.dossierFileChanges$.next(changeModel);
     }
 }

apps/red-ui/src/app/services/entity-services/dictionary.service.ts

@@ -157,8 +157,9 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
             .filter(d => d.model['typeId'] && (d.hasDictionary || d.addToDictionaryAction));
     }
 
-    getRedactTextDictionaries(dossierId: string, dossierDictionaryOnly: boolean): Dictionary[] {
+    getRedactTextDictionaries(dossierId: string, dossierDictionaryOnly: boolean, dossierTemplateId: string): Dictionary[] {
-        return this.#extractDossierLevelTypes(dossierId)
+        const types = dossierDictionaryOnly ? this.#extractDossierLevelTypes(dossierId) : this.getDictionariesOptions(dossierTemplateId);
+        return types
             .filter(d => d.model['typeId'] && !d.hint && d.addToDictionaryAction && (dossierDictionaryOnly || !d.dossierDictionaryOnly))
             .sort((a, b) => a.label.localeCompare(b.label));
     }

apps/red-ui/src/app/services/files/files.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { EntitiesService, isArray, QueryParam } from '@iqser/common-ui';
 import { List, mapEach } from '@iqser/common-ui/lib/utils';
-import { File, IFile } from '@red/domain';
+import { DossierFileChanges, File, IFile } from '@red/domain';
 import { UserService } from '@users/user.service';
 import { NGXLogger } from 'ngx-logger';
 import { firstValueFrom } from 'rxjs';
@@ -27,8 +27,35 @@ export class FilesService extends EntitiesService<IFile, File> {
         super();
     }
 
+    loadByIds(dossierFileChanges: DossierFileChanges) {
+        const filesByDossier$ = super
+            ._post<{ value: Record<string, IFile[]> }>({ value: dossierFileChanges }, `${this._defaultModelPath}/by-id`)
+            .pipe(
+                map(response => {
+                    const filesByDossier = response.value;
+                    const result: Record<string, File[]> = {};
+                    for (const key of Object.keys(filesByDossier)) {
+                        result[key] = filesByDossier[key].map(file => new File(file, this._userService.getName(file.assignee)));
+                        result[key].forEach(file => this._logger.info('[FILE] Loaded', file));
+                    }
+                    return result;
+                }),
+            );
+        return filesByDossier$.pipe(
+            tap(files => {
+                for (const key of Object.keys(files)) {
+                    const notDeletedFiles = files[key].filter(file => !file.deleted);
+                    const deletedFiles = files[key].filter(file => file.deleted);
+                    this._filesMapService.replace(key, notDeletedFiles);
+                    deletedFiles.map(file => file.id).forEach(id => this._filesMapService.delete(key, id));
+                }
+            }),
+        );
+    }
+
     /** Reload dossier files + stats. */
     loadAll(dossierId: string) {
+        console.log('loadAll');
         const files$ = this.getFor(dossierId).pipe(
             mapEach(file => new File(file, this._userService.getName(file.assignee))),
             tap(file => this._logger.info('[FILE] Loaded', file)),

apps/red-ui/src/app/services/notifications.service.ts

@@ -95,7 +95,7 @@ export class NotificationsService extends EntitiesService<INotification, Notific
     }
 
     #getDossierHref(dossier: Dossier): string {
-        return dossier ? `${dossier.routerLink}` : null;
+        return dossier ? `${this.#appBaseHref}${dossier.routerLink}` : null;
     }
 
     #getUsername(userId: string | undefined) {

apps/red-ui/src/app/services/permissions.service.ts

@@ -409,11 +409,7 @@ export class PermissionsService {
     }
 
     #canReanalyseFile(file: File, dossier: Dossier): boolean {
-        return (
+        return dossier.isActive && ((this.isAssigneeOrApprover(file, dossier) && file.analysisRequired) || file.isError);
-            dossier.isActive &&
-            ((this.isAssigneeOrApprover(file, dossier) && file.analysisRequired) ||
-                (file.isError && (this.isOwner(dossier) || this.isFileAssignee(file))))
-        );
     }
 
     #canEnableAutoAnalysis(file: File, dossier: Dossier): boolean {

apps/red-ui/src/app/translations/download-types-translations.ts

@@ -4,6 +4,7 @@ import { DownloadFileType } from '@red/domain';
 export const downloadTypesTranslations: { [key in DownloadFileType]: string } = {
     ORIGINAL: _('download-type.original'),
     PREVIEW: _('download-type.preview'),
+    OPTIMIZED_PREVIEW: _('download-type.optimized-preview'),
     REDACTED: _('download-type.redacted'),
     ANNOTATED: _('download-type.annotated'),
     FLATTEN: _('download-type.flatten'),
@@ -13,6 +14,7 @@ export const downloadTypesTranslations: { [key in DownloadFileType]: string } =
 export const downloadTypesForDownloadTranslations: { [key in DownloadFileType]: string } = {
     ORIGINAL: _('download-type.original'),
     PREVIEW: _('download-type.preview'),
+    OPTIMIZED_PREVIEW: _('download-type.optimized-preview'),
     REDACTED: _('download-type.redacted-only'),
     ANNOTATED: _('download-type.annotated'),
     FLATTEN: _('download-type.flatten'),

apps/red-ui/src/app/translations/file-status-translations.ts

@@ -4,7 +4,6 @@ import { ProcessingFileStatus, WorkflowFileStatus } from '@red/domain';
 export const workflowFileStatusTranslations: { [key in WorkflowFileStatus]: string } = {
     APPROVED: _('file-status.approved'),
     NEW: _('file-status.new'),
-    UNASSIGNED: _('file-status.unassigned'),
     UNDER_APPROVAL: _('file-status.under-approval'),
     UNDER_REVIEW: _('file-status.under-review'),
 };

apps/red-ui/src/app/users/user-preference.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { IqserUserPreferenceService, ListingMode } from '@iqser/common-ui';
 import { SystemDefaultOption, SystemDefaultType } from '../modules/account/utils/dialog-defaults';
 import { RedactOrHintOption, RemoveRedactionOption } from '../modules/file-preview/utils/dialog-types';
+import { OverwriteFileOption } from '@red/domain';
 
 export const PreferencesKeys = {
     dossierRecent: 'Dossier-Recent',
@@ -22,6 +23,7 @@ export const PreferencesKeys = {
     removeRedactionDefaultExtraOption: 'Remove-Redaction-Default-Extra',
     removeRecommendationDefaultExtraOption: 'Remove-Recommendation-Default-Extra',
     removeHintDefaultExtraOption: 'Remove-Hint-Default-Extra',
+    rememberOverwriteFileOption: 'Remember-Overwrite-File',
 } as const;
 
 @Injectable({
@@ -179,4 +181,12 @@ export class UserPreferenceService extends IqserUserPreferenceService {
     async saveRemoveRecommendationDefaultExtraOption(defaultOption: boolean | string): Promise<void> {
         await this.save(PreferencesKeys.removeRecommendationDefaultExtraOption, defaultOption.toString());
     }
+
+    getOverwriteFileOption(): OverwriteFileOption | 'undefined' {
+        return this._getAttribute(PreferencesKeys.rememberOverwriteFileOption, 'undefined') as OverwriteFileOption | 'undefined';
+    }
+
+    async saveOverwriteFileOption(preference: OverwriteFileOption | 'undefined') {
+        await this.save(PreferencesKeys.rememberOverwriteFileOption, preference);
+    }
 }

apps/red-ui/src/app/utils/functions.ts

@@ -1,5 +1,5 @@
 import { ITrackable } from '@iqser/common-ui';
-import type { List } from '@iqser/common-ui/lib/utils';
+import type { IqserEventTarget, List } from '@iqser/common-ui/lib/utils';
 import type { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { Dayjs } from 'dayjs';
 
@@ -143,3 +143,11 @@ export function urlFileId() {
     const fileId = splitUrl[splitUrl.length - 1];
     return fileId.split('?')[0];
 }
+
+export function isTargetInput(event: Event) {
+    return (event?.target as IqserEventTarget)?.localName === 'input';
+}
+
+export function isTargetTextArea(event: Event) {
+    return (event?.target as IqserEventTarget)?.localName === 'textarea';
+}

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

@@ -206,11 +206,14 @@
       "generic": "Speichern des Benutzers fehlgeschlagen."
     },
     "form": {
+      "account-setup": "User account setup",
       "email": "E-Mail",
       "first-name": "Vorname",
       "last-name": "Nachname",
       "reset-password": "Passwort zurücksetzen",
-      "role": "Rolle"
+      "role": "Rolle",
+      "send-email": "Do not send email requesting the user to set a password",
+      "send-email-explanation": "Select this option if you use SSO. Please note that you will need to inform the user directly."
     },
     "title": "{type, select, edit{Benutzer bearbeiten} create{Neuen Benutzer erstellen} other{}}"
   },
@@ -271,9 +274,6 @@
     "watermarks": "Wasserzeichen"
   },
   "analysis-disabled": "",
-  "annotation": {
-    "pending": "(Analyse steht aus)"
-  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -329,14 +329,14 @@
           "error": "Rekategorisierung des Bilds fehlgeschlagen: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove": {
-          "error": "Entfernen der Schwärzung fehlgeschlagen: {error}",
-          "success": "Schwärzung wurde entfernt"
-        },
         "remove-hint": {
           "error": "Entfernen des Hinweises fehlgeschlagen: {error}",
           "success": "Hinweis wurde entfernt"
         },
+        "remove": {
+          "error": "Entfernen der Schwärzung fehlgeschlagen: {error}",
+          "success": "Schwärzung wurde entfernt"
+        },
         "undo": {
           "error": "Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}",
           "success": "Rücksetzung erfolgreich"
@@ -349,15 +349,15 @@
     "remove-highlights": {
       "label": "Ausgewählte Markierungen entfernen"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "resize-accept": {
       "label": "Neue Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "see-references": {
       "label": "Referenzen anzeigen"
     },
@@ -391,6 +391,9 @@
     "skipped": "Ignorierte Schwärzung",
     "text-highlight": "Markierung"
   },
+  "annotation": {
+    "pending": "(Analyse steht aus)"
+  },
   "annotations": "Annotationen",
   "archived-dossiers-listing": {
     "no-data": {
@@ -613,18 +616,14 @@
     "warning": "Warnung: Wiederherstellung des Benutzers nicht möglich."
   },
   "confirmation-dialog": {
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen, die sich durch die Reanalyse ergeben haben. <br><br>Möchten Sie es trotzdem freigeben?",
-      "title": "Warnung!"
-    },
     "approve-file-without-analysis": {
       "confirmationText": "Ohne Analyse freigeben",
       "denyText": "Abbrechen",
       "question": "Analyse zur Erkennung neuer Schwärzungen erforderlich.",
       "title": "Warnung!"
     },
-    "approve-multiple-files": {
+    "approve-file": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen, die im Zuge einer Reanalyse hinzugefügt wurden.<br><br>Möchen Sie die Dateien wirklich freigeben?",
+      "question": "Dieses Dokument enthält ungesehene Änderungen, die sich durch die Reanalyse ergeben haben. <br><br>Möchten Sie es trotzdem freigeben?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -633,6 +632,10 @@
       "question": "Für mindestens eine Datei ist ein Analyselauf zur Erkennung neuer Schwärzungen erforderlich.",
       "title": "Warnung"
     },
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen, die im Zuge einer Reanalyse hinzugefügt wurden.<br><br>Möchen Sie die Dateien wirklich freigeben?",
+      "title": "Warnung!"
+    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft.<br><br>Möchten Sie sich die Datei dennoch zuweisen?",
@@ -910,6 +913,9 @@
     "reanalyse": {
       "action": "Ganzes Dossier analysieren"
     },
+    "rules": {
+      "timeoutError": "Regeln für Dossier-Vorlagen gesperrt!"
+    },
     "stats": {
       "analyzed-pages": "{count, plural, one{Seite} other{Seiten}}",
       "total-people": "Benutzer"
@@ -966,7 +972,7 @@
     "download-file-disabled": "Download: Sie müssen Genehmiger im Dossier sein und die initiale Verarbeitung {count, plural, one{der Datei} other{der Dateien}} muss abgeschlossen sein.",
     "file-listing": {
       "file-entry": {
-        "file-error": "Reanalyse erforderlich",
+        "file-error": "Reanalyse erforderlich {errorCode, select, RULES_EXECUTION_TIMEOUT{(Zeitlimit für Regeln)} other{}}",
         "file-pending": "Ausstehend ..."
       }
     },
@@ -1002,13 +1008,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Keinem Bearbeiter zugewiesen"
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "reanalyse-dossier": {
       "error": "Einplanung der Dateien für die Reanalyse fehlgeschlagen. Bitte versuchen Sie es noch einmal.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "start-auto-analysis": "Auto-Analyse aktivieren",
     "stop-auto-analysis": "Auto-Analyse anhalten",
     "table-col-names": {
@@ -1066,6 +1072,12 @@
     "entities": "{count} {count, plural, one{Entität} other{Entitäten}}",
     "entries": "{count} {count, plural, one{Eintrag} other{Einträge}}",
     "modified-on": "Geändert am: {date}",
+    "rules-reset": {
+      "disabled-action": "Bitte wenden Sie sich an Ihren Administrator, um die Regeln freizuschalten.",
+      "label": "Regeln gesperrt",
+      "success": "Die Regeln der Dossier-Vorlage wurden erfolgreich zurückgesetzt.",
+      "tooltip": "Klicken Sie hier, um die Regeln zurückzusetzen"
+    },
     "title": "Dossier-Vorlage bearbeiten",
     "valid-from": "Gültig ab: {date}",
     "valid-to": "Gültig bis: {Datum}"
@@ -1078,19 +1090,10 @@
     "total-documents": "Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{Benutzer} other {Benutzer}}"
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Aktiv",
-      "inactive": "Inaktiv",
-      "incomplete": "Unvollständig"
-    }
-  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Vorlage klonen",
-      "delete": "Vorlage löschen",
+      "delete": "Vorlage löschen"
-      "edit": "Vorlage bearbeiten"
     },
     "add-new": "Neue Dossier-Vorlage",
     "bulk": {
@@ -1121,6 +1124,14 @@
       "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}"
     }
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Aktiv",
+      "inactive": "Inaktiv",
+      "incomplete": "Unvollständig"
+    }
+  },
   "dossier-watermark-selector": {
     "heading": "Wasserzeichen auf Dokumenten",
     "no-watermark": "Kein Wasserzeichen in der Dossier-Vorlage verfügbar:<br>Bitten Sie Ihren Admin, eines zu konfigurieren.",
@@ -1152,6 +1163,7 @@
     "delta-preview": "Delta-PDF",
     "flatten": "Verflachte PDF",
     "label": "{length} Dokumenten{length, plural, one{typ} other{typen}}",
+    "optimized-preview": "Optimized Preview PDF",
     "original": "Optimierte PDF",
     "preview": "Vorschau-PDF",
     "redacted": "Geschwärzte PDF",
@@ -1316,15 +1328,6 @@
       "title": "{length} {length, plural, one{Wörterbuch} other{Wörterbücher}}"
     }
   },
-  "entity": {
-    "info": {
-      "actions": {
-        "revert": "Zurücksetzen",
-        "save": "Änderungen speichern"
-      },
-      "heading": "Entität bearbeiten"
-    }
-  },
   "entity-rules-screen": {
     "error": {
       "generic": "Fehler: Aktualisierung der Entitätsregeln fehlgeschlagen."
@@ -1339,19 +1342,28 @@
     "warning-text": "Warnung: experimentelle Funktion!",
     "warnings-found": "{warnings, plural, one{A warning} other{{warnings} warnings}} in Regeln gefunden"
   },
+  "entity": {
+    "info": {
+      "actions": {
+        "revert": "Zurücksetzen",
+        "save": "Änderungen speichern"
+      },
+      "heading": "Entität bearbeiten"
+    }
+  },
   "error": {
     "deleted-entity": {
       "dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file": {
-        "action": "Zurück zum Dossier",
-        "label": "Diese Datei wurde gelöscht!"
-      },
       "file-dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Das Dossier dieser Datei wurde gelöscht!"
+      },
+      "file": {
+        "action": "Zurück zum Dossier",
+        "label": "Diese Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1369,12 +1381,6 @@
   },
   "exact-date": "{day}. {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
-  "file-attribute": {
-    "update": {
-      "error": "Aktualisierung des Werts für das Datei-Attribut fehlgeschlagen. Bitte versuchen Sie es noch einmal.",
-      "success": "Der Wert für das Dateiattribut wurde erfolgreich aktualisiert."
-    }
-  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1385,6 +1391,12 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
+  "file-attribute": {
+    "update": {
+      "error": "Aktualisierung des Werts für das Datei-Attribut fehlgeschlagen. Bitte versuchen Sie es noch einmal.",
+      "success": "Der Wert für das Dateiattribut wurde erfolgreich aktualisiert."
+    }
+  },
   "file-attributes-configurations": {
     "cancel": "Abbrechen",
     "form": {
@@ -1602,15 +1614,6 @@
       "csv": "Die Datei-Attribute wurden erfolgreich aus der hochgeladenen CSV-Datei importiert."
     }
   },
-  "filter": {
-    "analysis": "Analyse erforderlich",
-    "comment": "Kommentare",
-    "hint": "Nur Hinweise",
-    "image": "Bilder",
-    "none": "Keine Annotationen",
-    "redaction": "Schwärzungen",
-    "updated": "Aktualisiert"
-  },
   "filter-menu": {
     "filter-options": "Filteroptionen",
     "filter-types": "Filter",
@@ -1620,6 +1623,15 @@
     "unseen-pages": "Nur Annotationen auf ungesehenen Seiten",
     "with-comments": "Nur Annotationen mit Kommentaren"
   },
+  "filter": {
+    "analysis": "Analyse erforderlich",
+    "comment": "Kommentare",
+    "hint": "Nur Hinweise",
+    "image": "Bilder",
+    "none": "Keine Annotationen",
+    "redaction": "Schwärzungen",
+    "updated": "Aktualisiert"
+  },
   "filters": {
     "assigned-people": "Bearbeiter",
     "documents-status": "Dokumentenstatus",
@@ -1898,13 +1910,6 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
-  "notifications": {
-    "button-text": "Benachrichtigungen",
-    "deleted-dossier": "Gelöschtes Dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Als {type, select, read{gelesen} unread{ungelesen} other{}} markieren"
-  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail-Benachrichtigungen",
@@ -1918,6 +1923,7 @@
       "dossier": "Benachrichtigungen zu Dossiers",
       "other": "Andere Benachrichtigungen"
     },
+    "options-title": "Wählen Sie aus, bei welchen Aktivitäten Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen werde",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Prüfer zugewiesen werde",
@@ -1935,7 +1941,6 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
-    "options-title": "Wählen Sie aus, bei welchen Aktivitäten Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofort",
@@ -1943,6 +1948,13 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
+  "notifications": {
+    "button-text": "Benachrichtigungen",
+    "deleted-dossier": "Gelöschtes Dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Als {type, select, read{gelesen} unread{ungelesen} other{}} markieren"
+  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Abbrechen",
@@ -2026,6 +2038,7 @@
       "help-mode-dialog": "Dialog zur Aktivierung des Hilfemodus",
       "load-all-annotations-warning": "Warnung bei gleichzeitigem Laden aller Annotationen in der Miniaturansicht",
       "open-structured-view-by-default": "Strukturierte Komponentenansicht standardmäßig anzeigen",
+      "overwrite-file-option": "",
       "table-extraction-type": "Art der Tabellenextraktion"
     },
     "label": "Präferenzen",
@@ -2034,16 +2047,17 @@
     "warnings-label": "Dialoge und Meldungen",
     "warnings-subtitle": "„Nicht mehr anzeigen“-Optionen"
   },
-  "processing": {
-    "basic": "Verarbeitung läuft",
-    "ocr": "OCR"
-  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Ausstehend",
+    "pending-timeout": "Ausstehend (Zeitlimit für Regeln)",
     "processed": "verarbeitet",
     "processing": "Verarbeitung läuft"
   },
+  "processing": {
+    "basic": "Verarbeitung läuft",
+    "ocr": "OCR"
+  },
   "readonly": "Lesemodus",
   "readonly-archived": "Lesemodus (archiviert)",
   "redact-text": {
@@ -2279,12 +2293,6 @@
     "red-user-admin": "Benutzeradmin",
     "regular": "regulärer Benutzer"
   },
-  "search": {
-    "active-dossiers": "Dokumente in aktiven Dossiers",
-    "all-dossiers": "Alle Dokumente",
-    "placeholder": "Dokumente durchsuchen...",
-    "this-dossier": "In diesem Dossier"
-  },
   "search-screen": {
     "cols": {
       "assignee": "Bearbeiter",
@@ -2308,6 +2316,12 @@
     "no-match": "Suchbegriff wurde in keinem der Dokumente gefunden.",
     "table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}"
   },
+  "search": {
+    "active-dossiers": "Dokumente in aktiven Dossiers",
+    "all-dossiers": "Alle Dokumente",
+    "placeholder": "Dokumente durchsuchen...",
+    "this-dossier": "In diesem Dossier"
+  },
   "seconds": "Sekunden",
   "size": "Größe",
   "smtp-auth-config": {
@@ -2563,4 +2577,4 @@
     }
   },
   "yesterday": "Gestern"
-}
+}

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

@@ -206,11 +206,14 @@
       "generic": "Failed to save user."
     },
     "form": {
+      "account-setup": "User account setup",
       "email": "E-mail",
       "first-name": "First name",
       "last-name": "Last name",
       "reset-password": "Reset password",
-      "role": "Role"
+      "role": "Role",
+      "send-email": "Do not send email requesting the user to set a password",
+      "send-email-explanation": "Select this option if you use SSO. Please note that you will need to inform the user directly."
     },
     "title": "{type, select, edit{Edit} create{Add new} other{}} user"
   },
@@ -910,6 +913,9 @@
     "reanalyse": {
       "action": "Analyze entire dossier"
     },
+    "rules": {
+      "timeoutError": "Dossier template rules locked!"
+    },
     "stats": {
       "analyzed-pages": "{count, plural, one{Page} other{Pages}}",
       "total-people": "Total users"
@@ -966,7 +972,7 @@
     "download-file-disabled": "To download, ensure you are an approver in the dossier, and the {count, plural, one{file has undergone} other{files have undergone}} initial processing.",
     "file-listing": {
       "file-entry": {
-        "file-error": "Re-processing required",
+        "file-error": "Re-processing required {errorCode, select, RULES_EXECUTION_TIMEOUT{(Rules timeout)} other{}}",
         "file-pending": "Pending..."
       }
     },
@@ -1066,6 +1072,12 @@
     "entities": "{count} {count, plural, one{entity} other{entities}}",
     "entries": "{count} {count, plural, one{entry} other{entries}}",
     "modified-on": "Modified on: {date}",
+    "rules-reset": {
+      "disabled-action": "Please contact your administrator to unlock the rules.",
+      "label": "Rules locked",
+      "success": "Dossier template rules successfully reset.",
+      "tooltip": "Click to reset rules"
+    },
     "title": "Edit dossier template",
     "valid-from": "Valid from: {date}",
     "valid-to": "Valid to: {date}"
@@ -1081,8 +1093,7 @@
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone template",
-      "delete": "Delete template",
+      "delete": "Delete template"
-      "edit": "Edit template"
     },
     "add-new": "New dossier template",
     "bulk": {
@@ -1152,6 +1163,7 @@
     "delta-preview": "Delta PDF",
     "flatten": "Flatten PDF",
     "label": "{length} document {length, plural, one{version} other{versions}}",
+    "optimized-preview": "Optimized Preview PDF",
     "original": "Optimized PDF",
     "preview": "Preview PDF",
     "redacted": "Redacted PDF",
@@ -1518,7 +1530,7 @@
     },
     "reanalyse-notification": "Start reanalysis",
     "redacted": "Preview",
-    "redacted-tooltip": "Redaction preview shows only redactions. Consider this a preview for the final redacted version. This view is only available if the file has no pending changes & doesn't require a reanalysis",
+    "redacted-tooltip": "The preview shows only the redactions. It is a preview of the final redacted version.",
     "standard": "Standard",
     "standard-tooltip": "Standard shows all annotation types and allows for editing.",
     "tabs": {
@@ -2026,6 +2038,7 @@
       "help-mode-dialog": "Help mode activation dialog",
       "load-all-annotations-warning": "Warning regarding simultaneous loading of all annotations in thumbnails",
       "open-structured-view-by-default": "Display structured component management modal by default",
+      "overwrite-file-option": "Preferred action when re-uploading of an already existing file",
       "table-extraction-type": "Table extraction type"
     },
     "label": "Preferences",
@@ -2037,6 +2050,7 @@
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
+    "pending-timeout": "Pending (Rules timeout)",
     "processed": "processed",
     "processing": "Processing"
   },
@@ -2125,28 +2139,28 @@
         "comment-placeholder": "Add remarks or notes...",
         "options": {
           "do-not-recommend": {
-            "description": "Do not recommend the selected term in any document of this dossier.",
+            "description": "Do not recommend the selected {isImage, select, image{image} other{term}} in any document of this dossier.",
-            "description-bulk": "Do not recommend the selected terms in any document of this dossier.",
+            "description-bulk": "Do not recommend the selected {isImage, select, image{images} other{terms}} in any document of this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier"
           },
           "false-positive": {
-            "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.",
+            "description": "Mark this redaction as a false-positive. The {isImage, select, image{image} other{term}} will not be redacted in this dossier if it occurs in the same context.",
-            "description-bulk": "Mark these redactions as false-positives. The terms will not be redacted in this dossier if they occur in the same context.",
+            "description-bulk": "Mark these redactions as false-positives. The {isImage, select, image{images} other{terms}} will not be redacted in this dossier if they occur in the same context.",
             "extraOptionDescription": "Dossier template access is required to reverse this action. As a regular user you can only reverse it for this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not {type, select, hint{annotate} other{auto-redact}} the selected term in any document of this dossier.",
+            "description": "Do not {type, select, hint{annotate} other{auto-redact}} the selected {isImage, select, image{image} other{term}} in any document of this dossier.",
-            "description-bulk": "Do not {type, select, hint{annotate} other{auto-redact}} the selected terms in this dossier.",
+            "description-bulk": "Do not {type, select, hint{annotate} other{auto-redact}} the selected {isImage, select, image{images} other{terms}} in this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier",
             "label-bulk": "Remove from dossier"
           },
           "only-here": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} the term at this position in the current document.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the {isImage, select, image{image} other{term}} at this position in the current document.",
-            "description-bulk": "Do not {type, select, hint{annotate} other{redact}} the selected terms at this position in the current document.",
+            "description-bulk": "Do not {type, select, hint{annotate} other{redact}} the selected {isImage, select, image{images} other{terms}} at this position in the current document.",
             "label": "Remove here"
           }
         }
@@ -2563,4 +2577,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
+}

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

@@ -206,11 +206,14 @@
       "generic": "Benutzer konnte nicht gespeichert werden!"
     },
     "form": {
+      "account-setup": "User account setup",
       "email": "E-Mail",
       "first-name": "Vorname",
       "last-name": "Nachname",
       "reset-password": "Passwort zurücksetzen",
-      "role": "Rolle"
+      "role": "Rolle",
+      "send-email": "Do not send email requesting the user to set a password",
+      "send-email-explanation": "Select this option if you use SSO. Please note that you will need to inform the user directly."
     },
     "title": "{type, select, edit{Benutzer bearbeiten} create{Neuen Benutzer hinzufügen} other{}}"
   },
@@ -271,9 +274,6 @@
     "watermarks": "Watermarks"
   },
   "analysis-disabled": "Analysis disabled",
-  "annotation": {
-    "pending": "(Pending analysis)"
-  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -329,14 +329,14 @@
           "error": "Rekategorisierung des Bildes gescheitert: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove": {
-          "error": "Fehler beim Entfernen der Schwärzung: {error}",
-          "success": "Schwärzung entfernt!"
-        },
         "remove-hint": {
           "error": "Failed to remove hint: {error}",
           "success": "Hint removed!"
         },
+        "remove": {
+          "error": "Fehler beim Entfernen der Schwärzung: {error}",
+          "success": "Schwärzung entfernt!"
+        },
         "undo": {
           "error": "Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}",
           "success": "erfolgreich Rückgängig gemacht"
@@ -349,15 +349,15 @@
     "remove-highlights": {
       "label": "Remove selected earmarks"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "resize-accept": {
       "label": "Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "see-references": {
       "label": "See references"
     },
@@ -391,6 +391,9 @@
     "skipped": "Übersprungen",
     "text-highlight": "Earmark"
   },
+  "annotation": {
+    "pending": "(Pending analysis)"
+  },
   "annotations": "Annotations",
   "archived-dossiers-listing": {
     "no-data": {
@@ -613,18 +616,14 @@
     "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
   },
   "confirmation-dialog": {
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
-      "title": "Warnung!"
-    },
     "approve-file-without-analysis": {
       "confirmationText": "Approve without analysis",
       "denyText": "Cancel",
       "question": "Analysis required to detect new components.",
       "title": "Warning!"
     },
-    "approve-multiple-files": {
+    "approve-file": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
+      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -633,6 +632,10 @@
       "question": "Analysis required to detect new components for at least one file.",
       "title": "Warning"
     },
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
+      "title": "Warnung!"
+    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@@ -910,6 +913,9 @@
     "reanalyse": {
       "action": "Gesamtes Dossier analysieren"
     },
+    "rules": {
+      "timeoutError": "Regeln für Dossier-Vorlagen gesperrt!"
+    },
     "stats": {
       "analyzed-pages": "{count, plural, one{Page} other{Pages}}",
       "total-people": "Anzahl der Benutzer"
@@ -966,7 +972,7 @@
     "download-file-disabled": "You need to be approver in the dossier and the {count, plural, one{file needs} other{files need}} to be initially processed in order to download.",
     "file-listing": {
       "file-entry": {
-        "file-error": "Reanalyse erforderlich",
+        "file-error": "Reanalyse erforderlich {errorCode, select, RULES_EXECUTION_TIMEOUT{(Zeitlimit für Regeln)} other{}}",
         "file-pending": "Ausstehend ..."
       }
     },
@@ -1002,13 +1008,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Niemandem zugewiesen"
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "reanalyse-dossier": {
       "error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "start-auto-analysis": "Enable auto-analysis",
     "stop-auto-analysis": "Stop auto-analysis",
     "table-col-names": {
@@ -1061,14 +1067,20 @@
     }
   },
   "dossier-template-info-screen": {
-    "created-by": "Created by",
+    "created-by": "Ersteller",
-    "created-on": "Created on: {date}",
+    "created-on": "Erstellt am {date}",
-    "entities": "{count} {count, plural, one{entity} other{entities}}",
+    "entities": "{count} {count, plural, one{Entität} other{Entitäten}}",
-    "entries": "{count} {count, plural, one{entry} other{entries}}",
+    "entries": "{count} {count, plural, one{Eintrag} other{Einträge}}",
-    "modified-on": "Modified on: {date}",
+    "modified-on": "Geändert am {date}",
-    "title": "Edit dossier template",
+    "rules-reset": {
-    "valid-from": "Valid from: {date}",
+      "disabled-action": "Bitte wenden Sie sich an Ihren Administrator, um die Regeln freizuschalten.",
-    "valid-to": "Valid to: {date}"
+      "label": "Regeln gesperrt",
+      "success": "Die Regeln der Dossier-Vorlage wurden erfolgreich zurückgesetzt.",
+      "tooltip": "Klicken Sie hier, um die Regeln zurückzusetzen"
+    },
+    "title": "Dossier-Vorlage bearbeiten",
+    "valid-from": "Gültig ab: {date}",
+    "valid-to": "Gültig bis: {date}"
   },
   "dossier-template-stats": {
     "active-dossiers": "Active {count, plural, one{dossier} other{dossiers}}",
@@ -1078,19 +1090,10 @@
     "total-documents": "Anzahl der Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{user} other {users}}"
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Active",
-      "inactive": "Inactive",
-      "incomplete": "Incomplete"
-    }
-  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone template",
-      "delete": "Dossier-Vorlage",
+      "delete": "Dossier-Vorlage"
-      "edit": "Vorlage bearbeiten"
     },
     "add-new": "Neue Dossier-Vorlage",
     "bulk": {
@@ -1121,6 +1124,14 @@
       "title": "{length} dossier {length, plural, one{template} other{templates}}"
     }
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Active",
+      "inactive": "Inactive",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-watermark-selector": {
     "heading": "Watermarks on documents",
     "no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@@ -1152,6 +1163,7 @@
     "delta-preview": "Delta PDF",
     "flatten": "PDF verflachen",
     "label": "{length} document {length, plural, one{version} other{versions}}",
+    "optimized-preview": "Optimized Preview PDF",
     "original": "Optimiertes PDF",
     "preview": "PDF-Vorschau",
     "redacted": "geschwärztes PDF",
@@ -1316,15 +1328,6 @@
       "title": "{length} {length, plural, one{entity} other{entities}}"
     }
   },
-  "entity": {
-    "info": {
-      "actions": {
-        "revert": "Revert",
-        "save": "Save changes"
-      },
-      "heading": "Edit entity"
-    }
-  },
   "entity-rules-screen": {
     "error": {
       "generic": "Something went wrong... Entity rules update failed!"
@@ -1339,19 +1342,28 @@
     "warning-text": "Warning: experimental feature!",
     "warnings-found": "{warnings, plural, one{A warning} other{{warnings} warnings}} found in rules"
   },
+  "entity": {
+    "info": {
+      "actions": {
+        "revert": "Revert",
+        "save": "Save changes"
+      },
+      "heading": "Edit entity"
+    }
+  },
   "error": {
     "deleted-entity": {
       "dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file": {
-        "action": "Zurück zum Dossier",
-        "label": "Diese Datei wurde gelöscht!"
-      },
       "file-dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Das Dossier dieser Datei wurde gelöscht!"
+      },
+      "file": {
+        "action": "Zurück zum Dossier",
+        "label": "Diese Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1369,12 +1381,6 @@
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
-  "file-attribute": {
-    "update": {
-      "error": "Failed to update file attribute value!",
-      "success": "File attribute value has been updated successfully!"
-    }
-  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1385,6 +1391,12 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
+  "file-attribute": {
+    "update": {
+      "error": "Failed to update file attribute value!",
+      "success": "File attribute value has been updated successfully!"
+    }
+  },
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
@@ -1602,15 +1614,6 @@
       "csv": "File attributes were imported successfully from uploaded CSV file."
     }
   },
-  "filter": {
-    "analysis": "Analyse erforderlich",
-    "comment": "Kommentare",
-    "hint": "Nut Hinweise",
-    "image": "Bilder",
-    "none": "Keine Anmerkungen",
-    "redaction": "Geschwärzt",
-    "updated": "Aktualisiert"
-  },
   "filter-menu": {
     "filter-options": "Filteroptionen",
     "filter-types": "Filter",
@@ -1620,6 +1623,15 @@
     "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
     "with-comments": "Nur Anmerkungen mit Kommentaren"
   },
+  "filter": {
+    "analysis": "Analyse erforderlich",
+    "comment": "Kommentare",
+    "hint": "Nut Hinweise",
+    "image": "Bilder",
+    "none": "Keine Anmerkungen",
+    "redaction": "Geschwärzt",
+    "updated": "Aktualisiert"
+  },
   "filters": {
     "assigned-people": "Beauftragt",
     "documents-status": "Documents state",
@@ -1898,13 +1910,6 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
-  "notifications": {
-    "button-text": "Notifications",
-    "deleted-dossier": "Deleted dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
-  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail Benachrichtigungen",
@@ -1918,6 +1923,7 @@
       "dossier": "Dossierbezogene Benachrichtigungen",
       "other": "Andere Benachrichtigungen"
     },
+    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@@ -1935,7 +1941,6 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
-    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofortig",
@@ -1943,6 +1948,13 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
+  "notifications": {
+    "button-text": "Notifications",
+    "deleted-dossier": "Deleted dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
+  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Cancel",
@@ -2026,6 +2038,7 @@
       "help-mode-dialog": "Help Mode Dialog",
       "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview",
       "open-structured-view-by-default": "Display Component View by default when opening a document",
+      "overwrite-file-option": "",
       "table-extraction-type": "Table extraction type"
     },
     "label": "Preferences",
@@ -2034,16 +2047,17 @@
     "warnings-label": "Prompts and dialogs",
     "warnings-subtitle": "Do not show again options"
   },
-  "processing": {
-    "basic": "Processing",
-    "ocr": "OCR"
-  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
+    "pending-timeout": "Ausstehend (Zeitlimit für Regeln)",
     "processed": "Processed",
     "processing": "Processing"
   },
+  "processing": {
+    "basic": "Processing",
+    "ocr": "OCR"
+  },
   "readonly": "Lesemodus",
   "readonly-archived": "Read only (archived)",
   "redact-text": {
@@ -2279,12 +2293,6 @@
     "red-user-admin": "Benutzer-Admin",
     "regular": "Regulär"
   },
-  "search": {
-    "active-dossiers": "ganze Plattform",
-    "all-dossiers": "all documents",
-    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
-    "this-dossier": "in diesem Dossier"
-  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
@@ -2308,6 +2316,12 @@
     "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} search {length, plural, one{result} other{results}}"
   },
+  "search": {
+    "active-dossiers": "ganze Plattform",
+    "all-dossiers": "all documents",
+    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
+    "this-dossier": "in diesem Dossier"
+  },
   "seconds": "seconds",
   "size": "Size",
   "smtp-auth-config": {
@@ -2563,4 +2577,4 @@
     }
   },
   "yesterday": "Gestern"
-}
+}

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

@@ -206,11 +206,14 @@
       "generic": "Failed to save user!"
     },
     "form": {
+      "account-setup": "User account setup",
       "email": "E-mail",
       "first-name": "First name",
       "last-name": "Last name",
       "reset-password": "Reset password",
-      "role": "Role"
+      "role": "Role",
+      "send-email": "Do not send email requesting the user to set a password",
+      "send-email-explanation": "Select this option if you use SSO. Please note that you will need to inform the user directly."
     },
     "title": "{type, select, edit{Edit} create{Add New} other{}} user"
   },
@@ -910,6 +913,9 @@
     "reanalyse": {
       "action": "Analyze entire dossier"
     },
+    "rules": {
+      "timeoutError": "Dossier template rules locked!"
+    },
     "stats": {
       "analyzed-pages": "{count, plural, one{Page} other{Pages}}",
       "total-people": "Total users"
@@ -966,7 +972,7 @@
     "download-file-disabled": "You need to be approver in the dossier and the {count, plural, one{file needs} other{files need}} to be initially processed in order to download.",
     "file-listing": {
       "file-entry": {
-        "file-error": "Re-processing required",
+        "file-error": "Re-processing required {errorCode, select, RULES_EXECUTION_TIMEOUT{(Rules timeout)} other{}}",
         "file-pending": "Pending..."
       }
     },
@@ -1066,6 +1072,12 @@
     "entities": "{count} {count, plural, one{entity} other{entities}}",
     "entries": "{count} {count, plural, one{entry} other{entries}}",
     "modified-on": "Modified on: {date}",
+    "rules-reset": {
+      "disabled-action": "Please contact your administrator to unlock the rules.",
+      "label": "Rules locked",
+      "success": "Dossier template rules successfully reset.",
+      "tooltip": "Click to reset rules"
+    },
     "title": "Edit dossier template",
     "valid-from": "Valid from: {date}",
     "valid-to": "Valid to: {date}"
@@ -1081,8 +1093,7 @@
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone template",
-      "delete": "Delete template",
+      "delete": "Delete template"
-      "edit": "Edit template"
     },
     "add-new": "New dossier template",
     "bulk": {
@@ -1152,6 +1163,7 @@
     "delta-preview": "Delta PDF",
     "flatten": "Flatten PDF",
     "label": "{length} document {length, plural, one{version} other{versions}}",
+    "optimized-preview": "Optimized Preview PDF",
     "original": "Optimized PDF",
     "preview": "Preview PDF",
     "redacted": "Redacted PDF",
@@ -2026,6 +2038,7 @@
       "help-mode-dialog": "Help Mode Dialog",
       "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview",
       "open-structured-view-by-default": "Display Component View by default when opening a document",
+      "overwrite-file-option": "Preferred action when re-uploading of an already existing file",
       "table-extraction-type": "Table extraction type"
     },
     "label": "Preferences",
@@ -2037,6 +2050,7 @@
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
+    "pending-timeout": "Pending (Rules timeout)",
     "processed": "Processed",
     "processing": "Processing"
   },
@@ -2563,4 +2577,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
+}

apps/red-ui/src/assets/pdftron/fonts/Apache License.txt

@@ -0,0 +1,205 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.-------------------------------------------------------------------
+------------[ Log Start: 2019-Oct-10 19:32:29.143159]--------------
+System: (Windows, AMD64), PDFNetVersion: 7.1.0.71627
+-------------------------------------------------------------------
+[ INFO  19:32:29.143159, fontapp, WebFontCreator.cpp(679)]: logging enabled