From 0bc35729c69e6b8e6874535c6b50676ce22ca8bd Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 7 Oct 2025 09:04:44 +0100 Subject: [PATCH 1/6] Add additional logs for doc uploads --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- .../palette/document/write-document-field.component.spec.ts | 6 +++--- .../palette/document/write-document-field.component.ts | 3 +++ .../document-management/document-management.service.spec.ts | 2 +- .../document-management/document-management.service.ts | 3 ++- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 954c6f253..9d273ba02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.2.47", + "version": "7.2.47-3552", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 2bc84319b..66a56b6c2 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.2.47", + "version": "7.2.47-3552", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts index 0fc50fb2d..545eb129f 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts @@ -139,7 +139,7 @@ describe('WriteDocumentFieldComponent', () => { 'isUploadInProgress' ]); - appConfig = createSpyObj('AbstractAppConfig', ['getCdamExclusionList']); + appConfig = createSpyObj('AbstractAppConfig', ['getCdamExclusionList', 'logMessage']); mockDocumentManagementService.isDocumentSecureModeEnabled.and.returnValue(true); caseNotifier = {}; caseNotifier.caseView = of({ case_type: { id: 'test' } }); @@ -692,7 +692,7 @@ describe('WriteDocumentFieldComponent with Mandatory casefield', () => { 'isUploadInProgress' ]); - appConfig = createSpyObj('AbstractAppConfig', ['getCdamExclusionList']); + appConfig = createSpyObj('AbstractAppConfig', ['getCdamExclusionList', 'logMessage']); mockDocumentManagementService.isDocumentSecureModeEnabled.and.returnValue(true); caseNotifier = {}; caseNotifier.caseView = of({ case_type: { id: 'test' } }); @@ -918,7 +918,7 @@ describe('WriteDocumentFieldComponent', () => { 'isUploadInProgress' ]); - appConfig = createSpyObj('AbstractAppConfig', ['getCdamExclusionList']); + appConfig = createSpyObj('AbstractAppConfig', ['getCdamExclusionList', 'logMessage']); mockDocumentManagementService.isDocumentSecureModeEnabled.and.returnValue(true); caseNotifier = {}; caseNotifier.caseView = of(undefined); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.ts index 8da644e17..0c6c62e49 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.ts @@ -94,7 +94,10 @@ export class WriteDocumentFieldComponent extends AbstractFieldWriteComponent imp } // 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 }; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.spec.ts index 750206524..59945e2ea 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.spec.ts @@ -25,7 +25,7 @@ describe('DocumentManagementService', () => { appConfig = createSpyObj('appConfig', [ 'getDocumentManagementUrl', 'getRemoteDocumentManagementUrl', 'getHrsUrl', 'getRemoteHrsUrl', - 'getAnnotationApiUrl', 'getCdamExclusionList', 'getDocumentManagementUrlV2' + 'getAnnotationApiUrl', 'getCdamExclusionList', 'getDocumentManagementUrlV2', 'logMessage' ]); appConfig.getRemoteDocumentManagementUrl.and.returnValue(REMOTE_DOCUMENT_MANAGEMENT_URL); appConfig.getDocumentManagementUrl.and.returnValue(DOCUMENT_MANAGEMENT_URL); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.ts index cad784a42..8c33d92b2 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.ts @@ -63,6 +63,7 @@ export class DocumentManagementService { // 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}`); const headers = new HttpHeaders(); return this.http .post(url, formData, {headers, observe: 'body'}) @@ -145,7 +146,7 @@ export class DocumentManagementService { public isDocumentSecureModeEnabled(): boolean { const documentSecureModeCaseTypeExclusions = this.appConfig.getCdamExclusionList()?.split(','); const isDocumentOnExclusionList = documentSecureModeCaseTypeExclusions?.includes(this.caseTypeId); - + this.appConfig.logMessage(`isDocumentOnExclusionList: ${isDocumentOnExclusionList}`); if (!isDocumentOnExclusionList){ return true; } From 0ab71ea4be62376f359466d9b65f1be371acd950 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 7 Oct 2025 10:49:08 +0100 Subject: [PATCH 2/6] add tests for logs --- .../write-document-field.component.spec.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts index 545eb129f..8e403c400 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts @@ -772,6 +772,36 @@ describe('WriteDocumentFieldComponent with Mandatory casefield', () => { expect(component.fileUploadMessages).toEqual('File required'); }); + it('should be log if file is securemode', () => { + component.caseField = CASE_FIELD_MANDATORY; + mockDocumentManagementService.isDocumentSecureModeEnabled.and.returnValue(true); + caseNotifier.caseView = of({ case_id: '12345', case_type: { id: 'test', jurisdiction: { id: 'test-jurisdiction' } } }); + component.ngOnInit(); + expect(component.caseField.value).toBeTruthy(); + + component.fileChangeEvent({ + target: { + files: [] + } + }); + expect(appConfig.logMessage).toHaveBeenCalledWith('CDAM is enabled for case with case ref:: 12345'); + }); + + it('should be log if file is NOT securemode', () => { + component.caseField = CASE_FIELD_MANDATORY; + mockDocumentManagementService.isDocumentSecureModeEnabled.and.returnValue(false); + caseNotifier.caseView = of({ case_id: '12345', case_type: { id: 'test', jurisdiction: { id: 'test-jurisdiction' } } }); + component.ngOnInit(); + expect(component.caseField.value).toBeTruthy(); + + component.fileChangeEvent({ + target: { + files: [] + } + }); + expect(appConfig.logMessage).toHaveBeenCalledWith('CDAM is disabled for case with case ref:: 12345'); + }); + it('should be valid if no document specified for upload for not read only. Empty file.', () => { // Initialization. component.valid = true; From d8292f3c3febd776744841ad43dc52dbad1f2702 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 20 Oct 2025 09:09:22 +0100 Subject: [PATCH 3/6] update test name --- .../palette/document/write-document-field.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts index 8e403c400..e1ac04552 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts @@ -772,7 +772,7 @@ describe('WriteDocumentFieldComponent with Mandatory casefield', () => { expect(component.fileUploadMessages).toEqual('File required'); }); - it('should be log if file is securemode', () => { + it('should be logged as enabled if file is securemode', () => { component.caseField = CASE_FIELD_MANDATORY; mockDocumentManagementService.isDocumentSecureModeEnabled.and.returnValue(true); caseNotifier.caseView = of({ case_id: '12345', case_type: { id: 'test', jurisdiction: { id: 'test-jurisdiction' } } }); @@ -787,7 +787,7 @@ describe('WriteDocumentFieldComponent with Mandatory casefield', () => { expect(appConfig.logMessage).toHaveBeenCalledWith('CDAM is enabled for case with case ref:: 12345'); }); - it('should be log if file is NOT securemode', () => { + it('should be logged as disabled if file is NOT securemode', () => { component.caseField = CASE_FIELD_MANDATORY; mockDocumentManagementService.isDocumentSecureModeEnabled.and.returnValue(false); caseNotifier.caseView = of({ case_id: '12345', case_type: { id: 'test', jurisdiction: { id: 'test-jurisdiction' } } }); From 38c4a7b4465629477799ea1d61ca9db0532e2f68 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 22 Oct 2025 11:27:36 +0100 Subject: [PATCH 4/6] update to pre-release name --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 84ed6867f..03ec485eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.2.51", + "version": "7.2.51-3552", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 81766a116..ab318d4c9 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.2.51", + "version": "7.2.51-3552", "engines": { "node": ">=18.19.0" }, From b7a4abb2ce8c6587a81ab00e19e5373cb65d63b4 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 27 Oct 2025 09:57:09 +0000 Subject: [PATCH 5/6] Update version number --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 99afc4e6c..bcdb89496 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.2.53", + "version": "7.2.53-3552", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index f9a702a7f..2fb691e36 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.2.53", + "version": "7.2.53-3552", "engines": { "node": ">=18.19.0" }, From b07f0478978178160d0a70bfb55d9cf8b3a0c3d4 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 3 Nov 2025 16:41:52 +0000 Subject: [PATCH 6/6] update version number to release --- RELEASE-NOTES.md | 3 +++ package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 8719fab5e..dc5918e49 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,8 @@ ## RELEASE NOTES +### Version 7.2.54 +**EXUI-3552** Some of the requests for document create are going to XUI and not CDAM + ### Version 7.2.53 **EXUI-2519** Angular error in query-write-raise-query.component diff --git a/package.json b/package.json index bcdb89496..76285f182 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.2.53-3552", + "version": "7.2.54", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 2fb691e36..007df95b5 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.2.53-3552", + "version": "7.2.54", "engines": { "node": ">=18.19.0" },