@hmcts/ccd-case-ui-toolkit 7.2.58-update-all-error-message-1 → 7.2.59-exui-3053-1

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -8,9 +8,9 @@ import * as i1$1 from '@angular/router';
 import { RouterModule, NavigationStart, NavigationEnd } from '@angular/router';
 import * as i4 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormArray, FormGroup, FormControl, Validators, ReactiveFormsModule, FormsModule } from '@angular/forms';
-import { BehaviorSubject, throwError, Subject, EMPTY, Observable, of, combineLatest, timer, forkJoin, fromEvent, Subscription } from 'rxjs';
+import { BehaviorSubject, throwError, Subject, EMPTY, Observable, skip, of, combineLatest, timer, forkJoin, fromEvent, Subscription } from 'rxjs';
 import * as i1$2 from '@angular/common/http';
-import { HttpErrorResponse, HttpHeaders, HttpParams, HttpStatusCode } from '@angular/common/http';
+import { HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
 import { distinctUntilChanged, catchError, map, publish, refCount, switchMap, debounceTime, take, delay, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, first, takeUntil, filter } from 'rxjs/operators';
 import { polling } from 'rx-polling-hmcts';
 import { Type, Exclude, Expose, plainToClassFromExist, plainToClass } from 'class-transformer';
@@ -6533,11 +6533,8 @@ class LabelSubstitutorDirective {
         this.initialHintText = this.caseField.hint_text;
         this.caseField.originalLabel = this.caseField.label;
         this.formGroup = this.formGroup || new FormGroup({});
-        this.languageSubscription = this.rpxTranslationService.language$.subscribe(() => {
-            // timeout is required to prevent race conditions with translation pipe
-            setTimeout(() => {
-                this.onLanguageChange();
-            }, 100);
+        this.languageSubscription = this.rpxTranslationService.language$.pipe(skip(1)).subscribe(() => {
+            this.onLanguageChange();
         });
         this.applySubstitutions();
     }
@@ -7346,7 +7343,6 @@ class DocumentManagementService {
     isDocumentSecureModeEnabled() {
         const documentSecureModeCaseTypeExclusions = this.appConfig.getCdamExclusionList()?.split(',');
         const isDocumentOnExclusionList = documentSecureModeCaseTypeExclusions?.includes(this.caseTypeId);
-        this.appConfig.logMessage(`isDocumentOnExclusionList: ${isDocumentOnExclusionList}`);
         if (!isDocumentOnExclusionList) {
             return true;
         }
@@ -13079,8 +13075,8 @@ class CaseFileViewFieldComponent {
         this.caseFileViewService.updateDocumentCategory(cid, this.caseVersion, data.document.attribute_path, data.newCategory)
             .pipe(finalize(() => {
             this.loadingService.unregister(loadingToken);
-        }), catchError((err) => {
-            this.errorMessages = [this.moveDocumentError(err)];
+        }), catchError(() => {
+            this.errorMessages = ['You do not have permission to move this document to the selected folder.'];
             return of(null);
         }))
             .subscribe(res => {
@@ -13104,31 +13100,6 @@ class CaseFileViewFieldComponent {
     isIcpEnabled() {
         return this.icpEnabled && ((this.icp_jurisdictions?.length < 1) || this.icp_jurisdictions.includes(this.caseNotifier?.cachedCaseView?.case_type?.jurisdiction.id));
     }
-    moveDocumentError(err) {
-        const defaultMsg = 'We couldn\'t move the document. Please try again.';
-        if (!(err instanceof HttpErrorResponse)) {
-            return defaultMsg;
-        }
-        switch (err.status) {
-            case HttpStatusCode.BadRequest:
-                // e.g. malformed PUT, invalid attribute_path, invalid target category
-                return 'The request was invalid. Check the document path and destination folder.';
-            case HttpStatusCode.Conflict:
-                // optimistic concurrency / stale case version
-                return 'This case changed since you opened it. Refresh and try again.';
-            case HttpStatusCode.NotFound:
-                return 'The document or destination folder could not be found.';
-            case HttpStatusCode.Forbidden:
-            case HttpStatusCode.Unauthorized:
-                return 'You do not have permission to move this document to the selected folder.';
-            case HttpStatusCode.ServiceUnavailable:
-            case HttpStatusCode.GatewayTimeout:
-                return 'The service is temporarily unavailable. Please try again in a moment.';
-            default:
-                // Any other status (including 500)
-                return defaultMsg;
-        }
-    }
     static ɵfac = function CaseFileViewFieldComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || CaseFileViewFieldComponent)(i0.ɵɵdirectiveInject(i0.ElementRef), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseFileViewService), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(AbstractAppConfig)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseFileViewFieldComponent, selectors: [["ccd-case-file-view-field"]], decls: 3, vars: 3, consts: [[4, "ngIf"], ["class", "govuk-grid-column-two-thirds", 4, "ngIf"], ["id", "case-file-view-field-errors", "data-module", "govuk-error-summary", 1, "govuk-error-summary", "govuk-!-margin-bottom-4"], ["role", "alert"], [1, "govuk-error-summary__title"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [4, "ngFor", "ngForOf"], ["type", "button", 1, "govuk-js-link"], [1, "govuk-grid-column-two-thirds"], [1, "govuk-heading-xl"], [1, "govuk-body"], [1, "govuk-heading-l"], ["id", "case-file-view", 1, "govuk-form-group"], [1, "document-tree-container"], [1, "document-tree-container__tree", 3, "clickedDocument", "moveDocument", "categoriesAndDocuments", "allowMoving"], [1, "slider"], [1, "media-viewer-container"], [3, "url", "downloadFileName", "showToolbar", "contentType", "enableAnnotations", "enableRedactions", "height", "caseId", "multimediaPlayerEnabled", "enableICP"]], template: function CaseFileViewFieldComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵtemplate(0, CaseFileViewFieldComponent_ng_container_0_Template, 8, 1, "ng-container", 0)(1, CaseFileViewFieldComponent_div_1_Template, 5, 0, "div", 1)(2, CaseFileViewFieldComponent_div_2_Template, 9, 3, "div", 0);
@@ -13144,7 +13115,7 @@ class CaseFileViewFieldComponent {
         type: Component,
         args: [{ selector: 'ccd-case-file-view-field', template: "<ng-container *ngIf=\"errorMessages?.length\">\n  <div\n    id=\"case-file-view-field-errors\"\n    class=\"govuk-error-summary govuk-!-margin-bottom-4\"\n    data-module=\"govuk-error-summary\"\n  >\n    <div role=\"alert\">\n      <h2 class=\"govuk-error-summary__title\">There is a problem</h2>\n      <div class=\"govuk-error-summary__body\">\n        <ul class=\"govuk-list govuk-error-summary__list\">\n          <li *ngFor=\"let errorMessage of errorMessages\">\n            <button type=\"button\" class=\"govuk-js-link\">{{ errorMessage }}</button>\n          </li>\n        </ul>\n      </div>\n    </div>\n  </div>\n</ng-container>\n\n<div\n  *ngIf=\"getCategoriesAndDocumentsError\"\n  class=\"govuk-grid-column-two-thirds\"\n>\n  <h1 class=\"govuk-heading-xl\">Sorry, there is a problem with the service</h1>\n  <p class=\"govuk-body\">Try again later.</p>\n</div>\n<div *ngIf=\"!getCategoriesAndDocumentsError\">\n  <h2 class=\"govuk-heading-l\">Case file</h2>\n  <div class=\"govuk-form-group\" id=\"case-file-view\">\n    <!-- Document tree -->\n    <div class=\"document-tree-container\">\n      <ccd-case-file-view-folder \n          class=\"document-tree-container__tree\"\n          [categoriesAndDocuments]=\"categoriesAndDocuments$\"\n          (clickedDocument)=\"setMediaViewerFile($event); resetErrorMessages()\" \n          (moveDocument)=\"moveDocument($event)\"\n          [allowMoving]=\"allowMoving\">\n      </ccd-case-file-view-folder>\n    </div>\n    <!-- Slider -->\n    <div class=\"slider\"></div>\n    <!-- Media viewer -->\n    <div class=\"media-viewer-container\">\n      <ng-container *ngIf=\"currentDocument\">\n        <mv-media-viewer\n          [url]=\"currentDocument.document_binary_url\"\n          [downloadFileName]=\"currentDocument.document_filename\"\n          [showToolbar]=\"true\"\n          [contentType]=\"currentDocument.content_type\"\n          [enableAnnotations]=\"true\"\n          [enableRedactions]=\"true\"\n          [height]=\"'94.5vh'\"\n          [caseId]=\"caseId\"\n          [multimediaPlayerEnabled]=\"true\"\n          [enableICP]=\"isIcpEnabled()\"\n        >\n        </mv-media-viewer>\n      </ng-container>\n    </div>\n  </div>\n</div>\n", styles: ["#case-file-view{display:flex;border:2px solid #C9C9C9;height:100vh;position:relative}#case-file-view .document-tree-container{background-color:#faf8f8;width:30%;min-height:400px;min-width:10%}#case-file-view .slider{width:.2%;background-color:#6b6b6b}#case-file-view .slider:hover,#case-file-view .slider:focus{cursor:col-resize}#case-file-view .media-viewer-container{background-color:#dee0e2;flex:1 1 0;overflow:hidden}\n"] }]
     }], () => [{ type: i0.ElementRef }, { type: i1$1.ActivatedRoute }, { type: CaseFileViewService }, { type: DocumentManagementService }, { type: LoadingService }, { type: SessionStorageService }, { type: CaseNotifier }, { type: AbstractAppConfig }], null); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseFileViewFieldComponent, { className: "CaseFileViewFieldComponent", filePath: "lib/shared/components/palette/case-file-view/case-file-view-field.component.ts", lineNumber: 18 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseFileViewFieldComponent, { className: "CaseFileViewFieldComponent", filePath: "lib/shared/components/palette/case-file-view/case-file-view-field.component.ts", lineNumber: 17 }); })();
 
 function ReadCaseFlagFieldComponent_ng_container_0_Template(rf, ctx) { if (rf & 1) {
     const _r1 = i0.ɵɵgetCurrentView();
@@ -15277,6 +15248,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     jurisdictionId;
     caseTypeId;
     caseTypeExclusions;
+    caseId;
     // Should the file upload use CDAM
     fileSecureModeOn = false;
     constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
@@ -15297,6 +15269,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             if (caseDetails) {
                 this.caseTypeId = caseDetails?.case_type?.id;
                 this.jurisdictionId = caseDetails?.case_type?.jurisdiction?.id;
+                this.caseId = caseDetails?.case_id;
             }
             if (jurisdiction) {
                 this.jurisdictionId = jurisdiction.id;
@@ -15315,12 +15288,8 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             }
             // use the documentManagement service to check if the document upload should use CDAM
             if (this.documentManagement.isDocumentSecureModeEnabled()) {
-                this.appConfig.logMessage(`CDAM is enabled for case with case ref:: ${caseDetails?.case_id}`);
                 this.fileSecureModeOn = true;
             }
-            else {
-                this.appConfig.logMessage(`CDAM is disabled for case with case ref:: ${caseDetails?.case_id}`);
-            }
             this.dialogConfig = initDialog();
             let document = this.caseField.value || { document_url: null, document_binary_url: null, document_filename: null };
             document = this.fileSecureModeOn && !document.document_hash ? { ...document, document_hash: null } : document;
@@ -15554,6 +15523,13 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         return documentUpload;
     }
     handleDocumentUploadResult(result) {
+        // use the documentManagement service to check if the document upload should use CDAM
+        if (this.documentManagement.isDocumentSecureModeEnabled()) {
+            this.appConfig.logMessage(`CDAM is enabled for case with case ref:: ${this.caseId}`);
+        }
+        else {
+            this.appConfig.logMessage(`CDAM is disabled for case with case ref:: ${this.caseId}`);
+        }
         if (!this.uploadedDocument) {
             if (this.fileSecureModeOn) {
                 this.createDocumentForm({ document_url: null, document_binary_url: null, document_filename: null, document_hash: null });