Merge branch 'Release' into feature/EUI-8693-QM-navigate-to-query-list

.github/renovate.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+        "local>hmcts/.github:renovate-config"
+    ]
+}

.gitignore

@@ -45,6 +45,9 @@ tmp/*
 # Visual Studio Code
 .history/
 
+# Yarn
+.yarn
+
 # docs
 docs/
 
@@ -73,3 +76,4 @@ projects/ccd-case-ui-toolkit/.yarn/*
 !projects/ccd-case-ui-toolkit/.yarn/releases
 !projects/ccd-case-ui-toolkit/.yarn/sdks
 !projects/ccd-case-ui-toolkit/.yarn/versions
+cptk.sh

RELEASE-NOTES.md

@@ -2,6 +2,104 @@
 ### Version 6.16.0-query-management-navigate-back-to-query-list
 **EUI-8693** Query management navigate back to query list from query details
 
+### Version 6.19.13-case-flags-v2-update-flag-show-other-description
+**EUI-9016** Amend display of page title and field labels on "Update flag" page, to include the flag description for flags of type "Other"
+
+### Version 6.19.13-case-flags-v2-1-consolidation-final-fixes-7
+**EUI-9000** Amend "Comments" field label for external users to display static text instead of duplicating the page title
+**EUI-9009** Fix bug where `otherDescription`, `otherDescription_cy`, and `flagComment_cy` field values are not retained when a flag is updated and those fields are not part of the update
+
+### Version 6.19.13-case-flags-v2-1-consolidation-final-fixes-6
+**EUI-8999** Restrict display of the comments visibility warning text to flags not of type "Other (internal)" for the "Create Case Flag" journey, and flags that were previously created as external for the "Manage Case Flags" journey
+
+### Version 6.19.13-case-flags-v2-manage-case-flags-status-fix
+**EUI-8990** Fix bug where `UpdateFlagComponent` and `ManageCaseFlagsComponent` are using the flag status updated via the UI as if it was the actual persisted status. This causes problems when a user sets the status to "Inactive" or "Not approved", then returns to an earlier point in the "Manage Case Flags" journey via the Case Flag Summary (CYA) page. `UpdateFlagComponent` displays the wrong flag status options or none at all (if "Not approved" was selected previously), and `ManageCaseFlagsComponent` no longer displays the flag in the selection list because it has been wrongly filtered out
+
+### Version 6.19.13-case-flags-v2-1-consolidation-final-fixes-5
+**EUI-8985** Fix incorrect logic for updating tab group selected index, ensuring it is done only when non-zero because zero indicates it is already selected
+
+### Version 6.19.13-case-flags-v2-1-consolidation-final-fixes-4
+**EUI-8918/EUI-8968** Re-tag for re-release following deployment of Case File View 1.1 to live
+
+### Version 6.19.11-case-flags-v2-1-consolidation-final-fixes-4
+**EUI-8918** Fix `CaseEventTriggerComponent` to bypass case validation only if a `FlagLauncher` case field is present in the eventTrigger case fields, instead of being present in any `CaseTab` case fields
+**EUI-8968** Fix missing validation error message on clicking "Continue" button when Case Flags v2.1 is enabled
+
+### Version 6.19.9-case-flags-v2-1-consolidation-final-fixes-3
+**EUI-8934** Fix merging of internal and external flags collections to work when a `Flags.details` array is falsy
+
+### Version 6.19.9-case-flags-exui-848-fix
+**EUI-8947** Fix bug introduced by change to `CaseEditComponent` case event data generation in EXUI-848
+
+### Version 6.19.9-case-flags-v2-1-manage-case-flags-missing-header
+**EUI-8944** Fix missing header on "Manage case flags" page when Case Flags v2.1 is enabled
+
+### Version 6.19.8-case-flags-v2-1-consolidation-final-fixes-2
+**EUI-8935** Fix incorrect logic for setting flag status on flag creation
+
+### Version 6.19.8-case-flags-v2-1-consolidation-final-fixes-1
+**EUI-8914** Fix case-level flag creation to work when the case-level `Flags` object in the form data is an empty object initially
+**EUI-8913** Remove the "Previous" button from the Case Flag Summary (CYA) page
+**EUI-8915** Remove the "Change" link for the "Status" item on the Case Flag Summary (CYA) page if Case Flags v2.1 is not enabled
+**EUI-8916** Fix "Change" link navigations from the Case Flag Summary (CYA) page when Case Flags v2.1 is enabled
+
+### Version 6.19.8-case-flags-v2-1-consolidation-final
+**EUI-8819** Final release of Case Flags v2.1 consolidation; includes support for "dual mode" operation, allowing the Case Flags feature to be run as either v1 or v2.1
+
+### Version 6.19.7-case-flags-v2-1-consolidation-interim
+**EUI-8819** Interim release of Case Flags v2.1 consolidation; includes minor UI display changes (flag status tag colour changes; flag status displayed on Case Flag Summary page always)
+
+### Version 6.19.7-case-flags-v2-1-remove-duplicate-party-locations
+**EUI-8844** Remove duplicate party locations where an internal and external `Flags` object (with the same groupId) exists for a party
+
+### Version 6.19.7
+**EUI-8711/EUI-8706** Re-tag for formal release. Also includes EUI-8734
+
+### Version 6.19.5-case-flags-v2-1-determine-correct-flag-location
+**EUI-8706** Determine the correct location for a flag to be added - either internal or external - based on whether the flag is marked as "internal only" if of type "Other", or its `externallyAvailable` attribute if not of type "Other"
+
+### Version 6.19.5-case-flags-v2-1-internal-external-grouping
+**EUI-8711** Ensure internal and external collections of flag data are grouped by groupId into one instance of the `Flags` object per party, for internal users
+
+### Version 6.19.6-case-flags-v2-external-user-flag-update-fix
+**EUI-8840** Use flagUpdateComment field for persisting flag comments on update by external users
+
+### Version 6.19.6-case-flags-v2-reasonable-adjustments-v2
+**EUI-7243** Case flags v2 reasonable adjustments
+
+### Version 6.19.13
+**EXUI-908** Unable to upload correspondence to Manage Cases
+
+### Version 6.19.11-case-file-view-feature-toggle-v1.1
+**EUI-7807** Case file view v1.1
+
+### Version 6.19.6-case-file-view-document-upload-date-v2
+**EUI-7807** Case file view v1.1
+
+### Version 6.19.11-rc1
+**EXUI-1000** Complex type not showing data
+**EXUI-1006** Case Flags stopped working
+
+### Version 6.19.5
+**EXUI-623** Make secure docstore work during case creation
+
+### Version 6.19.4-sscs-joh-fixes
+**EUI-8679/EUI-8770** Re-tag for formal release. Also includes partial reversion of EXUI-623 (`WriteDocumentFieldComponent` changes) due to deficient unit test coverage
+
+### Version 6.19.5-hotfix-EUI-8679-8770
+**EUI-8679** Remove JudicialUser FormControl values from the overall FormGroup value stored and passed as search criteria by the `WorkbasketFiltersComponent` when applying filters
+**EUI-8770** Ensure the `WorkbasketFiltersComponent` announces the selected jurisdiction and case type via the `JurisdictionService`; in the `WriteJudicialUserField` component, get the current jurisdiction and case type from the `JurisdictionService` if no case info is present
+
+### Version 6.19.5-secure-doc-case-creation.1
+**EXUI-623** Make secure docstore work during case creation
+
+### Version 6.19.1-case-flags-v2-reasonable-adjustments
+**EUI-7243** Case flags v2 reasonable adjustments - updating latest from master
+
+### Version 6.19.0-case-flags-v2.1-warning-text-display-v2
+**EUI-8709** Case flags v2.1 add warning text to create case flag journey
+**EUI-8710** Case flags v2.1 add warning text to update case flag journey
+
 ### Version 6.16.0-query-management-update-mock-data
 **EUI-8636** Query management update mock data to support CCD
 
@@ -17,6 +115,33 @@
 ### Version 6.16.0-query-management-raise-a-query-page-changes
 **EUI-8602** Query management raise a query page changes
 
+### Version 6.19.2-case-flags-v2-status-text-wrapping-fix
+**EUI-8778** Prevent flag status tag text from wrapping in Case Flags table
+
+### Version 6.19.2-case-flags-v2-reasonable-adjustments-text-amendments-v3
+**EUI-8283** Reasonable adjustments amend the term flag and flag type
+**EUI-8284** Reasonable adjustments amend screen caption text on the tell us more about the request screen
+**EUI-8287** Reasonable adjustments amend the update screen caption text to remove for not approved
+
+### Version 6.19.2-case-flags-v2-reasonable-adjustments-v2
+**EUI-7243** Case flags v2 reasonable adjustments
+
+### Version 6.18.3-hotfix-EUI-8738
+**EUI-8738** Remove JudicialUser FormControls from FormGroup displayed on "Check your answers" page
+
+### Version 6.18.2-hotfix-EUI-8601-8687-8732
+**EUI-8601** Re-implement `WriteJudicialUserField` component to extend `WriteComplexFieldComponent`, to ensure correct working when used in a collection
+**EUI-8687** Fix validation logic for `WriteJudicialUserField` component
+**EUI-8732** Fix `WriteJudicialUserField` error handling to allow user to continue searching if an error occurs on calling `getJudicialUsersSearch` API endpoint
+
+### Version 6.18.0-welsh-release-v6
+**EUI-5497** Welsh release part 1
+
+### Version 6.18.2-rc2
+**EXUI-343** Fix XUI bug - Text not showing in the "Continue" green button
+**EXUI-229** DynamicMultiSelectList Updates Required
+**EXUI-313** Fix issue with secure document store
+
 ### Version 6.16-hotfix-EUI-8515-case-flags-submission
 **EUI-8515** Fix Case Flags and Linked Cases submissions not to depend on presence of "Check your answers" page
 **EUI-8550** Fix incorrect behaviour of showEventNotes() function on Case Event submission, introduced in error by EUI-6693
@@ -89,6 +214,12 @@
 ### Version 6.10.7-case-flags-confirm-flag-status-step
 **EUI-7350** Add "confirm flag status" step of Create Case Flag journey
 
+### Version 6.13.10-case-file-view-sort-by-document-upload-date-v9
+**EUI-7812** Case file view sort by document upload date
+
+### Version 6.13.10-case-file-view-display-document-upload-date-v3
+**EUI-7819** Case file view display document upload date
+
 ### Version 6.13.10-case-flags-show-language-for-interpreter-flag-types
 **EUI-8069** Fix Case Flags table display to show selected language for "Language Interpreter" flag types
 

angular.json

@@ -26,7 +26,8 @@
               "src/assets"
             ],
             "styles": [],
-            "scripts": []
+            "scripts": [],
+            "preserveSymlinks": true
           },
           "configurations": {
             "production": {

demo/src/app/app.config.ts

@@ -120,6 +120,14 @@ export class AppConfig extends AbstractAppConfig {
     return this.config.activity_retry;
   }
 
+  public getTimeoutsForCaseRetrieval() {
+    return this.config.timeouts_case_retrieval;
+  }
+
+  public getTimeoutsCaseRetrievalArtificialDelay() {
+    return this.config.timeouts_case_retrieval_artificial_delay;
+  }
+
   public getActivityBatchCollectionDelayMs() {
     return this.config.activity_batch_collection_delay_ms;
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "6.16.0-query-management-navigate-back-to-query-list",
+  "version": "6.19.13-case-flags-v2-update-flag-show-other-description",
   "engines": {
     "yarn": "^3.5.0",
     "npm": "^8.10.0"
@@ -65,7 +65,7 @@
     "@edium/fsm": "^2.1.2",
     "@hmcts/ccpay-web-component": "5.2.8",
     "@hmcts/frontend": "^0.0.50-alpha",
-    "@hmcts/media-viewer": "2.9.3",
+    "@hmcts/media-viewer": "2.9.5",
     "@ngrx/effects": "^7.4.0",
     "@ngrx/store": "^7.4.0",
     "@nicky-lenaers/ngx-scroll-to": "^9.0.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "6.16.0-query-management-navigate-back-to-query-list",
+  "version": "6.19.13-case-flags-v2-update-flag-show-other-description",
   "engines": {
     "yarn": "^3.5.0",
     "npm": "^8.10.0"

projects/ccd-case-ui-toolkit/src/lib/app-config.mock.ts

@@ -23,6 +23,14 @@ export class AppMockConfig implements AbstractAppConfig {
     return 0;
   }
 
+  public getTimeoutsForCaseRetrieval(): number[] {
+    return [0];
+  }
+
+  public getTimeoutsCaseRetrievalArtificialDelay(): number {
+    return 0;
+  }
+
   public getActivityUrl(): string {
     return '';
   }
@@ -47,6 +55,18 @@ export class AppMockConfig implements AbstractAppConfig {
     return '';
   }
 
+  public getEnvironment() {
+    if (this.getActivityUrl()?.includes('.aat.'))
+      return 'aat';
+    else if (this.getActivityUrl()?.includes('.preview.'))
+      return 'preview';
+    else if (this.getActivityUrl()?.includes('.demo.'))
+      return 'demo';
+    else if (this.getActivityUrl()?.includes('.ithc.'))
+      return 'ithc';
+    return 'prod';
+  }
+
   public getCaseHistoryUrl(caseId: string, eventId: string): string {
     return '';
   }
@@ -186,4 +206,8 @@ export class AppMockConfig implements AbstractAppConfig {
   public getCaseDataStoreApiUrl(): string {
     return '';
   }
+
+  public getEnableCaseFileViewVersion1_1(): boolean {
+    return true;
+  }
 }

projects/ccd-case-ui-toolkit/src/lib/app.config.ts

@@ -29,12 +29,8 @@ export abstract class AbstractAppConfig {
   public abstract getApiUrl(): string;
   public abstract getCaseDataUrl(): string;
   public abstract getDocumentManagementUrl(): string;
-  public getDocumentManagementUrlV2(): string {
-    return undefined;
-  }
-  public getDocumentSecureMode(): boolean {
-    return undefined;
-  }
+  public abstract getDocumentManagementUrlV2(): string;
+  public abstract getDocumentSecureMode(): boolean;
   public abstract getRemoteDocumentManagementUrl(): string;
   public abstract getHrsUrl(): string;
   public abstract getRemoteHrsUrl(): string;
@@ -48,6 +44,8 @@ export abstract class AbstractAppConfig {
   public abstract getActivityUrl(): string;
   public abstract getActivityNexPollRequestMs(): number;
   public abstract getActivityRetry(): number;
+  public abstract getTimeoutsForCaseRetrieval(): number[];
+  public abstract getTimeoutsCaseRetrievalArtificialDelay(): number;
   public abstract getActivityBatchCollectionDelayMs(): number;
   public abstract getActivityMaxRequestPerBatch(): number;
   public abstract getCaseHistoryUrl(caseId: string, eventId: string): string;
@@ -83,6 +81,17 @@ export abstract class AbstractAppConfig {
   public getLocationRefApiUrl(): string {
     return undefined;
   }
+  public getEnvironment() {
+    if (this.getActivityUrl()?.includes('.aat.'))
+      return 'aat';
+    else if (this.getActivityUrl()?.includes('.preview.'))
+      return 'preview';
+    else if (this.getActivityUrl()?.includes('.demo.'))
+      return 'demo';
+    else if (this.getActivityUrl()?.includes('.ithc.'))
+      return 'ithc';
+    return 'prod';
+  }
   public abstract getRefundsUrl(): string;
   public abstract getNotificationUrl(): string;
   public abstract getPaymentReturnUrl(): string;
@@ -94,6 +103,7 @@ export abstract class AbstractAppConfig {
   public abstract getCaseFlagsRefdataApiUrl(): string;
   public abstract getRDCommonDataApiUrl(): string;
   public abstract getCaseDataStoreApiUrl(): string;
+  public abstract getEnableCaseFileViewVersion1_1(): boolean;
 }
 
 export class CaseEditorConfig {
@@ -114,6 +124,8 @@ export class CaseEditorConfig {
   public activity_batch_collection_delay_ms: number;
   public activity_next_poll_request_ms: number;
   public activity_retry: number;
+  public timeouts_case_retrieval: number[];
+  public timeouts_case_retrieval_artificial_delay: number;
   public activity_url: string;
   public activity_max_request_per_batch: number;
   public print_service_url: string;
@@ -160,4 +172,5 @@ export class CaseEditorConfig {
   public case_flags_refdata_api_url: string;
   public rd_common_data_api_url: string;
   public case_data_store_api_url: string;
+  public enable_case_file_view_version_1_1: boolean;
 }

projects/ccd-case-ui-toolkit/src/lib/components/header/headers.module.ts

@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
+import { RpxTranslationModule } from 'rpx-xui-translation';
 import { HeaderBarComponent } from './header-bar/header-bar.component';
 import { NavigationItemComponent } from './navigation/navigation-item.component';
 import { NavigationComponent } from './navigation/navigation.component';
 import { PhaseComponent } from './phase/phase.component';
-import { RpxTranslationModule } from 'rpx-xui-translation';
 
 @NgModule({
     imports: [CommonModule, RouterModule, RpxTranslationModule.forChild()],

projects/ccd-case-ui-toolkit/src/lib/shared/commons/case-edit-data/case-edit-data.service.spec.ts

@@ -31,7 +31,7 @@ describe('CaseEditDataService', () => {
       const result = [{
         id: 'id',
         message: 'message'
-      }]
+      }];
       service = new CaseEditDataService();
       service.setFormValidationErrors(result);
       service.caseFormValidationErrors$.pipe(take(1)).subscribe((actual) => {
@@ -46,7 +46,7 @@ describe('CaseEditDataService', () => {
       const result = [{
         id: 'id',
         message: 'message'
-      }]
+      }];
       service = new CaseEditDataService();
       service.addFormValidationError(result[0]);
       service.caseFormValidationErrors$.pipe(take(1)).subscribe((actual) => {
@@ -58,7 +58,7 @@ describe('CaseEditDataService', () => {
 
   describe('setTriggerSubmitEvent', () => {
     it('should update triggerSubmitEvent', (done) => {
-      const result = true
+      const result = true;
       service = new CaseEditDataService();
       service.setTriggerSubmitEvent(result);
       service.caseTriggerSubmitEvent$.pipe(take(1)).subscribe((actual) => {

projects/ccd-case-ui-toolkit/src/lib/shared/commons/case-edit-data/case-edit-validation.model.ts

@@ -1,4 +1,5 @@
 export type CaseEditValidationError = {
-    id: string,
-    message: string
+  id: string,
+  message: string,
+  label?: string
 };

projects/ccd-case-ui-toolkit/src/lib/shared/components/activity/activity.component.spec.ts

@@ -103,7 +103,6 @@ describe('CcdActivityComponent', () => {
         imports: [],
         declarations: [
           ActivityComponent,
-
           // Mocks
           activityIconComponentMock,
           activityBannerComponentMock,

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-create/case-create.component.spec.ts

@@ -326,7 +326,7 @@ describe('CaseCreateComponent failed to resolve event trigger', () => {
   }));
 
   it('should alert warning message and never announce event trigger if getting event trigger fails', () => {
-    expect(alertService.error).toHaveBeenCalledWith({ phrase: 'ERROR!' });
+    expect(alertService.error).toHaveBeenCalledWith({ phrase: 'ERROR!'});
     expect(eventTriggerService.announceEventTrigger).not.toHaveBeenCalled();
   });
 });