RED-3800 SCM Theming and i18n - cleanup

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

@@ -1,4 +1,4 @@
-<iqser-help-mode></iqser-help-mode>
+<iqser-help-mode *ngIf="!permissionsService.has(roles.getRss)"></iqser-help-mode>
 
 <div class="top-bar">
     <ng-template #menuPlaceholder>
@@ -27,7 +27,7 @@
                 [placeholder]="'search.placeholder' | translate"
             ></redaction-spotlight-search>
 
-            <iqser-help-button [iqserHelpMode]="'help_mode'"></iqser-help-button>
+            <iqser-help-button [iqserHelpMode]="'help_mode'" *ngIf="!permissionsService.has(roles.getRss)"></iqser-help-button>
 
             <redaction-notifications [iqserHelpMode]="'open_notifications'"></redaction-notifications>
         </div>

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

@@ -43,19 +43,19 @@ export class BaseScreenComponent {
             id: 'admin',
             name: _('top-bar.navigation-items.my-account.children.admin'),
             routerLink: '/main/admin',
-            show: (this.currentUser.isManager || this.currentUser.isUserAdmin) && this._permissionsService.has([ROLES.templates.read]),
+            show: (this.currentUser.isManager || this.currentUser.isUserAdmin) && this.permissionsService.has([ROLES.templates.read]),
         },
         {
             id: 'downloads',
             name: _('top-bar.navigation-items.my-account.children.downloads'),
             routerLink: '/main/downloads',
-            show: this.currentUser.isUser && this._permissionsService.has(ROLES.readDownloadStatus),
+            show: this.currentUser.isUser && this.permissionsService.has(ROLES.readDownloadStatus),
         },
         {
             id: 'trash',
             name: _('top-bar.navigation-items.my-account.children.trash'),
             routerLink: '/main/trash',
-            show: this.currentUser.isUser && this._permissionsService.has([ROLES.dossiers.read, ROLES.files.readStatus]),
+            show: this.currentUser.isUser && this.permissionsService.has([ROLES.dossiers.read, ROLES.files.readStatus]),
         },
     ];
     readonly searchActions: readonly SpotlightSearchAction[] = [
@@ -89,7 +89,7 @@ export class BaseScreenComponent {
         private readonly _router: Router,
         private readonly _translateService: TranslateService,
         private readonly _featuresService: FeaturesService,
-        private readonly _permissionsService: IqserPermissionsService,
+        readonly permissionsService: IqserPermissionsService,
         readonly userService: UserService,
         readonly userPreferenceService: UserPreferenceService,
         readonly titleService: Title,

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

@@ -95,7 +95,10 @@
             <button (click)="save()" [disabled]="disabled" color="primary" mat-flat-button type="button">
                 {{ 'add-edit-clone-dossier-template.save' | translate }}
             </button>
-            <iqser-help-button *ngIf="dossierTemplate" helpButtonKey="edit_clone_delete_dossier_templates"></iqser-help-button>
+            <iqser-help-button
+                helpButtonKey="edit_clone_delete_dossier_templates"
+                *ngIf="dossierTemplate && !permissionsService.has(roles.getRss)"
+            ></iqser-help-button>
         </div>
     </form>
 

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

@@ -4,12 +4,13 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { applyIntervalConstraints } from '@utils/date-inputs-utils';
 import { downloadTypesTranslations } from '@translations/download-types-translations';
 import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
-import { BaseDialogComponent } from '@iqser/common-ui';
+import { BaseDialogComponent, IqserPermissionsService } from '@iqser/common-ui';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { DossierTemplate, DownloadFileType, IDossierTemplate } from '@red/domain';
 import { HttpStatusCode } from '@angular/common/http';
 import { firstValueFrom } from 'rxjs';
 import dayjs, { Dayjs } from 'dayjs';
+import { ROLES } from '@users/roles';
 
 interface EditCloneTemplateData {
     dossierTemplateId: string;
@@ -21,6 +22,7 @@ interface EditCloneTemplateData {
     styleUrls: ['./add-edit-clone-dossier-template-dialog.component.scss'],
 })
 export class AddEditCloneDossierTemplateDialogComponent extends BaseDialogComponent {
+    readonly roles = ROLES;
     hasValidFrom: boolean;
     hasValidTo: boolean;
     downloadTypesEnum: DownloadFileType[] = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'];
@@ -35,6 +37,7 @@ export class AddEditCloneDossierTemplateDialogComponent extends BaseDialogCompon
     private _lastValidTo: Dayjs;
 
     constructor(
+        readonly permissionsService: IqserPermissionsService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
         protected readonly _dialogRef: MatDialogRef<AddEditCloneDossierTemplateDialogComponent>,
         @Inject(MAT_DIALOG_DATA) readonly data: EditCloneTemplateData,

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

@@ -16,7 +16,7 @@
         <button (click)="save()" [disabled]="disabled" color="primary" mat-flat-button type="button">
             {{ 'add-entity.save' | translate }}
         </button>
-        <iqser-help-button helpButtonKey="create_new_entity"></iqser-help-button>
+        <iqser-help-button helpButtonKey="create_new_entity" *ngIf="!permissionsService.has(roles.getRss)"></iqser-help-button>
     </div>
 
     <iqser-circle-button (click)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>

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

@@ -1,7 +1,8 @@
 import { ChangeDetectionStrategy, Component, Inject, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { AddEditEntityComponent } from '@shared/components/add-edit-entity/add-edit-entity.component';
-import { BaseDialogComponent } from '@iqser/common-ui';
+import { BaseDialogComponent, IqserPermissionsService } from '@iqser/common-ui';
+import { ROLES } from '@users/roles';
 
 interface DialogData {
     readonly dossierTemplateId: string;
@@ -13,12 +14,14 @@ interface DialogData {
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AddEntityDialogComponent extends BaseDialogComponent {
+    readonly roles = ROLES;
     readonly dossierTemplateId = this._data.dossierTemplateId;
 
     @ViewChild(AddEditEntityComponent, { static: true }) private readonly _addEditEntityComponent: AddEditEntityComponent;
 
     constructor(
         protected readonly _dialogRef: MatDialogRef<AddEntityDialogComponent>,
+        readonly permissionsService: IqserPermissionsService,
         @Inject(MAT_DIALOG_DATA) private readonly _data: DialogData,
     ) {
         super(_dialogRef, false);

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

@@ -88,7 +88,7 @@
             <div class="cell center">
                 <redaction-annotation-icon
                     [color]="dict.hexColor"
-                    [label]="dict.hint ? 'H' : 'R'"
+                    [label]="dict.hint ? 'H' : ('redaction-abbreviation' | translate)"
                     [type]="dict.hint ? 'circle' : 'square'"
                 ></redaction-annotation-icon>
             </div>

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

@@ -23,7 +23,7 @@
             </button>
 
             <div (click)="revert()" [translate]="'entity.info.actions.revert'" class="all-caps-label cancel"></div>
-            <iqser-help-button helpButtonKey="edit_delete_entities"></iqser-help-button>
+            <iqser-help-button helpButtonKey="edit_delete_entities" *ngIf="!iqserPermissionsService.has(roles.getRss)"></iqser-help-button>
         </div>
     </div>
 </div>

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

@@ -5,8 +5,9 @@ import { ActivatedRoute } from '@angular/router';
 import { getCurrentUser } from '@users/user.service';
 import { PermissionsService } from '@services/permissions.service';
 import { AddEditEntityComponent } from '@shared/components/add-edit-entity/add-edit-entity.component';
-import { IqserEventTarget } from '@iqser/common-ui';
+import { IqserEventTarget, IqserPermissionsService } from '@iqser/common-ui';
 import { Observable } from 'rxjs';
+import { ROLES } from '@users/roles';
 
 @Component({
     selector: 'redaction-entity-info',
@@ -18,9 +19,15 @@ export class EntityInfoComponent {
     readonly currentUser = getCurrentUser();
     readonly entity$: Observable<Dictionary>;
     readonly dossierTemplateId: string;
+    readonly roles = ROLES;
     @ViewChild(AddEditEntityComponent) private readonly _addEditEntityComponent: AddEditEntityComponent;
 
-    constructor(route: ActivatedRoute, dictionariesMapService: DictionariesMapService, readonly permissionsService: PermissionsService) {
+    constructor(
+        route: ActivatedRoute,
+        dictionariesMapService: DictionariesMapService,
+        readonly iqserPermissionsService: IqserPermissionsService,
+        readonly permissionsService: PermissionsService,
+    ) {
         this.dossierTemplateId = route.parent.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID);
         const entityType = route.parent.snapshot.paramMap.get(ENTITY_TYPE);
         this.entity$ = dictionariesMapService.watch$(this.dossierTemplateId, entityType);

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

@@ -1,7 +1,7 @@
 <div class="details">
     <redaction-annotation-icon
         [color]="annotation.color"
-        [label]="annotation.isEarmark ? '' : annotation.superType[0].toUpperCase()"
+        [label]="annotation.isEarmark ? '' : (annotationTypesTranslations[annotation.superType] | translate)[0].toUpperCase()"
         [type]="annotation.iconShape"
         class="mt-6 mr-10"
     ></redaction-annotation-icon>

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

@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { MultiSelectService } from '../../services/multi-select.service';
+import { annotationTypesTranslations } from '@translations/annotation-types-translations';
 
 @Component({
     selector: 'redaction-annotation-card',
@@ -9,6 +10,7 @@ import { MultiSelectService } from '../../services/multi-select.service';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AnnotationCardComponent {
+    annotationTypesTranslations = annotationTypesTranslations;
     @Input() annotation: AnnotationWrapper;
     @Input() isSelected = false;
 

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

@@ -11,6 +11,7 @@
 
     <button
         (click)="switchView(viewModes.DELTA)"
+        *ngIf="!permissionsService.has(roles.getRss)"
         [class.active]="viewMode === viewModes.DELTA"
         [disabled]="(canSwitchToDeltaView$ | async) === false"
         [iqserHelpMode]="'views'"
@@ -22,6 +23,7 @@
 
     <button
         (click)="switchView(viewModes.REDACTED)"
+        *ngIf="!permissionsService.has(roles.getRss)"
         [class.active]="viewMode === viewModes.REDACTED"
         [disabled]="(canSwitchToRedactedView$ | async) === false"
         [iqserHelpMode]="'views'"
@@ -33,6 +35,7 @@
 
     <button
         (click)="switchView(viewModes.TEXT_HIGHLIGHTS)"
+        *ngIf="!permissionsService.has(roles.getRss)"
         [class.active]="viewMode === viewModes.TEXT_HIGHLIGHTS"
         [disabled]="(canSwitchToEarmarksView$ | async) === false"
         [iqserHelpMode]="'views'"

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

@@ -5,10 +5,11 @@ import { FilePreviewStateService } from '../../services/file-preview-state.servi
 import { combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { FileDataService } from '../../services/file-data.service';
-import { BASE_HREF, ConfirmationDialogInput, ConfirmOptions, Toaster } from '@iqser/common-ui';
+import { BASE_HREF, ConfirmationDialogInput, ConfirmOptions, IqserPermissionsService, Toaster } from '@iqser/common-ui';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { UserPreferenceService } from '@users/user-preference.service';
 import { FilePreviewDialogService } from '../../services/file-preview-dialog.service';
+import { ROLES } from '@users/roles';
 
 @Component({
     selector: 'redaction-view-switch',
@@ -21,10 +22,12 @@ export class ViewSwitchComponent {
     readonly canSwitchToDeltaView$: Observable<boolean>;
     readonly canSwitchToRedactedView$: Observable<boolean>;
     readonly canSwitchToEarmarksView$: Observable<boolean>;
+    readonly roles = ROLES;
 
     constructor(
         @Inject(BASE_HREF) private readonly _baseHref: string,
         readonly viewModeService: ViewModeService,
+        readonly permissionsService: IqserPermissionsService,
         private readonly _stateService: FilePreviewStateService,
         private readonly _fileDataService: FileDataService,
         private readonly _userPreferenceService: UserPreferenceService,

apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html

@@ -34,7 +34,7 @@
                 {{ translations[data.operation].save | translate }}
             </button>
             <div class="all-caps-label cancel" mat-dialog-close translate="highlight-action-dialog.actions.cancel"></div>
-            <iqser-help-button helpButtonKey="highlights"></iqser-help-button>
+            <iqser-help-button helpButtonKey="highlights" *ngIf="!permissionsService.has(roles.getRss)"></iqser-help-button>
         </div>
     </form>
 

apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts

@@ -2,11 +2,12 @@ import { Component, Inject } from '@angular/core';
 import { UntypedFormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { EarmarkOperation, EarmarkOperationPages } from '@red/domain';
-import { BaseDialogComponent, DetailsRadioOption } from '@iqser/common-ui';
+import { BaseDialogComponent, DetailsRadioOption, IqserPermissionsService } from '@iqser/common-ui';
 import { EarmarksService } from '@services/files/earmarks.service';
 import { firstValueFrom } from 'rxjs';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { highlightsTranslations } from '@translations/highlights-translations';
+import { ROLES } from '@users/roles';
 
 export interface HighlightActionData {
     readonly operation: EarmarkOperation;
@@ -24,6 +25,7 @@ export interface HighlightActionData {
 export class HighlightActionDialogComponent extends BaseDialogComponent {
     readonly translations = highlightsTranslations;
     readonly #operation = this.data.operation;
+    readonly roles = ROLES;
 
     readonly options: DetailsRadioOption<EarmarkOperationPages>[] = [
         {
@@ -39,6 +41,7 @@ export class HighlightActionDialogComponent extends BaseDialogComponent {
     ];
 
     constructor(
+        readonly permissionsService: IqserPermissionsService,
         protected readonly _dialogRef: MatDialogRef<HighlightActionDialogComponent>,
         private readonly _textHighlightService: EarmarksService,
         @Inject(MAT_DIALOG_DATA) readonly data: HighlightActionData,

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

@@ -4,7 +4,7 @@
     <hr />
     <div class="dialog-content">
         <div *ngIf="rssData$ | async as rssEntry">
-            <div *ngFor="let entry of rssEntry.result | keyvalue" class="rss-row">
+            <div *ngFor="let entry of rssEntry.result | keyvalue: originalOrder" class="rss-row">
                 <div class="rss-key">{{ entry.key }}:</div>
                 <div class="rss-value">{{ entry.value }}</div>
             </div>

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

@@ -7,6 +7,7 @@ import { firstValueFrom, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { FilesMapService } from '@services/files/files-map.service';
 import { UserPreferenceService } from '@users/user-preference.service';
+import { KeyValue } from '@angular/common';
 
 interface RssData {
     file: IFile;
@@ -19,6 +20,8 @@ interface RssData {
 export class RssDialogComponent extends BaseDialogComponent {
     rssData$: Observable<IRssEntry>;
 
+    originalOrder = (a: KeyValue<string, string>, b: KeyValue<string, string>): number => 0;
+
     constructor(
         protected readonly _dialogRef: MatDialogRef<RssDialogComponent>,
         private readonly _rssService: RssService,

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

@@ -25,14 +25,6 @@
 
                 <div class="vertical-line"></div>
 
-                <redaction-file-actions
-                    [dossier]="dossier"
-                    [file]="file"
-                    [minWidth]="width"
-                    fileActionsHelpModeKey="document_features_in_editor"
-                    type="file-preview"
-                ></redaction-file-actions>
-
                 <iqser-circle-button
                     (action)="openRSSView(file)"
                     *allow="roles.getRss"
@@ -42,6 +34,14 @@
                     tooltipPosition="below"
                 ></iqser-circle-button>
 
+                <redaction-file-actions
+                    [dossier]="dossier"
+                    [file]="file"
+                    [minWidth]="width"
+                    fileActionsHelpModeKey="document_features_in_editor"
+                    type="file-preview"
+                ></redaction-file-actions>
+
                 <iqser-circle-button
                     (action)="toggleFullScreen()"
                     [icon]="fullScreen ? 'red:exit-fullscreen' : 'red:fullscreen'"

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

@@ -48,7 +48,9 @@ export class PdfProxyService {
     readonly #visibilityOffIcon = this._convertPath('/assets/icons/general/visibility-off.svg');
     readonly #visibilityIcon = this._convertPath('/assets/icons/general/visibility.svg');
     readonly #falsePositiveIcon = this._convertPath('/assets/icons/general/pdftron-action-false-positive.svg');
-    readonly #addRedactionIcon = this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg');
+    readonly #addRedactionIcon = this._iqserPermissionsService.has(ROLES.getRss)
+        ? this._convertPath('/assets/icons/general/pdftron-action-add-component.svg')
+        : this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg');
     readonly #addDictIcon = this._convertPath('/assets/icons/general/pdftron-action-add-dict.svg');
 
     constructor(

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

@@ -247,7 +247,7 @@ export class ViewerHeaderService {
                 ],
             ];
             groups.forEach(group => this._pushGroup(enabledItems, group));
-            header.getItems().splice(8, header.getItems().length - 13, ...enabledItems);
+            header.getItems().splice(10, header.getItems().length - 14, ...enabledItems);
         });
 
         this._pdf.instance.UI.updateElement('selectToolButton', {

apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html

@@ -1,64 +1,62 @@
-<div>
+<div class="cell filename">
-    <div class="cell filename">
+    <div [matTooltip]="item.filename" class="table-item-title heading" matTooltipPosition="above">
-        <div [matTooltip]="item.filename" class="table-item-title heading" matTooltipPosition="above">
+        <span
-            <span
+            *ngIf="item.highlights.filename; else defaultFilename"
-                *ngIf="item.highlights.filename; else defaultFilename"
+            [innerHTML]="sanitize(item.highlights.filename[0])"
-                [innerHTML]="sanitize(item.highlights.filename[0])"
+            class="highlights"
-                class="highlights"
+        ></span>
-            ></span>
+        <ng-template #defaultFilename>{{ item.filename }}</ng-template>
-            <ng-template #defaultFilename>{{ item.filename }}</ng-template>
-        </div>
-
-        <ng-container *ngIf="item.highlights['sections.text'] as highlights">
-            <div *ngIf="highlights.length > 0" class="small-label">
-                <span [innerHTML]="sanitize(highlights[0])" class="highlights"></span>
-            </div>
-            <div *ngIf="highlights.length > 1" class="small-label">
-                <span [innerHTML]="sanitize(highlights[1])" class="highlights"></span>
-            </div>
-        </ng-container>
-
-        <div *ngIf="item.unmatched?.length && item.unmatched as unmatched" class="small-label">
-            <span>
-                {{ 'search-screen.missing' | translate }}:<span *ngFor="let term of unmatched"
-                    >&nbsp;<s>{{ term }}</s></span
-                >.&nbsp;{{ 'search-screen.must-contain' | translate }}:
-                <span (click)="$event.stopPropagation(); mustContain.emit(term)" *ngFor="let term of unmatched"
-                    >&nbsp;<u>{{ term }}</u></span
-                >
-            </span>
-        </div>
     </div>
 
-    <div class="cell">
+    <ng-container *ngIf="item.highlights['sections.text'] as highlights">
-        <iqser-initials-avatar [user]="item.assignee" [withName]="true"></iqser-initials-avatar>
+        <div *ngIf="highlights.length > 0" class="small-label">
-    </div>
+            <span [innerHTML]="sanitize(highlights[0])" class="highlights"></span>
-
-    <div class="cell">
-        <iqser-status-bar
-            [configs]="[
-                {
-                    color: item.status,
-                    label: fileStatusTranslations[item.status] | translate,
-                    length: 1,
-                    cssClass: 'all-caps-label'
-                }
-            ]"
-            [small]="true"
-        ></iqser-status-bar>
-    </div>
-
-    <div class="cell small-label stats-subtitle">
-        <div>
-            <mat-icon *ngIf="item.archived" svgIcon="red:archive"></mat-icon>
-            {{ item.dossierName }}
         </div>
-    </div>
+        <div *ngIf="highlights.length > 1" class="small-label">
-
+            <span [innerHTML]="sanitize(highlights[1])" class="highlights"></span>
-    <div class="cell small-label stats-subtitle">
-        <div>
-            <mat-icon svgIcon="iqser:pages"></mat-icon>
-            {{ item.numberOfPages }}
         </div>
+    </ng-container>
+
+    <div *ngIf="item.unmatched?.length && item.unmatched as unmatched" class="small-label">
+        <span>
+            {{ 'search-screen.missing' | translate }}:<span *ngFor="let term of unmatched"
+                >&nbsp;<s>{{ term }}</s></span
+            >.&nbsp;{{ 'search-screen.must-contain' | translate }}:
+            <span (click)="$event.stopPropagation(); mustContain.emit(term)" *ngFor="let term of unmatched"
+                >&nbsp;<u>{{ term }}</u></span
+            >
+        </span>
+    </div>
+</div>
+
+<div class="cell">
+    <iqser-initials-avatar [user]="item.assignee" [withName]="true"></iqser-initials-avatar>
+</div>
+
+<div class="cell">
+    <iqser-status-bar
+        [configs]="[
+            {
+                color: item.status,
+                label: fileStatusTranslations[item.status] | translate,
+                length: 1,
+                cssClass: 'all-caps-label'
+            }
+        ]"
+        [small]="true"
+    ></iqser-status-bar>
+</div>
+
+<div class="cell small-label stats-subtitle">
+    <div>
+        <mat-icon *ngIf="item.archived" svgIcon="red:archive"></mat-icon>
+        {{ item.dossierName }}
+    </div>
+</div>
+
+<div class="cell small-label stats-subtitle">
+    <div>
+        <mat-icon svgIcon="iqser:pages"></mat-icon>
+        {{ item.numberOfPages }}
     </div>
 </div>

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

@@ -16,6 +16,7 @@ import {
     CircleButtonType,
     CircleButtonTypes,
     ConfirmationDialogInput,
+    IqserPermissionsService,
     IqserTooltipPosition,
     LoadingService,
     Toaster,
@@ -37,6 +38,7 @@ import { PageRotationService } from '../../../pdf-viewer/services/page-rotation.
 import { FileAssignService } from '../../services/file-assign.service';
 import { ViewerHeaderService } from '../../../pdf-viewer/services/viewer-header.service';
 import { ROTATION_ACTION_BUTTONS } from '../../../pdf-viewer/utils/constants';
+import { ROLES } from '@users/roles';
 
 @Component({
     selector: 'redaction-file-actions [file] [type] [dossier]',
@@ -97,6 +99,7 @@ export class FileActionsComponent implements OnChanges {
         private readonly _fileAssignService: FileAssignService,
         private readonly _reanalysisService: ReanalysisService,
         private readonly _permissionsService: PermissionsService,
+        private readonly _iqserPermissionsService: IqserPermissionsService,
         private readonly _pageRotationService: PageRotationService,
         private readonly _viewerHeaderService: ViewerHeaderService,
         private readonly _activeDossiersService: ActiveDossiersService,
@@ -150,7 +153,7 @@ export class FileActionsComponent implements OnChanges {
                 action: ($event: MouseEvent) => this._openImportRedactionsDialog($event),
                 tooltip: _('dossier-overview.import-redactions'),
                 icon: 'red:import_redactions',
-                show: this.showImportRedactions,
+                show: this.showImportRedactions && !this._iqserPermissionsService.has(ROLES.getRss),
             },
             {
                 type: ActionTypes.downloadBtn,
@@ -177,7 +180,8 @@ export class FileActionsComponent implements OnChanges {
                 show:
                     !!this._excludedPagesService &&
                     !this.file.excluded &&
-                    this._permissionsService.canExcludePages(this.file, this.dossier),
+                    this._permissionsService.canExcludePages(this.file, this.dossier) &&
+                    !this._iqserPermissionsService.has(ROLES.getRss),
             },
             {
                 type: ActionTypes.circleBtn,

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

@@ -73,7 +73,7 @@
                 </iqser-icon-button>
                 <div (click)="revert()" class="all-caps-label cancel" id="revert" translate="edit-dossier-dialog.actions.revert"></div>
 
-                <iqser-help-button [dialogButton]="true"></iqser-help-button>
+                <iqser-help-button [dialogButton]="true" *ngIf="!iqserPermissionsService.has(roles.getRss)"></iqser-help-button>
             </div>
         </div>
     </div>

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

@@ -40,6 +40,7 @@ interface NavItem {
     providers: [dossiersServiceProvider],
 })
 export class EditDossierDialogComponent extends BaseDialogComponent implements AfterViewInit {
+    readonly roles = ROLES;
     navItems: NavItem[] = [];
     readonly iconButtonTypes = IconButtonTypes;
     activeNav: Section;
@@ -53,9 +54,9 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A
     private _dossier: Dossier;
 
     constructor(
+        readonly iqserPermissionsService: IqserPermissionsService,
         private readonly _dossiersService: DossiersService,
         private readonly _permissionsService: PermissionsService,
-        private readonly _iqserPermissionsService: IqserPermissionsService,
         protected readonly _dialogRef: MatDialogRef<EditDossierDialogComponent>,
         @Inject(MAT_DIALOG_DATA)
         private readonly _data: {
@@ -99,7 +100,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A
         return (
             (['members'].includes(this.activeNav) &&
                 this.#currentUser.isManager &&
-                this._iqserPermissionsService.has(ROLES.dossiers.edit)) ||
+                this.iqserPermissionsService.has(ROLES.dossiers.edit)) ||
             this._permissionsService.canEditDossier(this._dossier)
         );
     }

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

@@ -21,6 +21,8 @@
 
         .mat-chip-list-wrapper {
             height: 100%;
+            align-items: flex-start;
+            flex-direction: column;
             overflow-x: hidden;
             overflow-y: auto;
             @include common-mixins.scroll-bar();

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

@@ -2,6 +2,7 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { INestedFilter } from '@iqser/common-ui';
 import { SuperTypes } from '@red/domain';
 import { DefaultColorsService } from '@services/entity-services/default-colors.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
     selector: 'redaction-type-filter [dossierTemplateId]',
@@ -26,7 +27,7 @@ export class TypeFilterComponent implements OnChanges {
     ];
     private _needsAnalysisKeys: string[] = ['remove-only-here', 'analysis'];
 
-    constructor(private readonly _defaultColorsService: DefaultColorsService) {}
+    constructor(private readonly _defaultColorsService: DefaultColorsService, private readonly _translateService: TranslateService) {}
 
     ngOnChanges(): void {
         this.label =
@@ -38,6 +39,8 @@ export class TypeFilterComponent implements OnChanges {
                 ? 'A'
                 : this._suggestionsKeys.includes(this.filter.id)
                 ? 'S'
-                : this.filter.id.charAt(0);
+                : this.filter.skipTranslation
+                ? this.filter.label.charAt(0)
+                : this._translateService.instant(this.filter.label).charAt(0);
     }
 }

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

@@ -109,7 +109,7 @@
                 icon="red:assign"
             ></iqser-icon-button>
 
-            <iqser-help-button [helpButtonKey]="'new_dossier_button'"></iqser-help-button>
+            <iqser-help-button [helpButtonKey]="'new_dossier_button'" *ngIf="!permissionsService.has(roles.getRss)"></iqser-help-button>
         </div>
     </form>
 

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

@@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { DOSSIER_TEMPLATE_ID, DownloadFileType, IDossierRequest, IDossierTemplate, IReportTemplate } from '@red/domain';
 import { UntypedFormGroup, Validators } from '@angular/forms';
 import { downloadTypesTranslations } from '@translations/download-types-translations';
-import { BaseDialogComponent, IconButtonTypes, SaveOptions } from '@iqser/common-ui';
+import { BaseDialogComponent, IconButtonTypes, IqserPermissionsService, SaveOptions } from '@iqser/common-ui';
 import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
 import { ReportTemplateService } from '@services/report-template.service';
@@ -11,6 +11,7 @@ import { firstValueFrom } from 'rxjs';
 import dayjs from 'dayjs';
 import { Router } from '@angular/router';
 import { DossiersDialogService } from '../../../shared-dossiers/services/dossiers-dialog.service';
+import { ROLES } from '@users/roles';
 
 interface DialogData {
     readonly dossierTemplateId?: string;
@@ -21,20 +22,26 @@ interface DialogData {
     styleUrls: ['./add-dossier-dialog.component.scss'],
 })
 export class AddDossierDialogComponent extends BaseDialogComponent implements OnInit {
+    readonly roles = ROLES;
     readonly iconButtonTypes = IconButtonTypes;
 
     hasDueDate = false;
-    downloadTypes: { key: DownloadFileType; label: string }[] = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(
+    downloadTypes: { key: DownloadFileType; label: string }[] = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED']
-        (type: DownloadFileType) => ({
+        .map((type: DownloadFileType) => ({
             key: type,
             label: downloadTypesTranslations[type],
-        }),
+        }))
-    );
+        .filter(
+            element =>
+                !this.permissionsService.has(ROLES.getRss) ||
+                (this.permissionsService.has(ROLES.getRss) && !['DELTA_PREVIEW', 'REDACTED'].includes(element.key)),
+        );
     dossierTemplates: IDossierTemplate[];
     availableReportTypes = [];
     dossierTemplateId: string;
 
     constructor(
+        readonly permissionsService: IqserPermissionsService,
         private readonly _activeDossiersService: ActiveDossiersService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _reportTemplateController: ReportTemplateService,

apps/red-ui/src/assets/config/config.json

@@ -15,8 +15,7 @@
   "RECENT_PERIOD_IN_HOURS": 24,
   "SELECTION_MODE": "structural",
   "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview",
-  "RSS_ENABLED": true,
   "ANNOTATIONS_THRESHOLD": 1000,
-  "THEME": "theme-template",
+  "THEME": "scm",
-  "BASE_TRANSLATIONS_DIRECTORY": "/assets/i18n/redact/"
+  "BASE_TRANSLATIONS_DIRECTORY": "/assets/i18n/scm/"
 }

apps/red-ui/src/assets/icons/general/pdftron-action-add-component.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" version="1.1" viewBox="0 0 16 16" width="16px"
+     xmlns="http://www.w3.org/2000/svg">
+    <g fill="none" fill-rule="evenodd" id="Redacted" stroke="none" stroke-width="1">
+        <rect fill="#283241" height="16" id="Rectangle" width="16" x="0" y="0"></rect>
+        <text fill="#FFFFFF" font-family="Inter-SemiBold, Inter" font-size="11" font-weight="500"
+              id="H">
+            <tspan x="4.421875" y="12">C</tspan>
+        </text>
+    </g>
+</svg>

docker/red-ui/docker-entrypoint.sh

@@ -17,7 +17,6 @@ OAUTH_URL="${OAUTH_URL:-/auth}"
 RECENT_PERIOD_IN_HOURS="${RECENT_PERIOD_IN_HOURS:-24}"
 SELECTION_MODE="${SELECTION_MODE:-structural}"
 MANUAL_BASE_URL="${MANUAL_BASE_URL:-https://docs.redactmanager.com/preview}"
-RSS_ENABLED="${RSS_ENABLED:-false}"
 ANNOTATIONS_THRESHOLD="${ANNOTATIONS_THRESHOLD:-1000}"
 BASE_TRANSLATIONS_DIRECTORY="${BASE_TRANSLATIONS_DIRECTORY:-/assets/i18n/redact/}"
 THEME="${THEME:-theme-template}"
@@ -41,7 +40,6 @@ echo '{
           "RECENT_PERIOD_IN_HOURS":"'"$RECENT_PERIOD_IN_HOURS"'",
           "SELECTION_MODE":"'"$SELECTION_MODE"'",
           "MANUAL_BASE_URL":"'"$MANUAL_BASE_URL"'",
-          "RSS_ENABLED":"'"$RSS_ENABLED"'",
           "BASE_TRANSLATIONS_DIRECTORY":"'"$BASE_TRANSLATIONS_DIRECTORY"'",
           "THEME":"'"$THEME"'",
           "ANNOTATIONS_THRESHOLD":"'"$ANNOTATIONS_THRESHOLD"'"

libs/red-domain/src/lib/files/file.model.ts

@@ -133,7 +133,7 @@ export class File extends Entity<IFile> implements IFile {
         this.numberOfOCRedPages = file.numberOfOCRedPages ?? 0;
 
         this.statusSort = StatusSorter[this.workflowStatus];
-        this.cacheIdentifier = btoa(this.fileManipulationDate ?? '');
+        this.cacheIdentifier = btoa(`${this.fileManipulationDate}${file.lastOCRTime}${file.ocrEndTime}`);
         this.hintsOnly = this.hasHints && !this.hasRedactions;
         this.hasNone = !this.hasRedactions && !this.hasHints && !this.hasSuggestions;
         this.isProcessing = isProcessingStatuses.includes(this.processingStatus);