Merge branch 'RED10758' into 'master'

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

See merge request redactmanager/red-ui!767

.gitlab-ci.yml

@@ -11,6 +11,26 @@ include:
       rules:
           - if: $CI_PIPELINE_SOURCE != "schedule"
 
+sonarqube:
+  stage: test
+  image:
+    name: sonarsource/sonar-scanner-cli:11.1
+    entrypoint:
+    - ''
+  variables:
+    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"
+    GIT_DEPTH: '0'
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+    - ".sonar/cache"
+  script:
+  - sonar-scanner
+  rules:
+  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
+  - if: "$CI_COMMIT_BRANCH =~ /^release/"
+
 localazy update:
     image: node:20.5
     cache:

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

@@ -69,3 +69,5 @@ export const canEditHint = (annotation: AnnotationWrapper) =>
     ((annotation.isHint && !annotation.isRuleBased) || annotation.isIgnoredHint) && !annotation.isImage;
 
 export const canEditImage = (annotation: AnnotationWrapper) => annotation.isImage;
+
+export const canRevertChanges = (annotation: AnnotationWrapper) => annotation.hasRedactionChanges;

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

@@ -17,6 +17,7 @@ import {
     canRemoveRedaction,
     canResizeAnnotation,
     canResizeInDictionary,
+    canRevertChanges,
     canUndo,
 } from './annotation-permissions.utils';
 import { AnnotationWrapper } from './annotation.wrapper';
@@ -37,6 +38,7 @@ export class AnnotationPermissions {
     canEditAnnotations = true;
     canEditHints = true;
     canEditImages = true;
+    canRevertChanges = true;
 
     static forUser(
         isApprover: boolean,
@@ -75,6 +77,7 @@ export class AnnotationPermissions {
             permissions.canEditAnnotations = canEditAnnotation(annotation);
             permissions.canEditHints = canEditHint(annotation);
             permissions.canEditImages = canEditImage(annotation);
+            permissions.canRevertChanges = canRevertChanges(annotation);
             summedPermissions._merge(permissions);
         }
         return summedPermissions;
@@ -97,6 +100,7 @@ export class AnnotationPermissions {
         result.canEditAnnotations = permissions.reduce((acc, next) => acc && next.canEditAnnotations, true);
         result.canEditHints = permissions.reduce((acc, next) => acc && next.canEditHints, true);
         result.canEditImages = permissions.reduce((acc, next) => acc && next.canEditImages, true);
+        result.canRevertChanges = permissions.reduce((acc, next) => acc && next.canRevertChanges, true);
         return result;
     }
 

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 @use 'common-mixins';
 
 .error {
-    color: var(--iqser-primary);
+    color: #dd4d50;
 }
 
 .extend-cols {

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

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

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

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

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

@@ -151,6 +151,15 @@
                 icon="iqser:visibility"
             ></iqser-circle-button>
 
+            <iqser-circle-button
+                (action)="revertChanges()"
+                *ngIf="canRevertChanges() && devMode"
+                [buttonId]="annotations().length === 1 ? 'annotation-' + annotations()[0].id + '-undo' : 'annotations-undo'"
+                [type]="buttonType"
+                [iconSize]="16"
+                icon="red:revert-changes"
+            ></iqser-circle-button>
+
             <iqser-circle-button
                 (action)="removeRedaction()"
                 *ngIf="canRemoveRedaction()"

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

@@ -13,6 +13,7 @@ import { FilePreviewStateService } from '../../services/file-preview-state.servi
 import { MultiSelectService } from '../../services/multi-select.service';
 import { SkippedService } from '../../services/skipped.service';
 import { ViewModeService } from '../../services/view-mode.service';
+import { UserPreferenceService } from '@users/user-preference.service';
 
 export const AnnotationButtonTypes = {
     default: 'default',
@@ -35,6 +36,7 @@ export class AnnotationActionsComponent {
     @Input() alwaysVisible: boolean;
     @Input() actionsHelpModeKey: string;
     readonly roles = Roles;
+    readonly devMode = this._userPreferences.isIqserDevMode;
     readonly annotations = input.required<AnnotationWrapper[], (AnnotationWrapper | undefined)[]>({
         transform: value => value.filter(a => a !== undefined),
     });
@@ -68,6 +70,7 @@ export class AnnotationActionsComponent {
     readonly hideSkipped = computed(() => this.skippedService.hideSkipped() && this.annotations().some(a => a.isSkipped));
     readonly isImageHint = computed(() => this.annotations().every(a => a.IMAGE_HINT));
     readonly isImage = computed(() => this.annotations().reduce((acc, a) => acc && a.isImage, true));
+    readonly canRevertChanges = computed(() => this.annotationPermissions().canRevertChanges);
     readonly annotationChangesAllowed = computed(
         () => (!this.#isDocumine || !this._state.file().excludedFromAutomaticAnalysis) && !this.somePending(),
     );
@@ -104,13 +107,14 @@ export class AnnotationActionsComponent {
         readonly viewModeService: ViewModeService,
         readonly helpModeService: HelpModeService,
         readonly multiSelectService: MultiSelectService,
+        readonly skippedService: SkippedService,
+        readonly annotationActionsService: AnnotationActionsService,
+        readonly annotationReferencesService: AnnotationReferencesService,
         private readonly _state: FilePreviewStateService,
         private readonly _permissionsService: PermissionsService,
         private readonly _iqserPermissionsService: IqserPermissionsService,
         private readonly _annotationManager: REDAnnotationManager,
-        readonly skippedService: SkippedService,
+        private readonly _userPreferences: UserPreferenceService,
-        readonly annotationActionsService: AnnotationActionsService,
-        readonly annotationReferencesService: AnnotationReferencesService,
     ) {}
 
     get resized(): boolean {
@@ -128,6 +132,11 @@ export class AnnotationActionsComponent {
         await this.annotationActionsService.convertRecommendationToAnnotation(annotations, 'accept');
     }
 
+    async revertChanges() {
+        const annotations = untracked(this.annotations);
+        await this.annotationActionsService.revertChanges(annotations);
+    }
+
     hideAnnotation() {
         const viewerAnnotations = untracked(this.viewerAnnotations);
         this._annotationManager.hide(viewerAnnotations);

apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.html

@@ -37,7 +37,7 @@
                         class="draggable"
                         svgIcon="red:draggable-dots"
                     ></mat-icon>
-                    <div [attr.help-mode-key]="'edit_component'" class="iqser-input-group w-full">
+                    <div [attr.help-mode-key]="'editor_edit_component'" class="iqser-input-group w-full">
                         <textarea [id]="'value-input-' + $index" [(ngModel)]="value.value" rows="1" type="text"></textarea>
                     </div>
                     <iqser-circle-button

apps/red-ui/src/app/modules/file-preview/components/expandable-row-table/expandable-row-table.component.html

@@ -0,0 +1,38 @@
+<div [ngStyle]="{ height: redactedTextsAreaHeight() }" class="table-container">
+    <table mat-table [dataSource]="source()" multiTemplateDataRows>
+        @for (column of config().columns; track column.label) {
+            <ng-container matColumnDef="{{ column.label }}">
+                <th mat-header-cell class="cell" *matHeaderCellDef>
+                    <label>{{ column.value }}</label>
+                </th>
+                <td mat-cell class="cell" [ngStyle]="{ width: column.width ?? 'unset' }" *matCellDef="let cell">
+                    {{ cell[column.label] }}
+                </td>
+            </ng-container>
+        }
+        <ng-container matColumnDef="expand-icon">
+            <td mat-cell class="expand-icon" *matCellDef="let element" [class.expanded-by-default]="shouldBeExpanded()">
+                @if (!shouldBeExpanded()) {
+                    @if (expandedElement === element) {
+                        <mat-icon svgIcon="red:arrow-up" (click)="close($event)"></mat-icon>
+                    } @else {
+                        <mat-icon svgIcon="red:arrow-down" (click)="expand($event, element)"></mat-icon>
+                    }
+                }
+            </td>
+            <th mat-header-cell *matHeaderCellDef aria-label="row actions"></th>
+        </ng-container>
+
+        <ng-container matColumnDef="expandedDetail">
+            <td mat-cell class="expanded" *matCellDef="let element" [attr.colspan]="columnsToDisplay().length">
+                <div class="expanded-component" [class.expanded-by-default]="shouldBeExpanded()">
+                    <ng-container #detailsComponent></ng-container>
+                </div>
+            </td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="columnsToDisplay(); sticky: true"></tr>
+        <tr mat-row *matRowDef="let element; columns: columnsToDisplay()"></tr>
+        <tr mat-row *matRowDef="let row; columns: ['expandedDetail']" class="component-row"></tr>
+    </table>
+</div>

apps/red-ui/src/app/modules/file-preview/components/expandable-row-table/expandable-row-table.component.scss

@@ -0,0 +1,101 @@
+table {
+    width: 100%;
+
+    td {
+        max-width: 0;
+    }
+}
+
+.table-container {
+    overflow-y: auto;
+    transition: height 0.25s ease-in-out;
+}
+
+.mat-mdc-row {
+    height: 20px;
+    max-height: 20px;
+    font-size: 13px;
+
+    &:nth-child(4n - 3),
+    &:nth-child(4n - 2) {
+        background-color: var(--iqser-alt-background);
+    }
+
+    .mdc-data-table__cell {
+        height: 20px;
+        padding: 0 8px 0 8px;
+        border: none;
+
+        &.expand-icon {
+            margin-right: 8px;
+            max-width: 28px;
+            width: 28px;
+            background: white;
+        }
+
+        &.expanded-by-default {
+            width: 0;
+            margin: 0;
+            max-width: 0;
+            padding: 0;
+        }
+
+        &.expanded {
+            width: 100%;
+            background: white;
+            padding: 0;
+            height: 0;
+        }
+
+        .expanded-component {
+            width: 100%;
+            background: var(--iqser-alt-background);
+        }
+    }
+
+    &.component-row {
+        height: 0;
+    }
+}
+
+.mat-mdc-header-row {
+    height: 20px;
+    font-size: 13px;
+
+    .mat-mdc-header-cell {
+        padding: 0;
+        border: none;
+    }
+}
+
+mat-icon {
+    width: 20px;
+    height: 20px;
+    font-size: 13px;
+}
+
+.expanded-component {
+    overflow: hidden;
+    display: flex;
+
+    &:not(.expanded-by-default) {
+        margin-left: 28px;
+    }
+}
+
+label {
+    opacity: 0.7;
+    font-weight: normal;
+    padding-left: 8px;
+}
+
+.cell {
+    text-align: start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    list-style-position: inside;
+    overflow: hidden;
+
+    padding-right: 8px;
+    line-height: 1.5;
+}

apps/red-ui/src/app/modules/file-preview/components/expandable-row-table/expandable-row-table.component.ts

@@ -0,0 +1,117 @@
+import { Component, computed, effect, input, signal, Type, viewChildren, ViewContainerRef } from '@angular/core';
+import { NgStyle } from '@angular/common';
+import {
+    MatCell,
+    MatCellDef,
+    MatColumnDef,
+    MatHeaderCell,
+    MatHeaderCellDef,
+    MatHeaderRow,
+    MatHeaderRowDef,
+    MatRow,
+    MatRowDef,
+    MatTable,
+} from '@angular/material/table';
+import { MatIcon } from '@angular/material/icon';
+import { isJustOne } from '@common-ui/utils';
+
+export interface Data {
+    styles?: string;
+    component?: Type<unknown>;
+    componentInputs?: { [key: string]: unknown };
+    expanded: boolean;
+    values: Record<string, string>;
+}
+
+export interface Column {
+    label: string;
+    value: string;
+    width?: string;
+}
+
+export interface Config {
+    columns: Column[];
+    data: Data[];
+}
+
+const TABLE_ROW_SIZE = 24;
+const MAX_ITEMS_DISPLAY = 10;
+
+@Component({
+    selector: 'redaction-expandable-row-table',
+    standalone: true,
+    imports: [
+        NgStyle,
+        MatTable,
+        MatColumnDef,
+        MatHeaderCell,
+        MatCell,
+        MatIcon,
+        MatHeaderRow,
+        MatRow,
+        MatHeaderCellDef,
+        MatCellDef,
+        MatHeaderRowDef,
+        MatRowDef,
+    ],
+    templateUrl: './expandable-row-table.component.html',
+    styleUrl: './expandable-row-table.component.scss',
+})
+export class ExpandableRowTableComponent {
+    readonly config = input.required<Config>();
+    readonly source = computed(() => this.config().data.map(row => row.values));
+    readonly columnsToDisplay = computed(() => ['expand-icon', ...this.config().columns.map(column => column.label)]);
+    readonly detailsComponentRef = viewChildren('detailsComponent', { read: ViewContainerRef });
+    readonly shouldBeExpanded = computed(() => isJustOne(this.config().data));
+    readonly redactedTextsAreaHeight = computed(() =>
+        this.shouldBeExpanded()
+            ? 'unset'
+            : `${
+                  (this.config().data.length <= MAX_ITEMS_DISPLAY
+                      ? TABLE_ROW_SIZE * this.config().data.length + (this.#currentExpandedComponentHeight() ?? 0)
+                      : TABLE_ROW_SIZE * MAX_ITEMS_DISPLAY) + 20
+              }px`,
+    );
+    expandedElement: Record<string, string>;
+    #expandedComponentRef = null;
+    readonly #currentExpandedComponentHeight = signal(null);
+
+    constructor() {
+        effect(() => {
+            if (this.shouldBeExpanded()) {
+                this.#initializeDetailsComponent(this.source()[0]);
+            }
+        });
+    }
+
+    expand($event: MouseEvent, element: Record<string, string>) {
+        this.expandedElement = element;
+        this.#initializeDetailsComponent(element);
+        $event.stopPropagation();
+    }
+
+    close($event: MouseEvent) {
+        this.expandedElement = null;
+        this.#currentExpandedComponentHeight.set(null);
+        this.detailsComponentRef().forEach(ref => ref.clear());
+        $event.stopPropagation();
+    }
+
+    #initializeDetailsComponent(element: Record<string, string>) {
+        this.detailsComponentRef().forEach(ref => ref.clear());
+        const expandedIndex = this.source().indexOf(element);
+        if (this.detailsComponentRef()[expandedIndex]) {
+            this.#currentExpandedComponentHeight.set(null);
+            const config = this.config().data.find(row => row.values['id'] === element['id']);
+            this.#expandedComponentRef = this.detailsComponentRef()[expandedIndex].createComponent(config.component);
+            if (config.componentInputs) {
+                for (const [key, value] of Object.entries(config.componentInputs)) {
+                    (this.#expandedComponentRef.instance as any)[key] = value;
+                }
+            }
+            setTimeout(() =>
+                this.#currentExpandedComponentHeight.set(this.#expandedComponentRef.instance.elementRef.nativeElement.clientHeight),
+            );
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+<div [class.full-width]="isExpanded()" class="container">
+    <p><strong [translate]="'revert-manual-changes-dialog.details.title'"></strong></p>
+    <redaction-selected-annotations-table
+        [data]="data()"
+        [columns]="columns"
+        [headerHasBackground]="true"
+    ></redaction-selected-annotations-table>
+</div>

apps/red-ui/src/app/modules/file-preview/components/manual-changes/manual-changes.component.scss

@@ -0,0 +1,50 @@
+:host {
+    width: 100%;
+}
+
+.container {
+    padding: 8px;
+    width: calc(100% - 28px);
+
+    &.full-width {
+        width: 100%;
+    }
+}
+
+p {
+    margin: 4px 0;
+}
+
+.original-container {
+    display: inline-flex;
+    width: calc(100% - 16px);
+
+    p:nth-child(n + 2) {
+        padding-left: 8px;
+    }
+
+    p {
+        flex: 1;
+        text-align: start;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        list-style-position: inside;
+        overflow: hidden;
+
+        padding-right: 8px;
+        line-height: 1.5;
+        width: 25%;
+    }
+
+    p:last-child {
+        padding-right: 0;
+        width: 50%;
+    }
+}
+
+redaction-selected-annotations-table {
+    ::ng-deep .table {
+        padding: 0;
+        width: calc(100% - 16px);
+    }
+}

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

@@ -0,0 +1,29 @@
+import { Component, computed, ElementRef, inject, input } from '@angular/core';
+import { AnnotationWrapper } from '@models/file/annotation.wrapper';
+import { SelectedAnnotationsTableComponent, ValueColumn } from '../selected-annotations-table/selected-annotations-table.component';
+import { TranslateModule } from '@ngx-translate/core';
+
+@Component({
+    selector: 'redaction-manual-changes',
+    standalone: true,
+    imports: [SelectedAnnotationsTableComponent, TranslateModule],
+    templateUrl: './manual-changes.component.html',
+    styleUrl: './manual-changes.component.scss',
+})
+export class ManualChangesComponent {
+    readonly redaction = input<AnnotationWrapper>();
+    readonly isExpanded = input<boolean>();
+
+    readonly columns = [{ label: 'Action' }, { label: 'Date' }, { label: 'User' }];
+    readonly data = computed(() =>
+        this.redaction().entry.manualChanges.map(
+            change =>
+                [
+                    { label: change.manualRedactionType.toLowerCase().capitalize() },
+                    { label: change.requestedDate, componentType: 'date' },
+                    { label: change.userId, componentType: 'avatar' },
+                ] as ValueColumn[],
+        ),
+    );
+    readonly elementRef = inject(ElementRef);
+}

apps/red-ui/src/app/modules/file-preview/components/selected-annotations-table/selected-annotations-table.component.html

@@ -1,13 +1,19 @@
 <div [ngStyle]="gridConfig()" class="table">
     @for (column of _columns(); track column.label) {
-        <div [ngClass]="{ hide: !!column.hide }" class="col cell">
+        <div [ngClass]="{ hide: !!column.hide, background: headerHasBackground() }" class="col cell">
             <label>{{ column.label }}</label>
         </div>
     }
     @for (row of _data(); track $index) {
         @for (cell of row; track cell.label) {
             <div [ngClass]="{ background: _data().indexOf(row) % 2 === 0, hide: !!cell.hide, bold: cell.bold }" class="cell">
-                {{ cell.label }}
+                @if (cell.componentType === 'date') {
+                    <span>{{ cell.label | date }}</span>
+                } @else if (cell.componentType === 'avatar') {
+                    <iqser-initials-avatar [user]="cell.label" [withName]="true" [size]="'extra-small'"></iqser-initials-avatar>
+                } @else {
+                    {{ cell.label }}
+                }
             </div>
         }
     }

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

@@ -11,7 +11,10 @@
         position: sticky;
         top: 0;
         z-index: 1;
-        background: white;
+
+        &:not(.background) {
+            background: white;
+        }
 
         label {
             opacity: 0.7;
@@ -26,6 +29,10 @@
         list-style-position: inside;
         overflow: hidden;
 
+        &:not(.background) {
+            background: white;
+        }
+
         padding-right: 8px;
         line-height: 1.5;
     }

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

@@ -1,11 +1,14 @@
 import { Component, computed, input } from '@angular/core';
 import { NgClass, NgStyle } from '@angular/common';
+import { InitialsAvatarComponent } from '@common-ui/users';
+import { DatePipe } from '@shared/pipes/date.pipe';
 
 export interface ValueColumn {
     label: string;
     hide?: boolean;
     bold?: boolean;
     width?: string;
+    componentType?: 'string' | 'avatar' | 'date';
 }
 
 const TABLE_ROW_SIZE = 20;
@@ -13,13 +16,13 @@ const MAX_ITEMS_DISPLAY = 10;
 
 @Component({
     selector: 'redaction-selected-annotations-table',
-    imports: [NgClass, NgStyle],
+    imports: [NgClass, NgStyle, InitialsAvatarComponent, DatePipe],
     templateUrl: './selected-annotations-table.component.html',
     styleUrl: './selected-annotations-table.component.scss',
 })
 export class SelectedAnnotationsTableComponent {
     readonly defaultColumnWidth = input(false);
-
+    readonly headerHasBackground = input(false);
     readonly columns = input.required<ValueColumn[]>();
     readonly _columns = computed(() => this.columns().filter(item => !this.defaultColumnWidth() || !item.hide));
 

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

@@ -3,7 +3,7 @@
     <iqser-popup-filter [primaryFiltersSlug]="'componentLogFilters'" [attr.help-mode-key]="'filter_components'"></iqser-popup-filter>
 </div>
 
-<div *ngIf="componentLogService.all$ | async as components" class="components-container" id="components-view">
+<div class="components-container" id="components-view">
     <div class="component-row">
         <div class="header">
             <div class="component">{{ 'component-management.table-header.component' | translate }}</div>
@@ -12,7 +12,7 @@
         <div class="row-separator"></div>
     </div>
 
-    <div *ngFor="let entry of components" class="component-row">
+    <div *ngFor="let entry of filteredComponents()" class="component-row">
         <redaction-editable-structured-component-value
             #editableComponent
             [entry]="entry"

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

@@ -1,21 +1,22 @@
-import { Component, effect, Input, OnInit, signal, ViewChildren } from '@angular/core';
+import { Component, computed, effect, Input, OnInit, ViewChildren } from '@angular/core';
 import { List } from '@common-ui/utils';
 import { IconButtonTypes, LoadingService } from '@iqser/common-ui';
 import { ComponentLogEntry, Dictionary, File, IComponentLogEntry, WorkflowFileStatuses } from '@red/domain';
-import { combineLatest, firstValueFrom, Observable } from 'rxjs';
+import { firstValueFrom, map } from 'rxjs';
 import { EditableStructuredComponentValueComponent } from '../editable-structured-component-value/editable-structured-component-value.component';
 import { FilterService, PopupFilterComponent } from '@common-ui/filtering';
 import { ComponentLogFilterService } from '../../services/component-log-filter.service';
-import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
+import { NgForOf } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { FilePreviewStateService } from '../../services/file-preview-state.service';
 import { ComponentLogService } from '@services/entity-services/component-log.service';
+import { toSignal } from '@angular/core/rxjs-interop';
 
 @Component({
     selector: 'redaction-structured-component-management',
     templateUrl: './structured-component-management.component.html',
     styleUrls: ['./structured-component-management.component.scss'],
-    imports: [PopupFilterComponent, NgIf, AsyncPipe, TranslateModule, NgForOf, EditableStructuredComponentValueComponent],
+    imports: [PopupFilterComponent, TranslateModule, NgForOf, EditableStructuredComponentValueComponent],
 })
 export class StructuredComponentManagementComponent implements OnInit {
     protected readonly iconButtonTypes = IconButtonTypes;
@@ -23,6 +24,12 @@ export class StructuredComponentManagementComponent implements OnInit {
     @Input() dictionaries: Dictionary[];
     @ViewChildren('editableComponent') editableComponents: List<EditableStructuredComponentValueComponent>;
 
+    readonly filteredComponents = computed(() => this.#filteredComponents);
+    readonly #displayedComponents = toSignal(this.componentLogService.all$);
+    readonly #filterModel = toSignal(
+        this._filterService.getFilterModels$('componentLogFilters').pipe(map(filters => (filters ? [...filters] : []))),
+    );
+
     constructor(
         private readonly _loadingService: LoadingService,
         private readonly _componentLogFilterService: ComponentLogFilterService,
@@ -40,6 +47,13 @@ export class StructuredComponentManagementComponent implements OnInit {
         return this.file.workflowStatus !== WorkflowFileStatuses.APPROVED;
     }
 
+    get #filteredComponents() {
+        if (this.#filterModel() && this.#displayedComponents()) {
+            return this._componentLogFilterService.filterComponents(this.#displayedComponents(), this.#filterModel());
+        }
+        return this.#displayedComponents();
+    }
+
     async ngOnInit(): Promise<void> {
         await this.#loadData();
     }

apps/red-ui/src/app/modules/file-preview/dialogs/revert-manual-changes-dialog/revert-manual-changes-dialog.component.html

@@ -0,0 +1,22 @@
+<section class="dialog">
+    <div class="dialog-header heading-l">
+        <span [translate]="'revert-manual-changes-dialog.title'"></span>
+    </div>
+
+    <div class="dialog-content" [class.is-expanded]="data.redactions.length === 1">
+        <div class="iqser-input-group">
+            <redaction-expandable-row-table [config]="config"></redaction-expandable-row-table>
+        </div>
+    </div>
+
+    <div class="dialog-actions">
+        <iqser-icon-button
+            [label]="'revert-manual-changes-dialog.actions.save' | translate"
+            [type]="IconButtonTypes.primary"
+            (click)="save()"
+        ></iqser-icon-button>
+        <div [translate]="'revert-manual-changes-dialog.actions.cancel'" class="all-caps-label cancel" mat-dialog-close></div>
+    </div>
+
+    <iqser-circle-button (action)="close()" class="dialog-close" icon="iqser:close" mat-dialog-close />
+</section>

apps/red-ui/src/app/modules/file-preview/dialogs/revert-manual-changes-dialog/revert-manual-changes-dialog.component.scss

@@ -0,0 +1,3 @@
+.dialog-content:not(.is-expanded) {
+    padding-left: 20px;
+}

apps/red-ui/src/app/modules/file-preview/dialogs/revert-manual-changes-dialog/revert-manual-changes-dialog.component.ts

@@ -0,0 +1,50 @@
+import { Component, signal } from '@angular/core';
+import { CircleButtonComponent, IconButtonComponent, IconButtonTypes, IqserDialogComponent } from '@iqser/common-ui';
+import { RevertManualChangesData } from '../../utils/dialog-types';
+import { TranslateModule } from '@ngx-translate/core';
+import { Config, ExpandableRowTableComponent } from '../../components/expandable-row-table/expandable-row-table.component';
+import { ManualChangesComponent } from '../../components/manual-changes/manual-changes.component';
+import { MatDialogClose } from '@angular/material/dialog';
+import { isJustOne } from '@common-ui/utils';
+
+@Component({
+    selector: 'redaction-revert-manual-changes-dialog',
+    standalone: true,
+    imports: [IconButtonComponent, TranslateModule, CircleButtonComponent, ExpandableRowTableComponent, MatDialogClose],
+    templateUrl: './revert-manual-changes-dialog.component.html',
+    styleUrl: './revert-manual-changes-dialog.component.scss',
+})
+export class RevertManualChangesDialogComponent extends IqserDialogComponent<RevertManualChangesData, RevertManualChangesData, boolean> {
+    protected readonly IconButtonTypes = IconButtonTypes;
+
+    readonly config: Config = {
+        columns: [
+            { label: 'value', value: 'Value', width: '25%' },
+            { label: 'type', value: 'Type', width: '25%' },
+            {
+                label: 'reason',
+                value: 'Reason',
+                width: '50%',
+            },
+        ],
+        data: this.data.redactions.map(redaction => ({
+            values: {
+                id: redaction.id,
+                value: redaction.value,
+                type: redaction.typeLabel,
+                reason: redaction.legalBasisValue,
+            },
+            expanded: false,
+            component: ManualChangesComponent,
+            componentInputs: { redaction: signal(redaction), isExpanded: signal(isJustOne(this.data.redactions)) },
+        })),
+    };
+
+    constructor() {
+        super();
+    }
+
+    save() {
+        this.close(true);
+    }
+}

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

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

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

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

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

@@ -43,6 +43,7 @@ import {
     RemoveRedactionPermissions,
     RemoveRedactionResult,
     ResizeRedactionData,
+    RevertManualChangesData,
 } from '../utils/dialog-types';
 import { toPosition } from '../utils/pdf-calculation.utils';
 import { FileDataService } from './file-data.service';
@@ -50,6 +51,7 @@ import { FilePreviewDialogService } from './file-preview-dialog.service';
 import { FilePreviewStateService } from './file-preview-state.service';
 import { ManualRedactionService } from './manual-redaction.service';
 import { SkippedService } from './skipped.service';
+import { RevertManualChangesDialogComponent } from '../dialogs/revert-manual-changes-dialog/revert-manual-changes-dialog.component';
 
 @Injectable()
 export class AnnotationActionsService {
@@ -68,6 +70,7 @@ export class AnnotationActionsService {
         private readonly _skippedService: SkippedService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _permissionsService: PermissionsService,
+        private readonly _iqserDialogService: IqserDialog,
     ) {}
 
     removeHighlights(highlights: AnnotationWrapper[]): void {
@@ -134,7 +137,11 @@ export class AnnotationActionsService {
 
         let recategorizeBody: List<IRecategorizationRequest> | IBulkRecategorizationRequest;
 
-        if (result.option === RedactOrHintOptions.ONLY_HERE || result.option === RectangleRedactOptions.ONLY_THIS_PAGE) {
+        if (
+            result.option === RedactOrHintOptions.ONLY_HERE ||
+            result.option === RectangleRedactOptions.ONLY_THIS_PAGE ||
+            this.#isDocumine
+        ) {
             recategorizeBody = annotations.map(annotation => {
                 const body: IRecategorizationRequest = {
                     annotationId: annotation.id,
@@ -164,6 +171,7 @@ export class AnnotationActionsService {
             };
         }
 
+        result.pageNumbers = result.pageNumbers || [];
         await this.#processObsAndEmit(
             this._manualRedactionService.recategorizeRedactions(
                 recategorizeBody,
@@ -213,6 +221,22 @@ export class AnnotationActionsService {
         }
     }
 
+    async revertChanges(annotations: AnnotationWrapper[]) {
+        const dialogData: RevertManualChangesData = {
+            redactions: annotations,
+        };
+        const result = await this._iqserDialogService.openDefault(RevertManualChangesDialogComponent, { data: dialogData }).result();
+        if (!result) return;
+
+        const data = annotations.map(annotation => annotation.id);
+        const dossierId = this._state.dossierId;
+        const fileId = this._state.fileId;
+
+        this.#processObsAndEmit(
+            this._manualRedactionService.revertChanges(data, dossierId, fileId, this._state.file().excludedFromAutomaticAnalysis),
+        ).then();
+    }
+
     undoDirectAction(annotations: AnnotationWrapper[]) {
         const { dossierId, fileId } = this._state;
         const modifyDictionary = annotations[0].isModifyDictionary;
@@ -587,6 +611,7 @@ export class AnnotationActionsService {
         redactions: AnnotationWrapper[],
         dialogResult: RemoveRedactionResult,
     ): List<IRemoveRedactionRequest | IBulkLocalRemoveRequest> {
+        dialogResult.pageNumbers = dialogResult.pageNumbers || [];
         if (dialogResult.bulkLocal || !!dialogResult.pageNumbers.length) {
             return dialogResult.positions.map((position, index) => ({
                 value: redactions[index].value,

apps/red-ui/src/app/modules/file-preview/services/component-log-filter.service.ts

@@ -1,15 +1,19 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { ComponentLogEntry } from '@red/domain';
-import { INestedFilter, NestedFilter } from '@common-ui/filtering';
+import { IFilterGroup, INestedFilter, keyChecker, NestedFilter } from '@common-ui/filtering';
+import { TranslateService } from '@ngx-translate/core';
+import { sortArray } from '@utils/sorters/custom-sort';
 
 @Injectable()
 export class ComponentLogFilterService {
+    readonly #translateService = inject(TranslateService);
+
     filterGroups(entities: ComponentLogEntry[]) {
         const allDistinctComponentLogs = new Set<string>();
 
         entities?.forEach(entry => allDistinctComponentLogs.add(entry.name));
 
-        const componentLogFilters = [...allDistinctComponentLogs].map(
+        const componentLogFilters = sortArray([...allDistinctComponentLogs]).map(
             id =>
                 new NestedFilter({
                     id: id,
@@ -21,7 +25,9 @@ export class ComponentLogFilterService {
             {
                 slug: 'componentLogFilters',
                 filters: componentLogFilters,
-            },
+                checker: keyChecker('name'),
+                filterceptionPlaceholder: this.#translateService.instant('component-management.filter.search-placeholder'),
+            } as IFilterGroup,
         ];
     }
 

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

@@ -1,7 +1,7 @@
 import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { GenericService, IqserPermissionsService, Toaster } from '@iqser/common-ui';
+import { GenericService, IqserPermissionsService, QueryParam, Toaster } from '@iqser/common-ui';
 import { List } from '@iqser/common-ui/lib/utils';
 import { type AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { type ManualRedactionEntryType } from '@models/file/manual-redaction-entry.wrapper';
@@ -108,6 +108,10 @@ export class ManualRedactionService extends GenericService<IManualAddResponse> {
         return this.undo(annotationIds, dossierId, fileId).pipe(this.#showToast('undo', modifyDictionary));
     }
 
+    revertChanges(body: List<string>, dossierId: string, fileId: string, includeOnlyUnprocessed: boolean) {
+        return this.#revertChanges(body, dossierId, fileId, includeOnlyUnprocessed).pipe(this.#showToast('revert-changes'));
+    }
+
     removeRedaction(
         body: List<IRemoveRedactionRequest> | IBulkLocalRemoveRequest,
         dossierId: string,
@@ -154,6 +158,14 @@ export class ManualRedactionService extends GenericService<IManualAddResponse> {
         return this._post(body, `${this.#bulkRedaction}/resize/${dossierId}/${fileId}`).pipe(this.#log('Resize', body));
     }
 
+    #revertChanges(body: List<string>, dossierId: string, fileId: string, includeOnlyUnprocessed: boolean) {
+        const queryParams: List<QueryParam> = [
+            { key: 'includeOnlyUnprocessed', value: includeOnlyUnprocessed },
+            { key: 'includeOnlyLocal', value: true },
+        ];
+        return this.delete(body, `${this._defaultModelPath}/bulk/undo/${dossierId}/${fileId}`, queryParams);
+    }
+
     #recategorize(
         body: List<IRecategorizationRequest> | IBulkRecategorizationRequest,
         dossierId: string,

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

@@ -10,6 +10,7 @@ import { REDAnnotationManager } from '../../pdf-viewer/services/annotation-manag
 import { AnnotationActionsService } from './annotation-actions.service';
 import { FilePreviewStateService } from './file-preview-state.service';
 import { UI_ROOT_PATH_FN } from '@common-ui/utils';
+import { UserPreferenceService } from '@users/user-preference.service';
 
 @Injectable()
 export class PdfAnnotationActionsService {
@@ -20,8 +21,10 @@ export class PdfAnnotationActionsService {
     readonly #annotationActionsService = inject(AnnotationActionsService);
     readonly #iqserPermissionsService = inject(IqserPermissionsService);
     readonly #annotationManager = inject(REDAnnotationManager);
+    readonly #userPreferences = inject(UserPreferenceService);
     readonly #isDocumine = getConfig().IS_DOCUMINE;
     readonly #convertPath = inject(UI_ROOT_PATH_FN);
+    readonly #devMode = this.#userPreferences.isIqserDevMode;
 
     get(annotations: AnnotationWrapper[], annotationChangesAllowed: boolean): IHeaderElement[] {
         const availableActions: IHeaderElement[] = [];
@@ -97,6 +100,13 @@ export class PdfAnnotationActionsService {
             availableActions.push(forceHintButton);
         }
 
+        if (permissions.canRevertChanges && annotationChangesAllowed && this.#devMode) {
+            const revertChangesButton = this.#getButton('general/revert-changes', _('annotation-actions.revert-changes.label'), () =>
+                this.#annotationActionsService.revertChanges(annotations),
+            );
+            availableActions.push(revertChangesButton);
+        }
+
         if (permissions.canRemoveRedaction && sameType && annotationChangesAllowed) {
             const removeRedactionButton = this.#getButton('trash', _('annotation-actions.remove-annotation.remove-redaction'), () =>
                 this.#annotationActionsService.removeRedaction(annotations, permissions),

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

@@ -183,3 +183,7 @@ export interface RectangleDialogData {
 export interface RectangleDialogResult {
     annotation: IManualRedactionEntry;
 }
+
+export interface RevertManualChangesData {
+    redactions: AnnotationWrapper[];
+}

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

@@ -75,6 +75,7 @@ export class IconsModule {
             'reference',
             'remove-from-dict',
             'report',
+            'revert-changes',
             'rotation',
             'rss',
             'rule',

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

@@ -296,7 +296,7 @@ export class FileActionsComponent {
                 icon: 'iqser:refresh',
                 show: this.#showReanalyseFilePreview(),
                 disabled: this.file().isProcessing || this.#areRulesLocked(),
-                helpModeKey: 'stop_analysis',
+                helpModeKey: this.#isDocumine ? 'analyze_file' : 'stop_analysis',
             },
             {
                 id: 'btn-toggle_automatic_analysis',
@@ -334,7 +334,7 @@ export class FileActionsComponent {
                 icon: 'iqser:refresh',
                 show: this.#showReanalyseDossierOverview(),
                 disabled: this.#areRulesLocked(),
-                helpModeKey: 'stop_analysis',
+                helpModeKey: this.#isDocumine ? 'analyze_file' : 'stop_analysis',
             },
             {
                 id: 'btn-toggle_analysis',

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

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

apps/red-ui/src/app/translations/annotation-actions-translations.ts

@@ -44,6 +44,10 @@ export const manualRedactionActionsTranslations: Record<ManualRedactionActions,
         error: _('annotation-actions.message.manual-redaction.recategorize-annotation.error'),
         success: _('annotation-actions.message.manual-redaction.recategorize-annotation.success'),
     },
+    'revert-changes': {
+        success: _('annotation-actions.message.manual-redaction.revert-changes.success'),
+        error: _('annotation-actions.message.manual-redaction.revert-changes.error'),
+    },
     undo: {
         error: _('annotation-actions.message.manual-redaction.undo.error'),
         success: _('annotation-actions.message.manual-redaction.undo.success'),

apps/red-ui/src/assets/help-mode/help-mode-keys.json

@@ -577,6 +577,11 @@
     "documentKey": "dossier_stop_analysis",
     "scrollableParentView": "VIRTUAL_SCROLL"
   },
+  {
+    "elementKey": "dossier_analyze_file",
+    "documentKey": "analyze_file",
+    "scrollableParentView": "VIRTUAL_SCROLL"
+  },
   {
     "elementKey": "dossier_automatic_text_recognition",
     "documentKey": "dossier_automatic_text_recognition",
@@ -626,7 +631,6 @@
     "elementKey": "workload_page_list",
     "documentKey": "workload_page_list"
   },
-
   {
     "elementKey": "editor_delete_file",
     "documentKey": "editor_delete_file"
@@ -792,10 +796,6 @@
     "elementKey": "components_table",
     "documentKey": "components_table"
   },
-  {
-    "elementKey": "components_table",
-    "documentKey": "components_table"
-  },
   {
     "elementKey": "remove_annotation_DIALOG",
     "documentKey": "remove_annotation"

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

@@ -275,6 +275,9 @@
     "watermarks": "Wasserzeichen"
   },
   "analysis-disabled": "",
+  "annotation": {
+    "pending": "(Analyse steht aus)"
+  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -330,13 +333,17 @@
           "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": {
+        "revert-changes": {
-          "error": "Entfernen der Schwärzung fehlgeschlagen: {error}",
+          "error": "Manuelle Änderungen konnten nicht rückgängig gemacht werden: {error}",
-          "success": "Schwärzung wurde entfernt"
+          "success": "Manuelle Änderungen wurden erfolgreich rückgängig gemacht."
         },
         "undo": {
           "error": "Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}",
@@ -350,14 +357,17 @@
     "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": {
+    "revert-changes": {
-      "label": "Größe ändern"
+      "label": "Änderungen rückgängig machen"
     },
     "see-references": {
       "label": "Referenzen anzeigen"
@@ -393,9 +403,6 @@
     "skipped": "Ignorierte Schwärzung",
     "text-highlight": "Markierung"
   },
-  "annotation": {
-    "pending": "(Analyse steht aus)"
-  },
   "annotations": "Annotationen",
   "archived-dossiers-listing": {
     "no-data": {
@@ -553,6 +560,9 @@
       "undo": "Zurücksetzen"
     },
     "components": "Komponenten",
+    "filter": {
+      "search-placeholder": "Suche nach Komponente..."
+    },
     "table-header": {
       "component": "Komponente",
       "value": "Wert"
@@ -703,7 +713,7 @@
   },
   "content": "Grund",
   "copilot": {
-    "label": ""
+    "label": "Copilot"
   },
   "dashboard": {
     "empty-template": {
@@ -1026,13 +1036,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"
-    },
     "report-download": "",
     "start-auto-analysis": "Auto-Analyse aktivieren",
     "stop-auto-analysis": "Auto-Analyse anhalten",
@@ -1108,6 +1118,14 @@
     "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",
@@ -1142,14 +1160,6 @@
       "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.",
@@ -1360,6 +1370,15 @@
       "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."
@@ -1373,28 +1392,19 @@
     "title": "Entitätsregeln-Editor",
     "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-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-dossier": {
+        "action": "Zurück zur Übersicht",
+        "label": "Das Dossier dieser Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1412,6 +1422,12 @@
   },
   "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",
@@ -1422,12 +1438,6 @@
     "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": {
@@ -1645,15 +1655,6 @@
       "zip": "Die Zip-Datei wurde erfolgreich hochgeladen!"
     }
   },
-  "filter-menu": {
-    "filter-options": "Filteroptionen",
-    "filter-types": "Filter",
-    "label": "Filter",
-    "pages-without-annotations": "Nur Seiten ohne Annotationen",
-    "redaction-changes": "Nur Annotationen mit lokalen manuellen Änderungen",
-    "unseen-pages": "Nur Annotationen auf ungesehenen Seiten",
-    "with-comments": "Nur Annotationen mit Kommentaren"
-  },
   "filter": {
     "analysis": "Analyse erforderlich",
     "comment": "Kommentare",
@@ -1663,6 +1664,15 @@
     "redaction": "Schwärzung",
     "updated": "Aktualisiert"
   },
+  "filter-menu": {
+    "filter-options": "Filteroptionen",
+    "filter-types": "Filter",
+    "label": "Filter",
+    "pages-without-annotations": "Nur Seiten ohne Annotationen",
+    "redaction-changes": "Nur Annotationen mit lokalen manuellen Änderungen",
+    "unseen-pages": "Nur Annotationen auf ungesehenen Seiten",
+    "with-comments": "Nur Annotationen mit Kommentaren"
+  },
   "filters": {
     "assigned-people": "Bearbeiter",
     "documents-status": "Dokumentenstatus",
@@ -1952,6 +1962,13 @@
     "user-promoted-to-approver": "Sie wurden zum Genehmiger in einem Dossier ernannt: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>",
     "user-removed-as-dossier-member": "Sie wurden als Dossier-Mitglied entfernt: \n<b>{dossierHref, select, null{{dossierName}} other\n{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>\n"
   },
+  "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",
@@ -1965,7 +1982,6 @@
       "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",
@@ -1983,6 +1999,7 @@
       "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",
@@ -1990,13 +2007,6 @@
     },
     "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",
@@ -2108,6 +2118,10 @@
     "warnings-label": "Dialoge und Meldungen",
     "warnings-subtitle": "„Nicht mehr anzeigen“-Optionen"
   },
+  "processing": {
+    "basic": "Verarbeitung läuft",
+    "ocr": "OCR"
+  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Ausstehend",
@@ -2115,10 +2129,6 @@
     "processed": "Verarbeitet",
     "processing": "Verarbeitung läuft"
   },
-  "processing": {
-    "basic": "Verarbeitung läuft",
-    "ocr": "OCR"
-  },
   "readonly": "Lesemodus",
   "readonly-archived": "Lesemodus (archiviert)",
   "redact-text": {
@@ -2368,6 +2378,16 @@
       "header": "Größe von {type} ändern"
     }
   },
+  "revert-manual-changes-dialog": {
+    "actions": {
+      "cancel": "Abbrechen",
+      "save": "Zu den Originalen zurückkehren"
+    },
+    "details": {
+      "title": "Manuelle Änderungen"
+    },
+    "title": "Lokale manuelle Änderungen rückgängig machen"
+  },
   "revert-value-dialog": {
     "actions": {
       "cancel": "Abbrechen",
@@ -2388,6 +2408,12 @@
     "red-user-admin": "{count, plural, one{Benutzeradmin} other{Benutzeradmins}}",
     "regular": "{count, plural, one{regulärer Benutzer} other{reguläre 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",
@@ -2411,12 +2437,6 @@
     "no-match": "Der 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": {

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

@@ -338,6 +338,10 @@
           "error": "Failed to remove redaction: {error}",
           "success": "Redaction removed"
         },
+        "revert-changes": {
+          "error": "Failed to revert manual changes: {error}",
+          "success": "Reverted manual changes successfully."
+        },
         "undo": {
           "error": "Failed to undo: {error}",
           "success": "Undo successful"
@@ -359,6 +363,9 @@
     "resize": {
       "label": "Resize"
     },
+    "revert-changes": {
+      "label": "Revert changes"
+    },
     "see-references": {
       "label": "See references"
     },
@@ -553,6 +560,9 @@
       "undo": "Undo"
     },
     "components": "Components",
+    "filter": {
+      "search-placeholder": "Search by component..."
+    },
     "table-header": {
       "component": "Component",
       "value": "Value"
@@ -632,7 +642,7 @@
   "confirm-delete-users": {
     "cancel": "Keep {usersCount, plural, one{user} other{users}}",
     "delete": "Delete {usersCount, plural, one{user} other{users}}",
-    "impacted-documents": "All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted",
+    "impacted-documents": "{documentsCount} {documentsCount, plural, one{document} other{documents}} will be impacted",
     "impacted-dossiers": "{dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted",
     "title": "Delete {usersCount, plural, one{user} other{users}} from workspace",
     "toast-error": "Please confirm that you understand the consequences of this action.",
@@ -2368,6 +2378,16 @@
       "header": "Resize {type}"
     }
   },
+  "revert-manual-changes-dialog": {
+    "actions": {
+      "cancel": "Cancel",
+      "save": "Revert to originals"
+    },
+    "details": {
+      "title": "Manual changes"
+    },
+    "title": "Revert local manual changes"
+  },
   "revert-value-dialog": {
     "actions": {
       "cancel": "Cancel",

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

@@ -225,7 +225,7 @@
       "actions": {
         "cancel": "Abbrechen",
         "save": "Speichern",
-        "save-and-remember": "Save and remember my choice"
+        "save-and-remember": "Speichern und Auswahl merken"
       },
       "content": {
         "comment": "Kommentar",
@@ -243,7 +243,7 @@
         },
         "type": "Typ",
         "type-placeholder": "Typ auswählen...",
-        "value": "Wert\n"
+        "value": "Wert"
       },
       "title": "Hinweis hinzufügen"
     }
@@ -275,6 +275,9 @@
     "watermarks": "Wasserzeichen"
   },
   "analysis-disabled": "Analyse deaktiviert",
+  "annotation": {
+    "pending": "(Analyse steht aus)"
+  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -330,13 +333,17 @@
           "error": "Rekategorisierung des Bilds fehlgeschlagen: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
+        "remove": {
+          "error": "Entfernen der Annotation fehlgeschlagen: {error}",
+          "success": "Annotation wurde entfernt"
+        },
         "remove-hint": {
           "error": "Entfernen des Hinweises fehlgeschlagen: {error}",
           "success": "Hinweis wurde entfernt"
         },
-        "remove": {
+        "revert-changes": {
-          "error": "Entfernen der Annotation fehlgeschlagen: {error}",
+          "error": "Manuelle Änderungen konnten nicht rückgängig gemacht werden: {error}",
-          "success": "Annotation wurde entfernt"
+          "success": "Manuelle Änderungen wurden erfolgreich rückgängig gemacht."
         },
         "undo": {
           "error": "Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}",
@@ -350,14 +357,17 @@
     "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": {
+    "revert-changes": {
-      "label": "Größe ändern"
+      "label": "Änderungen rückgängig machen"
     },
     "see-references": {
       "label": "Referenzen anzeigen"
@@ -375,7 +385,7 @@
     "removed-manual": "Schwärzung/Hinweis entfernt",
     "resized": "Schwärzungsbereich wurde geändert"
   },
-  "annotation-content": "{hasRule, select, true {Rule {matchedRule} trifft zu:{ruleSymbol}} other {}} {hasReason, select, true {{reason}} other {}} {hasLb, select, true {Legal basis: {legalBasis}} other {}} {hasOverride, select, true {Removed by manual override} other {}} {hasSection, select, true {{shouldLower, plural, =0 {I} other {i}}n Abschnitt{sectionSymbol} \"{section}\"} other {}}",
+  "annotation-content": "{hasRule, select, true {Rule {matchedRule} trifft zu:{ruleSymbol}} other {}} {hasReason, select, true {{reason}} other {}} {hasLb, select, true {Legal basis: {legalBasis}} other {}} {hasOverride, select, true {Removed by manual override} other {}} {hasSection, select, true {{shouldLower, plural, =0 {I} other {i}}n Abschnitt{sectionSymbol} \\\"{section}\\\"} other {}}",
   "annotation-engines": {
     "dictionary": "{isHint, select, true{Hinweis} other{Schwärzung}} basiert auf Wörterbuch",
     "dossier-dictionary": "Annotation basiert auf Dossier-Wörterbuch",
@@ -393,9 +403,6 @@
     "skipped": "Übersprungen",
     "text-highlight": "Markierung"
   },
-  "annotation": {
-    "pending": "(Analyse steht aus)"
-  },
   "annotations": "Annotationen",
   "archived-dossiers-listing": {
     "no-data": {
@@ -525,11 +532,11 @@
     "add-title": "Neue Definition hinzufügen",
     "columns": {
       "name": "Name",
-      "position": "Pos."
+      "position": "pos."
     },
     "edit-title": "Definition von {displayName} bearbeiten",
     "form": {
-      "autogenerated-label": "Wird ausgehend vom ersten Anzeigenamen automatisch generiert.",
+      "autogenerated-label": "Wurde ausgehend vom initialen Anzeigenamen automatisch generiert",
       "description": "Beschreibung",
       "description-placeholder": "Beschreibung",
       "display-name": "Anzeigename",
@@ -553,6 +560,9 @@
       "undo": "Zurücksetzen"
     },
     "components": "Komponenten",
+    "filter": {
+      "search-placeholder": "Suche nach Komponente..."
+    },
     "table-header": {
       "component": "Komponente",
       "value": "Wert"
@@ -571,7 +581,7 @@
     },
     "search": "Nach Name suchen...",
     "table-col-names": {
-      "column-labels": "Spaltenbeschriftungen",
+      "column-labels": "Column labels",
       "name": "Name",
       "number-of-lines": "Zeilenzahl",
       "version": "Version"
@@ -614,7 +624,7 @@
     "impacted-report": "{reportsCount} Berichte nutzen den Platzhalter dieses Attributs. Bitte aktualisieren Sie diese.",
     "title": "{count, plural, one{Attribut} other{Attribute}} löschen",
     "toast-error": "Bitte bestätigen Sie, dass die Folgen dieser Aktion verstehen.",
-    "warning": "Warnung: Wiederherstellung des Attributs nicht möglich."
+    "warning": "Warnung: Aktion kann nicht rückgängig gemacht werden."
   },
   "confirm-delete-dossier-state": {
     "cancel": "Abbrechen",
@@ -636,18 +646,18 @@
     "impacted-dossiers": "{dossiersCount} {dossiersCount, plural, one{Dossier} other{Dossiers}} sind betroffen",
     "title": "{usersCount, plural, one{Benutzer} other{Benutzer}} aus Workspace entfernen",
     "toast-error": "Bitte bestätigen Sie, dass Sie die Folgen dieser Aktion verstehen.",
-    "warning": "Warnung: Wiederherstellung des Benutzers nicht möglich."
+    "warning": "Warnung: Aktion kann nicht rückgängig gemacht werden."
   },
   "confirmation-dialog": {
     "approve-file": {
-      "confirmationText": "Trotzdem genehmigen",
+      "confirmationText": "Dennoch freigeben",
       "denyText": "Nein, abbrechen",
       "question": "Dieses Dokument enthält ungesehene Änderungen, die sich durch die Reanalyse ergeben haben.<br><br>Möchten Sie es trotzdem freigeben?",
       "title": "Warnung!",
       "warning-reason": {
-        "legal-basis-missing": "Rechtsgrundlage fehlt",
+        "legal-basis-missing": "Legal basis missing",
-        "pending-changes": "Änderungen stehen aus",
+        "pending-changes": "Ausstehende Änderungen",
-        "unmapped-justification": "Nicht gemappte Begründung"
+        "unmapped-justification": "Unmapped justification"
       }
     },
     "assign-file-to-me": {
@@ -703,7 +713,7 @@
   },
   "content": "Grund",
   "copilot": {
-    "label": ""
+    "label": "Copilot"
   },
   "dashboard": {
     "empty-template": {
@@ -931,7 +941,7 @@
       "action": "Ganzes Dossier analysieren"
     },
     "rules": {
-      "timeoutError": "Regeln für Dossier-Vorlagen gesperrt!"
+      "timeoutError": "Regeln der Dossier-Vorlage gesperrt!"
     },
     "stats": {
       "analyzed-pages": "{count, plural, one{Seite} other{Seiten}}",
@@ -948,7 +958,7 @@
     "table-header": {
       "title": "{length} {length, plural, one{aktives Dossier} other{aktive Dossiers}}"
     },
-    "template-inactive": "Aktuell ausgewählte Dossier-Vorlage inaktiv!"
+    "template-inactive": "Die aktuell ausgewählte Dossier-Vorlage ist inaktiv."
   },
   "dossier-overview": {
     "approve": "Genehmigen",
@@ -1026,13 +1036,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"
-    },
     "report-download": "Bericht herunterladen",
     "start-auto-analysis": "Auto-Analyse aktivieren",
     "stop-auto-analysis": "Auto-Analyse anhalten",
@@ -1108,6 +1118,14 @@
     "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",
@@ -1142,14 +1160,6 @@
       "title": "{length} {length, plural, one{archiviertes Dossier} other{archivierte Dossiers}}"
     }
   },
-  "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.",
@@ -1317,7 +1327,7 @@
         "options": {
           "in-document": {
             "description": "",
-            "label": "In Dokument ändern"
+            "label": "Im Dokument bearbeiten"
           },
           "only-here": {
             "description": "",
@@ -1360,6 +1370,15 @@
       "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."
@@ -1373,28 +1392,19 @@
     "title": "Entitätsregeln-Editor",
     "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-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-dossier": {
+        "action": "Zurück zur Übersicht",
+        "label": "Das Dossier dieser Datei wurde gelöscht."
       }
     },
     "file-preview": {
@@ -1412,6 +1422,12 @@
   },
   "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",
@@ -1422,12 +1438,6 @@
     "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": {
@@ -1642,18 +1652,9 @@
   "file-upload": {
     "type": {
       "csv": "Die Datei-Attribute wurden erfolgreich aus der hochgeladenen CSV-Datei importiert.",
-      "zip": ""
+      "zip": "Die Zip-Datei wurde erfolgreich hochgeladen!"
     }
   },
-  "filter-menu": {
-    "filter-options": "Filteroptionen",
-    "filter-types": "Filter",
-    "label": "Filter",
-    "pages-without-annotations": "Nur Seiten ohne Annotationen",
-    "redaction-changes": "Nur Annotationen mit lokalen manuellen Änderungen",
-    "unseen-pages": "Nur Anmerkungen auf ungesehenen Seiten",
-    "with-comments": "Nur Anmerkungen mit Kommentaren"
-  },
   "filter": {
     "analysis": "Analyse erforderlich",
     "comment": "Kommentare",
@@ -1663,6 +1664,15 @@
     "redaction": "Annotationen",
     "updated": "Aktualisiert"
   },
+  "filter-menu": {
+    "filter-options": "Filteroptionen",
+    "filter-types": "Filter",
+    "label": "Filter",
+    "pages-without-annotations": "Nur Seiten ohne Annotationen",
+    "redaction-changes": "Nur Annotationen mit lokalen manuellen Änderungen",
+    "unseen-pages": "Nur Anmerkungen auf ungesehenen Seiten",
+    "with-comments": "Nur Anmerkungen mit Kommentaren"
+  },
   "filters": {
     "assigned-people": "Bearbeiter",
     "documents-status": "Dokumentenstatus",
@@ -1731,11 +1741,11 @@
     "title": "SMTP-Konto konfigurieren"
   },
   "generic-errors": {
-    "400": "",
+    "400": "Die gesendete Anfrage ist ungültig.",
-    "403": "",
+    "403": "Der Zugriff auf die angeforderte Ressource ist nicht zulässig.",
-    "404": "",
+    "404": "Die angeforderte Ressource konnte nicht gefunden werden.",
-    "409": "",
+    "409": "Die Anfrage ist nicht mit dem aktuellen Status kompatibel.",
-    "500": ""
+    "500": "Der Server hat einen unerwarteten Fehler festgestellt und konnte die Anfrage nicht bearbeiten."
   },
   "help-button": {
     "disable": "Hilfemodus deaktivieren",
@@ -1907,15 +1917,15 @@
         "legalBasis": "Rechtsgrundlage",
         "options": {
           "multiple-pages": {
-            "description": "Annotation auf folgenden Seiten bearbeiten",
+            "description": "Fügen Sie die Annotation auf mehreren Seiten hinzu.",
-            "extraOptionDescription": "Minus (-) für Seitenbereich und Komma (,) für Aufzählung.",
+            "extraOptionDescription": "Minus (-) für Bereich und Komma (,) für Aufzählung.",
-            "extraOptionLabel": "Seitenbereich",
+            "extraOptionLabel": "Seiten",
             "extraOptionPlaceholder": "z. B. 1-20,22,32",
             "label": "Auf mehreren Seiten anwenden"
           },
           "only-this-page": {
-            "description": "Annotation nur an dieser Position im Dokument bearbeiten",
+            "description": "Fügen Sie die Annotation nur an dieser Stelle im Dokument hinzu.",
-            "label": "Auf dieser Seite anwenden"
+            "label": "Nur auf dieser Seite anwenden"
           }
         },
         "reason": "Grund",
@@ -1942,15 +1952,22 @@
     "document-approved": "<b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> wurde genehmigt.",
     "dossier-deleted": "Dossier wurde gelöscht: <b>{dossierName}</b>",
     "dossier-owner-deleted": "Der Besitzer des Dossiers wurde gelöscht: <b>{dossierName}</b>",
-    "dossier-owner-removed": "Der Dossier-Owner von <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> wurde entfernt!",
+    "dossier-owner-removed": "Sie wurden  <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> ",
     "dossier-owner-set": "Sie sind jetzt Besitzer des Dossiers <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>.",
     "download-ready": "Ihr <b><a href=\"{downloadHref}\", target=\"_self\">Download</a></b> steht bereit.",
     "no-data": "Sie haben aktuell keine Benachrichtigungen",
     "unassigned-from-file": "Sie wurden von einem Dokument entfernt. <br>Dokument: <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> <br>Dossier: <b>{dossierHref, select, null{{dossierName}} other{{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}}}</b>",
-    "user-becomes-dossier-member": "<b>{user}</b> ist jetzt Mitglied des Dossiers <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>!",
+    "user-becomes-dossier-member": "Sie wurden zu einem Dossier hinzugefügt: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>!",
     "user-demoted-to-reviewer": "Sie wurden auf die Reviewer-Rolle heruntergestuft: <b>{dossierHref, select, null{{dossierName}}\n other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>",
     "user-promoted-to-approver": "Sie wurden in einem Dossier zum Genehmiger ernannt: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>",
-    "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!"
+    "user-removed-as-dossier-member": "Sie wurden als Mitglied entfernt: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  "
+  },
+  "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": {
@@ -1958,14 +1975,13 @@
       "in-app-notifications": "In-App-Benachrichtigungen"
     },
     "error": {
-      "generic": "Fehler: Aktualisierung der Präferenzen fehlgeschlagen."
+      "generic": "Aktualisierung der Präferenzen fehlgeschlagen."
     },
     "groups": {
       "document": "Benachrichtigungen zu Dokumenten",
       "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 bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Prüfer zugewiesen werde",
@@ -1983,6 +1999,7 @@
       "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": "Sofortig",
@@ -1990,13 +2007,6 @@
     },
     "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",
@@ -2048,20 +2058,20 @@
       "compare-button": "Vergleichen",
       "layers-panel-button": "Ebenen",
       "left-panel-button": "Panel",
-      "load-all-annotations": "Alle Annotationen geladen",
+      "load-all-annotations": "Alle Annotationen laden",
       "no-outlines-text": "Keine Gliederung verfügbar",
       "no-signatures-text": "Dieses Dokument enthält keine Unterschriftenfelder.",
       "outline-multi-select": "Bearbeiten",
       "outlines-panel-button": "Gliederung",
       "pan-tool-button": "Verschieben",
-      "rectangle-tool-button": "Bereich schwärzen",
+      "rectangle-tool-button": "Bereich annotieren",
-      "rotate-left-button": "Seite nach links drehen",
+      "rotate-left-button": "Nach links drehen",
-      "rotate-right-button": "Seite nach rechts drehen",
+      "rotate-right-button": "Nach rechts drehen",
       "select-tool-button": "Auswählen",
       "signature-panel-button": "Unterschriften",
       "thumbnails-panel-button": "Miniaturansicht",
-      "toggle-layers": "Layout-Raster {active, select, true{deaktivieren} false{aktivieren} other{}}",
+      "toggle-layers": "Layoutraster {active, select, true{deaktivieren} false{aktivieren} other{}}",
-      "toggle-readable-redactions": "Schwärzungen {active, select, true{wie im finalen Dokument} false{in Preview-Farbe anzeigen} other{}}",
+      "toggle-readable-redactions": "Show redactions {active, select, true{as in final document} false{in preview color} other{}}",
       "toggle-tooltips": "Tooltips für Annotationen {active, select, true{deaktivieren} false{aktivieren} other{}}",
       "zoom-in-button": "Vergrößern",
       "zoom-out-button": "Verkleinern"
@@ -2108,6 +2118,10 @@
     "warnings-label": "Dialoge und Meldungen",
     "warnings-subtitle": "„Nicht mehr anzeigen“-Optionen"
   },
+  "processing": {
+    "basic": "Verarbeitung läuft",
+    "ocr": "OCR"
+  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Ausstehend",
@@ -2115,10 +2129,6 @@
     "processed": "Verarbeitet",
     "processing": "Verarbeitung läuft"
   },
-  "processing": {
-    "basic": "Verarbeitung läuft",
-    "ocr": "OCR"
-  },
   "readonly": "Lesemodus",
   "readonly-archived": "Lesemodus (archiviert)",
   "redact-text": {
@@ -2135,8 +2145,8 @@
         "legal-basis": "Rechtsgrundlage",
         "options": {
           "in-document": {
-            "description": "Fügen Sie die Schwärzung an allen Stellen in diesem Dokument hinzu.",
+            "description": "Add redaction for each occurrence of the term in this document.",
-            "label": "Im Dokument schwärzen"
+            "label": "Redact in document"
           },
           "in-dossier": {
             "description": "Fügen Sie die Schwärzung zu jedem Dokument in {dossierName} hinzu.",
@@ -2154,7 +2164,7 @@
         "type": "Typ",
         "type-placeholder": "Typ auswählen...",
         "unchanged": "",
-        "value": "Wert"
+        "value": "Value"
       },
       "title": "Text schwärzen"
     }
@@ -2368,6 +2378,16 @@
       "header": "Größe von {type} ändern"
     }
   },
+  "revert-manual-changes-dialog": {
+    "actions": {
+      "cancel": "Abbrechen",
+      "save": "Zu den Originalen zurückkehren"
+    },
+    "details": {
+      "title": "Manuelle Änderungen"
+    },
+    "title": "Lokale manuelle Änderungen rückgängig machen"
+  },
   "revert-value-dialog": {
     "actions": {
       "cancel": "Abbrechen",
@@ -2388,6 +2408,12 @@
     "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",
@@ -2411,12 +2437,6 @@
     "no-match": "Der 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": {
@@ -2521,7 +2541,7 @@
       "overwrite": "Überschreiben"
     },
     "question": "Wie möchten Sie vorgehen?",
-    "title": "Das Wörterbuch hat bereits Einträge!"
+    "title": "Das Wörterbuch hat bereits Einträge."
   },
   "upload-file": {
     "upload-area-text": "Klicken Sie hier oder ziehen Sie die Datei in diesen Bereich..."

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

@@ -338,6 +338,10 @@
           "error": "Failed to remove annotation: {error}",
           "success": "Annotation removed"
         },
+        "revert-changes": {
+          "error": "Failed to revert manual changes: {error}",
+          "success": "Reverted manual changes successfully."
+        },
         "undo": {
           "error": "Failed to undo: {error}",
           "success": "Undo successful"
@@ -359,6 +363,9 @@
     "resize": {
       "label": "Resize"
     },
+    "revert-changes": {
+      "label": "Revert changes"
+    },
     "see-references": {
       "label": "See references"
     },
@@ -553,6 +560,9 @@
       "undo": "Undo"
     },
     "components": "Components",
+    "filter": {
+      "search-placeholder": "Search by component..."
+    },
     "table-header": {
       "component": "Component",
       "value": "Value"
@@ -632,7 +642,7 @@
   "confirm-delete-users": {
     "cancel": "Keep {usersCount, plural, one{user} other{users}}",
     "delete": "Delete {usersCount, plural, one{user} other{users}}",
-    "impacted-documents": "All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted",
+    "impacted-documents": "{documentsCount} {documentsCount, plural, one{document} other{documents}} will be impacted",
     "impacted-dossiers": "{dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted",
     "title": "Delete {usersCount, plural, one{user} other{users}} from workspace",
     "toast-error": "Please confirm that you understand the consequences of this action.",
@@ -1317,7 +1327,7 @@
         "options": {
           "in-document": {
             "description": "",
-            "label": "In Dokument ändern"
+            "label": "Edit in document"
           },
           "only-here": {
             "description": "",
@@ -1907,9 +1917,9 @@
         "legalBasis": "Legal Basis",
         "options": {
           "multiple-pages": {
-            "description": "Edit annotation the range of pages",
+            "description": "Add annotation on a range of pages",
             "extraOptionDescription": "Minus(-) for range and comma(,) for enumeration",
-            "extraOptionLabel": "Range",
+            "extraOptionLabel": "Pages",
             "extraOptionPlaceholder": "e.g. 1-20,22,32",
             "label": "Apply on multiple pages"
           },
@@ -1958,7 +1968,7 @@
       "in-app-notifications": "In-app notifications"
     },
     "error": {
-      "generic": "Something went wrong... Preferences update failed."
+      "generic": "Preferences update failed."
     },
     "groups": {
       "document": "Document related notifications",
@@ -2368,6 +2378,16 @@
       "header": "Resize {type}"
     }
   },
+  "revert-manual-changes-dialog": {
+    "actions": {
+      "cancel": "Cancel",
+      "save": "Revert to originals"
+    },
+    "details": {
+      "title": "Manual changes"
+    },
+    "title": "Revert local manual changes"
+  },
   "revert-value-dialog": {
     "actions": {
       "cancel": "Cancel",

apps/red-ui/src/assets/icons/general/revert-changes.svg

@@ -0,0 +1,12 @@
+<svg width="100%" height="100%" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <g fill="currentColor" stroke="none">
+        <path fill-rule="evenodd" clip-rule="evenodd"
+              d="M10.7389 1.57074C9.61055 1.57074 8.5881 2.02374 7.84324 2.75924L9.09148 2.64397L9.19008 3.71175L5.98676 4.00756L5.69095 0.804226L6.75873 0.705624L6.8882 2.1077C7.84807 1.07713 9.21818 0.431396 10.7389 0.431396C13.6446 0.431396 16 2.78686 16 5.69246C16 8.00114 14.513 9.96249 12.4444 10.6709V9.4459C13.8698 8.79722 14.8607 7.36057 14.8607 5.69246C14.8607 3.4161 13.0153 1.57074 10.7389 1.57074Z"
+        />
+        <path fill-rule="evenodd" clip-rule="evenodd"
+              d="M5.12999 5.91604C5.1117 5.12697 4.46581 4.49243 3.67235 4.49243L3.63795 4.49283L3.60374 4.49402C2.83061 4.52987 2.21432 5.1685 2.21432 5.95044L2.21427 10.5306L2.17777 10.5151C1.55239 10.2584 0.814204 10.4274 0.365254 10.9664L0.340815 10.9966L0.316849 11.0276C-0.153667 11.6531 -0.0961886 12.5351 0.462852 13.0937L1.84534 14.4762L1.84539 14.6236L1.84614 14.652C1.8531 14.7838 1.90846 14.9086 2.00217 15.0023C2.10251 15.1027 2.23862 15.1591 2.38042 15.1591H10.1312L10.1595 15.1583C10.2913 15.1514 10.4162 15.096 10.5099 15.0023C10.6103 14.9019 10.6667 14.7658 10.6667 14.6236V8.53383L10.6661 8.49249C10.6555 8.1211 10.5033 7.76714 10.2397 7.50302C9.96631 7.22968 9.5954 7.07625 9.20863 7.07625L9.1681 7.07682L9.12388 7.07873C8.82966 7.09597 8.54852 7.20237 8.31717 7.38225L8.28601 7.40701L8.25512 7.38227L8.22172 7.35706C7.97441 7.17584 7.674 7.07629 7.36305 7.07629L7.32249 7.07686L7.28024 7.07865C6.98508 7.09547 6.70318 7.20186 6.47141 7.38225L6.44088 7.40668L6.42613 7.3945L6.3935 7.36894C6.04214 7.1019 5.58724 7.01172 5.16238 7.12206L5.13034 7.13076L5.13039 5.95044L5.12999 5.91604ZM3.2854 5.92921C3.29644 5.72504 3.46544 5.56294 3.67237 5.56294C3.88643 5.56294 4.05991 5.73641 4.05991 5.95047V10.1947L4.06043 10.2186C4.07289 10.5033 4.30738 10.7302 4.59493 10.7302C4.89081 10.7302 5.13039 10.4906 5.13039 10.1947V8.53388L5.13096 8.51261C5.142 8.30845 5.311 8.14635 5.51793 8.14635C5.73199 8.14635 5.90547 8.31982 5.90547 8.53388V10.1947L5.90599 10.2186C5.91845 10.5033 6.15294 10.7302 6.44049 10.7302C6.73603 10.7302 6.97552 10.4905 6.97552 10.1947V8.53388L6.97609 8.51261C6.98713 8.30845 7.15613 8.14635 7.36306 8.14635C7.57712 8.14635 7.75059 8.31982 7.75059 8.53388V10.1947L7.75112 10.2186C7.76359 10.5034 7.99817 10.7302 8.28605 10.7302C8.58159 10.7302 8.82108 10.4905 8.82108 10.1947V8.53388L8.82165 8.51261C8.83269 8.30845 9.00169 8.14635 9.20862 8.14635L9.22988 8.14692C9.43405 8.15796 9.59615 8.32696 9.59615 8.53388L9.59611 14.0886H2.88926L2.88027 14.063C2.85363 13.9937 2.81261 13.93 2.75909 13.8765L1.19969 12.3169C1.11077 12.2223 1.06145 12.1002 1.05991 11.9721C1.05863 11.8356 1.11237 11.7041 1.20917 11.6069C1.3059 11.5102 1.43762 11.4565 1.57441 11.4581C1.71139 11.4594 1.8418 11.516 1.93649 11.6149L2.37112 12.0496L2.38985 12.0674C2.54251 12.2061 2.76229 12.2451 2.95431 12.1656C3.15436 12.0829 3.28483 11.8878 3.28483 11.6713V5.95047L3.2854 5.92921Z"
+        />
+    </g>
+</svg>
+
+

docker/red-ui/09-set-application-config.sh

@@ -46,7 +46,7 @@ echo '{
           "AVAILABLE_NOTIFICATIONS_DAYS":"'"$AVAILABLE_NOTIFICATIONS_DAYS"'",
           "AVAILABLE_OLD_NOTIFICATIONS_MINUTES":"'"$AVAILABLE_OLD_NOTIFICATIONS_MINUTES"'",
           "NOTIFICATIONS_THRESHOLD":"'"$NOTIFICATIONS_THRESHOLD"'",
-          "WATERMARK_PREVIEW_PAPER_FORMAT":"'"$WATERMARK_PREVIEW_PAPER_FORMAT"'"
+          "WATERMARK_PREVIEW_PAPER_FORMAT":"'"$WATERMARK_PREVIEW_PAPER_FORMAT"'",
           "LANDING_PAGE_THEME":"'"$LANDING_PAGE_THEME"'"
        }' >/usr/share/nginx/html/ui/assets/config/config.json
 

libs/common-ui

@@ -1 +1 @@
-Subproject commit a4e3ed8854604fccd87579a3f3b8a77dc7b9c1ca
+Subproject commit 7f13fa62d3d2b346c609bc4978cff75f37f1ee6b

libs/red-domain/.eslintrc.json

@@ -22,6 +22,7 @@
             "style": "kebab-case"
           }
         ],
+        "@angular-eslint/no-host-metadata-property": "off",
         "@typescript-eslint/unbound-method": "error",
         "@typescript-eslint/no-floating-promises": "off",
         "@typescript-eslint/naming-convention": [

libs/red-domain/src/lib/annotations/types.ts

@@ -10,7 +10,8 @@ export type ManualRedactionActions =
     | 'undo'
     | 'force-redaction'
     | 'force-hint'
-    | 'recategorize-annotation';
+    | 'recategorize-annotation'
+    | 'revert-changes';
 
 export const AnnotationIconTypes = {
     square: 'square',

libs/red-domain/src/lib/files/types.ts

@@ -48,6 +48,7 @@ export const isProcessingStatuses: List<ProcessingFileStatus> = [
     ProcessingFileStatuses.FULL_PROCESSING,
     ProcessingFileStatuses.PRE_PROCESSING,
     ProcessingFileStatuses.TABLE_PARSING_ANALYZING,
+    ProcessingFileStatuses.OCR_PROCESSING_QUEUED,
 ] as const;
 
 export const isFullProcessingStatuses: List<ProcessingFileStatus> = [

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

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

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

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

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

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

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

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

sonar-project.properties

@@ -0,0 +1,4 @@
+sonar.projectKey=red_ui
+sonar.sources=apps/red-ui,libs/common-ui
+sonar.qualitygate.wait=false
+sonar.python.version=3.7, 3.8, 3.9