commit after pulling from release and resolving conflicts

Author: chrisjones-hmcts

RELEASE-NOTES.md

@@ -1,8 +1,12 @@
 ## RELEASE NOTES
 
-### Version 7.2.58-exui-3053
+### Version 7.2.59-exui-3053
 **EXUI-3053** Media Viewer - Improve keyboard movement within media viewer screen
 
+### Version 7.2.59
+**EXUI-3661** Performance issues on screens to return data
+**EXUI-3681** Users unable to upload documents
+
 ### Version 7.2.58
 **EXUI-2821** Media Viewer - Search/Present button issues
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.2.58-exui-3053",
+  "version": "7.2.59-exui-3053",
   "engines": {
     "node": ">=18.19.0"
   },

projects/ccd-case-ui-toolkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.2.58-exui-3053",
+  "version": "7.2.59-exui-3053",
   "engines": {
     "node": ">=18.19.0"
   },

projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.spec.ts

@@ -773,49 +773,53 @@ describe('WriteDocumentFieldComponent with Mandatory casefield', () => {
   });
 
   it('should be logged as enabled if file is securemode', () => {
-    component.caseField = CASE_FIELD_MANDATORY;
+    const blobParts: BlobPart[] = ['some contents for blob'];
+    const file: File = new File(blobParts, 'test.pdf');
     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: []
+        files: [
+          file
+        ]
       }
     });
+    expect(mockFileUploadStateService.setUploadInProgress).toHaveBeenCalledWith(true);
+    expect(mockDocumentManagementService.uploadFile).toHaveBeenCalledWith(any(FormData));
     expect(appConfig.logMessage).toHaveBeenCalledWith('CDAM is enabled for case with case ref:: 12345');
   });
 
   it('should be logged as disabled if file is NOT securemode', () => {
-    component.caseField = CASE_FIELD_MANDATORY;
+    const blobParts: BlobPart[] = ['some contents for blob'];
+    const file: File = new File(blobParts, 'test.pdf');
     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: []
+        files: [
+          file
+        ]
       }
     });
     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;
-    component.caseField = CASE_FIELD;
+  it('should set caseId from caseNotifier', () => {
+    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();
-    expect(component.valid).toBeTruthy();
 
     component.fileChangeEvent({
       target: {
         files: []
       }
     });
-    expect(component.valid).toBeTruthy();
+    expect(component.caseId).toBe('12345');
   });
 
   it('should cancel file upload', () => {

projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/document/write-document-field.component.ts

@@ -53,6 +53,7 @@ export class WriteDocumentFieldComponent extends AbstractFieldWriteComponent imp
   public jurisdictionId: string;
   public caseTypeId: string;
   public caseTypeExclusions: string;
+  public caseId: string;
   // Should the file upload use CDAM
   public fileSecureModeOn: boolean = false;
 
@@ -76,6 +77,7 @@ export class WriteDocumentFieldComponent extends AbstractFieldWriteComponent imp
       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;
@@ -94,10 +96,7 @@ 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 };
@@ -364,6 +363,12 @@ export class WriteDocumentFieldComponent extends AbstractFieldWriteComponent imp
   }
 
   private handleDocumentUploadResult(result: DocumentData): void {
+    // 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 });

projects/ccd-case-ui-toolkit/src/lib/shared/directives/substitutor/label-substitutor.directive.spec.ts

@@ -846,24 +846,18 @@ describe('LabelSubstitutorDirective', () => {
       expect(comp.caseField.isTranslated).toBe(false);
     });
 
-    it('should handle language change timeout correctly', fakeAsync(() => {
+    it('should handle language change correctly', fakeAsync(() => {
       const label = 'Label with ${placeholder}';
       comp.caseField = textField('LabelB', '', label);
       comp.caseFields = [comp.caseField, textField('LabelA', 'ValueA', '')];
 
-      placeholderService.resolvePlaceholders.and.returnValues('Label with ValueA', '', '');
+      placeholderService.resolvePlaceholders.and.returnValues('Label with ValueA', 'Label with ValueA', '', '');
       fixture.detectChanges();
 
       placeholderService.resolvePlaceholders.calls.reset();
 
       translationService.setLanguage('cy');
 
-      expect(placeholderService.resolvePlaceholders).not.toHaveBeenCalled();
-
-      tick(50);
-      expect(placeholderService.resolvePlaceholders).not.toHaveBeenCalled();
-
-      tick(50);
       fixture.detectChanges();
       expect(placeholderService.resolvePlaceholders).toHaveBeenCalled();
     }));

projects/ccd-case-ui-toolkit/src/lib/shared/directives/substitutor/label-substitutor.directive.ts

@@ -5,7 +5,7 @@ import { CaseField } from '../../domain/definition/case-field.model';
 import { FieldsUtils } from '../../services/fields/fields.utils';
 import { PlaceholderService } from './services/placeholder.service';
 import { RpxTranslatePipe, RpxTranslationService } from 'rpx-xui-translation';
-import { Subscription } from 'rxjs';
+import { skip, Subscription } from 'rxjs';
 
 @Directive({ selector: '[ccdLabelSubstitutor]' })
 /**
@@ -33,11 +33,10 @@ export class LabelSubstitutorDirective implements OnInit, OnDestroy {
     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()

projects/ccd-case-ui-toolkit/src/lib/shared/services/document-management/document-management.service.ts

@@ -146,7 +146,6 @@ 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;
     }