@hmcts/ccd-case-ui-toolkit 7.2.58 → 7.2.59-3552

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

@@ -8,10 +8,10 @@ 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, timer, forkJoin, fromEvent, combineLatest, Subscription } from 'rxjs';
 import * as i1$2 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 { distinctUntilChanged, catchError, map, publish, refCount, switchMap, debounceTime, delay, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, take, first, takeUntil, filter } from 'rxjs/operators';
 import { polling } from 'rx-polling-hmcts';
 import { Type, Exclude, Expose, plainToClassFromExist, plainToClass } from 'class-transformer';
 import moment from 'moment';
@@ -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();
     }
@@ -7134,89 +7131,9 @@ class ReadCookieService {
                 args: [DOCUMENT]
             }] }], null); })();
 
-class CaseNotifier {
-    casesService;
-    static CASE_NAME = 'caseNameHmctsInternal';
-    static CASE_LOCATION = 'caseManagementLocation';
-    caseViewSource = new BehaviorSubject(new CaseView());
-    caseView = this.caseViewSource.asObservable();
-    cachedCaseView;
-    constructor(casesService) {
-        this.casesService = casesService;
-    }
-    removeCachedCase() {
-        this.cachedCaseView = null;
-    }
-    announceCase(c) {
-        this.caseViewSource.next(c);
-    }
-    fetchAndRefresh(cid) {
-        return this.casesService
-            .getCaseViewV2(cid)
-            .pipe(map(caseView => {
-            this.cachedCaseView = plainToClassFromExist(new CaseView(), caseView);
-            this.setBasicFields(this.cachedCaseView.tabs);
-            this.announceCase(this.cachedCaseView);
-            return this.cachedCaseView;
-        }));
-    }
-    setBasicFields(tabs) {
-        tabs.forEach((t) => {
-            const caseName = t.fields.find(f => f.id === CaseNotifier.CASE_NAME);
-            const caseLocation = t.fields.find(f => f.id === CaseNotifier.CASE_LOCATION);
-            if (caseName || caseLocation) {
-                this.cachedCaseView.basicFields = {
-                    caseNameHmctsInternal: caseName ? caseName.value : null,
-                    caseManagementLocation: caseLocation ? caseLocation.value : null
-                };
-            }
-        });
-    }
-    static ɵfac = function CaseNotifier_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || CaseNotifier)(i0.ɵɵinject(CasesService)); };
-    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: CaseNotifier, factory: CaseNotifier.ɵfac });
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseNotifier, [{
-        type: Injectable
-    }], () => [{ type: CasesService }], null); })();
-
-class JurisdictionService {
-    httpService;
-    // We retain the Subject observable because subscribing code couldn't happen a null value
-    selectedJurisdictionSource = new Subject();
-    _selectedJurisdictionBS = new BehaviorSubject(null);
-    selectedJurisdiction;
-    constructor(httpService) {
-        this.httpService = httpService;
-        this.selectedJurisdiction = this.selectedJurisdictionSource.asObservable();
-    }
-    getJurisdictions() {
-        return this.httpService.get('/aggregated/caseworkers/:uid/jurisdictions?access=read');
-    }
-    announceSelectedJurisdiction(jurisdiction) {
-        this.selectedJurisdictionSource.next(jurisdiction);
-        this._selectedJurisdictionBS.next(jurisdiction);
-    }
-    getSelectedJurisdiction() {
-        return this._selectedJurisdictionBS;
-    }
-    searchJudicialUsers(searchTerm, serviceId) {
-        return this.httpService.post('api/prd/judicial/getJudicialUsersSearch', { searchString: searchTerm, serviceCode: serviceId });
-    }
-    searchJudicialUsersByPersonalCodes(personalCodes) {
-        return this.httpService.post('api/prd/judicial/searchJudicialUserByPersonalCodes', { personal_code: personalCodes });
-    }
-    static ɵfac = function JurisdictionService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || JurisdictionService)(i0.ɵɵinject(HttpService)); };
-    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: JurisdictionService, factory: JurisdictionService.ɵfac });
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(JurisdictionService, [{
-        type: Injectable
-    }], () => [{ type: HttpService }], null); })();
-
 class DocumentManagementService {
     http;
     appConfig;
-    caseNotifierService;
-    jurisdictionService;
     static PDF = 'pdf';
     static IMAGE = 'image';
     static WORD = 'word';
@@ -7232,32 +7149,21 @@ class DocumentManagementService {
     static excelList = ['XLS', 'XLSX', 'xls', 'xlsx'];
     static powerpointList = ['PPT', 'PPTX', 'ppt', 'pptx'];
     caseTypeId = '';
-    constructor(http, appConfig, caseNotifierService, jurisdictionService) {
+    constructor(http, appConfig) {
         this.http = http;
         this.appConfig = appConfig;
-        this.caseNotifierService = caseNotifierService;
-        this.jurisdictionService = jurisdictionService;
-        combineLatest([
-            this.caseNotifierService.caseView.pipe(take(1)),
-            this.jurisdictionService.getSelectedJurisdiction()
-        ]).subscribe(([caseDetails, jurisdiction]) => {
-            if (caseDetails) {
-                this.caseTypeId = caseDetails?.case_type?.id;
-            }
-            if (jurisdiction) {
-                if (jurisdiction.currentCaseType) {
-                    this.caseTypeId = jurisdiction.currentCaseType.id;
-                }
-            }
-            //if the user refreshes on the case creation page the above logic will not work, we can get the caseTypeId from the URL
-            if (!this.caseTypeId) {
-                const url = window.location.pathname;
-                if (url.indexOf('/case-create/') > -1) {
-                    const parts = url.split('/');
-                    this.caseTypeId = parts[parts.indexOf('case-create') + 2];
-                }
+        const currUrl = window.location.pathname;
+        if (currUrl.includes('/case-details/')) {
+            this.caseTypeId = currUrl.split('/')[4];
+        }
+        console.log(this.caseTypeId);
+        //if the user refreshes on the case creation page the above logic will not work, we can get the caseTypeId from the URL
+        if (!this.caseTypeId) {
+            if (currUrl.indexOf('/case-create/') > -1) {
+                const parts = currUrl.split('/');
+                this.caseTypeId = parts[parts.indexOf('case-create') + 2];
             }
-        });
+        }
     }
     uploadFile(formData) {
         const url = this.getDocStoreUrl();
@@ -7346,19 +7252,18 @@ class DocumentManagementService {
     isDocumentSecureModeEnabled() {
         const documentSecureModeCaseTypeExclusions = this.appConfig.getCdamExclusionList()?.split(',');
         const isDocumentOnExclusionList = documentSecureModeCaseTypeExclusions?.includes(this.caseTypeId);
-        this.appConfig.logMessage(`isDocumentOnExclusionList: ${isDocumentOnExclusionList}`);
         if (!isDocumentOnExclusionList) {
             return true;
         }
         // if documentSecureModeEnabled is true, and case is in the exclusion list, return false
         return false;
     }
-    static ɵfac = function DocumentManagementService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || DocumentManagementService)(i0.ɵɵinject(HttpService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(CaseNotifier), i0.ɵɵinject(JurisdictionService)); };
+    static ɵfac = function DocumentManagementService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || DocumentManagementService)(i0.ɵɵinject(HttpService), i0.ɵɵinject(AbstractAppConfig)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: DocumentManagementService, factory: DocumentManagementService.ɵfac });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(DocumentManagementService, [{
         type: Injectable
-    }], () => [{ type: HttpService }, { type: AbstractAppConfig }, { type: CaseNotifier }, { type: JurisdictionService }], null); })();
+    }], () => [{ type: HttpService }, { type: AbstractAppConfig }], null); })();
 
 class ErrorNotifierService {
     errorSource = new BehaviorSubject(null);
@@ -7550,6 +7455,39 @@ class MultipageComponentStateService {
             }]
     }], null, null); })();
 
+class JurisdictionService {
+    httpService;
+    // We retain the Subject observable because subscribing code couldn't happen a null value
+    selectedJurisdictionSource = new Subject();
+    _selectedJurisdictionBS = new BehaviorSubject(null);
+    selectedJurisdiction;
+    constructor(httpService) {
+        this.httpService = httpService;
+        this.selectedJurisdiction = this.selectedJurisdictionSource.asObservable();
+    }
+    getJurisdictions() {
+        return this.httpService.get('/aggregated/caseworkers/:uid/jurisdictions?access=read');
+    }
+    announceSelectedJurisdiction(jurisdiction) {
+        this.selectedJurisdictionSource.next(jurisdiction);
+        this._selectedJurisdictionBS.next(jurisdiction);
+    }
+    getSelectedJurisdiction() {
+        return this._selectedJurisdictionBS;
+    }
+    searchJudicialUsers(searchTerm, serviceId) {
+        return this.httpService.post('api/prd/judicial/getJudicialUsersSearch', { searchString: searchTerm, serviceCode: serviceId });
+    }
+    searchJudicialUsersByPersonalCodes(personalCodes) {
+        return this.httpService.post('api/prd/judicial/searchJudicialUserByPersonalCodes', { personal_code: personalCodes });
+    }
+    static ɵfac = function JurisdictionService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || JurisdictionService)(i0.ɵɵinject(HttpService)); };
+    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: JurisdictionService, factory: JurisdictionService.ɵfac });
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(JurisdictionService, [{
+        type: Injectable
+    }], () => [{ type: HttpService }], null); })();
+
 class BannersService {
     httpService;
     appConfig;
@@ -8669,6 +8607,51 @@ class CaseworkerService {
         type: Injectable
     }], () => [{ type: HttpService }, { type: AbstractAppConfig }, { type: HttpErrorService }], null); })();
 
+class CaseNotifier {
+    casesService;
+    static CASE_NAME = 'caseNameHmctsInternal';
+    static CASE_LOCATION = 'caseManagementLocation';
+    caseViewSource = new BehaviorSubject(new CaseView());
+    caseView = this.caseViewSource.asObservable();
+    cachedCaseView;
+    constructor(casesService) {
+        this.casesService = casesService;
+    }
+    removeCachedCase() {
+        this.cachedCaseView = null;
+    }
+    announceCase(c) {
+        this.caseViewSource.next(c);
+    }
+    fetchAndRefresh(cid) {
+        return this.casesService
+            .getCaseViewV2(cid)
+            .pipe(map(caseView => {
+            this.cachedCaseView = plainToClassFromExist(new CaseView(), caseView);
+            this.setBasicFields(this.cachedCaseView.tabs);
+            this.announceCase(this.cachedCaseView);
+            return this.cachedCaseView;
+        }));
+    }
+    setBasicFields(tabs) {
+        tabs.forEach((t) => {
+            const caseName = t.fields.find(f => f.id === CaseNotifier.CASE_NAME);
+            const caseLocation = t.fields.find(f => f.id === CaseNotifier.CASE_LOCATION);
+            if (caseName || caseLocation) {
+                this.cachedCaseView.basicFields = {
+                    caseNameHmctsInternal: caseName ? caseName.value : null,
+                    caseManagementLocation: caseLocation ? caseLocation.value : null
+                };
+            }
+        });
+    }
+    static ɵfac = function CaseNotifier_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || CaseNotifier)(i0.ɵɵinject(CasesService)); };
+    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: CaseNotifier, factory: CaseNotifier.ɵfac });
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseNotifier, [{
+        type: Injectable
+    }], () => [{ type: CasesService }], null); })();
+
 var Permissions;
 (function (Permissions) {
     Permissions["Own"] = "OWN";
@@ -15252,6 +15235,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     jurisdictionId;
     caseTypeId;
     caseTypeExclusions;
+    caseId;
     // Should the file upload use CDAM
     fileSecureModeOn = false;
     constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
@@ -15265,19 +15249,20 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     }
     ngOnInit() {
         // Wait for both observables to emit at least once
+        const currUrl = window.location.pathname;
+        if (currUrl.includes('/case-details/')) {
+            this.caseTypeId = currUrl.split('/')[4];
+        }
         this.caseNotifierSubscription = combineLatest([
             this.caseNotifier.caseView.pipe(take(1)),
             this.jurisdictionService.getSelectedJurisdiction()
         ]).subscribe(([caseDetails, jurisdiction]) => {
             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;
-                if (jurisdiction.currentCaseType) {
-                    this.caseTypeId = jurisdiction.currentCaseType.id;
-                }
             }
             //if we havent set the value of caseTypeId yet, we can check if its in the url. e.g. case-creation
             if (!this.caseTypeId) {
@@ -15290,12 +15275,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;
@@ -15529,6 +15510,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 });