RED-10405: removed locked rules pending type and fixed pending count.

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

@@ -100,13 +100,17 @@ export class DossierDetailsComponent extends ContextComponent<DossierDetailsCont
         super();
         const dossier$ = _dossiersService.getEntityChanged$(this.#dossierId).pipe(shareLast());
         const filesChanged$ = _filesMapService.watchChanged$(this.#dossierId).pipe(shareLast());
+        const files$ = _filesMapService.get$(this.#dossierId).pipe(shareLast());
         const dossierStats$ = dossierStatsService.watch$(this.#dossierId).pipe(shareLast());
         const dossierStatsWithEffects$ = dossierStats$.pipe(
             combineLatestWith(filesChanged$),
             tap(([stats]) => this.#calculateChartConfig(stats)),
             map(([stats]) => stats),
         );
-        const statusConfig$ = dossierStats$.pipe(map(stats => this.#calculateStatusConfig(stats)));
+        const statusConfig$ = dossierStats$.pipe(
+            combineLatestWith(files$),
+            map(([stats, files]) => this.#calculateStatusConfig(stats, files)),
+        );
 
         super._initContext({
             needsWorkFilters: filterService.getFilterModels$('needsWorkFilters'),
@@ -155,9 +159,7 @@ export class DossierDetailsComponent extends ContextComponent<DossierDetailsCont
             .reduce((sum: number, file: File) => sum + file.numberOfPages, 0);
     }
 
-    #calculateStatusConfig(stats: DossierStats): ProgressBarConfigModel[] {
+    #calculateStatusConfig(stats: DossierStats, files: File[]): ProgressBarConfigModel[] {
-        const files = this._filesMapService.get(this.#dossierId);
-        const numberOfRulesLockedFiles = files.filter(file => file.errorCode === FileErrorCodes.LOCKED_RULES).length;
         const numberOfTimeoutFiles = files.filter(file => file.errorCode === FileErrorCodes.RULES_EXECUTION_TIMEOUT).length;
         return [
             {
@@ -167,13 +169,6 @@ export class DossierDetailsComponent extends ContextComponent<DossierDetailsCont
                 count: stats.processingStats.pending,
                 icon: 'red:reanalyse',
             },
-            {
-                id: PendingTypes.lockedRules,
-                label: _('processing-status.pending-locked-rules'),
-                total: stats.numberOfFiles,
-                count: numberOfRulesLockedFiles,
-                icon: 'red:reanalyse',
-            },
             {
                 id: PendingTypes.timeout,
                 label: _('processing-status.pending-timeout'),

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

@@ -55,7 +55,6 @@ export class FilesService extends EntitiesService<IFile, File> {
 
     /** Reload dossier files + stats. */
     loadAll(dossierId: string) {
-        console.log('loadAll');
         const files$ = this.getFor(dossierId).pipe(
             mapEach(file => new File(file, this._userService.getName(file.assignee))),
             tap(file => this._logger.info('[FILE] Loaded', file)),

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

@@ -987,7 +987,7 @@
     "download-file-disabled": "Download: Sie müssen Genehmiger im Dossier sein und die initiale Verarbeitung {count, plural, one{der Datei} other{der Dateien}} muss abgeschlossen sein.",
     "file-listing": {
       "file-entry": {
-        "file-error": "Reanalyse erforderlich {errorCode, select, RULES_EXECUTION_TIMEOUT{(Zeitlimit für Regeln)} LOCKED_RULES{(Regeln gesperrt)} other{}}",
+        "file-error": "Reanalyse erforderlich {errorCode, select, RULES_EXECUTION_TIMEOUT{(Zeitlimit für Regeln)} other{}}",
         "file-pending": "Ausstehend ..."
       }
     },
@@ -2102,7 +2102,6 @@
   "processing-status": {
     "ocr": "OCR",
     "pending": "Ausstehend",
-    "pending-locked-rules": "Ausstehend (Regeln gesperrt)",
     "pending-timeout": "Ausstehend (Zeitlimit für Regeln)",
     "processed": "Verarbeitet",
     "processing": "Verarbeitung läuft"

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

@@ -987,7 +987,7 @@
     "download-file-disabled": "To download, ensure you are an approver in the dossier, and the {count, plural, one{file has undergone} other{files have undergone}} initial processing.",
     "file-listing": {
       "file-entry": {
-        "file-error": "Re-processing required {errorCode, select, RULES_EXECUTION_TIMEOUT{(Rules timeout)} LOCKED_RULES{(Rules locked)} other{}}",
+        "file-error": "Re-processing required {errorCode, select, RULES_EXECUTION_TIMEOUT{(Rules timeout)} other{}}",
         "file-pending": "Pending..."
       }
     },
@@ -2102,7 +2102,6 @@
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
-    "pending-locked-rules": "Pending (Rules locked)",
     "pending-timeout": "Pending (Rules timeout)",
     "processed": "Processed",
     "processing": "Processing"

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

@@ -987,7 +987,7 @@
     "download-file-disabled": "Download: Sie müssen Genehmiger im Dossier sein und die initiale Verarbeitung {count, plural, one{der Datei} other{der Dateien}} muss abgeschlossen sein.",
     "file-listing": {
       "file-entry": {
-        "file-error": "Reanalyse erforderlich {errorCode, select, RULES_EXECUTION_TIMEOUT{(Zeitlimit für Regeln)} LOCKED_RULES{(Regeln gesperrt)} other{}}",
+        "file-error": "Reanalyse erforderlich {errorCode, select, RULES_EXECUTION_TIMEOUT{(Zeitlimit für Regeln)} other{}}",
         "file-pending": "Ausstehend ..."
       }
     },
@@ -2102,7 +2102,6 @@
   "processing-status": {
     "ocr": "OCR",
     "pending": "Ausstehend",
-    "pending-locked-rules": "Ausstehend (Regeln gesperrt)",
     "pending-timeout": "Ausstehend (Zeitlimit für Regeln)",
     "processed": "Verarbeitet",
     "processing": "Verarbeitung läuft"

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

@@ -987,7 +987,7 @@
     "download-file-disabled": "To download, ensure you are an approver in the dossier, and the {count, plural, one{file has undergone} other{files have undergone}} initial processing.",
     "file-listing": {
       "file-entry": {
-        "file-error": "Re-processing required {errorCode, select, RULES_EXECUTION_TIMEOUT{(Rules timeout)} LOCKED_RULES{(Rules locked)} other{}}",
+        "file-error": "Re-processing required {errorCode, select, RULES_EXECUTION_TIMEOUT{(Rules timeout)} other{}}",
         "file-pending": "Pending..."
       }
     },
@@ -2102,7 +2102,6 @@
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
-    "pending-locked-rules": "Pending (Rules locked)",
     "pending-timeout": "Pending (Rules timeout)",
     "processed": "Processed",
     "processing": "Processing"

libs/red-domain/src/lib/dossier-stats/types.ts

@@ -13,7 +13,6 @@ export const ProcessingTypes = {
 export type ProcessingType = keyof typeof ProcessingTypes;
 
 export const PendingTypes = {
-    lockedRules: 'lockedRules',
     timeout: 'timeout',
 } as const;
 

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

@@ -196,9 +196,6 @@ export class File extends Entity<IFile> implements IFile {
     }
 
     get #pendingType(): PendingType | undefined {
-        if (this.errorCode === FileErrorCodes.LOCKED_RULES) {
-            return PendingTypes.lockedRules;
-        }
         if (this.errorCode === FileErrorCodes.RULES_EXECUTION_TIMEOUT) {
             return PendingTypes.timeout;
         }