diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts index 40e99726e..36be94538 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -100,13 +100,17 @@ export class DossierDetailsComponent extends ContextComponent 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 sum + file.numberOfPages, 0); } - #calculateStatusConfig(stats: DossierStats): ProgressBarConfigModel[] { - const files = this._filesMapService.get(this.#dossierId); - const numberOfRulesLockedFiles = files.filter(file => file.errorCode === FileErrorCodes.LOCKED_RULES).length; + #calculateStatusConfig(stats: DossierStats, files: File[]): ProgressBarConfigModel[] { const numberOfTimeoutFiles = files.filter(file => file.errorCode === FileErrorCodes.RULES_EXECUTION_TIMEOUT).length; return [ { @@ -167,13 +169,6 @@ export class DossierDetailsComponent extends ContextComponent { /** 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)), diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index d95b11301..6ca1ce677 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/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" diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 70f700417..8eb095fdf 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/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" diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 383dcfc33..8cd4bf26e 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/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" diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index d781a982a..9b4efdfbd 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/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" diff --git a/libs/red-domain/src/lib/dossier-stats/types.ts b/libs/red-domain/src/lib/dossier-stats/types.ts index 23696ad44..791458a05 100644 --- a/libs/red-domain/src/lib/dossier-stats/types.ts +++ b/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; diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index 49f1e5e4d..59e93d972 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -196,9 +196,6 @@ export class File extends Entity 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; }