Case flags v2 based on master

RELEASE-NOTES.md

@@ -1,4 +1,7 @@
 ## RELEASE NOTES
+### 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
 
@@ -19,6 +22,59 @@
 **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
 
+### Version 6.16.0-query-management-orchestrator-v3
+**EUI-8303** Query management orchestrator to get the mock data
+
+### Version 6.10.7-case-flags-v2-welsh-language-support-additional-rework-2
+**EUI-8116** Additional rework of Welsh language support
+
+### Version 6.10.7-case-flags-v2-reasonable-adjustments-fixes
+**EUI-8370** Ensure "Other" support type is not shown at the top-level selection when the user is external
+**EUI-8371** Show details of the selected support being updated when the user is external
+
+### Version 6.10.7-case-flags-v2-hide-event-summary-and-description-on-cya-page-v2
+**EUI-8246** Reasonable Adjustments legal rep hide Event Summary and Event Description section on CYA page
+
+### Version 6.10.7-case-flags-v2-view-case-flags-ui-amendments-v2
+**EUI-8069** Fix Case Flags table display to show selected language for "Language Interpreter" flag types (ported from Case Flags v1)
+**EUI-8070** Display "decision reason" (flag update comment) for "Not approved" flags to internal HMCTS users only
+**EUI-8071** Hide "Active flags" banner from external users
+
+### Version 6.10.7-case-flags-legal-rep-comments-page-v3
+**EUI-7373** Reasonable Adjustments legal rep display and edit 'Tell us why the support is no longer needed' screen
+
+### Version 6.10.7-case-flags-welsh-language-support
+**EUI-7858** Ensure support for Welsh language toggle by storing flag description and comments entries in correct `_cy` fields, and displaying flag comments according to language selection
+
+### Version 6.10.7-case-flags-legal-rep-review-details-page
+**EUI-7375** Reasonable adjustments legal rep display review flag details page
+
+### Version 6.10.7-case-flags-review-details-page-v4
+**EUI-7351** Reasonable adjustments display review flag details page
+
+### Version 6.10.7-manage-case-flags-valid-status-progression
+**EUI-7929** Set the valid flag status options available on the "Update flag" page, based on the current status of the selected flag
+
+### Version 6.10.7-manage-case-flags-filter-out-inactive-and-not-approved
+**EUI-7354** Ensure flags with a status of either "Inactive" or "Not approved" are filtered out from display on "Manage case flags" page, so they cannot be selected for update
+
+### Version 6.10.7-case-flags-add-translations-page-validation
+**EUI-7932** Add validation to "Add translations to flag" page and map additional fields for "Other" description (English/Welsh) and flag comments (Welsh) for persistence as part of flag update
+
+### Version 6.10.7-case-flags-manage-case-flags-ui-amendments
+**EUI-7777** Change wording for "translation needed" checkbox on "Update flag" page
+**EUI-7842** Remove read-only setting from English description and comments boxes on "Add Welsh translation to flag" page
+**EUI-7900** Add validation to "Update flag" page
+
+### Version 6.10.7-case-flags-confirm-flag-status-page-validation
+**EUI-7611** Add validation to "Confirm the status of the flag" page
+
+### Version 6.10.7-case-flags-write-component-fixes-for-legal-rep-journey
+**EUI-7362** Ensure correct titles and captions are shown for "Request support" and "Manage support" journeys for legal reps
+
+### 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-flags-show-language-for-interpreter-flag-types
 **EUI-8069** Fix Case Flags table display to show selected language for "Language Interpreter" flag types
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "6.19.3-RetryCaseRetrievals.1",
+  "version": "6.19.2-case-flags-v2-reasonable-adjustments-v2",
   "engines": {
     "yarn": "^3.5.0",
     "npm": "^8.10.0"
@@ -99,7 +99,7 @@
     "@angular/cli": "^11.2.19",
     "@angular/compiler-cli": "~11.2.14",
     "@babel/core": "^7.18.10",
-    "@compodoc/compodoc": "1.1.12",
+    "@compodoc/compodoc": "^1.1.12",
     "@storybook/addon-actions": "^6.5.10",
     "@storybook/addon-essentials": "^6.5.10",
     "@storybook/addon-interactions": "^6.5.10",

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

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "6.19.3-RetryCaseRetrievals.1",
+  "version": "6.19.2-case-flags-v2-reasonable-adjustments-v2",
   "engines": {
     "yarn": "^3.5.0",
     "npm": "^8.10.0"

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

@@ -0,0 +1,9 @@
+import { CaseEditDataModule } from './case-edit-data.module';
+
+describe('JurisdictionService', () => {
+  describe('forRoot', () => {
+    it('shouldto be truthy', () => {
+      expect(CaseEditDataModule.forRoot()).toBeTruthy();
+    });
+  });
+});

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

@@ -0,0 +1,84 @@
+import { take } from 'rxjs/operators';
+import { CaseEditDataService } from './case-edit-data.service';
+
+describe('CaseEditDataService', () => {
+  let service: CaseEditDataService;
+
+  describe('setCaseTitle', () => {
+    it('should update title', (done) => {
+      service = new CaseEditDataService();
+      service.setCaseTitle('mr');
+      service.caseTitle$.pipe(take(1)).subscribe((actual) => {
+        expect(actual).toEqual('mr');
+        done();
+      });
+    });
+  });
+
+  describe('setCaseEventTriggerName', () => {
+    it('should update eventTriggerName', (done) => {
+      service = new CaseEditDataService();
+      service.setCaseEventTriggerName('test');
+      service.caseEventTriggerName$.pipe(take(1)).subscribe((actual) => {
+        expect(actual).toEqual('test');
+        done();
+      });
+    });
+  });
+
+  describe('setFormValidationErrors', () => {
+    it('should update formValidationErrors', (done) => {
+      const result = [{
+        id: 'id',
+        message: 'message'
+      }];
+      service = new CaseEditDataService();
+      service.setFormValidationErrors(result);
+      service.caseFormValidationErrors$.pipe(take(1)).subscribe((actual) => {
+        expect(actual).toEqual(result);
+        done();
+      });
+    });
+  });
+
+  describe('addFormValidationError', () => {
+    it('should update formValidationErrors', (done) => {
+      const result = [{
+        id: 'id',
+        message: 'message'
+      }];
+      service = new CaseEditDataService();
+      service.addFormValidationError(result[0]);
+      service.caseFormValidationErrors$.pipe(take(1)).subscribe((actual) => {
+        expect(actual).toEqual(result);
+        done();
+      });
+    });
+  });
+
+  describe('setTriggerSubmitEvent', () => {
+    it('should update triggerSubmitEvent', (done) => {
+      const result = true;
+      service = new CaseEditDataService();
+      service.setTriggerSubmitEvent(result);
+      service.caseTriggerSubmitEvent$.pipe(take(1)).subscribe((actual) => {
+        expect(actual).toEqual(result);
+        done();
+      });
+    });
+  });
+
+  describe('clearFormValidationErrors', () => {
+    it('should clear formValidationErrors', (done) => {
+      const result = [];
+      service = new CaseEditDataService();
+      service.clearFormValidationErrors();
+
+      service.caseFormValidationErrors$.pipe(take(1)).subscribe((actual) => {
+        expect(actual).toEqual(result);
+        done();
+      });
+    });
+  });
+
+});

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();
   });
 });

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

@@ -24,6 +24,7 @@ import {
   ProfileNotifier,
   SessionStorageService
 } from '../../../services';
+import { MockRpxTranslatePipe } from '../../../test/mock-rpx-translate.pipe';
 import { IsCompoundPipe } from '../../palette/utils/is-compound.pipe';
 import { CaseEditPageText } from '../case-edit-page/case-edit-page-text.enum';
 import { aWizardPage } from '../case-edit.spec';
@@ -204,7 +205,8 @@ describe('CaseEditSubmitComponent', () => {
           CcdCYAPageLabelFilterPipe,
           CcdPageFieldsPipe,
           CaseReferencePipe,
-          CcdCaseTitlePipe
+          CcdCaseTitlePipe,
+          MockRpxTranslatePipe
         ],
         schemas: [CUSTOM_ELEMENTS_SCHEMA],
         providers: [
@@ -532,7 +534,8 @@ describe('CaseEditSubmitComponent', () => {
           CcdPageFieldsPipe,
           CcdCYAPageLabelFilterPipe,
           CaseReferencePipe,
-          CcdCaseTitlePipe
+          CcdCaseTitlePipe,
+          MockRpxTranslatePipe
         ],
         schemas: [CUSTOM_ELEMENTS_SCHEMA],
         providers: [
@@ -683,7 +686,8 @@ describe('CaseEditSubmitComponent', () => {
           CcdPageFieldsPipe,
           CcdCYAPageLabelFilterPipe,
           CaseReferencePipe,
-          CcdCaseTitlePipe
+          CcdCaseTitlePipe,
+          MockRpxTranslatePipe
         ],
         schemas: [CUSTOM_ELEMENTS_SCHEMA],
         providers: [

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.html

@@ -1,6 +1,6 @@
 <div *ngIf="!caseEdit.isEventCompletionChecksRequired">
   <!-- Event trigger name -->
-  <h1 class="govuk-heading-l">{{ eventTrigger.name}}</h1>
+  <h1 class="govuk-heading-l">{{eventTrigger.name | rpxTranslate}}</h1>
 
   <!--Case ID or Title -->
   <div *ngIf="getCaseTitle(); then titleBlock; else idBlock"></div>
@@ -22,7 +22,7 @@ <h2 *ngIf="getCaseId()" class="heading-h2">#{{ getCaseId() | ccdCaseReference }}
       <h2 class="heading-h2">{{pageTitle | rpxTranslate }}</h2>
       <span class="text-16" *ngIf="!caseEdit.isCaseFlagSubmission">{{'Check the information below carefully.' | rpxTranslate}}</span>
 
-      <table class="form-table" aria-describedby="check your answers table">
+      <table class="form-table" [attr.aria-describedby]="'check your answers table' | rpxTranslate">
         <tbody>
         <ng-container *ngFor="let page of wizard.pages">
           <ng-container *ngIf="isShown(page)">
@@ -33,15 +33,21 @@ <h2 class="heading-h2">{{pageTitle | rpxTranslate }}</h2>
               <ng-container *ngIf="canShowFieldInCYA(field)">
                 <tr ccdLabelSubstitutor [caseField]="field" [hidden]="field.hidden"
                     [formGroup]="editForm.controls['data']" [contextFields]="contextFields">
-                  <th *ngIf="!isLabel(field) && !caseEdit.isCaseFlagSubmission" class="valign-top case-field-label"><span class="text-16">{{field.label}}</span></th>
+                  <th *ngIf="!isLabel(field) && !caseEdit.isCaseFlagSubmission" class="valign-top case-field-label">
+                    <span class="text-16">{{field.label | rpxTranslate}}</span>
+                  </th>
                   <td class="form-cell case-field-content" [attr.colspan]="isLabel(field) ? '2' : '1'">
                     <ccd-field-read
                       [formGroup]="editForm.controls['data']" [topLevelFormGroup]="editForm.controls['data']"
                       [caseField]="summaryCaseField(field)" [context]="paletteContext" [caseFields]="contextFields"></ccd-field-read>
                   </td>
                   <td class="valign-top check-your-answers__change case-field-change">
                     <a *ngIf="isChangeAllowed(field)" (click)="navigateToPage(page.id)"
-                      href="javascript:void(0)"><span class="text-16" attr.aria-label="Change {{ field.label }}">Change</span></a>
+                      href="javascript:void(0)">
+                      <span class="text-16" attr.aria-label="{{'Change' | rpxTranslate}} {{ field.label | rpxTranslate }}">
+                        {{'Change' | rpxTranslate}}
+                      </span>
+                    </a>
                   </td>
                 </tr>
               </ng-container>
@@ -53,12 +59,12 @@ <h2 class="heading-h2">{{pageTitle | rpxTranslate }}</h2>
     </ng-container>
     <ng-container *ngIf="readOnlySummaryFieldsToDisplayExists()">
 
-      <table class="summary-fields" aria-describedby="summary fields table">
+      <table class="summary-fields" [attr.aria-describedby]="'summary fields table' | rpxTranslate">
         <tbody>
           <ng-container *ngFor="let field of showSummaryFields">
               <ng-container [ngSwitch]="!(field | ccdIsCompound)">
                 <tr *ngSwitchCase="true" ccdLabelSubstitutor [caseField]="field" [formGroup]="editForm.controls['data']" [contextFields]="contextFields">
-                  <th id="summary-field-label">{{field.label}}</th>
+                  <th id="summary-field-label">{{field.label | rpxTranslate}}</th>
                   <td class="form-cell">
                     <ccd-field-read [formGroup]="editForm.controls['data']" [caseField]="summaryCaseField(field)"></ccd-field-read>
                   </td>
@@ -78,23 +84,31 @@ <h2 class="heading-h2">{{pageTitle | rpxTranslate }}</h2>
         <legend style="display: none;"></legend>
         <div class="form-group">
           <label for="field-trigger-summary" class="form-label">
-            Event summary (optional)
-            <span class="form-hint">A few words describing the purpose of the event.</span>
+            {{'Event summary (optional)' | rpxTranslate}}
+            <span class="form-hint">{{'A few words describing the purpose of the event.' | rpxTranslate}}</span>
           </label>
           <input type="text" id="field-trigger-summary" class="form-control bottom-30 width-50" formControlName="summary" maxlength="1024">
         </div>
         <div class="form-group">
-          <label for="field-trigger-description" class="form-label">Event description (optional)</label>
+          <label for="field-trigger-description" class="form-label">{{'Event description(optional)' | rpxTranslate}}</label>
           <textarea id="field-trigger-description" class="form-control bottom-30 width-50" formControlName="description"
                     maxlength="65536"></textarea>
         </div>
       </fieldset>
     </ng-container>
     <div class="form-group form-group-related">
-      <button class="button button-secondary" type="button" [disabled]="!hasPrevious() || caseEdit.isSubmitting" (click)="previous()">Previous</button>
-      <button type="submit" [disabled]="isDisabled" class="button">{{triggerText}}</button>
+      <button class="button button-secondary" type="button" [disabled]="!hasPrevious() || caseEdit.isSubmitting" (click)="previous()">
+        {{'Previous' | rpxTranslate}}
+      </button>
+      <button type="submit" [disabled]="isDisabled" class="button">
+        {{triggerText | rpxTranslate}}
+      </button>
     </div>
-    <p class="cancel"><a (click)="cancel()" href="javascript:void(0)" [class.disabled]="caseEdit.isSubmitting">{{getCancelText()}}</a></p>
+    <p class="cancel">
+      <a (click)="cancel()" href="javascript:void(0)" [class.disabled]="caseEdit.isSubmitting">
+        {{getCancelText() | rpxTranslate}}
+      </a>
+    </p>
   </form>
 </div>
 <ccd-case-event-completion *ngIf="caseEdit.isEventCompletionChecksRequired"

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit.scss

@@ -51,6 +51,10 @@ a.disabled {
   width: 50%
 }
 
+.no-bottom-border {
+  border-bottom: none;
+}
+
 .case-field-change {
   width: 5%
 }

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-editor.module.ts

@@ -53,6 +53,7 @@ import {
   WorkAllocationService
 } from './services';
 import { CaseEditWizardGuard } from './services/case-edit-wizard.guard';
+import { CaseFlagStateService } from './services/case-flag-state.service';
 import { CaseworkerService } from './services/case-worker.service';
 
 @NgModule({
@@ -121,7 +122,8 @@ import { CaseworkerService } from './services/case-worker.service';
     JudicialworkerService,
     CaseworkerService,
     SessionStorageService,
-    EventCompletionStateMachineService
+    EventCompletionStateMachineService,
+    CaseFlagStateService
   ]
 })
 export class CaseEditorModule { }

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/services/case-flag-state.service.spec.ts

@@ -0,0 +1,28 @@
+import { TestBed } from '@angular/core/testing';
+import { FormControl } from '@angular/forms';
+import { CaseFlagStateService } from './case-flag-state.service';
+
+describe('CaseFlagStateService', () => {
+  let caseFlagStateService: CaseFlagStateService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [CaseFlagStateService]
+    });
+    caseFlagStateService = TestBed.inject(CaseFlagStateService);
+  });
+
+  it('should be created', () => {
+    expect(caseFlagStateService).toBeTruthy();
+  });
+
+  it('calling resetCache should reset the form group and set location', () => {
+    const formControlName = 'test' ;
+    caseFlagStateService.formGroup.addControl(formControlName, new FormControl());
+    expect(caseFlagStateService.formGroup.get(formControlName)).toBeTruthy();
+    const newLocation = 'newLocation';
+    caseFlagStateService.resetCache(newLocation);
+    expect(caseFlagStateService.formGroup.get(formControlName)).toBeNull();
+    expect(caseFlagStateService.pageLocation).toBe(newLocation);
+  });
+});