Merge branch 'RED10758' into 'master'

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

See merge request redactmanager/red-ui!767

.eslintrc.json

@@ -16,6 +16,7 @@
       },
       "rules": {
         "rxjs/no-ignored-subscription": "warn",
+        "@angular-eslint/prefer-standalone": "off",
         "@angular-eslint/no-conflicting-lifecycle": "error",
         "@angular-eslint/no-host-metadata-property": "error",
         "@angular-eslint/no-input-rename": "error",

.gitlab-ci.yml

@@ -4,41 +4,60 @@ variables:
     PROJECT: red-ui
     DOCKERFILELOCATION: 'docker/$PROJECT/Dockerfile'
 
-
 include:
     - project: 'gitlab/gitlab'
       ref: 'main'
       file: 'ci-templates/docker_build_nexus_v2.yml'
       rules:
-      - if: $CI_PIPELINE_SOURCE != "schedule"
+          - 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
+    image: node:20.5
-  cache:
+    cache:
-      - key:
+        - key:
-            files:
+              files:
-                - yarn.lock
+                  - yarn.lock
-        paths:
+          paths:
-            - .yarn-cache/
+              - .yarn-cache/
-  script:
+    script:
-      # - git config user.email "${CI_EMAIL}"
+        # - git config user.email "${CI_EMAIL}"
-      # - git config user.name "${CI_USERNAME}"
+        # - git config user.name "${CI_USERNAME}"
-      # - git remote add gitlab_origin https://${CI_USERNAME}:${CI_ACCESS_TOKEN}@gitlab.knecon.com/redactmanager/red-ui.git
+        # - git remote add gitlab_origin https://${CI_USERNAME}:${CI_ACCESS_TOKEN}@gitlab.knecon.com/redactmanager/red-ui.git
-      - git push https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.knecon.com/redactmanager/red-ui.git
+        - git push https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.knecon.com/redactmanager/red-ui.git
-      - cd tools/localazy
+        - cd tools/localazy
-      - yarn install --cache-folder .yarn-cache
+        - yarn install --cache-folder .yarn-cache
-      - yarn start
+        - yarn start
-      - cd ../..
+        - cd ../..
-      - git add .
+        - git add .
-      - |-
+        - |-
-        CHANGES=$(git status --porcelain | wc -l)
+            CHANGES=$(git status --porcelain | wc -l)
-        if [ "$CHANGES" -gt "0" ]
+            if [ "$CHANGES" -gt "0" ]
-        then
+            then
-          git status
+              git status
-          git commit -m "push back localazy update"
+              git commit -m "push back localazy update"
-          git push gitlab_origin HEAD:${CI_COMMIT_REF_NAME}
+              git push gitlab_origin HEAD:${CI_COMMIT_REF_NAME}
-          # git push https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.knecon.com/redactmanager/red-ui.git
+              # git push https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.knecon.com/redactmanager/red-ui.git
-          # git push
+              # git push
-        fi
+            fi
-  rules:
+    rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+        - if: $CI_PIPELINE_SOURCE == "schedule"

angular.json

@@ -50,7 +50,7 @@
               {
                 "glob": "**/*",
                 "input": "node_modules/@pdftron/webviewer/public/",
-                "output": "/assets/wv-resources/10.10.1/"
+                "output": "/assets/wv-resources/11.1.0/"
               },
               {
                 "glob": "**/*",
@@ -73,7 +73,7 @@
             "stylePreprocessorOptions": {
               "includePaths": ["./apps/red-ui/src/assets/styles", "./libs/common-ui/src/assets/styles"]
             },
-            "scripts": ["node_modules/@pdftron/webviewer/webviewer.min.js", "node_modules/chart.js/auto/auto.cjs"],
+            "scripts": ["node_modules/chart.js/auto/auto.cjs"],
             "extractLicenses": false,
             "sourceMap": true,
             "optimization": false,

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

@@ -4,26 +4,27 @@ import { UserPreferenceService } from '@users/user-preference.service';
 import { getConfig } from '@iqser/common-ui';
 import { AppConfig } from '@red/domain';
 import { NavigationEnd, Router } from '@angular/router';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { APP_TYPE_PATHS } from '@common-ui/utils/constants';
+import { MatIconRegistry } from '@angular/material/icon';
+import { DomSanitizer } from '@angular/platform-browser';
+import { TenantsService } from '@common-ui/tenants';
 
-function loadCustomTheme() {
+export function loadCustomTheme(cssFileName: string) {
-    const cssFileName = getConfig<AppConfig>().THEME;
+    const head = document.getElementsByTagName('head')[0];
-
+    const link = document.createElement('link');
-    if (cssFileName) {
+    link.id = cssFileName;
-        const head = document.getElementsByTagName('head')[0];
+    link.rel = 'stylesheet';
-        const link = document.createElement('link');
+    link.type = 'text/css';
-        link.id = cssFileName;
+    link.href = 'assets/styles/themes/' + cssFileName + '.css';
-        link.rel = 'stylesheet';
+    link.media = 'all';
-        link.type = 'text/css';
+    head.appendChild(link);
-        link.href = 'assets/styles/themes/' + cssFileName + '.css';
-        link.media = 'all';
-        head.appendChild(link);
-    }
 }
 
 @Component({
     selector: 'redaction-root',
     templateUrl: './app.component.html',
+    standalone: false,
 })
 export class AppComponent {
     constructor(
@@ -34,9 +35,12 @@ export class AppComponent {
         userPreferenceService: UserPreferenceService,
         renderer: Renderer2,
         private readonly _router: Router,
+        private readonly _iconRegistry: MatIconRegistry,
+        private readonly _sanitizer: DomSanitizer,
+        private readonly _tenantsService: TenantsService,
     ) {
+        const config = getConfig<AppConfig>();
         renderer.addClass(document.body, userPreferenceService.getTheme());
-        loadCustomTheme();
 
         const removeQueryParams = _router.events.pipe(
             filter((event): event is NavigationEnd => event instanceof NavigationEnd),
@@ -47,9 +51,25 @@ export class AppComponent {
         );
         removeQueryParams.subscribe();
 
-        if (getConfig().IS_DOCUMINE) {
+        this._tenantsService
-            document.getElementById('favicon').setAttribute('href', 'assets/icons/documine-logo.ico');
+            .waitForSettingTenant()
-        }
+            .pipe(
+                tap(() => {
+                    const isDocumine = this._tenantsService.activeTenant.documine;
+                    const logo = isDocumine ? 'documine' : 'redaction';
+                    _iconRegistry.addSvgIconInNamespace(
+                        'iqser',
+                        'logo',
+                        _sanitizer.bypassSecurityTrustResourceUrl(`/assets/icons/general/${logo}-logo.svg`),
+                    );
+                    if (isDocumine) {
+                        document.getElementById('favicon').setAttribute('href', 'assets/icons/documine-logo.ico');
+                    }
+                    loadCustomTheme(isDocumine ? APP_TYPE_PATHS.SCM : APP_TYPE_PATHS.REDACT);
+                }),
+                take(1),
+            )
+            .subscribe();
     }
 
     #removeKeycloakQueryParams() {

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

@@ -1,6 +1,6 @@
 import { APP_BASE_HREF, DatePipe as BaseDatePipe } from '@angular/common';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import { ENVIRONMENT_INITIALIZER, ErrorHandler, inject, NgModule } from '@angular/core';
+import { ErrorHandler, inject, NgModule, provideEnvironmentInitializer } from '@angular/core';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIcon } from '@angular/material/icon';
 import { MatMenu, MatMenuContent, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
@@ -117,7 +117,7 @@ export const appModuleFactory = (config: AppConfig) => {
                 resetTimeoutOnDuplicate: true,
             }),
             TenantsModule.forRoot(),
-            IqserTranslateModule.forRoot({ pathPrefix: config.BASE_TRANSLATIONS_DIRECTORY || '/assets/i18n/redact/' }),
+            IqserTranslateModule.forRoot({ pathPrefix: config.BASE_TRANSLATIONS_DIRECTORY }),
             IqserLoadingModule.forRoot(),
             ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
             LoggerModule.forRoot(undefined, {
@@ -135,20 +135,20 @@ export const appModuleFactory = (config: AppConfig) => {
                         features: {
                             ANNOTATIONS: {
                                 color: 'aqua',
-                                enabled: true,
+                                enabled: false,
                                 level: NgxLoggerLevel.DEBUG,
                             },
                             FILTERS: {
                                 enabled: false,
                             },
                             TENANTS: {
-                                enabled: true,
+                                enabled: false,
                             },
                             ROUTES: {
-                                enabled: true,
+                                enabled: false,
                             },
                             PDF: {
-                                enabled: true,
+                                enabled: false,
                             },
                             FILE: {
                                 enabled: false,
@@ -171,6 +171,9 @@ export const appModuleFactory = (config: AppConfig) => {
                             DOSSIERS_CHANGES: {
                                 enabled: false,
                             },
+                            GUARDS: {
+                                enabled: false,
+                            },
                         },
                     } as ILoggerConfig,
                 },
@@ -230,14 +233,10 @@ export const appModuleFactory = (config: AppConfig) => {
                 provide: ErrorHandler,
                 useClass: GlobalErrorHandler,
             },
-            {
+            provideEnvironmentInitializer(async () => {
-                provide: ENVIRONMENT_INITIALIZER,
+                const languageService = inject(LanguageService);
-                multi: true,
+                return languageService.setInitialLanguage();
-                useValue: async () => {
+            }),
-                    const languageService = inject(LanguageService);
-                    return languageService.setInitialLanguage();
-                },
-            },
             {
                 provide: MAX_RETRIES_ON_SERVER_ERROR,
                 useFactory: () => config.MAX_RETRIES_ON_SERVER_ERROR,
@@ -258,6 +257,7 @@ export const appModuleFactory = (config: AppConfig) => {
                 provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
                 useValue: {
                     disableTooltipInteractivity: true,
+                    showDelay: 1,
                 },
             },
             BaseDatePipe,

apps/red-ui/src/app/components/auth-error/auth-error.component.ts

@@ -7,6 +7,7 @@ import { AppConfig } from '@red/domain';
     selector: 'redaction-auth-error',
     templateUrl: './auth-error.component.html',
     styleUrls: ['./auth-error.component.scss'],
+    standalone: false,
 })
 export class AuthErrorComponent {
     readonly #config = getConfig<AppConfig>();

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

@@ -20,6 +20,7 @@ const isSearchScreen: (url: string) => boolean = url => url.includes('/search');
 @Component({
     templateUrl: './base-screen.component.html',
     styleUrls: ['./base-screen.component.scss'],
+    standalone: false,
 })
 export class BaseScreenComponent {
     readonly roles = Roles;

apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts

@@ -7,6 +7,7 @@ import { Breadcrumb, BreadcrumbDisplayType, BreadcrumbsService } from '@services
     selector: 'redaction-breadcrumbs',
     templateUrl: './breadcrumbs.component.html',
     styleUrls: ['./breadcrumbs.component.scss'],
+    standalone: false,
 })
 export class BreadcrumbsComponent {
     constructor(readonly breadcrumbsService: BreadcrumbsService) {}

apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts

@@ -13,6 +13,7 @@ import { firstValueFrom } from 'rxjs';
         entitiesService: FileDownloadService,
         component: DownloadsListScreenComponent,
     }),
+    standalone: false,
 })
 export class DownloadsListScreenComponent extends ListingComponent<DownloadStatus> implements OnDestroy {
     readonly #interval: number;

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

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

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

@@ -25,6 +25,7 @@ function chronologically(first: string, second: string) {
     selector: 'redaction-notifications',
     templateUrl: './notifications.component.html',
     styleUrls: ['./notifications.component.scss'],
+    standalone: false,
 })
 export class NotificationsComponent {
     readonly hasUnreadNotifications$: Observable<boolean>;

apps/red-ui/src/app/components/skeleton/dashboard-skeleton/dashboard-skeleton.component.ts

@@ -5,5 +5,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
     templateUrl: './dashboard-skeleton.component.html',
     styleUrls: ['./dashboard-skeleton.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class DashboardSkeletonComponent {}

apps/red-ui/src/app/components/skeleton/dossier-skeleton/dossier-skeleton.component.ts

@@ -5,6 +5,7 @@ import { ChangeDetectionStrategy, Component, OnInit, TemplateRef, ViewChild } fr
     templateUrl: './dossier-skeleton.component.html',
     styleUrls: ['./dossier-skeleton.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class DossierSkeletonComponent implements OnInit {
     @ViewChild('workload1', { static: true }) workload1: TemplateRef<unknown>;

apps/red-ui/src/app/components/skeleton/skeleton-stats/skeleton-stats.component.ts

@@ -5,5 +5,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
     templateUrl: './skeleton-stats.component.html',
     styleUrls: ['./skeleton-stats.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class SkeletonStatsComponent {}

apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.ts

@@ -6,6 +6,7 @@ import { Title } from '@angular/platform-browser';
     templateUrl: './skeleton-top-bar.component.html',
     styleUrls: ['./skeleton-top-bar.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class SkeletonTopBarComponent {
     constructor(readonly titleService: Title) {}

apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.ts

@@ -9,6 +9,7 @@ import { MatMenuTrigger } from '@angular/material/menu';
     templateUrl: './spotlight-search.component.html',
     styleUrls: ['./spotlight-search.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class SpotlightSearchComponent {
     @Input() actions: readonly SpotlightSearchAction[];

apps/red-ui/src/app/components/tenants-menu/tenants-menu.component.ts

@@ -9,6 +9,7 @@ interface ITenant extends IStoredTenantId {
     selector: 'app-tenants-menu',
     templateUrl: './tenants-menu.component.html',
     styleUrls: ['./tenants-menu.component.scss'],
+    standalone: false,
 })
 export class TenantsMenuComponent {
     readonly tenantsService = inject(TenantsService);

apps/red-ui/src/app/components/user-menu/user-menu.component.ts

@@ -20,6 +20,7 @@ interface MenuItem {
     selector: 'app-user-menu',
     templateUrl: './user-menu.component.html',
     styleUrls: ['./user-menu.component.scss'],
+    standalone: false,
 })
 export class UserMenuComponent {
     readonly currentUser = getCurrentUser<User>();

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

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

apps/red-ui/src/app/guards/if-logged-in.guard.ts

@@ -40,8 +40,7 @@ export function ifLoggedIn(): AsyncGuard {
 
             logger.info('[KEYCLOAK] Keycloak init...');
             await keycloakInitializer(tenant);
-            logger.info('[KEYCLOAK] Keycloak init done!');
+            logger.info('[KEYCLOAK] Keycloak init done for tenant: ', { tenant });
-            console.log({ tenant });
             await tenantsService.selectTenant(tenant);
             await usersService.initialize();
             await licenseService.loadLicenses();
@@ -51,6 +50,7 @@ export function ifLoggedIn(): AsyncGuard {
                 const jwtToken = jwtDecode(token) as JwtToken;
                 const authTime = (jwtToken.auth_time || jwtToken.iat).toString();
                 localStorage.setItem('authTime', authTime);
+                localStorage.setItem('token', token);
             }
         }
 

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

@@ -16,11 +16,7 @@ export const canForceRedaction = (annotation: AnnotationWrapper, canAddRedaction
 export const canAcceptRecommendation = (annotation: AnnotationWrapper) => annotation.isRecommendation && !annotation.pending;
 
 export const canMarkAsFalsePositive = (annotation: AnnotationWrapper, annotationEntity: Dictionary) =>
-    annotation.canBeMarkedAsFalsePositive &&
+    annotation.canBeMarkedAsFalsePositive && !annotation.hasBeenResizedLocally && annotationEntity?.hasDictionary;
-    !annotation.hasBeenResizedLocally &&
-    !annotation.isRemovedLocally &&
-    !annotation.hasBeenForcedRedaction &&
-    annotationEntity?.hasDictionary;
 
 export const canRemoveOnlyHere = (annotation: AnnotationWrapper, canAddRedaction: boolean, autoAnalysisDisabled: boolean) =>
     canAddRedaction &&
@@ -73,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/models/file/annotation.wrapper.ts

@@ -40,7 +40,7 @@ export class AnnotationWrapper implements IListable {
     typeLabel?: string;
     color: string;
     numberOfComments = 0;
-    firstTopLeftPoint: IPoint;
+    firstBottomLeftPoint: IPoint;
     shortContent: string;
     content: AnnotationContent;
     value: string;
@@ -84,7 +84,10 @@ export class AnnotationWrapper implements IListable {
     }
 
     get isRedactedImageHint() {
-        return this.IMAGE_HINT && this.superType === SuperTypes.Redaction;
+        return (
+            (this.IMAGE_HINT && this.superType === SuperTypes.Redaction) ||
+            (this.IMAGE_HINT && this.superType === SuperTypes.ManualRedaction)
+        );
     }
 
     get isSkippedImageHint() {
@@ -109,7 +112,10 @@ export class AnnotationWrapper implements IListable {
 
     get canBeMarkedAsFalsePositive() {
         return (
-            (this.isRecommendation || this.superType === SuperTypes.Redaction || (this.isSkipped && this.isDictBased)) &&
+            (this.isRecommendation ||
+                this.superType === SuperTypes.Redaction ||
+                (this.isSkipped && this.isDictBased) ||
+                (this.isRemovedLocally && this.isDictBased)) &&
             !this.isImage &&
             !this.imported &&
             !this.pending &&
@@ -193,11 +199,11 @@ export class AnnotationWrapper implements IListable {
     }
 
     get x() {
-        return this.firstTopLeftPoint.x;
+        return this.firstBottomLeftPoint.x;
     }
 
     get y() {
-        return this.firstTopLeftPoint.y;
+        return this.firstBottomLeftPoint.y;
     }
 
     get legalBasis() {
@@ -222,7 +228,7 @@ export class AnnotationWrapper implements IListable {
         annotationWrapper.value = 'Imported';
         annotationWrapper.color = earmark.hexColor;
         annotationWrapper.positions = earmark.positions;
-        annotationWrapper.firstTopLeftPoint = earmark.positions[0]?.topLeft;
+        annotationWrapper.firstBottomLeftPoint = earmark.positions[0]?.topLeft;
         annotationWrapper.superTypeLabel = annotationTypesTranslations[annotationWrapper.superType];
 
         return annotationWrapper;
@@ -243,7 +249,7 @@ export class AnnotationWrapper implements IListable {
         annotationWrapper.isChangeLogEntry = logEntry.state === EntryStates.REMOVED || !!changeLogType;
         annotationWrapper.type = logEntry.type;
         annotationWrapper.value = logEntry.value;
-        annotationWrapper.firstTopLeftPoint = { x: logEntry.positions[0].rectangle[0], y: logEntry.positions[0].rectangle[1] };
+        annotationWrapper.firstBottomLeftPoint = { x: logEntry.positions[0].rectangle[0], y: logEntry.positions[0].rectangle[1] };
         annotationWrapper.pageNumber = logEntry.positions[0].pageNumber;
         annotationWrapper.positions = logEntry.positions.map(p => ({
             page: p.pageNumber,
@@ -372,7 +378,7 @@ export class AnnotationWrapper implements IListable {
 
     static #getShortContent(annotationWrapper: AnnotationWrapper, legalBasisList: ILegalBasis[]) {
         if (annotationWrapper.legalBasis) {
-            const lb = legalBasisList.find(lbm => lbm.reason?.toLowerCase().includes(annotationWrapper.legalBasis.toLowerCase()));
+            const lb = legalBasisList.find(lbm => lbm.technicalName?.toLowerCase().includes(annotationWrapper.legalBasis.toLowerCase()));
             if (lb) {
                 return lb.name;
             }

apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts

@@ -21,7 +21,6 @@ interface NavItem {
     templateUrl: './account-side-nav.component.html',
     styleUrls: ['./account-side-nav.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [SideNavComponent, TranslateModule, NgForOf, NgIf, RouterLinkActive, RouterLink],
 })
 export class AccountSideNavComponent {

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

@@ -8,10 +8,11 @@
             <div class="content-container full-height">
                 <div class="overlay-shadow"></div>
                 <div [ngClass]="!isWarningsScreen && 'dialog'">
-                    <div *ngIf="!isWarningsScreen" class="dialog-header">
+                    @if (!isWarningsScreen) {
-                        <div class="heading-l" [translate]="translations[path]"></div>
+                        <div class="dialog-header">
-                    </div>
+                            <div class="heading-l" [translate]="translations[path]"></div>
-
+                        </div>
+                    }
                     <router-outlet></router-outlet>
                 </div>
             </div>

apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, OnInit, ViewContainerRef } from '@angular/core';
 import { Router, RouterOutlet } from '@angular/router';
 import { accountTranslations } from '@translations/account-translations';
-import { NgClass, NgIf } from '@angular/common';
+import { NgClass } from '@angular/common';
 import { AccountSideNavComponent } from '../account-side-nav/account-side-nav.component';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -10,8 +10,7 @@ import { TranslateModule } from '@ngx-translate/core';
     templateUrl: './base-account-screen-component.html',
     styleUrls: ['./base-account-screen-component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
+    imports: [NgClass, RouterOutlet, AccountSideNavComponent, TranslateModule],
-    imports: [NgClass, NgIf, RouterOutlet, AccountSideNavComponent, TranslateModule],
 })
 export class BaseAccountScreenComponent implements OnInit {
     readonly translations = accountTranslations;

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

@@ -25,7 +25,6 @@ const RSS_EXCLUDED_SETTINGS = ['USER_PROMOTED_TO_APPROVER', 'USER_DEGRADED_TO_RE
     templateUrl: './notifications-screen.component.html',
     styleUrls: ['./notifications-screen.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [ReactiveFormsModule, NgForOf, MatSlideToggle, TranslateModule, NgIf, MatCheckbox, IconButtonComponent],
 })
 export class NotificationsScreenComponent extends BaseFormComponent implements OnInit {

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

@@ -41,7 +41,6 @@ interface DefaultOptionsForm {
     selector: 'redaction-dialog-defaults',
     templateUrl: './dialog-defaults.component.html',
     styleUrl: './dialog-defaults.component.scss',
-    standalone: true,
     imports: [ReactiveFormsModule, TranslateModule, MatFormField, MatSelect, MatOption, NgForOf, MatCheckbox, NgIf, IconButtonComponent],
 })
 export class DialogDefaultsComponent extends BaseFormComponent {

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

@@ -44,7 +44,6 @@ const Screens = {
     templateUrl: './preferences.component.html',
     styleUrls: ['./preferences.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         DialogDefaultsComponent,
         NgClass,

apps/red-ui/src/app/modules/account/screens/user-profile/confirm-password-dialog/confirm-password-dialog.component.ts

@@ -10,7 +10,6 @@ interface FormType {
 
 @Component({
     templateUrl: './confirm-password-dialog.component.html',
-    standalone: true,
     imports: [ReactiveFormsModule, IconButtonComponent, TranslateModule, CircleButtonComponent],
 })
 export class ConfirmPasswordDialogComponent extends BaseDialogComponent {

apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.html

@@ -16,14 +16,16 @@
                 <input formControlName="lastName" name="lastName" type="text" />
             </div>
 
-            <div *ngIf="devMode" class="iqser-input-group">
+            <div class="iqser-input-group">
                 <label [translate]="'top-bar.navigation-items.my-account.children.language.label'"></label>
                 <mat-form-field>
                     <mat-select formControlName="language">
                         <mat-select-trigger>{{ languageSelectLabel() | translate }}</mat-select-trigger>
-                        <mat-option *ngFor="let language of languages" [value]="language">
+                        @for (language of languages; track language) {
-                            {{ translations[language] | translate }}
+                            <mat-option [value]="language">
-                        </mat-option>
+                                {{ translations[language] | translate }}
+                            </mat-option>
+                        }
                     </mat-select>
                 </mat-form-field>
             </div>
@@ -32,11 +34,13 @@
                 <a (click)="resetPassword()" target="_blank"> {{ 'user-profile-screen.actions.change-password' | translate }}</a>
             </div>
 
-            <div *ngIf="devMode" class="iqser-input-group">
+            @if (devMode) {
-                <mat-slide-toggle color="primary" formControlName="darkTheme">
+                <div class="iqser-input-group">
-                    {{ 'user-profile-screen.form.dark-theme' | translate }}
+                    <mat-slide-toggle color="primary" formControlName="darkTheme">
-                </mat-slide-toggle>
+                        {{ 'user-profile-screen.form.dark-theme' | translate }}
-            </div>
+                    </mat-slide-toggle>
+                </div>
+            }
         </div>
     </div>
 

apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts

@@ -17,7 +17,6 @@ import { UserPreferenceService } from '@users/user-preference.service';
 import { UserService } from '@users/user.service';
 import { firstValueFrom } from 'rxjs';
 import { UserProfileDialogService } from '../services/user-profile-dialog.service';
-import { NgForOf, NgIf } from '@angular/common';
 import { MatFormField } from '@angular/material/form-field';
 import { MatOption, MatSelect, MatSelectTrigger } from '@angular/material/select';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
@@ -37,14 +36,11 @@ interface UserProfileForm {
     templateUrl: './user-profile-screen.component.html',
     styleUrls: ['./user-profile-screen.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         ReactiveFormsModule,
-        NgIf,
         MatFormField,
         MatSelect,
         MatOption,
-        NgForOf,
         TranslateModule,
         MatSlideToggle,
         IconButtonComponent,

apps/red-ui/src/app/modules/admin/admin.routes.ts

@@ -1,22 +1,24 @@
-import { CompositeRouteGuard, IqserPermissionsGuard, IqserRoutes } from '@iqser/common-ui';
+import { inject, provideEnvironmentInitializer } from '@angular/core';
-import { RedRoleGuard } from '@users/red-role.guard';
-import { EntitiesListingScreenComponent } from './screens/entities-listing/entities-listing-screen.component';
 import { PendingChangesGuard } from '@guards/can-deactivate.guard';
-import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component';
+import { templateExistsWhenEnteringAdmin } from '@guards/dossier-template-exists.guard';
-import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component';
+import { DossierTemplatesGuard } from '@guards/dossier-templates.guard';
-import { DigitalSignatureScreenComponent } from './screens/digital-signature/digital-signature-screen.component';
+import { entityExistsGuard } from '@guards/entity-exists-guard.service';
-import { AuditScreenComponent } from './screens/audit/audit-screen.component';
+import { PermissionsGuard } from '@guards/permissions-guard';
-import { GeneralConfigScreenComponent } from './screens/general-config/general-config-screen.component';
+import { CompositeRouteGuard, IqserPermissionsGuard, IqserRoutes } from '@iqser/common-ui';
+import { IqserAuthGuard } from '@iqser/common-ui/lib/users';
+import { DOSSIER_TEMPLATE_ID, ENTITY_TYPE } from '@red/domain';
+import { CopilotService } from '@services/copilot.service';
+import { RedRoleGuard } from '@users/red-role.guard';
+import { Roles } from '@users/roles';
 import { BaseAdminScreenComponent } from './base-admin-screen/base-admin-screen.component';
 import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component';
-import { DossierTemplatesGuard } from '@guards/dossier-templates.guard';
-import { DOSSIER_TEMPLATE_ID, ENTITY_TYPE } from '@red/domain';
-import { templateExistsWhenEnteringAdmin } from '@guards/dossier-template-exists.guard';
-import { entityExistsGuard } from '@guards/entity-exists-guard.service';
 import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component';
-import { PermissionsGuard } from '@guards/permissions-guard';
+import { AuditScreenComponent } from './screens/audit/audit-screen.component';
-import { Roles } from '@users/roles';
+import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component';
-import { IqserAuthGuard } from '@iqser/common-ui/lib/users';
+import { DigitalSignatureScreenComponent } from './screens/digital-signature/digital-signature-screen.component';
+import { EntitiesListingScreenComponent } from './screens/entities-listing/entities-listing-screen.component';
+import { GeneralConfigScreenComponent } from './screens/general-config/general-config-screen.component';
+import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component';
 import { AdminDialogService } from './services/admin-dialog.service';
 import { AuditService } from './services/audit.service';
 import { DigitalSignatureService } from './services/digital-signature.service';
@@ -78,7 +80,12 @@ const dossierTemplateIdRoutes: IqserRoutes = [
                     },
                     type: 'ENTITY',
                 },
-                providers: [RulesService],
+                providers: [
+                    RulesService,
+                    provideEnvironmentInitializer(() => {
+                        return inject(CopilotService).connectAsync('/api/llm/llm-websocket');
+                    }),
+                ],
             },
             {
                 path: 'component-rules',

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

@@ -5,7 +5,6 @@ import { RouterOutlet } from '@angular/router';
 @Component({
     templateUrl: './base-admin-screen.component.html',
     styleUrls: ['./base-admin-screen.component.scss'],
-    standalone: true,
     imports: [AdminSideNavComponent, RouterOutlet],
 })
 export class BaseAdminScreenComponent {}

apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.ts

@@ -9,7 +9,6 @@ import { AdminSideNavComponent } from '../shared/components/admin-side-nav/admin
 @Component({
     templateUrl: './base-dossier-template-screen.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         DossierTemplateBreadcrumbsComponent,
         DossierTemplateActionsComponent,

apps/red-ui/src/app/modules/admin/base-entity-screen/base-entity-screen.component.ts

@@ -18,7 +18,6 @@ import { AdminSideNavComponent } from '../shared/components/admin-side-nav/admin
 @Component({
     templateUrl: './base-entity-screen.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         DossierTemplateBreadcrumbsComponent,
         CircleButtonComponent,

apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.html

@@ -23,7 +23,7 @@
 
 <div class="mt-44">
     <redaction-donut-chart
-        [config]="chartConfig"
+        [config]="chartConfig()"
         [radius]="63"
         [strokeWidth]="15"
         [subtitles]="['user-stats.chart.users' | translate]"

apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, input, Input, output, Output } from '@angular/core';
 import { DonutChartConfig } from '@red/domain';
 import { CircleButtonComponent } from '@iqser/common-ui';
 import { TranslateModule } from '@ngx-translate/core';
@@ -8,10 +8,9 @@ import { DonutChartComponent } from '@shared/components/donut-chart/donut-chart.
     selector: 'redaction-users-stats',
     templateUrl: './users-stats.component.html',
     styleUrls: ['./users-stats.component.scss'],
-    standalone: true,
     imports: [CircleButtonComponent, TranslateModule, DonutChartComponent],
 })
 export class UsersStatsComponent {
-    @Output() toggleCollapse = new EventEmitter();
+    readonly chartConfig = input.required<DonutChartConfig[]>();
-    @Input() chartConfig: DonutChartConfig[];
+    readonly toggleCollapse = output();
 }

apps/red-ui/src/app/modules/admin/dialogs/add-clone-dossier-template-dialog/add-clone-dossier-template-dialog.component.ts

@@ -16,7 +16,6 @@ export interface CloneTemplateData {
 @Component({
     templateUrl: './add-clone-dossier-template-dialog.component.html',
     styleUrls: ['./add-clone-dossier-template-dialog.component.scss'],
-    standalone: true,
     imports: [TranslateModule, ReactiveFormsModule, IconButtonComponent, CircleButtonComponent],
 })
 export class AddCloneDossierTemplateDialogComponent extends BaseDialogComponent {

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

@@ -8,7 +8,6 @@ import { UserDetailsComponent } from './user-details/user-details.component';
 @Component({
     selector: 'redaction-add-edit-user-dialog',
     templateUrl: './add-edit-user-dialog.component.html',
-    standalone: true,
     imports: [UserDetailsComponent, ResetPasswordComponent, CircleButtonComponent],
 })
 export class AddEditUserDialogComponent extends BaseDialogComponent {

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

@@ -10,7 +10,6 @@ import { NamePipe } from '@common-ui/users/name.pipe';
 @Component({
     selector: 'redaction-reset-password',
     templateUrl: './reset-password.component.html',
-    standalone: true,
     imports: [TranslateModule, NamePipe, ReactiveFormsModule, IconButtonComponent],
 })
 export class ResetPasswordComponent {

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

@@ -32,7 +32,7 @@
                     [formControlName]="role"
                     color="primary"
                 >
-                    {{ translations[role] | translate }}
+                    {{ translations[role] | translate: { count: 1 } }}
                 </mat-checkbox>
             </div>
         </div>

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

@@ -3,10 +3,8 @@ import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup, Validators }
 import { AdminDialogService } from '../../../services/admin-dialog.service';
 import { BaseFormComponent, IconButtonComponent, LoadingService, Toaster } from '@iqser/common-ui';
 import { rolesTranslations } from '@translations/roles-translations';
-import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { User } from '@red/domain';
 import { UserService } from '@users/user.service';
-import { HttpStatusCode } from '@angular/common/http';
 import { firstValueFrom } from 'rxjs';
 import { IProfileUpdateRequest } from '@iqser/common-ui/lib/users';
 import { TranslateModule } from '@ngx-translate/core';
@@ -17,7 +15,6 @@ import { NgForOf, NgIf } from '@angular/common';
     selector: 'redaction-user-details',
     templateUrl: './user-details.component.html',
     styleUrls: ['./user-details.component.scss'],
-    standalone: true,
     imports: [TranslateModule, ReactiveFormsModule, MatCheckbox, NgForOf, IconButtonComponent, NgIf],
 })
 export class UserDetailsComponent extends BaseFormComponent implements OnInit {
@@ -101,11 +98,7 @@ export class UserDetailsComponent extends BaseFormComponent implements OnInit {
                     this.closeDialog.emit(true);
                 })
                 .catch(error => {
-                    if (error.status === HttpStatusCode.Conflict) {
+                    this._toaster.error(null, { error });
-                        this._toaster.error(_('add-edit-user.error.email-already-used'));
-                    } else {
-                        this._toaster.error(_('add-edit-user.error.generic'));
-                    }
                     this._loadingService.stop();
                 });
         } else {

apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts

@@ -19,7 +19,6 @@ interface DialogData {
 @Component({
     templateUrl: './add-entity-dialog.component.html',
     styleUrls: ['./add-entity-dialog.component.scss'],
-    standalone: true,
     imports: [AddEditEntityComponent, TranslateModule, IconButtonComponent, NgIf, CircleButtonComponent, HelpButtonComponent],
 })
 export class AddEntityDialogComponent extends BaseDialogComponent {

apps/red-ui/src/app/modules/admin/dialogs/audit-info-dialog/audit-info-dialog.component.ts

@@ -16,7 +16,6 @@ type OrderFn = (a: KeyValue<string, string>, b: KeyValue<string, string>) => num
     templateUrl: './audit-info-dialog.component.html',
     styleUrls: ['./audit-info-dialog.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [TranslateModule, NgForOf, KeyValuePipe, HumanizePipe, CircleButtonComponent, JsonPipe],
 })
 export class AuditInfoDialogComponent extends BaseDialogComponent {

apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts

@@ -20,7 +20,6 @@ const KMS_SIGNATURE_DIALOG_WIDTH = '810px';
 @Component({
     templateUrl: './configure-certificate-dialog.component.html',
     styleUrls: ['./configure-certificate-dialog.component.scss'],
-    standalone: true,
     imports: [
         DetailsRadioComponent,
         NgIf,

apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.ts

@@ -13,7 +13,6 @@ import { TranslateModule } from '@ngx-translate/core';
     templateUrl: './kms-signature-configuration.component.html',
     styleUrls: ['./kms-signature-configuration.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [UploadFileComponent, ReactiveFormsModule, NgIf, TranslateModule],
 })
 export class KmsSignatureConfigurationComponent extends BaseSignatureConfigurationComponent implements OnInit {

apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.ts

@@ -14,7 +14,6 @@ import { TranslateModule } from '@ngx-translate/core';
     templateUrl: './pkcs-signature-configuration.component.html',
     styleUrls: ['./pkcs-signature-configuration.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [UploadFileComponent, ReactiveFormsModule, NgIf, TranslateModule],
 })
 export class PkcsSignatureConfigurationComponent extends BaseSignatureConfigurationComponent implements OnInit {

apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts

@@ -20,7 +20,6 @@ interface IEditColorData {
 @Component({
     templateUrl: './edit-color-dialog.component.html',
     styleUrls: ['./edit-color-dialog.component.scss'],
-    standalone: true,
     imports: [ReactiveFormsModule, TranslateModule, ColorPickerModule, MatIcon, NgIf, IconButtonComponent, CircleButtonComponent],
 })
 export class EditColorDialogComponent extends BaseDialogComponent {

apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts

@@ -9,7 +9,6 @@ import { TranslateModule } from '@ngx-translate/core';
 @Component({
     selector: 'redaction-smtp-auth-dialog',
     templateUrl: './smtp-auth-dialog.component.html',
-    standalone: true,
     imports: [ReactiveFormsModule, TranslateModule, IconButtonComponent, CircleButtonComponent, MatDialogClose],
 })
 export class SmtpAuthDialogComponent extends BaseDialogComponent {

apps/red-ui/src/app/modules/admin/dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component.ts

@@ -7,7 +7,6 @@ import { TranslateModule } from '@ngx-translate/core';
     templateUrl: './upload-dictionary-dialog.component.html',
     styleUrls: ['./upload-dictionary-dialog.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [IconButtonComponent, TranslateModule],
 })
 export class UploadDictionaryDialogComponent {

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

@@ -17,7 +17,7 @@ import { RouterHistoryService } from '@services/router-history.service';
 import { auditCategoriesTranslations } from '@translations/audit-categories-translations';
 import { Roles } from '@users/roles';
 import { applyIntervalConstraints } from '@utils/date-inputs-utils';
-import { Dayjs } from 'dayjs';
+import dayjs, { Dayjs } from 'dayjs';
 import { firstValueFrom } from 'rxjs';
 import { AdminDialogService } from '../../services/admin-dialog.service';
 import { AuditService } from '../../services/audit.service';
@@ -36,7 +36,6 @@ const PAGE_SIZE = 50;
     templateUrl: './audit-screen.component.html',
     styleUrls: ['./audit-screen.component.scss'],
     providers: listingProvidersFactory(AuditScreenComponent),
-    standalone: true,
     imports: [
         IqserListingModule,
         TranslateModule,
@@ -139,16 +138,9 @@ export class AuditScreenComponent extends ListingComponent<Audit> implements OnI
         const promises = [];
         const category = this.form.get('category').value;
         const userId = this.form.get('userId').value;
-        const from = this.form.get('from').value;
+        const from = this.form.get('from').value ? dayjs(this.form.get('from').value).startOf('day').toISOString() : null;
-        let to = this.form.get('to').value;
+        const to = this.form.get('to').value ? dayjs(this.form.get('to').value).endOf('day').toISOString() : null;
-        if (to) {
+
-            const hoursLeft = new Date(to).getHours();
-            const minutesLeft = new Date(to).getMinutes();
-            to = to
-                .clone()
-                .add(24 - hoursLeft - 1, 'h')
-                .add(60 - minutesLeft - 1);
-        }
         const logsRequestBody: IAuditSearchRequest = {
             pageSize: PAGE_SIZE,
             page: page,

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

@@ -1,12 +1,18 @@
 import { Component, OnInit, signal } from '@angular/core';
-import { BaseFormComponent, CircleButtonComponent, IconButtonComponent, listingProvidersFactory, LoadingService } from '@iqser/common-ui';
+import {
+    BaseFormComponent,
+    CircleButtonComponent,
+    HasScrollbarDirective,
+    IconButtonComponent,
+    listingProvidersFactory,
+    LoadingService,
+} from '@iqser/common-ui';
 import { ComponentDefinitionsService } from '@services/entity-services/component-definitions.service';
 import { firstValueFrom } from 'rxjs';
 import { getParam } from '@common-ui/utils';
 import { DOSSIER_TEMPLATE_ID, IComponentDefinition } from '@red/domain';
 import { toObservable } from '@angular/core/rxjs-interop';
-import { InputWithActionComponent } from '@common-ui/inputs/input-with-action/input-with-action.component';
+import { CommonModule } from '@angular/common';
-import { CommonModule, NgIf } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { PermissionsService } from '@services/permissions.service';
 import { MatIcon } from '@angular/material/icon';
@@ -18,11 +24,8 @@ import { AdminDialogService } from '../../services/admin-dialog.service';
     templateUrl: './component-definitions.component.html',
     styleUrls: ['./component-definitions.component.scss'],
     providers: listingProvidersFactory(ComponentDefinitionsComponent),
-    standalone: true,
     imports: [
         IconButtonComponent,
-        InputWithActionComponent,
-        NgIf,
         TranslateModule,
         CommonModule,
         MatIcon,
@@ -32,6 +35,7 @@ import { AdminDialogService } from '../../services/admin-dialog.service';
         FormsModule,
         ReactiveFormsModule,
         CircleButtonComponent,
+        HasScrollbarDirective,
     ],
 })
 export default class ComponentDefinitionsComponent extends BaseFormComponent implements OnInit {
@@ -103,6 +107,7 @@ export default class ComponentDefinitionsComponent extends BaseFormComponent imp
         this._dialogService.openDialog('confirm', null, async () => {
             await firstValueFrom(this._componentDefinitionsService.deleteComponentDefinitions(this.#dossierTemplateId, [componentId]));
             await this.#loadData();
+            this.selectedComponent = null;
         });
     }
 

apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.html

@@ -42,6 +42,15 @@
                         type="text"
                     />
                 </div>
+                <div class="iqser-input-group required w-150">
+                    <label translate="add-edit-component-mapping.form.quote-char"></label>
+                    <input
+                        [placeholder]="'add-edit-component-mapping.form.quote-char-placeholder' | translate"
+                        formControlName="quoteChar"
+                        name="quoteChar"
+                        type="text"
+                    />
+                </div>
 
                 <div class="iqser-input-group required w-150">
                     <label translate="add-edit-component-mapping.form.encoding-type"></label>

apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts

@@ -7,7 +7,7 @@ import { NgForOf, NgIf } from '@angular/common';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatOption } from '@angular/material/autocomplete';
-import { MatSelect, MatSelectTrigger } from '@angular/material/select';
+import { MatSelect } from '@angular/material/select';
 import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations';
 import { firstValueFrom } from 'rxjs';
 import { ComponentMappingsService } from '@services/entity-services/component-mappings.service';
@@ -17,19 +17,20 @@ interface DialogData {
     dossierTemplateId: string;
     mapping: IComponentMapping;
 }
+
 interface DialogResult {
     id: string;
     name: string;
     file: Blob;
     encoding: string;
     delimiter: string;
+    quoteChar: string;
     fileName?: string;
 }
 
 @Component({
     templateUrl: './add-edit-component-mapping-dialog.component.html',
     styleUrls: ['./add-edit-component-mapping-dialog.component.scss'],
-    standalone: true,
     imports: [
         TranslateModule,
         ReactiveFormsModule,
@@ -39,7 +40,6 @@ interface DialogResult {
         CircleButtonComponent,
         MatDialogModule,
         MatOption,
-        MatSelectTrigger,
         MatSelect,
         IconButtonComponent,
         UploadFileComponent,
@@ -72,14 +72,14 @@ export class AddEditComponentMappingDialogComponent
             const file = new Blob([fileContent.body as Blob], { type: 'text/csv' });
             this.form.get('file').setValue(file);
             this.initialFormValue = this.form.getRawValue();
-            this.#disableEncodingAndDelimiter();
+            this.#disableEncodingAndQuoteCharAndDelimiter();
         }
     }
 
     changeFile(file: File) {
         this.form.get('file').setValue(file);
         this.form.get('fileName').setValue(file?.name);
-        this.#enableEncodingAndDelimiter();
+        this.#enableEncodingAndQuoteCharAndDelimiter();
     }
 
     save() {
@@ -93,16 +93,19 @@ export class AddEditComponentMappingDialogComponent
             fileName: [this.data?.mapping?.fileName, Validators.required],
             encoding: this.encodingTypeOptions.find(e => e === this.data?.mapping?.encoding) ?? this.encodingTypeOptions[0],
             delimiter: [this.data?.mapping?.delimiter ?? ',', Validators.required],
+            quoteChar: [this.data?.mapping?.quoteChar ?? '"', Validators.required],
         });
     }
 
-    #disableEncodingAndDelimiter() {
+    #disableEncodingAndQuoteCharAndDelimiter() {
         this.form.get('encoding').disable();
         this.form.get('delimiter').disable();
+        this.form.get('quoteChar').disable();
     }
 
-    #enableEncodingAndDelimiter() {
+    #enableEncodingAndQuoteCharAndDelimiter() {
         this.form.get('encoding').enable();
         this.form.get('delimiter').enable();
+        this.form.get('quoteChar').enable();
     }
 }

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

@@ -1,6 +1,5 @@
 import { AsyncPipe, NgIf } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
-import { RouterLink } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { InputWithActionComponent } from '@common-ui/inputs/input-with-action/input-with-action.component';
 import { getCurrentUser } from '@common-ui/users';
@@ -25,9 +24,6 @@ import { Roles } from '@users/roles';
 import { combineLatest, firstValueFrom } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 import { AdminDialogService } from '../../services/admin-dialog.service';
-import { AdminSideNavComponent } from '../../shared/components/admin-side-nav/admin-side-nav.component';
-import { DossierTemplateActionsComponent } from '../../shared/components/dossier-template-actions/dossier-template-actions.component';
-import { DossierTemplateBreadcrumbsComponent } from '../../shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component';
 import { AddEditComponentMappingDialogComponent } from './add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component';
 import { download } from '@utils/file-download-utils';
 import { MatTooltip } from '@angular/material/tooltip';
@@ -36,16 +32,11 @@ import { MatTooltip } from '@angular/material/tooltip';
     templateUrl: './component-mappings-screen.component.html',
     styleUrls: ['./component-mappings-screen.component.scss'],
     providers: listingProvidersFactory(ComponentMappingsScreenComponent),
-    standalone: true,
     imports: [
-        DossierTemplateBreadcrumbsComponent,
         AsyncPipe,
         NgIf,
-        DossierTemplateActionsComponent,
         CircleButtonComponent,
         TranslateModule,
-        RouterLink,
-        AdminSideNavComponent,
         IqserListingModule,
         InputWithActionComponent,
         IconButtonComponent,
@@ -99,8 +90,8 @@ export default class ComponentMappingsScreenComponent extends ListingComponent<C
         const result = await dialog.result();
         if (result) {
             this._loadingService.start();
-            const { id, name, encoding, delimiter, fileName } = result;
+            const { id, name, encoding, delimiter, fileName, quoteChar } = result;
-            const newMapping = { id, name, encoding, delimiter, fileName };
+            const newMapping = { id, name, encoding, delimiter, fileName, quoteChar };
             await firstValueFrom(
                 this._componentMappingService.createUpdateComponentMapping(this.#dossierTemplateId, newMapping, result.file),
             );

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

@@ -33,7 +33,6 @@ interface ListItem extends IListable {
     styleUrls: ['./default-colors-screen.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: listingProvidersFactory(DefaultColorsScreenComponent),
-    standalone: true,
     imports: [IqserListingModule, NgStyle, CircleButtonComponent, IqserAllowDirective, TranslateModule, AsyncPipe, NgIf],
 })
 export class DefaultColorsScreenComponent extends ListingComponent<ListItem> implements OnInit {

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

@@ -25,7 +25,6 @@ import { DigitalSignatureService } from '../../services/digital-signature.servic
     selector: 'redaction-digital-signature-screen',
     templateUrl: './digital-signature-screen.component.html',
     styleUrls: ['./digital-signature-screen.component.scss'],
-    standalone: true,
     imports: [
         IqserListingModule,
         EmptyStateComponent,

apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts

@@ -20,7 +20,6 @@ export interface AddEditDossierAttributeDialogData {
 @Component({
     templateUrl: './add-edit-dossier-attribute-dialog.component.html',
     styleUrls: ['./add-edit-dossier-attribute-dialog.component.scss'],
-    standalone: true,
     imports: [
         TranslateModule,
         ReactiveFormsModule,

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

@@ -35,7 +35,6 @@ import { TableItemComponent } from './table-item/table-item.component';
         entitiesService: DossierAttributesService,
         component: DossierAttributesListingScreenComponent,
     }),
-    standalone: true,
     imports: [
         IqserListingModule,
         TranslateModule,

apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/table-item/table-item.component.ts

@@ -10,7 +10,6 @@ import { NgIf } from '@angular/common';
     selector: 'redaction-table-item [attribute] [canEditDossierAttributes]',
     templateUrl: './table-item.component.html',
     styleUrls: ['./table-item.component.scss'],
-    standalone: true,
     imports: [MatTooltip, TranslateModule, CircleButtonComponent, NgIf],
 })
 export class TableItemComponent {

apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts

@@ -18,7 +18,6 @@ export interface AddEditDossierStateDialogData {
 @Component({
     templateUrl: './add-edit-dossier-state-dialog.component.html',
     styleUrls: ['./add-edit-dossier-state-dialog.component.scss'],
-    standalone: true,
     imports: [TranslateModule, ReactiveFormsModule, ColorPickerModule, MatIcon, NgIf, IconButtonComponent, CircleButtonComponent],
 })
 export class AddEditDossierStateDialogComponent extends BaseDialogComponent {

apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts

@@ -11,7 +11,7 @@ import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.se
 import { TranslateModule } from '@ngx-translate/core';
 import { MatCheckbox } from '@angular/material/checkbox';
 import { MatFormField } from '@angular/material/form-field';
-import { MatOption, MatSelect, MatSelectTrigger } from '@angular/material/select';
+import { MatOption, MatSelect } from '@angular/material/select';
 import { NgForOf, NgIf } from '@angular/common';
 
 export interface ConfirmDeleteDossierStateDialogData {
@@ -23,13 +23,11 @@ export interface ConfirmDeleteDossierStateDialogData {
 @Component({
     templateUrl: './confirm-delete-dossier-state-dialog.component.html',
     styleUrls: ['./confirm-delete-dossier-state-dialog.component.scss'],
-    standalone: true,
     imports: [
         TranslateModule,
         ReactiveFormsModule,
         MatCheckbox,
         MatFormField,
-        MatSelectTrigger,
         MatSelect,
         MatOption,
         NgForOf,

apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen/dossier-states-listing-screen.component.ts

@@ -33,7 +33,6 @@ import { DossierStatesTableItemComponent } from '../dossier-states-table-item/do
     templateUrl: './dossier-states-listing-screen.component.html',
     styleUrls: ['./dossier-states-listing-screen.component.scss'],
     providers: listingProvidersFactory(DossierStatesListingScreenComponent),
-    standalone: true,
     imports: [
         IqserListingModule,
         DonutChartComponent,

apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.ts

@@ -20,7 +20,6 @@ import { SnakeCasePipe } from '@common-ui/pipes/snake-case.pipe';
     selector: 'redaction-dossier-states-table-item',
     templateUrl: './dossier-states-table-item.component.html',
     styleUrls: ['./dossier-states-table-item.component.scss'],
-    standalone: true,
     imports: [MatTooltip, CircleButtonComponent, TranslateModule, NgIf, SnakeCasePipe],
 })
 export class DossierStatesTableItemComponent {

apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts

@@ -33,7 +33,6 @@ import { TableItemComponent } from '../table-item/table-item.component';
         entitiesService: DossierTemplatesService,
         component: DossierTemplatesListingScreenComponent,
     }),
-    standalone: true,
     imports: [
         IqserListingModule,
         TranslateModule,

apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts

@@ -17,7 +17,6 @@ import { DatePipe } from '@shared/pipes/date.pipe';
     templateUrl: './table-item.component.html',
     styleUrls: ['./table-item.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatTooltip, NgIf, AsyncPipe, MatIcon, TranslateModule, DatePipe, DossierTemplateActionsComponent, InitialsAvatarComponent],
 })
 export class TableItemComponent implements OnChanges {

apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html

@@ -87,6 +87,7 @@
                             [routerLink]="dict.routerLink"
                             [tooltip]="'entities-listing.action.edit' | translate"
                             icon="iqser:edit"
+                            iqserStopPropagation
                         ></iqser-circle-button>
                     </div>
                 </div>

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

@@ -11,6 +11,7 @@ import {
     ListingComponent,
     listingProvidersFactory,
     LoadingService,
+    StopPropagationDirective,
     TableColumnConfig,
 } from '@iqser/common-ui';
 import { getParam } from '@iqser/common-ui/lib/utils';
@@ -29,7 +30,6 @@ import { AdminDialogService } from '../../services/admin-dialog.service';
     templateUrl: './entities-listing-screen.component.html',
     styleUrls: ['./entities-listing-screen.component.scss'],
     providers: listingProvidersFactory(EntitiesListingScreenComponent),
-    standalone: true,
     imports: [
         IqserListingModule,
         TranslateModule,
@@ -41,6 +41,7 @@ import { AdminDialogService } from '../../services/admin-dialog.service';
         AnnotationIconComponent,
         AsyncPipe,
         RouterLink,
+        StopPropagationDirective,
     ],
 })
 export class EntitiesListingScreenComponent extends ListingComponent<Dictionary> implements OnInit {

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

@@ -16,7 +16,6 @@ import { AsyncPipe } from '@angular/common';
     templateUrl: './dictionary-screen.component.html',
     styleUrls: ['./dictionary-screen.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [AsyncPipe, DictionaryManagerComponent],
 })
 export class DictionaryScreenComponent implements OnInit {

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

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, HostListener, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { getConfig, HasScrollbarDirective, HelpButtonComponent, IconButtonComponent, IconButtonTypes } from '@iqser/common-ui';
+import { getConfig, HasScrollbarDirective, IconButtonComponent, IconButtonTypes } from '@iqser/common-ui';
 import { IqserEventTarget } from '@iqser/common-ui/lib/utils';
 import { Dictionary, DOSSIER_TEMPLATE_ID, ENTITY_TYPE } from '@red/domain';
 import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
@@ -17,17 +17,7 @@ import { TranslateModule } from '@ngx-translate/core';
     templateUrl: './entity-info.component.html',
     styleUrls: ['./entity-info.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
+    imports: [HasScrollbarDirective, MatIcon, NgIf, TranslateModule, AsyncPipe, IconButtonComponent, AddEditEntityComponent],
-    imports: [
-        HasScrollbarDirective,
-        MatIcon,
-        NgIf,
-        TranslateModule,
-        AsyncPipe,
-        IconButtonComponent,
-        AddEditEntityComponent,
-        HelpButtonComponent,
-    ],
 })
 export class EntityInfoComponent {
     @ViewChild(AddEditEntityComponent) private readonly _addEditEntityComponent: AddEditEntityComponent;

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

@@ -22,7 +22,6 @@ export interface AddEditFileAttributeDialogData {
 @Component({
     templateUrl: './add-edit-file-attribute-dialog.component.html',
     styleUrls: ['./add-edit-file-attribute-dialog.component.scss'],
-    standalone: true,
     imports: [
         ReactiveFormsModule,
         TranslateModule,

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

@@ -13,7 +13,6 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 @Component({
     templateUrl: './file-attributes-configurations-dialog.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         ReactiveFormsModule,
         MatSlideToggleModule,
@@ -58,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,
@@ -67,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-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts

@@ -2,8 +2,8 @@ import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MatFormField } from '@angular/material/form-field';
-import { MatMenu, MatMenuTrigger } from '@angular/material/menu';
+import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
-import { MatOption, MatSelect, MatSelectTrigger } from '@angular/material/select';
+import { MatOption, MatSelect } from '@angular/material/select';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ChevronButtonComponent } from '@common-ui/buttons/chevron-button';
@@ -19,7 +19,6 @@ import { fileAttributeTypesTranslations } from '@translations/file-attribute-typ
     templateUrl: './active-fields-listing.component.html',
     styleUrls: ['./active-fields-listing.component.scss'],
     providers: listingProvidersFactory(ActiveFieldsListingComponent),
-    standalone: true,
     imports: [
         IqserListingModule,
         CircleButtonComponent,
@@ -30,7 +29,6 @@ import { fileAttributeTypesTranslations } from '@translations/file-attribute-typ
         MatMenu,
         EditableInputComponent,
         MatFormField,
-        MatSelectTrigger,
         MatSelect,
         MatOption,
         FormsModule,
@@ -38,6 +36,7 @@ import { fileAttributeTypesTranslations } from '@translations/file-attribute-typ
         RoundCheckboxComponent,
         NgForOf,
         NgIf,
+        MatMenuItem,
     ],
 })
 export class ActiveFieldsListingComponent extends ListingComponent<IField> implements OnChanges {

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

@@ -4,7 +4,7 @@ import { AbstractControl, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGr
 import { MatAutocomplete, MatAutocompleteTrigger, MatOption } from '@angular/material/autocomplete';
 import { MAT_DIALOG_DATA, MatDialogClose, MatDialogRef } from '@angular/material/dialog';
 import { MatFormField } from '@angular/material/form-field';
-import { MatSelect, MatSelectTrigger } from '@angular/material/select';
+import { MatSelect } from '@angular/material/select';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { InputWithActionComponent } from '@common-ui/inputs/input-with-action/input-with-action.component';
 import {
@@ -38,7 +38,6 @@ export interface IFileAttributesCSVImportData {
     styleUrls: ['./file-attributes-csv-import-dialog.component.scss'],
     providers: listingProvidersFactory(),
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         ReactiveFormsModule,
         MatFormField,
@@ -46,7 +45,6 @@ export interface IFileAttributesCSVImportData {
         MatAutocomplete,
         AsyncPipe,
         MatOption,
-        MatSelectTrigger,
         MatSelect,
         CircleButtonComponent,
         NgIf,

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

@@ -46,7 +46,6 @@ import {
     templateUrl: './file-attributes-listing-screen.component.html',
     styleUrls: ['./file-attributes-listing-screen.component.scss'],
     providers: listingProvidersFactory(FileAttributesListingScreenComponent),
-    standalone: true,
     imports: [
         IqserListingModule,
         NgForOf,
@@ -86,6 +85,7 @@ export default class FileAttributesListingScreenComponent extends ListingCompone
         },
     ];
     readonly roles = Roles;
+    keyColumnValue: string = '';
 
     constructor(
         readonly permissionsService: PermissionsService,
@@ -172,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/screens/general-config/general-config-form/general-config-form.component.html

@@ -1,6 +1,5 @@
 <div class="dialog-header">
     <div class="heading-l" translate="general-config-screen.general.title"></div>
-    <div translate="general-config-screen.general.subtitle"></div>
 </div>
 <form (submit)="save()" *ngIf="form" [formGroup]="form">
     <div class="dialog-content">

apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts

@@ -13,7 +13,6 @@ import { MatSlideToggle } from '@angular/material/slide-toggle';
 @Component({
     selector: 'redaction-general-config-form',
     templateUrl: './general-config-form.component.html',
-    standalone: true,
     imports: [ReactiveFormsModule, TranslateModule, NgIf, MatSlideToggle, IconButtonComponent],
 })
 export class GeneralConfigFormComponent extends BaseFormComponent implements OnInit {

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

@@ -13,7 +13,6 @@ import { ILicenseFeature } from '@red/domain';
     selector: 'redaction-general-config-screen',
     templateUrl: './general-config-screen.component.html',
     styleUrls: ['./general-config-screen.component.scss'],
-    standalone: true,
     imports: [IqserListingModule, GeneralConfigFormComponent, SystemPreferencesFormComponent, SmtpFormComponent, TranslateModule],
 })
 export class GeneralConfigScreenComponent extends BaseFormComponent implements AfterViewInit {

apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts

@@ -21,7 +21,6 @@ import { NgIf } from '@angular/common';
 @Component({
     selector: 'redaction-smtp-form',
     templateUrl: './smtp-form.component.html',
-    standalone: true,
     imports: [ReactiveFormsModule, TranslateModule, MatSlideToggle, IconButtonComponent, NgIf],
 })
 export class SmtpFormComponent extends BaseFormComponent implements OnInit {

apps/red-ui/src/app/modules/admin/screens/general-config/system-preferences-form/system-preferences-form.component.ts

@@ -15,7 +15,6 @@ export type ValueType = 'number' | 'string' | 'boolean';
 @Component({
     selector: 'redaction-system-preferences-form',
     templateUrl: './system-preferences-form.component.html',
-    standalone: true,
     imports: [NgIf, ReactiveFormsModule, NgForOf, TranslateModule, MatSlideToggle, IconButtonComponent],
 })
 export class SystemPreferencesFormComponent extends BaseFormComponent {

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

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

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

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

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

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

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

@@ -22,7 +22,6 @@ import { Observable } from 'rxjs';
 import { DossierTemplateDetailsComponent } from '../dossier-template-details/dossier-template-details.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatCheckbox } from '@angular/material/checkbox';
-import { NgIf } from '@angular/common';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatIcon } from '@angular/material/icon';
 import { SelectComponent } from '@shared/components/select/select.component';
@@ -36,14 +35,12 @@ const downloadTypes = ['ORIGINAL', 'PREVIEW', 'OPTIMIZED_PREVIEW', 'DELTA_PREVIE
 @Component({
     templateUrl: './dossier-template-info-screen.component.html',
     styleUrls: ['./dossier-template-info-screen.component.scss'],
-    standalone: true,
     imports: [
         HasScrollbarDirective,
         ReactiveFormsModule,
         DossierTemplateDetailsComponent,
         TranslateModule,
         MatCheckbox,
-        NgIf,
         MatDatepickerModule,
         SelectComponent,
         IconButtonComponent,

apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html

@@ -17,8 +17,17 @@
                     type="text"
                 />
             </div>
+            <div class="iqser-input-group">
+                <label translate="add-edit-entity.form.technical-name"></label>
+                <div class="technical-name">{{ this.technicalName() || '-' }}</div>
+                <span
+                    [translateParams]="{ type: data.justification ? 'edit' : 'create' }"
+                    [translate]="'add-edit-entity.form.technical-name-hint'"
+                    class="hint"
+                ></span>
+            </div>
 
-            <div class="iqser-input-group required w-400">
+            <div class="iqser-input-group w-400">
                 <label translate="add-edit-justification.form.reason"></label>
                 <input
                     [placeholder]="'add-edit-justification.form.reason-placeholder' | translate"
@@ -28,7 +37,7 @@
                 />
             </div>
 
-            <div class="iqser-input-group required w-400">
+            <div class="iqser-input-group w-400">
                 <label translate="add-edit-justification.form.description"></label>
                 <textarea
                     [placeholder]="'add-edit-justification.form.description-placeholder' | translate"

apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts

@@ -1,11 +1,13 @@
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, Inject, untracked } from '@angular/core';
 import { ReactiveFormsModule, UntypedFormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Justification } from '@red/domain';
 import { JustificationsService } from '@services/entity-services/justifications.service';
-import { BaseDialogComponent, CircleButtonComponent, IconButtonComponent } from '@iqser/common-ui';
+import { BaseDialogComponent, CircleButtonComponent, HasScrollbarDirective, IconButtonComponent } from '@iqser/common-ui';
 import { firstValueFrom } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
+import { formControlToSignal } from '@utils/functions';
+import { toSignal } from '@angular/core/rxjs-interop';
 
 interface DialogData {
     justification?: Justification;
@@ -15,10 +17,29 @@ interface DialogData {
 @Component({
     templateUrl: './add-edit-justification-dialog.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
+    imports: [TranslateModule, ReactiveFormsModule, IconButtonComponent, CircleButtonComponent, HasScrollbarDirective],
-    imports: [TranslateModule, ReactiveFormsModule, IconButtonComponent, CircleButtonComponent],
 })
 export class AddEditJustificationDialogComponent extends BaseDialogComponent {
+    readonly form = this.#getForm();
+    readonly name = formControlToSignal(this.form.controls['name']);
+    readonly allJustifications = toSignal(this._justificationService.all$);
+    readonly technicalName = computed(() => {
+        if (this.data.justification) {
+            return this.data.justification.technicalName;
+        }
+        if (!this.name()) {
+            return null;
+        }
+        let currentTechnicalName = Justification.toTechnicalName(this.name());
+        const existingTechnicalNames = untracked(this.allJustifications).map(justification => justification.technicalName);
+        let suffix = 1;
+        while (existingTechnicalNames.includes(currentTechnicalName)) {
+            currentTechnicalName =
+                currentTechnicalName === '_' ? `${currentTechnicalName}${suffix++}` : [currentTechnicalName, suffix++].join('_');
+        }
+        return currentTechnicalName;
+    });
+
     constructor(
         private readonly _justificationService: JustificationsService,
         protected readonly _dialogRef: MatDialogRef<AddEditJustificationDialogComponent>,
@@ -26,7 +47,6 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent {
     ) {
         super(_dialogRef, !!data.justification);
 
-        this.form = this._getForm();
         this.initialFormValue = this.form.getRawValue();
     }
 
@@ -34,7 +54,8 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent {
         const dossierTemplateId = this.data.dossierTemplateId;
         this._loadingService.start();
         try {
-            await firstValueFrom(this._justificationService.createOrUpdate(this.form.getRawValue() as Justification, dossierTemplateId));
+            const formValue = { ...this.form.getRawValue(), technicalName: this.technicalName() };
+            await firstValueFrom(this._justificationService.createOrUpdate(formValue as Justification, dossierTemplateId));
             await firstValueFrom(this._justificationService.loadAll(dossierTemplateId));
             this._dialogRef.close(true);
         } catch (error) {
@@ -43,11 +64,12 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent {
         this._loadingService.stop();
     }
 
-    private _getForm(): UntypedFormGroup {
+    #getForm(): UntypedFormGroup {
         return this._formBuilder.group({
             name: [{ value: this.data.justification?.name, disabled: !!this.data.justification }, Validators.required],
-            reason: [this.data.justification?.reason, Validators.required],
+            reason: [this.data.justification?.reason],
-            description: [this.data.justification?.description, Validators.required],
+            description: [this.data.justification?.description],
+            technicalName: [this.data.justification?.technicalName ?? null],
         });
     }
 }

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

@@ -33,7 +33,6 @@ import { TranslateModule } from '@ngx-translate/core';
         }),
         JustificationsDialogService,
     ],
-    standalone: true,
     imports: [IqserListingModule, CircleButtonComponent, NgIf, TableItemComponent, TranslateModule, AsyncPipe, IconButtonComponent],
 })
 export default class JustificationsScreenComponent extends ListingComponent<Justification> implements OnInit {

apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.ts

@@ -12,7 +12,6 @@ import { TranslateModule } from '@ngx-translate/core';
     selector: 'redaction-table-item',
     templateUrl: './table-item.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatTooltip, CircleButtonComponent, NgIf, TranslateModule],
 })
 export class TableItemComponent {

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

@@ -6,7 +6,6 @@ import { BaseChartDirective, provideCharts, withDefaultRegisterables } from 'ng2
     selector: 'redaction-chart',
     templateUrl: './chart.component.html',
     styleUrls: ['./chart.component.scss'],
-    standalone: true,
     imports: [BaseChartDirective],
     providers: [provideCharts(withDefaultRegisterables())],
 })

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

@@ -16,7 +16,6 @@ import { ChartComponent } from '../chart/chart.component';
     selector: 'red-license-analysis-capacity-usage',
     templateUrl: './license-analysis-capacity-usage.component.html',
     styleUrls: ['./license-analysis-capacity-usage.component.scss'],
-    standalone: true,
     imports: [SizePipe, DecimalPipe, ChartComponent, AsyncPipe, NgIf, TranslateModule],
 })
 export class LicenseAnalysisCapacityUsageComponent {

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

@@ -14,7 +14,6 @@ import { ChartComponent } from '../chart/chart.component';
     selector: 'red-license-page-usage',
     templateUrl: './license-page-usage.component.html',
     styleUrls: ['./license-page-usage.component.scss'],
-    standalone: true,
     imports: [DecimalPipe, TranslateModule, ChartComponent, NgIf, AsyncPipe],
 })
 export class LicensePageUsageComponent {

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

@@ -17,7 +17,6 @@ import { ChartComponent } from '../chart/chart.component';
     selector: 'red-license-retention-capacity',
     templateUrl: './license-retention-capacity.component.html',
     styleUrls: ['./license-retention-capacity.component.scss'],
-    standalone: true,
     imports: [SizePipe, DecimalPipe, NgIf, DonutChartComponent, AsyncPipe, ChartComponent, TranslateModule],
 })
 export class LicenseRetentionCapacityComponent {
@@ -78,9 +77,9 @@ export class LicenseRetentionCapacityComponent {
 
         return [
             {
-                data: monthlyData.flatMap(d => d.activeFilesUploadedBytes),
+                data: monthlyData.flatMap(d => d.trashFilesUploadedBytes),
-                label: this._translateService.instant('license-info-screen.retention-capacity-usage.active-documents'),
+                label: this._translateService.instant('license-info-screen.retention-capacity-usage.trash-documents'),
-                ...getLineConfig(ChartGreen, false, 'origin'),
+                ...getLineConfig(ChartRed, false, 'origin'),
                 stack: 'storage',
             },
             {
@@ -90,9 +89,9 @@ export class LicenseRetentionCapacityComponent {
                 stack: 'storage',
             },
             {
-                data: monthlyData.flatMap(d => d.trashFilesUploadedBytes),
+                data: monthlyData.flatMap(d => d.activeFilesUploadedBytes),
-                label: this._translateService.instant('license-info-screen.retention-capacity-usage.trash-documents'),
+                label: this._translateService.instant('license-info-screen.retention-capacity-usage.active-documents'),
-                ...getLineConfig(ChartRed, false, '-1'),
+                ...getLineConfig(ChartGreen, false, 'origin'),
                 stack: 'storage',
             },
             {

apps/red-ui/src/app/modules/admin/screens/license/components/license-select/license-select.component.html

@@ -6,7 +6,7 @@
             </mat-select-trigger>
 
             <mat-option *ngFor="let license of licenses" [value]="license">
-                <ng-container *ngTemplateOutlet="licenseInfo; context: { license: this.license }"></ng-container>
+                <ng-container *ngTemplateOutlet="licenseInfo; context: { license: license }"></ng-container>
             </mat-option>
         </mat-select>
     </mat-form-field>

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

@@ -19,7 +19,6 @@ const translations = {
     selector: 'redaction-license-select',
     templateUrl: './license-select.component.html',
     styleUrls: ['./license-select.component.scss'],
-    standalone: true,
     imports: [
         AsyncPipe,
         NgIf,

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

@@ -16,7 +16,6 @@ import { DatePipe } from '@shared/pipes/date.pipe';
 @Component({
     templateUrl: './license-screen.component.html',
     styleUrls: ['./license-screen.component.scss'],
-    standalone: true,
     imports: [
         IqserListingModule,
         TranslateModule,

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

@@ -30,7 +30,6 @@ import { TranslateModule } from '@ngx-translate/core';
     templateUrl: './permissions-screen.component.html',
     styleUrls: ['./permissions-screen.component.scss'],
     providers: listingProvidersFactory(PermissionsScreenComponent),
-    standalone: true,
     imports: [IqserListingModule, NgIf, NgForOf, MatSlideToggle, AsyncPipe, TranslateModule],
 })
 export default class PermissionsScreenComponent extends ListingComponent<PermissionsMapping> implements OnInit {

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

@@ -41,7 +41,6 @@ const placeholderTypes: PlaceholderType[] = ['generalPlaceholders', 'fileAttribu
     templateUrl: './reports-screen.component.html',
     styleUrls: ['./reports-screen.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [HasScrollbarDirective, AsyncPipe, TranslateModule, CircleButtonComponent, IqserAllowDirective, SnakeCasePipe],
 })
 export default class ReportsScreenComponent implements OnInit {

apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.html

@@ -1,8 +1,57 @@
 <div class="header-container">
-    <div [translate]="translations[this.type]['title']" class="heading-l"></div>
+    <div [translate]="translations[type()]['title']" class="heading-l"></div>
 </div>
 
-<ngx-monaco-editor (init)="onCodeEditorInit($event)" [(ngModel)]="codeEditorText" [options]="editorOptions"></ngx-monaco-editor>
+<div class="flex" style="height: 100%">
+    <ngx-monaco-editor (init)="onCodeEditorInit($event)" [(ngModel)]="codeEditorText" [options]="editorOptions"></ngx-monaco-editor>
+
+    <div [class.collapsed]="collapsed()" class="right-container flex-column">
+        <div class="collapsed-wrapper">
+            <ng-container
+                *ngTemplateOutlet="collapsible; context: { action: 'expand', tooltip: ('copilot.label' | translate) }"
+            ></ng-container>
+            <div class="all-caps-label" translate="copilot.label"></div>
+        </div>
+
+        <div class="header-wrapper flex mt-8">
+            <div class="heading-xl flex-1">{{ 'copilot.label' | translate | titlecase }}</div>
+            <ng-container
+                *ngTemplateOutlet="collapsible; context: { action: 'collapse', tooltip: ('copilot.label' | translate) }"
+            ></ng-container>
+        </div>
+
+        <div class="mt-24">
+            @for (comment of conversation(); track comment) {
+                <div class="comment">
+                    <div class="comment-details-wrapper">
+                        <div [matTooltipPosition]="'above'" [matTooltip]="comment.date | date: 'exactDate'" class="small-label">
+                            {{ comment.date | date: 'sophisticatedDate' }}
+                        </div>
+                    </div>
+
+                    <pre class="text-auto">{{ comment.text }}</pre>
+                </div>
+            }
+
+            <iqser-input-with-action
+                (action)="add($event)"
+                [placeholder]="'comments.add-comment' | translate"
+                autocomplete="off"
+                icon="iqser:collapse"
+                width="full"
+            ></iqser-input-with-action>
+        </div>
+    </div>
+</div>
+
+<ng-template #collapsible let-action="action" let-tooltip="tooltip">
+    <iqser-circle-button
+        (action)="toggleCollapse()"
+        [icon]="'iqser:' + action"
+        [tooltipPosition]="IqserTooltipPositions.before"
+        [tooltip]="tooltip"
+    ></iqser-circle-button>
+</ng-template>
 
 <div *ngIf="changed && permissionsService.canEditRules() && !isLeaving" class="changes-box">
     <div (click)="goToErrors()" *ngIf="numberOfErrors() || numberOfWarnings()" class="errors">
@@ -12,15 +61,15 @@
                 <span
                     *ngIf="numberOfErrors()"
                     [translateParams]="{ errors: numberOfErrors() }"
-                    [translate]="translations[this.type]['errors-found']"
+                    [translate]="translations[type()]['errors-found']"
                 >
                 </span>
                 <span
                     *ngIf="numberOfWarnings()"
-                    [translateParams]="{ warnings: numberOfWarnings() }"
-                    [translate]="translations[this.type]['warnings-found']"
-                    class="warning"
                     [class.only-warning]="!numberOfErrors()"
+                    [translateParams]="{ warnings: numberOfWarnings() }"
+                    [translate]="translations[type()]['warnings-found']"
+                    class="warning"
                 ></span>
             </div>
         </span>
@@ -29,11 +78,11 @@
     <div class="actions">
         <iqser-icon-button
             (action)="save()"
-            [label]="translations[this.type]['save-changes'] | translate"
+            [label]="translations[type()]['save-changes'] | translate"
             [type]="iconButtonTypes.primary"
             icon="iqser:check"
         ></iqser-icon-button>
 
-        <div (click)="revert()" [translate]="translations[this.type]['revert-changes']" class="all-caps-label cancel"></div>
+        <div (click)="revert()" [translate]="translations[type()]['revert-changes']" class="all-caps-label cancel"></div>
     </div>
 </div>

apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.scss

@@ -81,3 +81,22 @@ ngx-monaco-editor {
         gap: 24px;
     }
 }
+
+.right-container {
+    display: flex;
+    width: 750px;
+    min-width: 375px;
+    padding: 16px 24px 16px 24px;
+
+    &.has-scrollbar:hover {
+        padding-right: 13px;
+    }
+
+    redaction-dossier-details {
+        width: 100%;
+    }
+}
+
+.text-auto {
+    text-wrap: auto;
+}