@hmcts/ccd-case-ui-toolkit 7.3.2-user-by-idam → 7.3.3-3859

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

@@ -7148,6 +7148,7 @@ class ReadCookieService {
 class DocumentManagementService {
     http;
     appConfig;
+    sessionStorageService;
     static PDF = 'pdf';
     static IMAGE = 'image';
     static WORD = 'word';
@@ -7162,29 +7163,22 @@ class DocumentManagementService {
     static wordList = ['DOC', 'DOCX', 'doc', 'docx'];
     static excelList = ['XLS', 'XLSX', 'xls', 'xlsx'];
     static powerpointList = ['PPT', 'PPTX', 'ppt', 'pptx'];
-    caseTypeId = '';
-    constructor(http, appConfig) {
+    caseTypeId;
+    caseId;
+    constructor(http, appConfig, sessionStorageService) {
         this.http = http;
         this.appConfig = appConfig;
-        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];
-            }
-        }
+        this.sessionStorageService = sessionStorageService;
+        const caseInfo = this.parseCaseInfo(this.sessionStorageService.getItem('caseInfo'));
+        const currUrl = this.getCurrentPathname();
+        this.caseTypeId = this.resolveCaseTypeId(caseInfo, currUrl);
     }
     uploadFile(formData) {
         const url = this.getDocStoreUrl();
         // Do not set any headers, such as "Accept" or "Content-Type", with null values; this is not permitted with the
         // Angular HttpClient in @angular/common/http. Just create and pass a new HttpHeaders object. Angular will add the
         // correct headers and values automatically
-        this.appConfig.logMessage(`Uploading document for case type: ${this.caseTypeId}, with url: ${url}`);
+        this.appConfig.logMessage(`DMS:: Uploading document for case type: ${this.caseTypeId}, with url: ${url}, and case id: ${this.caseId}`);
         const headers = new HttpHeaders();
         return this.http
             .post(url, formData, { headers, observe: 'body' })
@@ -7249,6 +7243,40 @@ class DocumentManagementService {
     isPowerpoint(powerpointType) {
         return DocumentManagementService.powerpointList.find(e => e === powerpointType) !== undefined;
     }
+    parseCaseInfo(caseInfo) {
+        if (!caseInfo) {
+            return null;
+        }
+        try {
+            return JSON.parse(caseInfo);
+        }
+        catch (error) {
+            this.appConfig.logMessage('Failed to parse caseInfo from session storage');
+            return null;
+        }
+    }
+    getCurrentPathname() {
+        if (typeof window === 'undefined' || !window.location) {
+            return '';
+        }
+        return window.location.pathname || '';
+    }
+    resolveCaseTypeId(caseInfo, currUrl) {
+        const caseTypeIdFromSession = caseInfo?.caseType;
+        if (caseTypeIdFromSession) {
+            this.caseId = caseInfo?.caseId;
+            return caseTypeIdFromSession;
+        }
+        const parts = currUrl.split('/');
+        if (currUrl.includes('/case-details/') && parts.length > 4) {
+            return parts[4];
+        }
+        const caseCreateIndex = parts.indexOf('case-create');
+        if (currUrl.includes('/case-create/') && caseCreateIndex > -1 && parts.length > caseCreateIndex + 2) {
+            return parts[caseCreateIndex + 2];
+        }
+        return '';
+    }
     transformDocumentUrl(documentBinaryUrl) {
         const remoteHrsPattern = new RegExp(this.appConfig.getRemoteHrsUrl());
         documentBinaryUrl = documentBinaryUrl.replace(remoteHrsPattern, this.appConfig.getHrsUrl());
@@ -7272,12 +7300,12 @@ class DocumentManagementService {
         // 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)); };
+    static ɵfac = function DocumentManagementService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || DocumentManagementService)(i0.ɵɵinject(HttpService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(SessionStorageService)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: DocumentManagementService, factory: DocumentManagementService.ɵfac });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(DocumentManagementService, [{
         type: Injectable
-    }], () => [{ type: HttpService }, { type: AbstractAppConfig }], null); })();
+    }], () => [{ type: HttpService }, { type: AbstractAppConfig }, { type: SessionStorageService }], null); })();
 
 class ErrorNotifierService {
     errorSource = new BehaviorSubject(null);
@@ -8605,10 +8633,10 @@ class CaseworkerService {
         this.appConfig = appConfig;
         this.errorService = errorService;
     }
-    getUserByIdamId(idamId) {
-        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUserByIdamId`;
+    getCaseworkers(serviceId) {
+        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUsersByServiceName`;
         return this.http
-            .post(url, idamId)
+            .post(url, { services: [serviceId] })
             .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
@@ -12054,9 +12082,12 @@ class CaseEventCompletionTaskReassignedComponent {
         this.jurisdiction = task.jurisdiction;
         this.caseType = task.case_type_id;
         // Current user is a caseworker?
-        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(task.assignee).subscribe(caseworker => {
-            if (caseworker) {
-                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(task.jurisdiction).subscribe(result => {
+            if (result && result[0].service === task.jurisdiction && result[0].caseworkers) {
+                const caseworker = result[0].caseworkers.find(x => x.idamId === task.assignee);
+                if (caseworker) {
+                    this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+                }
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?
@@ -15223,6 +15254,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     dialog;
     fileUploadStateService;
     jurisdictionService;
+    sessionStorageService;
     static DOCUMENT_URL = 'document_url';
     static DOCUMENT_BINARY_URL = 'document_binary_url';
     static DOCUMENT_FILENAME = 'document_filename';
@@ -15252,7 +15284,8 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     caseId;
     // Should the file upload use CDAM
     fileSecureModeOn = false;
-    constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
+    gotFromCaseInfo = false;
+    constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService, sessionStorageService) {
         super();
         this.appConfig = appConfig;
         this.caseNotifier = caseNotifier;
@@ -15260,12 +15293,20 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         this.dialog = dialog;
         this.fileUploadStateService = fileUploadStateService;
         this.jurisdictionService = jurisdictionService;
+        this.sessionStorageService = sessionStorageService;
     }
     ngOnInit() {
         // Wait for both observables to emit at least once
+        const caseInfo = this.documentManagement.parseCaseInfo(this.sessionStorageService.getItem('caseInfo'));
         const currUrl = window.location.pathname;
-        if (currUrl.includes('/case-details/')) {
-            this.caseTypeId = currUrl.split('/')[4];
+        if (caseInfo) {
+            this.gotFromCaseInfo = true;
+            this.caseTypeId = caseInfo.caseType;
+        }
+        else {
+            if (currUrl.includes('/case-details/')) {
+                this.caseTypeId = currUrl.split('/')[4];
+            }
         }
         this.caseNotifierSubscription = combineLatest([
             this.caseNotifier.caseView.pipe(take(1)),
@@ -15526,10 +15567,10 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     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}`);
+            this.appConfig.logMessage(`WDF:: CDAM is enabled for case with case ref:: ${this.caseId}, case type:: ${this.caseTypeId}, gotFromCaseInfo:: ${this.gotFromCaseInfo}`);
         }
         else {
-            this.appConfig.logMessage(`CDAM is disabled for case with case ref:: ${this.caseId}`);
+            this.appConfig.logMessage(`WDF:: CDAM is disabled for case with case ref:: ${this.caseId}, case type:: ${this.caseTypeId}, gotFromCaseInfo:: ${this.gotFromCaseInfo}`);
         }
         if (!this.uploadedDocument) {
             if (this.fileSecureModeOn) {
@@ -15563,7 +15604,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         this.valid = false;
         this.fileUploadStateService.setUploadInProgress(false);
     }
-    static ɵfac = function WriteDocumentFieldComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$3.MatLegacyDialog), i0.ɵɵdirectiveInject(FileUploadStateService), i0.ɵɵdirectiveInject(JurisdictionService)); };
+    static ɵfac = function WriteDocumentFieldComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$3.MatLegacyDialog), i0.ɵɵdirectiveInject(FileUploadStateService), i0.ɵɵdirectiveInject(JurisdictionService), i0.ɵɵdirectiveInject(SessionStorageService)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) { if (rf & 1) {
             i0.ɵɵviewQuery(_c0$S, 5);
         } if (rf & 2) {
@@ -15624,11 +15665,11 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WriteDocumentFieldComponent, [{
         type: Component,
         args: [{ selector: 'ccd-write-document-field', standalone: false, template: "<div class=\"form-group\" [ngClass]=\"{'form-group-error bottom-30': !valid}\">\n  <label [for]=\"id()\">\n    <span class=\"form-label\" attr.aria-label=\"{{caseField | ccdFieldLabel}}\">{{(caseField | ccdFieldLabel)}}</span>\n  </label>\n  <span class=\"form-hint\" *ngIf=\"caseField.hint_text\">\n    <markdown [data]=\"caseField.hint_text | rpxTranslate\"></markdown>\n  </span>\n  <span class=\"error-message\"\n        role=\"alert\"\n        tabindex=\"0\"\n        [hidden]=\"!(fileUploadMessages && !valid)\">\n    {{ fileUploadMessages | rpxTranslate }}\n  </span>\n  <div>\n    <!--<span *ngIf=\"getUploadedFileName()\" class=\"text-16\">File name: {{getUploadedFileName()}}</span>-->\n    <ccd-read-document-field *ngIf=\"caseField\" [caseField]=\"caseField\"></ccd-read-document-field>\n  </div>\n\n  <div style='position:relative'>\n    <div [id]=\"createElementId('fileInputWrapper')\" (click)=\"fileSelectEvent()\" (keyup)=\"fileSelectEvent()\"></div>\n    <input class=\"form-control bottom-30\" [id]=\"id()\" type=\"file\" (keydown.Tab)=\"fileValidationsOnTab()\" (change)=\"fileChangeEvent($event, caseField.field_type.regular_expression)\"\n           accept=\"{{caseField.field_type.regular_expression}}\" #fileInput/>\n  </div>\n</div>\n<div class=\"form-group bottom-30\">\n  <button class=\"button button-secondary\" type=\"button\" aria-label=\"Cancel upload\" (click)=\"cancelUpload()\" [disabled]=\"!isUploadInProgress()\">{{'Cancel upload' | rpxTranslate}}</button>\n</div>\n" }]
-    }], () => [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$3.MatLegacyDialog }, { type: FileUploadStateService }, { type: JurisdictionService }], { fileInput: [{
+    }], () => [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$3.MatLegacyDialog }, { type: FileUploadStateService }, { type: JurisdictionService }, { type: SessionStorageService }], { fileInput: [{
             type: ViewChild,
             args: ['fileInput', { static: false }]
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteDocumentFieldComponent, { className: "WriteDocumentFieldComponent", filePath: "lib/shared/components/palette/document/write-document-field.component.ts", lineNumber: 25 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteDocumentFieldComponent, { className: "WriteDocumentFieldComponent", filePath: "lib/shared/components/palette/document/write-document-field.component.ts", lineNumber: 26 }); })();
 
 class DynamicListPipe {
     static EMPTY = '';
@@ -34545,9 +34586,18 @@ class CaseResolver {
             this.navigateToCaseList();
         }
         else {
-            return this.isRootCaseViewRoute(route) ? this.getAndCacheCaseView(cid)
+            const resultPromise = this.isRootCaseViewRoute(route) ? this.getAndCacheCaseView(cid)
                 : this.caseNotifier.cachedCaseView ? Promise.resolve(this.caseNotifier.cachedCaseView)
                     : this.getAndCacheCaseView(cid);
+            return resultPromise.then((caseView) => {
+                const newCaseInfo = {
+                    caseId: caseView.case_id,
+                    jurisdiction: caseView.case_type.jurisdiction.id,
+                    caseType: caseView.case_type.id
+                };
+                this.sessionStorage.setItem('caseInfo', JSON.stringify(newCaseInfo));
+                return caseView;
+            });
         }
     }
     navigateToCaseList() {
@@ -35662,7 +35712,6 @@ class CaseFullAccessViewComponent {
             });
         }
         this.checkRouteAndSetCaseViewTab();
-        this.setCaseInfo();
         // Check for active Case Flags
         this.activeCaseFlags = this.hasActiveCaseFlags();
         this.linkedCasesService.resetLinkedCaseData();
@@ -35675,18 +35724,6 @@ class CaseFullAccessViewComponent {
             this.organiseTabPosition();
         }
     }
-    setCaseInfo() {
-        const caseInfo = JSON.parse(this.sessionStorageService.getItem('caseInfo') || '{}');
-        console.log('Case Info from session storage: ', caseInfo);
-        if (caseInfo?.caseId !== this.caseDetails.case_id) {
-            const newCaseInfo = {
-                caseId: this.caseDetails.case_id,
-                jurisdiction: this.caseDetails.case_type.jurisdiction.id,
-                caseType: this.caseDetails.case_type.id
-            };
-            this.sessionStorageService.setItem('caseInfo', JSON.stringify(newCaseInfo));
-        }
-    }
     isPrintEnabled() {
         return this.caseDetails.case_type.printEnabled;
     }
@@ -36600,9 +36637,12 @@ class TaskAssignedComponent {
         // Current user is a caseworker?
         this.jurisdiction = this.task.jurisdiction;
         this.caseType = this.task.case_type_id;
-        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(this.task.assignee).subscribe(caseworker => {
-            if (caseworker) {
-                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(this.task.jurisdiction).subscribe(result => {
+            if (result && result[0].service === this.task.jurisdiction && result[0].caseworkers) {
+                const caseworker = result[0].caseworkers.find(x => x.idamId === this.task.assignee);
+                if (caseworker) {
+                    this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+                }
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?