From 9c8b822be7e566c95bb36b6992acae9f1aa16ee1 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Mon, 12 Feb 2024 15:09:42 +0000 Subject: [PATCH 01/75] Work in progress regarding CSFD-16 --- .../case-edit-page.component.ts | 31 ++++- .../case-edit-page/case-edit-page.html | 2 +- .../case-editor/case-editor.module.ts | 4 +- .../abstract-field-write-journey.component.ts | 79 ++++++++++++ .../base-field/abstract-journey.component.ts | 72 +++++++++++ .../components/palette/base-field/index.ts | 2 + .../add-comments/add-comments.component.html | 6 +- .../add-comments/add-comments.component.ts | 13 +- .../select-flag-location.component.html | 6 +- .../select-flag-location.component.ts | 13 +- .../select-flag-type.component.html | 3 - .../select-flag-type.component.ts | 19 ++- .../write-case-flag-field.component.html | 51 ++++++-- .../write-case-flag-field.component.ts | 53 +++++++- .../src/lib/shared/domain/index.ts | 1 + .../src/lib/shared/domain/journey/index.ts | 2 + .../journey/journey-instigator.model.ts | 4 + .../shared/domain/journey/journey.model.ts | 13 ++ .../src/lib/shared/services/index.ts | 1 + .../src/lib/shared/services/journey/index.ts | 1 + .../multipage-component-state.service.spec.ts | 114 ++++++++++++++++++ .../multipage-component-state.service.ts | 111 +++++++++++++++++ 22 files changed, 557 insertions(+), 44 deletions(-) create mode 100644 projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts create mode 100644 projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts create mode 100644 projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/index.ts create mode 100644 projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey-instigator.model.ts create mode 100644 projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts create mode 100644 projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/index.ts create mode 100644 projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts create mode 100644 projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index ec4f9d5fa0..b09282b8f7 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -9,7 +9,7 @@ import { CaseEventData } from '../../../domain/case-event-data.model'; import { CaseEventTrigger } from '../../../domain/case-view/case-event-trigger.model'; import { CaseField } from '../../../domain/definition'; import { DRAFT_PREFIX } from '../../../domain/draft.model'; -import { LoadingService } from '../../../services'; +import { LoadingService, MultipageComponentStateService } from '../../../services'; import { CaseFieldService } from '../../../services/case-fields/case-field.service'; import { FieldsUtils } from '../../../services/fields'; import { FormErrorService } from '../../../services/form/form-error.service'; @@ -22,13 +22,14 @@ import { WizardPage } from '../domain/wizard-page.model'; import { Wizard } from '../domain/wizard.model'; import { PageValidationService } from '../services/page-validation.service'; import { ValidPageListCaseFieldsService } from '../services/valid-page-list-caseFields.service'; +import { JourneyInstigator } from '../../../domain/journey'; @Component({ selector: 'ccd-case-edit-page', templateUrl: 'case-edit-page.html', styleUrls: ['./case-edit-page.scss'] }) -export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestroy { +export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestroy, JourneyInstigator { public static readonly RESUMED_FORM_DISCARD = 'RESUMED_FORM_DISCARD'; public static readonly NEW_FORM_DISCARD = 'NEW_FORM_DISCARD'; public static readonly NEW_FORM_SAVE = 'NEW_FORM_CHANGED_SAVE'; @@ -83,8 +84,32 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro private readonly caseFieldService: CaseFieldService, private readonly caseEditDataService: CaseEditDataService, private readonly loadingService: LoadingService, - private readonly validPageListCaseFieldsService: ValidPageListCaseFieldsService + private readonly validPageListCaseFieldsService: ValidPageListCaseFieldsService, + private readonly multipageComponentStateService: MultipageComponentStateService ) { + //this.pageStateService.resetJourneyCollection(); + this.multipageComponentStateService.setInstigator(this); + } + + public onFinalNext(): void { + this.submit(); + } + + public onFinalPrevious(): void { + this.cancel(); + } + + // This method will be triggered by the next button in the app component + public nextStep(): void { + // TODO: Debug why the state isn't persisting. + // - Check the AbstractJourneyComponent for more details. + // - Compare to prototype. + this.multipageComponentStateService.next(); + } + + // This method will be triggered by the previous button in the app component + public previousStep(): void { + this.multipageComponentStateService.previous(); } public ngOnInit(): void { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html index ed618a16fa..a7e154adff 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html @@ -40,7 +40,7 @@

(callbackErrorsContext)="callbackErrorsNotify($event)">
-
+
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-editor.module.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-editor.module.ts index 659bfacfdd..a93c41b532 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-editor.module.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-editor.module.ts @@ -55,6 +55,7 @@ import { import { CaseEditWizardGuard } from './services/case-edit-wizard.guard'; import { CaseworkerService } from './services/case-worker.service'; import { ValidPageListCaseFieldsService } from './services/valid-page-list-caseFields.service'; +import { MultipageComponentStateService } from '../../services'; @NgModule({ imports: [ @@ -123,7 +124,8 @@ import { ValidPageListCaseFieldsService } from './services/valid-page-list-caseF CaseworkerService, SessionStorageService, EventCompletionStateMachineService, - ValidPageListCaseFieldsService + ValidPageListCaseFieldsService, + MultipageComponentStateService ] }) export class CaseEditorModule { } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts new file mode 100644 index 0000000000..3893f50d8c --- /dev/null +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts @@ -0,0 +1,79 @@ +import { Directive, Input, OnChanges, ViewChild } from "@angular/core"; +import { AbstractFieldWriteComponent } from "./abstract-field-write.component"; +import { Journey } from "../../../domain"; +import { MultipageComponentStateService } from "../../../services"; + +@Directive() +export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWriteComponent implements OnChanges, Journey { + public journeyStartPageNumber: number = 0; + public journeyEndPageNumber: number = 0; + public journeyPageNumber: number = 0; + + @Input() + public journeyId: string = 'journey'; + + // todo... + @ViewChild('journeyChild') + public childJourney!: Journey; + + public constructor(protected readonly multipageComponentStateService: MultipageComponentStateService) { + super(); + this.multipageComponentStateService.addTojourneyCollection(this); + this.journeyPageNumber = this.journeyStartPageNumber; + } + + public next(): void { + if (!this.hasNext()) { + return; + } + + this.childJourney.next(); + } + + public previous(): void { + if (!this.hasPrevious()) { + return; + } + this.previousPage(); + } + + protected previousPage(): void { + if (this.hasPrevious()) { + this.journeyPageNumber--; + } + } + + protected nextPage(): void { + if (this.hasNext()) { + this.journeyPageNumber++; + } + } + + public ngOnInit(): void { + this.journeyPageNumber = this.journeyStartPageNumber; + + const state = this.multipageComponentStateService.getJourneyState(this); + + if (state) { + const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; + + this.journeyPageNumber = journeyPageNumber; + this.journeyStartPageNumber = journeyStartPageNumber; + this.journeyEndPageNumber = journeyEndPageNumber; + } + } + + public ngOnDestroy(): void { + this.multipageComponentStateService.setJourneyState(this); + } + + public hasNext(): boolean { return this.journeyPageNumber < this.journeyEndPageNumber }; + + public hasPrevious(): boolean { return this.journeyPageNumber > this.journeyStartPageNumber }; + + public isFinished(): boolean { return this.journeyPageNumber === this.journeyEndPageNumber }; + + public isStart(): boolean { return this.journeyPageNumber === this.journeyStartPageNumber }; + + public getId(): string { return this.journeyId }; +} diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts new file mode 100644 index 0000000000..8e55edc528 --- /dev/null +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts @@ -0,0 +1,72 @@ +import { Directive, Input, ViewChild } from "@angular/core"; +import { Journey } from "../../../domain"; +import { MultipageComponentStateService } from "../../../services"; + +@Directive() +export abstract class AbstractJourneyComponent implements Journey { + + public journeyStartPageNumber: number = 0; + public journeyEndPageNumber: number = 0; + public journeyPageNumber: number = 0; + + @Input() + public journeyId: string = 'journey'; + + // todo... + @ViewChild('journeyChild') + public childJourney!: Journey; + + public constructor(protected readonly pageStateService: MultipageComponentStateService) { + this.pageStateService.addTojourneyCollection(this); + this.journeyPageNumber = this.journeyStartPageNumber; + } + + public next(): void { + if (!this.hasNext()) { + return; + } + + this.childJourney.next(); + } + + public previous(): void { + if (!this.hasPrevious()) { + return; + } + this.previousPage(); + } + + protected previousPage(): void { + if (this.hasPrevious()) { + this.journeyPageNumber--; + } + } + + public ngOnInit(): void { + this.journeyPageNumber = this.journeyStartPageNumber; + + const state = this.pageStateService.getJourneyState(this); + + if (state) { + const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; + + this.journeyPageNumber = journeyPageNumber; + this.journeyStartPageNumber = journeyStartPageNumber; + this.journeyEndPageNumber = journeyEndPageNumber; + } + } + + public ngOnDestroy(): void { + this.pageStateService.setJourneyState(this); + } + + public hasNext(): boolean { return this.journeyPageNumber < this.journeyEndPageNumber }; + + public hasPrevious(): boolean { return this.journeyPageNumber > this.journeyStartPageNumber }; + + public isFinished(): boolean { return this.journeyPageNumber === this.journeyEndPageNumber }; + + public isStart(): boolean { return this.journeyPageNumber === this.journeyStartPageNumber }; + + public getId(): string { return this.journeyId }; +} \ No newline at end of file diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/index.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/index.ts index 70ae56ca4f..b13b4854f9 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/index.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/index.ts @@ -1,5 +1,7 @@ export * from './abstract-field-read.component'; +export * from './abstract-field-write-journey.component'; export * from './abstract-field-write.component'; +export * from './abstract-journey.component'; export * from './field-read.component'; export * from './field-write.component'; export * from './field-read-label.component'; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.html index 37c72c0473..c5ac92751e 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.html @@ -24,8 +24,4 @@

- - -
- -
+ \ No newline at end of file diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.ts index f3d706ccd2..3baaf37082 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.ts @@ -1,14 +1,15 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { ErrorMessage } from '../../../../../domain'; +import { ErrorMessage, Journey } from '../../../../../domain'; import { CaseFlagState } from '../../domain'; import { AddCommentsErrorMessage, AddCommentsStep, CaseFlagFieldState, CaseFlagWizardStepTitle } from '../../enums'; +import { AbstractJourneyComponent } from '../../../base-field'; @Component({ selector: 'ccd-add-comments', templateUrl: './add-comments.component.html' }) -export class AddCommentsComponent implements OnInit { +export class AddCommentsComponent extends AbstractJourneyComponent implements OnInit, Journey { @Input() public formGroup: FormGroup; @Input() public optional = false; @@ -60,4 +61,12 @@ export class AddCommentsComponent implements OnInit { }); } } + + public next() { + this.onNext(); + + if (this.errorMessages.length === 0) { + super.next(); + } + } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.html index 443d4ed00c..72db6b113e 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.html @@ -29,8 +29,4 @@

- - -
- -
+ \ No newline at end of file diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts index ff2c40e66e..bd7395d69a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts @@ -1,14 +1,15 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { ErrorMessage } from '../../../../../domain'; +import { ErrorMessage, Journey } from '../../../../../domain'; import { CaseFlagState, FlagsWithFormGroupPath } from '../../domain'; import { CaseFlagFieldState, CaseFlagWizardStepTitle, SelectFlagLocationErrorMessage } from '../../enums'; +import { AbstractJourneyComponent } from '../../../base-field/abstract-journey.component'; @Component({ selector: 'ccd-select-flag-location', templateUrl: './select-flag-location.component.html' }) -export class SelectFlagLocationComponent implements OnInit { +export class SelectFlagLocationComponent extends AbstractJourneyComponent implements OnInit, Journey { @Input() public formGroup: FormGroup; @Input() public flagsData: FlagsWithFormGroupPath[]; @@ -80,4 +81,12 @@ export class SelectFlagLocationComponent implements OnInit { // Return case flag field state and error messages to the parent this.caseFlagStateEmitter.emit({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_TYPE, errorMessages: this.errorMessages }); } + + public next() { + this.onNext(); + + if (this.errorMessages.length === 0) { + super.next(); + } + } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.html index bdcd1cab35..716e2c53bf 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.html @@ -35,7 +35,4 @@

-
- -
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts index 5d222d8347..2bb3c5df03 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts @@ -2,19 +2,20 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu import { FormControl, FormGroup } from '@angular/forms'; import { Subscription } from 'rxjs'; import { catchError, switchMap } from 'rxjs/operators'; -import { ErrorMessage } from '../../../../../domain'; +import { ErrorMessage, Journey } from '../../../../../domain'; import { FlagType } from '../../../../../domain/case-flag'; -import { CaseFlagRefdataService } from '../../../../../services'; +import { CaseFlagRefdataService, MultipageComponentStateService } from '../../../../../services'; import { RefdataCaseFlagType } from '../../../../../services/case-flag/refdata-case-flag-type.enum'; import { CaseFlagState } from '../../domain'; import { CaseFlagFieldState, CaseFlagWizardStepTitle, SelectFlagTypeErrorMessage } from '../../enums'; +import { AbstractJourneyComponent } from '../../../base-field/abstract-journey.component'; @Component({ selector: 'ccd-select-flag-type', templateUrl: './select-flag-type.component.html', styleUrls: ['./select-flag-type.component.scss'] }) -export class SelectFlagTypeComponent implements OnInit, OnDestroy { +export class SelectFlagTypeComponent extends AbstractJourneyComponent implements OnInit, OnDestroy, Journey { @Input() public formGroup: FormGroup; @@ -54,7 +55,9 @@ export class SelectFlagTypeComponent implements OnInit, OnDestroy { return CaseFlagWizardStepTitle; } - constructor(private readonly caseFlagRefdataService: CaseFlagRefdataService) { } + constructor(private readonly caseFlagRefdataService: CaseFlagRefdataService, pageStateService: MultipageComponentStateService) { + super(pageStateService); + } public ngOnInit(): void { this.flagTypes = []; @@ -165,4 +168,12 @@ export class SelectFlagTypeComponent implements OnInit, OnDestroy { // Return case flag field state and error messages to the parent this.caseFlagStateEmitter.emit({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_TYPE, errorMessages: this.errorMessages }); } + + public next() { + this.onNext(); + + if (this.errorMessages.length === 0) { + super.next(); + } + } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.html index 2783cd4eb6..6f47e7bf05 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.html @@ -17,34 +17,61 @@

{{createFlagCaption | rpxTranslate}} - + + - + (flagCommentsOptionalEmitter)="onFlagCommentsOptionalEmitted($event)"> + - + + - + +
- + + - + +
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts index 13341ebdc1..9f2cff69ae 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts @@ -1,19 +1,20 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { AbstractControl, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { CaseEditDataService } from '../../../commons/case-edit-data/case-edit-data.service'; -import { CaseField, ErrorMessage } from '../../../domain'; +import { CaseField, ErrorMessage, Journey } from '../../../domain'; import { FieldsUtils } from '../../../services/fields'; -import { AbstractFieldWriteComponent } from '../base-field/abstract-field-write.component'; import { CaseFlagState, FlagDetail, FlagDetailDisplayWithFormGroupPath, FlagPath, FlagsWithFormGroupPath } from './domain'; import { CaseFlagFieldState, CaseFlagStatus, CaseFlagText } from './enums'; +import { MultipageComponentStateService } from '../../../services'; +import { AbstractFieldWriteJourneyComponent } from '../base-field/abstract-field-write-journey.component'; @Component({ selector: 'ccd-write-case-flag-field', templateUrl: './write-case-flag-field.component.html', styleUrls: ['./write-case-flag-field.component.scss'] }) -export class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent implements OnInit { +export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyComponent implements OnInit, OnDestroy, Journey { public formGroup: FormGroup; public fieldState: number; @@ -43,9 +44,14 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent imp constructor( private readonly route: ActivatedRoute, - private readonly caseEditDataService: CaseEditDataService + private readonly caseEditDataService: CaseEditDataService, + multipageComponentStateService: MultipageComponentStateService ) { - super(); + super(multipageComponentStateService); + } + + public ngOnDestroy(): void { + this.multipageComponentStateService.setJourneyState(this); } public ngOnInit(): void { @@ -106,6 +112,39 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent imp }); } } + + // CSFD-16. + // Setup the page number to initially be the same value as + // the start page number. Provided that some state exists within + // the page state service, use that instaead. + // + // If isDisplayContextParameterUpdate is true, then the starting page must be + // the value of 4. Otherwise, it's 0. However, we're using an enum to simplify + // this process. + // + // It might help to take a look at the template file. + if (this.isDisplayContextParameterUpdate) { + this.journeyStartPageNumber = CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS; + this.journeyEndPageNumber = CaseFlagFieldState.FLAG_UPDATE; + } else { + this.journeyStartPageNumber = CaseFlagFieldState.FLAG_LOCATION; + this.journeyEndPageNumber = CaseFlagFieldState.FLAG_COMMENTS; + } + + // Now that we've set the start page number, let's set the current page number. + this.journeyPageNumber = this.journeyStartPageNumber; + + // Provided we have some stored state, i.e. when going backwards, we want + // to get the last visited page, etc. + const state = this.multipageComponentStateService.getJourneyState(this); + + if (state) { + const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; + + this.journeyPageNumber = journeyPageNumber; + this.journeyStartPageNumber = journeyStartPageNumber; + this.journeyEndPageNumber = journeyEndPageNumber; + } } public setDisplayContextParameterUpdate(caseFields: CaseField[]): boolean { @@ -169,6 +208,8 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent imp } else { this.fieldState++; } + + this.nextPage(); } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/index.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/index.ts index 29ff143fcc..9a13f186f8 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/index.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/index.ts @@ -10,6 +10,7 @@ export * from './document'; export * from './draft.model'; export * from './error-message.model'; export * from './http'; +export * from './journey'; export * from './order'; export * from './organisation'; export * from './pagination-metadata.model'; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/index.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/index.ts new file mode 100644 index 0000000000..f92657094c --- /dev/null +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/index.ts @@ -0,0 +1,2 @@ +export * from './journey.model'; +export * from './journey-instigator.model'; \ No newline at end of file diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey-instigator.model.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey-instigator.model.ts new file mode 100644 index 0000000000..158f6a9b1e --- /dev/null +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey-instigator.model.ts @@ -0,0 +1,4 @@ +export interface JourneyInstigator { + onFinalNext(): void; + onFinalPrevious(): void; +} diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts new file mode 100644 index 0000000000..2c5f761081 --- /dev/null +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts @@ -0,0 +1,13 @@ +export interface Journey { + next(): void; + previous(): void; + hasNext(): boolean; + hasPrevious(): boolean; + isFinished(): boolean; + isStart(): boolean; + journeyId: string; + journeyPageNumber: number; + journeyStartPageNumber: number; + journeyEndPageNumber: number; + childJourney: Journey; +} diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/index.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/index.ts index f36a406324..6936a275a3 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/index.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/index.ts @@ -12,6 +12,7 @@ export * from './eventStatusService'; export * from './fields'; export * from './form'; export * from './http'; +export * from './journey'; export * from './jurisdiction'; export * from './banners'; export * from './navigation'; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/index.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/index.ts new file mode 100644 index 0000000000..8041f8271f --- /dev/null +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/index.ts @@ -0,0 +1 @@ +export * from './multipage-component-state.service'; \ No newline at end of file diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts new file mode 100644 index 0000000000..030c768c55 --- /dev/null +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts @@ -0,0 +1,114 @@ +import { TestBed } from '@angular/core/testing'; + +import { MultipageComponentStateService } from './multipage-component-state.service'; +import { Journey, JourneyInstigator } from '../../domain'; + +describe('PageStateService', () => { + let service: MultipageComponentStateService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(MultipageComponentStateService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should set and get journey collection', () => { + const journeys: Journey[] = []; + service.setJourneyCollection(journeys); + expect(service.getJourneyCollection()).toEqual(journeys); + }); + + it('should set and get instigator', () => { + const instigator: JourneyInstigator = { + onFinalNext: () => { }, + onFinalPrevious: () => { } + }; + + service.setInstigator(instigator); + expect(service.getInstigator()).toEqual(instigator); + }); + + it('should get and set the journey state', () => { + const journey: Journey = { + journeyId: 'test', + journeyPageNumber: 1, + journeyStartPageNumber: 0, + journeyEndPageNumber: 5, + next: () => { }, + previous: () => { }, + hasNext: () => true, + hasPrevious: () => true, + isFinished: () => false, + isStart: () => false, + childJourney: undefined + }; + + service.setJourneyState(journey); + expect(service.getJourneyState(journey)).toEqual(journey); + }); + + it('should reset journey state', () => { + const journey: Journey = { + journeyId: 'test', + journeyPageNumber: 1, + journeyStartPageNumber: 0, + journeyEndPageNumber: 5, + next: () => { }, + previous: () => { }, + hasNext: () => true, + hasPrevious: () => true, + isFinished: () => false, + isStart: () => false, + childJourney: undefined + }; + + service.setJourneyState(journey); + service.resetJourneyState(); + expect(service.getJourneyState(journey)).toBeNull(); + }); + + it('should invoke next method of journey', () => { + const journey: Journey = { + journeyId: 'test', + journeyPageNumber: 1, + journeyStartPageNumber: 0, + journeyEndPageNumber: 5, + next: () => { }, + previous: () => { }, + hasNext: () => true, + hasPrevious: () => true, + isFinished: () => false, + isStart: () => false, + childJourney: undefined + }; + + service.setJourneyCollection([journey]); + spyOn(journey, 'next'); + service.next(); + expect(journey.next).toHaveBeenCalled(); + }); + + it('should invoke previous method of journey', () => { + const journey: Journey = { + journeyId: 'test', + journeyPageNumber: 1, + journeyStartPageNumber: 0, + journeyEndPageNumber: 5, + next: () => { }, + previous: () => { }, + hasNext: () => true, + hasPrevious: () => true, + isFinished: () => false, + isStart: () => false, + childJourney: undefined + }; + + service.setJourneyCollection([journey]); + spyOn(journey, 'previous'); + service.previous(); + expect(journey.previous).toHaveBeenCalled(); + }); +}); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts new file mode 100644 index 0000000000..52a64b1ec2 --- /dev/null +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts @@ -0,0 +1,111 @@ +import { Injectable } from '@angular/core'; +import { Journey, JourneyInstigator } from '../../domain'; + +@Injectable({ + providedIn: 'root' +}) +export class MultipageComponentStateService { + + //journey collection references an upto date list of all the journey components currently rendered!!!! + private journeyCollection: Journey[] = new Array(); + //the instigator references the case-edit-page component that will invoke the next and previous methods + private instigator: JourneyInstigator | null = null; + //each journey will store its state here. this could include form data if needed + private journeyState: Map = new Map(); + + //setJourneyComponent will be called by the app component to update the journey collection + setJourneyCollection(journeyCollection: Journey[]): void { + this.journeyCollection = journeyCollection; + } + + //getJourneyCollection will be called by the app component to get the journey collection + getJourneyCollection(): Journey[] { + return this.journeyCollection; + } + + //addToJourneyCollection will be called from the journey + addTojourneyCollection(journey: Journey): void { + this.journeyCollection.push(journey); + } + + //resetJourneyCollection will be called + resetJourneyCollection(): void { + this.journeyCollection = []; + } + + //setInstigator will be called by the app component to update the instigator + setInstigator(instigator: JourneyInstigator): void { + this.instigator = instigator; + } + + //getInstigator will be called by the app component to get the instigator + getInstigator(): JourneyInstigator | null { + return this.instigator; + } + + //setJourneyState will be called by the journey component to update the journey state + setJourneyState(journey: Journey): void { + this.journeyState.set(journey.journeyId, journey); + } + + //getJourneyState will be called by the journey component to get the journey state + getJourneyState(journey: Journey): Journey | null { + return this.journeyState.get(journey.journeyId) || null; + } + + //resetJourneyState will be called by the journey component to reset the journey state + resetJourneyState(): void { + this.journeyState.clear(); + } + + //next will be called by the instigator that will invoke the next method of the journey component that will invoke the next method of the childpage component + public next(): void { + if (this.journeyCollection.length <= 0) { + this.instigator?.onFinalNext(); + return; + } + + const isAnyObjectNotFinished: boolean = this.journeyCollection.some(journey => !journey.isFinished()); + + if (!isAnyObjectNotFinished) { + this.instigator?.onFinalNext(); + return; + } + + for (const journey of this.journeyCollection) { + if (!journey) { + continue; + } + + if (!journey?.isFinished()) { + journey?.next(); + break; + } + } + } + + //previous will be called by the instigator that will invoke the previous method of the journey component that will invoke the previous method of the childpage component + public previous(): void { + if (this.journeyCollection.length <= 0) { + this.instigator?.onFinalPrevious(); + return; + } + + const isAnyObjectNotAtStart: boolean = this.journeyCollection.some(journey => !journey.isStart()); + + if (!isAnyObjectNotAtStart) { + this.instigator?.onFinalPrevious(); + return; + } + + for (const journey of this.journeyCollection.slice().reverse()) { + if (!journey) { + continue; + } + if (!journey?.isStart()) { + journey?.previous(); + break; + } + } + } +} From 500d76257c6b0befa5424ee88134c7df69d6fc73 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 13 Feb 2024 12:21:18 +0000 Subject: [PATCH 02/75] Resolved a couple of bugs associated with the changes for CSFD-16 --- .../case-editor/case-edit-page/case-edit-page.component.ts | 4 ++++ .../palette/case-flag/write-case-flag-field.component.ts | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index f5d89e05f9..3472fd16cb 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -113,6 +113,8 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } public ngOnInit(): void { + this.multipageComponentStateService.resetJourneyCollection(); + this.multipageComponentStateService.resetJourneyState(); initDialog(); this.eventTrigger = this.caseEdit.eventTrigger; this.editForm = this.caseEdit.form; @@ -446,6 +448,8 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } this.caseEditDataService.clearFormValidationErrors(); + this.multipageComponentStateService.resetJourneyCollection(); + this.multipageComponentStateService.resetJourneyState(); } public submitting(): boolean { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts index 8e84217c61..7cff8fc5f5 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts @@ -160,10 +160,10 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon // It might help to take a look at the template file. if (this.isDisplayContextParameterUpdate) { this.journeyStartPageNumber = CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS; - this.journeyEndPageNumber = CaseFlagFieldState.FLAG_UPDATE; + this.journeyEndPageNumber = CaseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION; } else { this.journeyStartPageNumber = CaseFlagFieldState.FLAG_LOCATION; - this.journeyEndPageNumber = CaseFlagFieldState.FLAG_COMMENTS; + this.journeyEndPageNumber = CaseFlagFieldState.FLAG_STATUS; } // Now that we've set the start page number, let's set the current page number. From cafd3e1e15e4fcbd74fe7cf2da3f09ff57b7d5f2 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 13 Feb 2024 14:54:34 +0000 Subject: [PATCH 03/75] Work in progress regarding CSFD-8 --- .../case-edit-page.component.ts | 1 - .../before-you-start.component.html | 3 --- .../before-you-start.component.ts | 16 +++++++++++++-- .../link-cases/link-cases.component.html | 3 --- .../link-cases/link-cases.component.ts | 20 ++++++++++++++++--- .../write-linked-cases-field.component.html | 20 ++++++++++++++----- .../write-linked-cases-field.component.ts | 17 +++++++++++----- .../multipage-component-state.service.ts | 2 +- 8 files changed, 59 insertions(+), 23 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index 3472fd16cb..fdc590ee6d 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -87,7 +87,6 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro private readonly validPageListCaseFieldsService: ValidPageListCaseFieldsService, private readonly multipageComponentStateService: MultipageComponentStateService ) { - //this.pageStateService.resetJourneyCollection(); this.multipageComponentStateService.setInstigator(this); } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.html index 04b55ba576..e6e68f0531 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.html @@ -19,8 +19,5 @@

Before you start

If there are linked hearings for the case you need to un-link then you must unlink the hearing first.

-
- -
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts index 7e9ca8670b..f3793c966e 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts @@ -4,12 +4,14 @@ import { ErrorMessage } from '../../../../../domain'; import { LinkedCasesState } from '../../domain'; import { LinkedCasesPages } from '../../enums'; import { LinkedCasesService } from '../../services/linked-cases.service'; +import { AbstractJourneyComponent } from '../../../base-field'; +import { MultipageComponentStateService } from '../../../../../services'; @Component({ selector: 'ccd-linked-cases-before-you-start', templateUrl: './before-you-start.component.html' }) -export class BeforeYouStartComponent { +export class BeforeYouStartComponent extends AbstractJourneyComponent { @Output() public linkedCasesStateEmitter: EventEmitter = new EventEmitter(); @@ -19,7 +21,9 @@ export class BeforeYouStartComponent { public serverLinkedApiError: { id: string, message: string }; constructor(private readonly router: Router, - private readonly linkedCasesService: LinkedCasesService) { + private readonly linkedCasesService: LinkedCasesService, + multipageComponentStateService: MultipageComponentStateService) { + super(multipageComponentStateService); this.isLinkCasesJourney = this.linkedCasesService.isLinkedCasesEventTrigger; this.serverLinkedApiError = this.linkedCasesService.serverLinkedApiError; // re-initiate the state based on the casefield value @@ -37,6 +41,14 @@ export class BeforeYouStartComponent { }); } + public next() { + this.onNext(); + + if (this.errorMessages.length === 0) { + super.next(); + } + } + public onBack(): void { this.router.navigate(['cases', 'case-details', this.linkedCasesService.caseId], { fragment: 'Linked cases' }); } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.html index 6f77529d8a..91a8ceebc7 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.html @@ -90,9 +90,6 @@

Comments

-
- -
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.ts index a7a359a54c..54098ed0f1 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; import moment from 'moment'; import { throwError } from 'rxjs'; -import { CaseView, ErrorMessage, HttpError } from '../../../../../domain'; +import { CaseView, ErrorMessage, HttpError, Journey } from '../../../../../domain'; import { LovRefDataModel } from '../../../../../services/common-data-service/common-data-service'; import { CasesService } from '../../../../case-editor/services/cases.service'; import { LinkedCasesState } from '../../domain'; @@ -15,13 +15,15 @@ import { import { LinkedCasesErrorMessages, LinkedCasesPages, Patterns } from '../../enums'; import { LinkedCasesService } from '../../services/linked-cases.service'; import { ValidatorsUtils } from '../../utils/validators.utils'; +import { AbstractJourneyComponent } from '../../../base-field'; +import { MultipageComponentStateService } from '../../../../../services'; @Component({ selector: 'ccd-link-cases', styleUrls: ['./link-cases.component.scss'], templateUrl: './link-cases.component.html', }) -export class LinkCasesComponent implements OnInit { +export class LinkCasesComponent extends AbstractJourneyComponent implements OnInit, Journey { @Output() public linkedCasesStateEmitter: EventEmitter = new EventEmitter(); @@ -43,7 +45,11 @@ export class LinkCasesComponent implements OnInit { private readonly casesService: CasesService, private readonly fb: FormBuilder, private readonly validatorsUtils: ValidatorsUtils, - private readonly linkedCasesService: LinkedCasesService) { } + private readonly linkedCasesService: LinkedCasesService, + multipageComponentStateService: MultipageComponentStateService + ) { + super(multipageComponentStateService); + } public ngOnInit(): void { this.caseId = this.linkedCasesService.caseId; @@ -311,4 +317,12 @@ export class LinkCasesComponent implements OnInit { } this.emitLinkedCasesState(navigateToNextPage); } + + public next() { + this.onNext(); + + if (this.errorMessages.length === 0) { + super.next(); + } + } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.html index 4fb4e21393..1fb8df57eb 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.html @@ -2,23 +2,33 @@
+ #journeyChild + (linkedCasesStateEmitter)="onLinkedCasesStateEmitted($event)"> + + #journeyChild + (linkedCasesStateEmitter)="onLinkedCasesStateEmitted($event)"> + + #journeyChild + (linkedCasesStateEmitter)="onLinkedCasesStateEmitted($event)"> + + #journeyChild + (linkedCasesStateEmitter)="onLinkedCasesStateEmitted($event)"> + + #journeyChild + (linkedCasesStateEmitter)="onLinkedCasesStateEmitted($event)"> +
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts index 92135e8159..c5eb034961 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts @@ -6,17 +6,18 @@ import { ErrorMessage } from '../../../domain'; import { CaseView } from '../../../domain/case-view'; import { CommonDataService } from '../../../services/common-data-service/common-data-service'; import { CasesService } from '../../case-editor/services/cases.service'; -import { AbstractFieldWriteComponent } from '../base-field'; +import { AbstractFieldWriteJourneyComponent } from '../base-field'; import { CaseLink, LinkedCasesState } from './domain'; import { LinkedCasesErrorMessages, LinkedCasesEventTriggers, LinkedCasesPages } from './enums'; import { LinkedCasesService } from './services'; import { Subscription } from 'rxjs'; +import { MultipageComponentStateService } from '../../../services'; @Component({ selector: 'ccd-write-linked-cases-field', templateUrl: './write-linked-cases-field.component.html' }) -export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent implements OnInit, AfterViewInit, OnDestroy { +export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyComponent implements OnInit, AfterViewInit, OnDestroy { public caseEditForm: FormGroup; public caseDetails: CaseView; public linkedCasesPage: number; @@ -30,8 +31,9 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent private readonly commonDataService: CommonDataService, private readonly casesService: CasesService, private readonly linkedCasesService: LinkedCasesService, - private readonly caseEditDataService: CaseEditDataService) { - super(); + private readonly caseEditDataService: CaseEditDataService, + multipageComponentStateService: MultipageComponentStateService) { + super(multipageComponentStateService); } public ngOnInit(): void { @@ -53,6 +55,9 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent this.subscriptions.add(this.caseEditDataService.caseEditForm$.subscribe({ next: editForm => this.caseEditForm = editForm })); + + this.journeyPageNumber = this.journeyStartPageNumber = LinkedCasesPages.BEFORE_YOU_START; + this.journeyEndPageNumber = LinkedCasesPages.CHECK_YOUR_ANSWERS; } public initialiseCaseDetails(caseDetails: CaseView): void { @@ -79,7 +84,7 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent public onLinkedCasesStateEmitted(linkedCasesState: LinkedCasesState): void { // Clear validation errors this.caseEditDataService.clearFormValidationErrors(); - + if (linkedCasesState.navigateToNextPage) { this.linkedCasesPage = this.getNextPage(linkedCasesState); this.proceedToNextPage(); @@ -128,6 +133,8 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent // Continue button event must not be allowed if not in final page this.caseEditDataService.setLinkedCasesJourneyAtFinalStep(false); } + + this.journeyPageNumber = this.linkedCasesPage; } public submitLinkedCases(): void { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts index 52a64b1ec2..9937aca2e7 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts @@ -66,7 +66,7 @@ export class MultipageComponentStateService { } const isAnyObjectNotFinished: boolean = this.journeyCollection.some(journey => !journey.isFinished()); - + if (!isAnyObjectNotFinished) { this.instigator?.onFinalNext(); return; From 52889ba399f338d9021851e84cf6f4984e719712 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 13 Feb 2024 15:26:16 +0000 Subject: [PATCH 04/75] Included changes for the case unlink component, regarding CSFD-8 --- .../unlink-cases/unlink-cases.component.html | 3 --- .../unlink-cases/unlink-cases.component.ts | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.html index 284cc7c01a..84b8593773 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.html @@ -15,8 +15,5 @@

Select the cases you want to unlink from this case< -
- -
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts index a0e15b9df2..ba8842cfd0 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts @@ -6,12 +6,15 @@ import { CasesService } from '../../../../case-editor/services/cases.service'; import { CaseLink, LinkedCasesState } from '../../domain'; import { LinkedCasesErrorMessages, LinkedCasesPages } from '../../enums/write-linked-cases-field.enum'; import { LinkedCasesService } from '../../services/linked-cases.service'; +import { AbstractFieldWriteJourneyComponent } from '../../../base-field'; +import { Journey } from '../../../../../domain'; +import { MultipageComponentStateService } from '../../../../../services'; @Component({ selector: 'ccd-unlink-cases', templateUrl: './unlink-cases.component.html' }) -export class UnLinkCasesComponent implements OnInit { +export class UnLinkCasesComponent extends AbstractFieldWriteJourneyComponent implements OnInit, Journey { private static readonly LINKED_CASES_TAB_ID = 'linked_cases_sscs'; private static readonly CASE_NAME_MISSING_TEXT = 'Case name missing'; @@ -31,7 +34,9 @@ export class UnLinkCasesComponent implements OnInit { constructor(private readonly fb: FormBuilder, private readonly casesService: CasesService, - private readonly linkedCasesService: LinkedCasesService) { + private readonly linkedCasesService: LinkedCasesService, + multipageComponentStateService: MultipageComponentStateService) { + super(multipageComponentStateService); } public ngOnInit(): void { @@ -130,6 +135,14 @@ export class UnLinkCasesComponent implements OnInit { this.emitLinkedCasesState(navigateToNextPage); } + public next() { + this.onNext(); + + if (this.errorMessages.length === 0) { + super.next(); + } + } + // Return linked cases state and error messages to the parent public emitLinkedCasesState(isNavigateToNextPage: boolean): void { this.linkedCasesStateEmitter.emit({ From e847534b5e4e313432b0373d7c02ccc85acb2ba3 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 13 Feb 2024 17:25:26 +0000 Subject: [PATCH 05/75] Work in progress regarding CSFD-15, ungrey back button We're in the process of debugging an issue where the user hits the review page & then hits change, the previous button is not always accessible. --- .../case-edit-page/case-edit-page.component.ts | 6 +++++- .../case-editor/case-edit-page/case-edit-page.html | 2 +- .../case-flag/read-case-flag-field.component.ts | 1 + .../case-flag/write-case-flag-field.component.ts | 10 ++++++++++ .../journey/multipage-component-state.service.ts | 10 ++++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index fdc590ee6d..384c0c4319 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -98,6 +98,10 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro this.cancel(); } + public isAtStart(): boolean { + return this.multipageComponentStateService.isJourneyAtStart(); + } + // This method will be triggered by the next button in the app component public nextStep(): void { // TODO: Debug why the state isn't persisting. @@ -198,11 +202,11 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro */ public toPreviousPage(): void { this.caseEditDataService.clearFormValidationErrors(); - const caseEventData: CaseEventData = this.buildCaseEventData(true); caseEventData.data = caseEventData.event_data; this.updateFormData(caseEventData); this.previous(); + this.previousStep(); CaseEditPageComponent.setFocusToTop(); } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html index a7e154adff..059313e555 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html @@ -62,7 +62,7 @@

- diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts index 252b8961e8..7635ef1431 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts @@ -151,6 +151,7 @@ export class ReadCaseFlagFieldComponent extends AbstractFieldReadComponent imple } public navigateBackToForm(fieldState: number): void { + console.log('yes i am here....'); this.caseFlagStateService.fieldStateToNavigate = fieldState; this.router.navigate([`../${this.caseFlagStateService.pageLocation}`], { relativeTo: this.route }); } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts index 7cff8fc5f5..645cfcce3f 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts @@ -272,6 +272,16 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon } } + public previousPage(): void { + if (this.hasPrevious() && this.fieldState === CaseFlagFieldState.FLAG_COMMENTS && !this.flagType?.listOfValues) { + this.fieldState = CaseFlagFieldState.FLAG_TYPE; + } else if (this.hasPrevious()) { + this.fieldState--; + } + + super.previousPage(); + } + public addFlagToCollection(): void { // Ensure no more than one new flag is being added at a time, by iterating through each Flags case field and removing // any previous entry from the details array where that entry has no id (hence it is new - and there should be only diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts index 9937aca2e7..fc67cc82f7 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts @@ -108,4 +108,14 @@ export class MultipageComponentStateService { } } } + + //isJourneyAtStart can be used to inform the instigator if we're at the start. + public isJourneyAtStart(): boolean { + return this.journeyCollection.every(j => j.isStart()); + } + + //isJourneyAtStart can be used to inform the instigator if we're at the end. + public isJourneyAtEnd(): boolean { + return this.journeyCollection.every(j => j.isFinished()); + } } From b19805a9833f1294d800787545b4257216a6bd4a Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 13 Feb 2024 17:48:01 +0000 Subject: [PATCH 06/75] Removed console log & also allowed previous button to work as expected when triggering a change --- .../case-flag/read-case-flag-field.component.ts | 1 - .../case-flag/write-case-flag-field.component.ts | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts index 7635ef1431..252b8961e8 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts @@ -151,7 +151,6 @@ export class ReadCaseFlagFieldComponent extends AbstractFieldReadComponent imple } public navigateBackToForm(fieldState: number): void { - console.log('yes i am here....'); this.caseFlagStateService.fieldStateToNavigate = fieldState; this.router.navigate([`../${this.caseFlagStateService.pageLocation}`], { relativeTo: this.route }); } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts index bbe6c9f4c9..b699198b2c 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts @@ -68,6 +68,8 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon } public ngOnInit(): void { + let navigatedTo: boolean = false; + // If it is start of the journey or navigation from check your answers page then fieldStateToNavigate property // in case flag state service will contain the field state to navigate based on create or manage journey this.fieldState = this.caseFlagStateService.fieldStateToNavigate; @@ -77,7 +79,10 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon const params = this.route.snapshot.params; // Clear the form group, field state to navigate and set the page location this.caseFlagStateService.resetCache(`../${params['eid']}/${params['page']}`); + } else { + navigatedTo = true; } + // Reassign the form group from the case flag state service this.caseFlagParentFormGroup = this.caseFlagStateService.formGroup; // Clear form validation errors as a new page will be rendered based on field state @@ -169,6 +174,12 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon // Now that we've set the start page number, let's set the current page number. this.journeyPageNumber = this.journeyStartPageNumber; + // If we've navigated to this page, then we know by default, we want to set the + // journey page number to the field state. + if (navigatedTo) { + this.journeyPageNumber = this.fieldState; + } + // Provided we have some stored state, i.e. when going backwards, we want // to get the last visited page, etc. const state = this.multipageComponentStateService.getJourneyState(this); From 7aed3d3c5ac6be563783270b409eb66b34e87c69 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Wed, 14 Feb 2024 10:50:36 +0000 Subject: [PATCH 07/75] I've added a change to allow the previous button to work nicely for the case flag journey --- .../case-edit-page/case-edit-page.component.ts | 3 ++- .../abstract-field-write-journey.component.ts | 4 ++++ .../base-field/abstract-journey.component.ts | 2 ++ .../case-flag/write-case-flag-field.component.ts | 6 ++++++ .../lib/shared/domain/journey/journey.model.ts | 1 + .../journey/multipage-component-state.service.ts | 15 ++++++++------- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index 384c0c4319..43793918a8 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -99,7 +99,7 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } public isAtStart(): boolean { - return this.multipageComponentStateService.isJourneyAtStart(); + return this.multipageComponentStateService.isAtStart; } // This method will be triggered by the next button in the app component @@ -453,6 +453,7 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro this.caseEditDataService.clearFormValidationErrors(); this.multipageComponentStateService.resetJourneyCollection(); this.multipageComponentStateService.resetJourneyState(); + this.multipageComponentStateService.isAtStart = false; } public submitting(): boolean { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts index 3893f50d8c..14c0122a33 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts @@ -40,12 +40,14 @@ export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWr protected previousPage(): void { if (this.hasPrevious()) { this.journeyPageNumber--; + this.onPageChange(); } } protected nextPage(): void { if (this.hasNext()) { this.journeyPageNumber++; + this.onPageChange(); } } @@ -76,4 +78,6 @@ export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWr public isStart(): boolean { return this.journeyPageNumber === this.journeyStartPageNumber }; public getId(): string { return this.journeyId }; + + public onPageChange(): void { /* To be implemented by some child classes. */ }; } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts index 752bfcafb1..2c190b2c12 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts @@ -69,4 +69,6 @@ export abstract class AbstractJourneyComponent implements Journey { public isStart(): boolean { return this.journeyPageNumber === this.journeyStartPageNumber }; public getId(): string { return this.journeyId }; + + public onPageChange(): void { /* To be implemented by some child classes. */ }; } \ No newline at end of file diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts index b699198b2c..0ac6740fff 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts @@ -191,6 +191,12 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon this.journeyStartPageNumber = journeyStartPageNumber; this.journeyEndPageNumber = journeyEndPageNumber; } + + this.multipageComponentStateService.isAtStart = this.journeyPageNumber === this.journeyStartPageNumber; + } + + public onPageChange(): void { + this.multipageComponentStateService.isAtStart = this.journeyPageNumber === this.journeyStartPageNumber; } public setDisplayContextParameterUpdate(displayContextParameter: string): boolean { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts index 2c5f761081..d12b3c39d6 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts @@ -5,6 +5,7 @@ export interface Journey { hasPrevious(): boolean; isFinished(): boolean; isStart(): boolean; + onPageChange(): void; journeyId: string; journeyPageNumber: number; journeyStartPageNumber: number; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts index fc67cc82f7..3654745519 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts @@ -5,7 +5,8 @@ import { Journey, JourneyInstigator } from '../../domain'; providedIn: 'root' }) export class MultipageComponentStateService { - + //is journey at start will help keep track of the progress through the journey. + private isJourneyAtStart: boolean = false; //journey collection references an upto date list of all the journey components currently rendered!!!! private journeyCollection: Journey[] = new Array(); //the instigator references the case-edit-page component that will invoke the next and previous methods @@ -109,13 +110,13 @@ export class MultipageComponentStateService { } } - //isJourneyAtStart can be used to inform the instigator if we're at the start. - public isJourneyAtStart(): boolean { - return this.journeyCollection.every(j => j.isStart()); + //isAtStart can be used to inform the instigator if we're at the start. + public get isAtStart(): boolean { + return this.isJourneyAtStart; } - //isJourneyAtStart can be used to inform the instigator if we're at the end. - public isJourneyAtEnd(): boolean { - return this.journeyCollection.every(j => j.isFinished()); + //isAtStart can be used to update the value from a journey object, so the instigator knows. + public set isAtStart(isAtStart: boolean) { + this.isJourneyAtStart = isAtStart; } } From 97c0fd5ae624c9a4784f18b82d70d0dc3e58fa55 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Wed, 14 Feb 2024 14:06:43 +0000 Subject: [PATCH 08/75] Work in progress, unregey previous button for the case link journey --- .../before-you-start.component.ts | 9 +++++-- .../check-your-answers.component.ts | 18 +++++++++++-- .../no-linked-cases.component.ts | 9 +++++-- .../write-linked-cases-field.component.ts | 25 ++++++++++++++++--- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts index f3793c966e..602934fbef 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts @@ -6,12 +6,13 @@ import { LinkedCasesPages } from '../../enums'; import { LinkedCasesService } from '../../services/linked-cases.service'; import { AbstractJourneyComponent } from '../../../base-field'; import { MultipageComponentStateService } from '../../../../../services'; +import { Journey } from '../../../../../domain'; @Component({ selector: 'ccd-linked-cases-before-you-start', templateUrl: './before-you-start.component.html' }) -export class BeforeYouStartComponent extends AbstractJourneyComponent { +export class BeforeYouStartComponent extends AbstractJourneyComponent implements Journey { @Output() public linkedCasesStateEmitter: EventEmitter = new EventEmitter(); @@ -44,7 +45,11 @@ export class BeforeYouStartComponent extends AbstractJourneyComponent { public next() { this.onNext(); - if (this.errorMessages.length === 0) { + const isAnArray: boolean = Array.isArray(this.errorMessages); + const isNotAnArray: boolean = !isAnArray; + const isValid: boolean = (isAnArray && this.errorMessages.length === 0) || isNotAnArray; + + if (isValid) { super.next(); } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts index e19daef5da..0fd7e39697 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts @@ -2,13 +2,16 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { CaseLink, LinkedCasesState } from '../../domain'; import { LinkedCasesPages } from '../../enums'; import { LinkedCasesService } from '../../services/linked-cases.service'; +import { AbstractJourneyComponent } from '../../../base-field'; +import { MultipageComponentStateService } from '../../../../../services'; +import { Journey } from '../../../../../domain'; @Component({ selector: 'ccd-linked-cases-check-your-answers', templateUrl: './check-your-answers.component.html', styleUrls: ['./check-your-answers.component.scss'] }) -export class CheckYourAnswersComponent implements OnInit { +export class CheckYourAnswersComponent extends AbstractJourneyComponent implements OnInit, Journey { @Output() public linkedCasesStateEmitter: EventEmitter = new EventEmitter(); @@ -18,7 +21,8 @@ export class CheckYourAnswersComponent implements OnInit { public isLinkCasesJourney: boolean; public linkedCasesTableCaption: string; - constructor(private linkedCasesService: LinkedCasesService) { + constructor(private linkedCasesService: LinkedCasesService, multipageComponentStateService: MultipageComponentStateService) { + super(multipageComponentStateService); } public ngOnInit(): void { @@ -36,4 +40,14 @@ export class CheckYourAnswersComponent implements OnInit { navigateToNextPage: true }); } + + public next() { + this.linkedCasesStateEmitter.emit({ + currentLinkedCasesPage: LinkedCasesPages.CHECK_YOUR_ANSWERS, + navigateToPreviousPage: false, + navigateToNextPage: true + }); + + super.next(); + } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/no-linked-cases/no-linked-cases.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/no-linked-cases/no-linked-cases.component.ts index 9a342e3176..dceea7eb0a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/no-linked-cases/no-linked-cases.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/no-linked-cases/no-linked-cases.component.ts @@ -1,17 +1,22 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { LinkedCasesService } from '../../services/linked-cases.service'; +import { AbstractJourneyComponent } from '../../../base-field'; +import { MultipageComponentStateService } from '../../../../../services'; +import { Journey } from '../../../../../domain'; @Component({ selector: 'ccd-no-linked-cases', templateUrl: './no-linked-cases.component.html' }) -export class NoLinkedCasesComponent implements OnInit { +export class NoLinkedCasesComponent extends AbstractJourneyComponent implements OnInit, Journey { public serverLinkedApiError: { id: string, message: string }; constructor(private readonly router: Router, - private readonly linkedCasesService: LinkedCasesService) { + private readonly linkedCasesService: LinkedCasesService, + multipageComponentStateService: MultipageComponentStateService) { + super(multipageComponentStateService); } public ngOnInit(): void { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts index c5eb034961..527c563956 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts @@ -58,6 +58,11 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom this.journeyPageNumber = this.journeyStartPageNumber = LinkedCasesPages.BEFORE_YOU_START; this.journeyEndPageNumber = LinkedCasesPages.CHECK_YOUR_ANSWERS; + this.multipageComponentStateService.isAtStart = this.journeyPageNumber === this.journeyStartPageNumber; + } + + public onPageChange(): void { + this.multipageComponentStateService.isAtStart = this.journeyPageNumber === this.journeyStartPageNumber; } public initialiseCaseDetails(caseDetails: CaseView): void { @@ -84,7 +89,7 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom public onLinkedCasesStateEmitted(linkedCasesState: LinkedCasesState): void { // Clear validation errors this.caseEditDataService.clearFormValidationErrors(); - + if (linkedCasesState.navigateToNextPage) { this.linkedCasesPage = this.getNextPage(linkedCasesState); this.proceedToNextPage(); @@ -117,12 +122,13 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom result.forEach(ids => { this.getLinkedCaseReasons(ids.service_id); }) - }) } public proceedToNextPage(): void { if (this.isAtFinalPage()) { + // Set the journey page to the end page. + this.journeyPageNumber = this.journeyEndPageNumber; // Continue button event must be allowed in final page this.caseEditDataService.setLinkedCasesJourneyAtFinalStep(true); // Trigger validation to clear the "notAtFinalPage" error if now at the final state @@ -134,7 +140,7 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom this.caseEditDataService.setLinkedCasesJourneyAtFinalStep(false); } - this.journeyPageNumber = this.linkedCasesPage; + this.nextPage(); } public submitLinkedCases(): void { @@ -143,6 +149,7 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom const caseFieldValue = this.linkedCasesService.caseFieldValue; this.linkedCasesService.caseFieldValue = caseFieldValue.filter(item => unlinkedCaseRefereneIds.indexOf(item.id) === -1); } + this.formGroup.value.caseLinks = this.linkedCasesService.caseFieldValue; (this.caseEditForm.controls['data'] as any) = new FormGroup({ caseLinks: new FormControl(this.linkedCasesService.caseFieldValue || []) }); this.caseEditDataService.setCaseEditForm(this.caseEditForm); @@ -188,4 +195,16 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom ngOnDestroy() { this.subscriptions.unsubscribe(); } + + public previousPage(): void { + if (this.linkedCasesPage === LinkedCasesPages.CHECK_YOUR_ANSWERS) { + this.linkedCasesPage = LinkedCasesPages.LINK_CASE + } else if (this.linkedCasesPage === LinkedCasesPages.LINK_CASE) { + this.linkedCasesPage = LinkedCasesPages.BEFORE_YOU_START; + } else { + this.linkedCasesPage --; + } + + super.previousPage(); + } } From 994bf2dec46a73a8fe3d88bfe91d8687b828e47e Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Fri, 16 Feb 2024 10:30:13 +0000 Subject: [PATCH 09/75] WIP: Case link previous button in progress. --- .../case-edit-page/case-edit-page.component.ts | 7 ++----- .../case-edit-submit/case-edit-submit.component.ts | 4 ++++ .../check-your-answers/check-your-answers.component.ts | 2 +- .../linked-cases/write-linked-cases-field.component.ts | 5 +++-- .../services/journey/multipage-component-state.service.ts | 8 ++++++++ 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index 43793918a8..19950681a5 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -116,8 +116,6 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } public ngOnInit(): void { - this.multipageComponentStateService.resetJourneyCollection(); - this.multipageComponentStateService.resetJourneyState(); initDialog(); this.eventTrigger = this.caseEdit.eventTrigger; this.editForm = this.caseEdit.form; @@ -176,6 +174,7 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro this.dialogRefAfterClosedSub?.unsubscribe(); this.saveDraftSub?.unsubscribe(); this.caseFormValidationErrorsSub?.unsubscribe(); + this.multipageComponentStateService.reset(); } public applyValuesChanged(valuesChanged: boolean): void { @@ -451,9 +450,7 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } this.caseEditDataService.clearFormValidationErrors(); - this.multipageComponentStateService.resetJourneyCollection(); - this.multipageComponentStateService.resetJourneyState(); - this.multipageComponentStateService.isAtStart = false; + this.multipageComponentStateService.reset(); } public submitting(): boolean { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts index 451b6f92c4..0585131119 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts @@ -7,6 +7,7 @@ import { Task } from '../../../domain/work-allocation/Task'; import { CaseFieldService, FieldsUtils, + MultipageComponentStateService, OrderService, ProfileNotifier, } from '../../../services'; @@ -67,6 +68,7 @@ export class CaseEditSubmitComponent implements OnInit, OnDestroy { private readonly route: ActivatedRoute, private readonly orderService: OrderService, private readonly profileNotifier: ProfileNotifier, + private readonly multipageComponentStateService: MultipageComponentStateService ) { } @@ -89,6 +91,8 @@ export class CaseEditSubmitComponent implements OnInit, OnDestroy { this.caseEdit.isLinkedCasesSubmission = this.eventTrigger.case_fields.some(caseField => FieldsUtils.isCaseFieldOfType(caseField, ['ComponentLauncher'])); this.pageTitle = this.getPageTitle(); + + console.log(this.multipageComponentStateService.getInstigator()); } public ngOnDestroy(): void { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts index 0fd7e39697..27da45a880 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts @@ -47,7 +47,7 @@ export class CheckYourAnswersComponent extends AbstractJourneyComponent implemen navigateToPreviousPage: false, navigateToNextPage: true }); - + super.next(); } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts index 527c563956..9ea3d3dbee 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts @@ -62,7 +62,8 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom } public onPageChange(): void { - this.multipageComponentStateService.isAtStart = this.journeyPageNumber === this.journeyStartPageNumber; + const isAtStart: boolean = this.journeyPageNumber === this.journeyStartPageNumber || this.linkedCasesPage === LinkedCasesPages.BEFORE_YOU_START; + this.multipageComponentStateService.isAtStart = isAtStart; } public initialiseCaseDetails(caseDetails: CaseView): void { @@ -89,7 +90,7 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom public onLinkedCasesStateEmitted(linkedCasesState: LinkedCasesState): void { // Clear validation errors this.caseEditDataService.clearFormValidationErrors(); - + if (linkedCasesState.navigateToNextPage) { this.linkedCasesPage = this.getNextPage(linkedCasesState); this.proceedToNextPage(); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts index 3654745519..643b1ea273 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts @@ -59,6 +59,14 @@ export class MultipageComponentStateService { this.journeyState.clear(); } + //reset will be called to ensure that the entire state is reset + reset(): void { + this.isJourneyAtStart = false; + this.journeyState.clear(); + this.instigator = null; + this.journeyCollection = []; + } + //next will be called by the instigator that will invoke the next method of the journey component that will invoke the next method of the childpage component public next(): void { if (this.journeyCollection.length <= 0) { From d43ab0d67ddce7586e7827e7ec1a9cb839905fac Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 5 Mar 2024 12:18:03 +0000 Subject: [PATCH 10/75] Merged with master & fixed tests --- .../case-edit-page.component.spec.ts | 7 +++++-- .../read-case-flag-field.component.spec.ts | 3 ++- .../write-linked-cases-field.component.spec.ts | 15 +++++++++++++-- .../multipage-component-state.service.spec.ts | 12 ++++++++---- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts index 44cf6c4c4b..5b590f63db 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts @@ -40,6 +40,7 @@ import { FormErrorService, FormValueService, LoadingService, + MultipageComponentStateService, } from '../../../services'; import { ValidPageListCaseFieldsService } from '../services/valid-page-list-caseFields.service'; import { FieldsUtils } from '../../../services/fields/fields.utils'; @@ -77,7 +78,8 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = caseFieldService = {}, caseEditDataService = {}, loadingService = {}, - validPageListCaseFieldsService = {} + validPageListCaseFieldsService = {}, + multipageComponentStateService = {} }) => new CaseEditPageComponent( caseEdit as CaseEditComponent, @@ -90,7 +92,8 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = caseFieldService as CaseFieldService, caseEditDataService as CaseEditDataService, loadingService as LoadingService, - validPageListCaseFieldsService as ValidPageListCaseFieldsService + validPageListCaseFieldsService as ValidPageListCaseFieldsService, + multipageComponentStateService as MultipageComponentStateService ); it('should create', () => { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.spec.ts index 379ac4a8d2..52d872bbc3 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.spec.ts @@ -12,6 +12,7 @@ import { FlagDetail, FlagDetailDisplay, FlagsWithFormGroupPath } from './domain' import { CaseFlagDisplayContextParameter, CaseFlagFieldState, CaseFlagStatus } from './enums'; import { ReadCaseFlagFieldComponent } from './read-case-flag-field.component'; import { WriteCaseFlagFieldComponent } from './write-case-flag-field.component'; +import { MultipageComponentStateService } from '../../../services'; describe('ReadCaseFlagFieldComponent', () => { let component: ReadCaseFlagFieldComponent; @@ -501,7 +502,7 @@ describe('ReadCaseFlagFieldComponent', () => { [flagLauncher1CaseField.id]: { controls: {}, caseField: flagLauncher1CaseField, - component: new WriteCaseFlagFieldComponent(null, new CaseEditDataService(), new CaseFlagStateService(), null) + component: new WriteCaseFlagFieldComponent(null, new CaseEditDataService(), new CaseFlagStateService(), null, new MultipageComponentStateService()) } }, get: (controlName: string) => { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts index 64d7fb784c..5636e9cd0e 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts @@ -10,7 +10,7 @@ import { CaseEventData } from '../../../domain/case-event-data.model'; import { CaseView } from '../../../domain/case-view'; import { CaseField } from '../../../domain/definition/case-field.model'; import { Draft } from '../../../domain/draft.model'; -import { FieldsUtils, LoadingService } from '../../../services'; +import { FieldsUtils, LoadingService, MultipageComponentStateService } from '../../../services'; import { CaseFieldService } from '../../../services/case-fields/case-field.service'; import { CommonDataService, LovRefDataByServiceModel } from '../../../services/common-data-service/common-data-service'; import { FieldTypeSanitiser } from '../../../services/form/field-type-sanitiser'; @@ -88,8 +88,19 @@ describe('WriteLinkedCasesFieldComponent', () => { const pageValidationService = new PageValidationService(caseFieldService); const fieldUtils = new FieldsUtils(); const validPageListCaseFieldsService = new ValidPageListCaseFieldsService(fieldUtils); + const multipageComponentStateService = new MultipageComponentStateService(); caseEditPageComponent = new CaseEditPageComponent(caseEditComponentStub, - route, formValueService, formErrorService, null, pageValidationService, dialog, caseFieldService, new CaseEditDataService(), new LoadingService(), validPageListCaseFieldsService); + route, + formValueService, + formErrorService, + null, + pageValidationService, + dialog, + caseFieldService, + new CaseEditDataService(), + new LoadingService(), + validPageListCaseFieldsService, + multipageComponentStateService); const caseInfo = { case_id: '1682374819203471', diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts index 030c768c55..7a6076cd7e 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts @@ -43,7 +43,8 @@ describe('PageStateService', () => { hasPrevious: () => true, isFinished: () => false, isStart: () => false, - childJourney: undefined + childJourney: undefined, + onPageChange: () => { } }; service.setJourneyState(journey); @@ -62,7 +63,8 @@ describe('PageStateService', () => { hasPrevious: () => true, isFinished: () => false, isStart: () => false, - childJourney: undefined + childJourney: undefined, + onPageChange: () => { } }; service.setJourneyState(journey); @@ -82,7 +84,8 @@ describe('PageStateService', () => { hasPrevious: () => true, isFinished: () => false, isStart: () => false, - childJourney: undefined + childJourney: undefined, + onPageChange: () => { } }; service.setJourneyCollection([journey]); @@ -103,7 +106,8 @@ describe('PageStateService', () => { hasPrevious: () => true, isFinished: () => false, isStart: () => false, - childJourney: undefined + childJourney: undefined, + onPageChange: () => { } }; service.setJourneyCollection([journey]); From 9a6e77758cc6c3f83afdaef45824635ee478011f Mon Sep 17 00:00:00 2001 From: John Benjamin Date: Tue, 5 Mar 2024 13:49:23 +0000 Subject: [PATCH 11/75] CSFD-18 --- .../case-event-trigger.component.spec.ts | 13 +++++++++++++ .../case-event-trigger.component.ts | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.spec.ts index 2ba22edcf1..3b2b495e1c 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.spec.ts @@ -372,4 +372,17 @@ describe('CaseEventTriggerComponent', () => { component.cancel(); expect(router.navigate).toHaveBeenCalledWith(['cases', 'case-details', '1111-2222-3333-4444'], { fragment: 'Linked cases' }); }); + + describe('cancel workflow - should navigate to the tab from where event was triggered', () => { + it('should verify with fragment', () => { + router.getCurrentNavigation.and.returnValue({ + previousNavigation: { + finalUrl: '/cases/case-details/1707912713167104#Claim%20details' + } + }); + fixture.detectChanges(); + component.cancel(); + expect(router.navigate).toHaveBeenCalledWith(['/cases/case-details/1707912713167104'], { fragment: 'Case details' }); + }); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts index 0824f61469..4efd8c7ead 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts @@ -22,6 +22,8 @@ export class CaseEventTriggerComponent implements OnInit, OnDestroy { public caseSubscription: Subscription; public parentUrl: string; + private routerCurrentNavigation: Navigation; + constructor( private readonly ngZone: NgZone, private readonly casesService: CasesService, @@ -33,6 +35,7 @@ export class CaseEventTriggerComponent implements OnInit, OnDestroy { private readonly activityPollingService: ActivityPollingService, private readonly sessionStorageService: SessionStorageService ) { + this.routerCurrentNavigation = this.router.getCurrentNavigation(); } public ngOnInit(): void { @@ -115,8 +118,15 @@ export class CaseEventTriggerComponent implements OnInit, OnDestroy { } public cancel(): Promise { - if (this.router.url && this.router.url.includes('linkCases')) { - this.router.navigate(['cases', 'case-details', this.caseDetails.case_id], { fragment: 'Linked cases' }); + const previousUrl = this.routerCurrentNavigation?.previousNavigation?.finalUrl?.toString(); + if (previousUrl) { + if (previousUrl.indexOf('#') > -1) { + const url = previousUrl.split('#')[0]; + const fragment = previousUrl.split('#')[1].replace('%20', ' '); + return this.router.navigate([url], { fragment: fragment }); + } else { + return this.router.navigate([previousUrl]); + } } else { return this.router.navigate([this.parentUrl]); } From 4d8be9ddbc3bfb0bfce0fd92344659fc16f11148 Mon Sep 17 00:00:00 2001 From: John Benjamin Date: Tue, 5 Mar 2024 15:27:43 +0000 Subject: [PATCH 12/75] CSFD-18 v2 --- .../case-event-trigger.component.spec.ts | 58 +++++-------------- .../case-event-trigger.component.ts | 8 +-- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.spec.ts index 3b2b495e1c..4a2184be7e 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.spec.ts @@ -60,7 +60,7 @@ describe('CaseEventTriggerComponent', () => { event: { id: EVENT_TRIGGER.id, summary: 'Some summary', - description: 'Some description', + description: 'Some description' }, event_token: 'cbcdcbdh', ignore_warning: false @@ -148,9 +148,11 @@ describe('CaseEventTriggerComponent', () => { activityPollingService.postEditActivity.and.returnValue(of(true)); router = { navigate: jasmine.createSpy('navigate'), - url: '' + url: '', + getCurrentNavigation: jasmine.createSpy('getCurrentNavigation') }; - router.navigate.and.returnValue({ then: f => f() }); + router.navigate.and.returnValue({ then: (f) => f() }); + router.getCurrentNavigation.and.returnValue({ previousNavigation: { finalUrl: '/cases/case-details/1707912713167104#Claim%20details' } }); TestBed .configureTestingModule({ @@ -227,7 +229,7 @@ describe('CaseEventTriggerComponent', () => { it('should alert warning message after task completion error available and set to true in session storage', () => { casesService.createEvent.and.returnValue(of({})); - sessionStorageService.getItem.and.returnValue('true') + sessionStorageService.getItem.and.returnValue('true'); component.submitted({ caseId: 123, status: 'happy' }); @@ -242,18 +244,9 @@ describe('CaseEventTriggerComponent', () => { expect(alertService.warning).toHaveBeenCalled(); }); - it('should have a cancel button going back to the create case', () => { + it('should verify cancel navigate to the correct url', () => { component.cancel(); - - expect(router.navigate).toHaveBeenCalledWith([`/${URL_SEGMENTS[0].path}/${URL_SEGMENTS[1].path}`]); - }); - - it('should cancel navigate to linked cases tab', () => { - const routerWithModifiedUrl = TestBed.get(Router); - routerWithModifiedUrl.url = 'linkCases'; - component.caseDetails.case_id = '1111-2222-3333-4444'; - component.cancel(); - expect(router.navigate).toHaveBeenCalledWith(['cases', 'case-details', '1111-2222-3333-4444'], { fragment: 'Linked cases' }); + expect(router.navigate).toHaveBeenCalledWith(['/cases/case-details/1707912713167104'], { fragment: 'Claim details' }); }); it('should bypass validation if the eventTrigger case fields contain a FlagLauncher field', (done) => { @@ -277,13 +270,13 @@ describe('CaseEventTriggerComponent', () => { }, hasPages(): boolean { return false; - }, + } }; SANITISED_EDIT_FORM.data = { caseFlagLauncherField1: null }; - component.validate()(SANITISED_EDIT_FORM, PAGE_ID).subscribe(result => { + component.validate()(SANITISED_EDIT_FORM, PAGE_ID).subscribe((result) => { expect(result).toBeNull(); done(); }); @@ -312,13 +305,13 @@ describe('CaseEventTriggerComponent', () => { }, hasPages(): boolean { return false; - }, + } }; SANITISED_EDIT_FORM.data = { caseFlagLauncherField1: null }; - component.validate()(SANITISED_EDIT_FORM, PAGE_ID).subscribe(result => { + component.validate()(SANITISED_EDIT_FORM, PAGE_ID).subscribe((result) => { expect(result).not.toBeNull(); done(); }); @@ -339,13 +332,13 @@ describe('CaseEventTriggerComponent', () => { }, hasPages(): boolean { return false; - }, + } }; SANITISED_EDIT_FORM.data = { caseFlagLauncherField1: null }; - component.validate()(SANITISED_EDIT_FORM, PAGE_ID).subscribe(result => { + component.validate()(SANITISED_EDIT_FORM, PAGE_ID).subscribe((result) => { expect(result).not.toBeNull(); done(); }); @@ -357,32 +350,11 @@ describe('CaseEventTriggerComponent', () => { spyOn(FieldsUtils, 'isCaseFieldOfType').and.callThrough(); component.eventTrigger = null; - component.validate()(SANITISED_EDIT_FORM, PAGE_ID).subscribe(result => { + component.validate()(SANITISED_EDIT_FORM, PAGE_ID).subscribe((result) => { expect(result).not.toBeNull(); done(); }); expect(FieldsUtils.isCaseFieldOfType).not.toHaveBeenCalled(); expect(casesService.validateCase).toHaveBeenCalled(); }); - - it('should cancel navigate to linked cases tab', () => { - const routerWithModifiedUrl = TestBed.get(Router); - routerWithModifiedUrl.url = 'linkCases'; - component.caseDetails.case_id = '1111-2222-3333-4444'; - component.cancel(); - expect(router.navigate).toHaveBeenCalledWith(['cases', 'case-details', '1111-2222-3333-4444'], { fragment: 'Linked cases' }); - }); - - describe('cancel workflow - should navigate to the tab from where event was triggered', () => { - it('should verify with fragment', () => { - router.getCurrentNavigation.and.returnValue({ - previousNavigation: { - finalUrl: '/cases/case-details/1707912713167104#Claim%20details' - } - }); - fixture.detectChanges(); - component.cancel(); - expect(router.navigate).toHaveBeenCalledWith(['/cases/case-details/1707912713167104'], { fragment: 'Case details' }); - }); - }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts index 4efd8c7ead..2ab1f42d4e 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts @@ -1,11 +1,11 @@ import { Component, NgZone, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Navigation, Router } from '@angular/router'; import { Observable, Subscription, of } from 'rxjs'; +import { Constants } from '../../../commons/constants'; import { Activity, CaseEventData, CaseEventTrigger, CaseView, DisplayMode } from '../../../domain'; import { CaseReferencePipe } from '../../../pipes'; import { ActivityPollingService, AlertService, EventStatusService, FieldsUtils, SessionStorageService } from '../../../services'; import { CaseNotifier, CasesService } from '../../case-editor'; -import { Constants } from '../../../commons/constants'; @Component({ selector: 'ccd-case-event-trigger', @@ -21,8 +21,7 @@ export class CaseEventTriggerComponent implements OnInit, OnDestroy { public activitySubscription: Subscription; public caseSubscription: Subscription; public parentUrl: string; - - private routerCurrentNavigation: Navigation; + public routerCurrentNavigation: Navigation; constructor( private readonly ngZone: NgZone, @@ -119,6 +118,7 @@ export class CaseEventTriggerComponent implements OnInit, OnDestroy { public cancel(): Promise { const previousUrl = this.routerCurrentNavigation?.previousNavigation?.finalUrl?.toString(); + console.log('PREVIOUS URL', previousUrl); if (previousUrl) { if (previousUrl.indexOf('#') > -1) { const url = previousUrl.split('#')[0]; From 815661ad268079271dac6085736e6f5136500459 Mon Sep 17 00:00:00 2001 From: John Benjamin Date: Tue, 5 Mar 2024 15:33:28 +0000 Subject: [PATCH 13/75] CSFD-18 v2 --- 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 2f4b1c69d6..1e9044ff1a 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,8 @@ ## RELEASE NOTES +### Version 7.0.18-event-flow-cancel-navigation +**CSFD-18** Ungrey back button - event flow cancel navigation + ### Version 7.0.17-welsh-event-trigger **CSFD-48** Fix the width of the event trigger to accomodate the Welsh labels which are large ### Version 7.0.17 diff --git a/package.json b/package.json index 7eb4625f02..1584ae3927 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.17-welsh-event-trigger", + "version": "7.0.18-event-flow-cancel-navigation", "engines": { "node": ">=18.17.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 0df4ebb135..749223dae6 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.0.17-welsh-event-trigger", + "version": "7.0.18-event-flow-cancel-navigation", "engines": { "node": ">=18.17.0" }, From 79899119d73bcce25b5c67246b1f47014a4acfb9 Mon Sep 17 00:00:00 2001 From: John Benjamin Date: Tue, 5 Mar 2024 16:53:33 +0000 Subject: [PATCH 14/75] CSFD-18 v2 --- RELEASE-NOTES.md | 2 +- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- .../case-event-trigger/case-event-trigger.component.ts | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 1e9044ff1a..711feece95 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,6 +1,6 @@ ## RELEASE NOTES -### Version 7.0.18-event-flow-cancel-navigation +### Version 7.0.18-event-flow-cancel-navigation-v2 **CSFD-18** Ungrey back button - event flow cancel navigation ### Version 7.0.17-welsh-event-trigger diff --git a/package.json b/package.json index 1584ae3927..33612ce88e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.18-event-flow-cancel-navigation", + "version": "7.0.18-event-flow-cancel-navigation-v2", "engines": { "node": ">=18.17.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 749223dae6..7bb9b9096e 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.0.18-event-flow-cancel-navigation", + "version": "7.0.18-event-flow-cancel-navigation-v2", "engines": { "node": ">=18.17.0" }, diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts index 2ab1f42d4e..4b415954ef 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts @@ -118,7 +118,6 @@ export class CaseEventTriggerComponent implements OnInit, OnDestroy { public cancel(): Promise { const previousUrl = this.routerCurrentNavigation?.previousNavigation?.finalUrl?.toString(); - console.log('PREVIOUS URL', previousUrl); if (previousUrl) { if (previousUrl.indexOf('#') > -1) { const url = previousUrl.split('#')[0]; From 9f93d0494d0a2e5739a7c3e605562d3b0ebb01f3 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 26 Mar 2024 10:17:03 +0000 Subject: [PATCH 15/75] More tests & removed comments --- .../case-edit-page.component.spec.ts | 36 +++++++++++++++++++ .../case-edit-page.component.ts | 3 -- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts index 73012f75e1..221a6084da 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts @@ -105,6 +105,42 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = expect(component).toBeTruthy(); }); + describe('multipageComponentStateService', () => { + it('should trigger previous step with the multi-page component state service', () => { + const service: MultipageComponentStateService = new MultipageComponentStateService(); + const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); + service.setInstigator(component); + component.previousStep(); + expect(service.previous).toHaveBeenCalled(); + expect(component.onFinalPrevious).toHaveBeenCalled(); + }); + + it('should trigger next step with the multi-page component state service', () => { + const service: MultipageComponentStateService = new MultipageComponentStateService(); + const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); + service.setInstigator(component); + component.nextStep(); + expect(service.next).toHaveBeenCalled(); + expect(component.onFinalNext).toHaveBeenCalled(); + }); + + it('should reset the multi-page component state service on initialisation', () => { + const service: MultipageComponentStateService = new MultipageComponentStateService(); + const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); + service.setInstigator(component); + component.ngOnInit(); + expect(service.reset).toHaveBeenCalled(); + }); + + it('should reset the multi-page component state service on destruction', () => { + const service: MultipageComponentStateService = new MultipageComponentStateService(); + const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); + service.setInstigator(component); + component.ngOnDestroy(); + expect(service.reset).toHaveBeenCalled(); + }); + }); + describe('updateEventTriggerCaseFields', () => { it(`should NOT update event trigger's case fields as eventTrigger is null`, () => { component = initializeComponent({}); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index 69c2bd8da1..b65537a4c2 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -105,9 +105,6 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro // This method will be triggered by the next button in the app component public nextStep(): void { - // TODO: Debug why the state isn't persisting. - // - Check the AbstractJourneyComponent for more details. - // - Compare to prototype. this.multipageComponentStateService.next(); } From 2718944c9f5b0942ee9c846686879a74c4579d66 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 26 Mar 2024 11:07:33 +0000 Subject: [PATCH 16/75] Fixed some tests for CaseEditPageComponent --- .../case-editor/case-edit-page/case-edit-page.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts index 221a6084da..c97f611519 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts @@ -80,7 +80,7 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = caseEditDataService = {}, loadingService = {}, validPageListCaseFieldsService = {}, - multipageComponentStateService = {}, + multipageComponentStateService = new MultipageComponentStateService(), addressesService = {} }) => new CaseEditPageComponent( From e1c22f784399649e38fbcf359ff01e7902f9d4f6 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 26 Mar 2024 12:47:17 +0000 Subject: [PATCH 17/75] WIP to fixing tests --- .../case-edit-page.component.spec.ts | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts index c97f611519..80a7618ef8 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts @@ -109,17 +109,27 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = it('should trigger previous step with the multi-page component state service', () => { const service: MultipageComponentStateService = new MultipageComponentStateService(); const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); + service.resetJourneyCollection(); + spyOn(service, 'previous'); + spyOn(component, 'onFinalPrevious'); + + service.setInstigator(component); component.previousStep(); + expect(service.previous).toHaveBeenCalled(); expect(component.onFinalPrevious).toHaveBeenCalled(); }); it('should trigger next step with the multi-page component state service', () => { const service: MultipageComponentStateService = new MultipageComponentStateService(); - const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); + const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service, caseEditDataService: new CaseEditDataService() }); + spyOn(service, 'next'); + spyOn(component, 'onFinalNext'); + service.setInstigator(component); component.nextStep(); + expect(service.next).toHaveBeenCalled(); expect(component.onFinalNext).toHaveBeenCalled(); }); @@ -127,16 +137,22 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = it('should reset the multi-page component state service on initialisation', () => { const service: MultipageComponentStateService = new MultipageComponentStateService(); const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); + + spyOn(service, 'reset'); service.setInstigator(component); component.ngOnInit(); + expect(service.reset).toHaveBeenCalled(); }); it('should reset the multi-page component state service on destruction', () => { const service: MultipageComponentStateService = new MultipageComponentStateService(); const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); + spyOn(service, 'reset'); + service.setInstigator(component); component.ngOnDestroy(); + expect(service.reset).toHaveBeenCalled(); }); }); @@ -496,6 +512,8 @@ describe('CaseEditPageComponent - all other tests', () => { loadingServiceMock = createSpyObj('LoadingService', ['register', 'unregister']); const addressesServiceMock = jasmine.createSpyObj('addressesService', ['setMandatoryError']); + const multipageComponentStateService = new MultipageComponentStateService(); + TestBed.configureTestingModule({ imports: [FormsModule, ReactiveFormsModule], declarations: [ @@ -518,7 +536,8 @@ describe('CaseEditPageComponent - all other tests', () => { PlaceholderService, { provide: LoadingService, useValue: loadingServiceMock }, { provide: ValidPageListCaseFieldsService, useValue: validPageListCaseFieldsService}, - { provide: AddressesService, useValue: addressesServiceMock } + { provide: AddressesService, useValue: addressesServiceMock }, + { provide: MultipageComponentStateService, useValue: multipageComponentStateService } ], }).compileComponents(); fixture = TestBed.createComponent(CaseEditPageComponent); From 0caac8f9b011325f2ed44d1ecc4c5d0278ea1a81 Mon Sep 17 00:00:00 2001 From: joeevanshmcts Date: Tue, 26 Mar 2024 17:55:38 +0000 Subject: [PATCH 18/75] Updated version & fixed tests --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- .../case-edit-page.component.spec.ts | 54 +++++++------------ .../add-comments.component.spec.ts | 16 +++--- .../confirm-flag-status.component.spec.ts | 16 +++--- .../manage-case-flags.component.spec.ts | 4 +- ...rch-language-interpreter.component.spec.ts | 12 ++--- .../select-flag-location.component.spec.ts | 4 +- .../select-flag-type.component.spec.ts | 45 +++++++--------- ...lag-add-translation-form.component.spec.ts | 6 +-- .../update-flag/update-flag.component.spec.ts | 37 +++++++------ .../before-you-start.component.spec.ts | 8 --- 12 files changed, 85 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index 2eac401e02..ac3c4f5538 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.22", + "version": "7.0.23", "engines": { "node": ">=18.17.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 7594efcdb8..d23efb07a1 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.0.22", + "version": "7.0.23", "engines": { "node": ">=18.17.0" }, diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts index 80a7618ef8..8ce4e31d7d 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts @@ -107,53 +107,38 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = describe('multipageComponentStateService', () => { it('should trigger previous step with the multi-page component state service', () => { - const service: MultipageComponentStateService = new MultipageComponentStateService(); - const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); - service.resetJourneyCollection(); - spyOn(service, 'previous'); - spyOn(component, 'onFinalPrevious'); - + const multipageComponentStateService: MultipageComponentStateService = new MultipageComponentStateService(); + const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService }); + multipageComponentStateService.resetJourneyCollection(); + spyOn(multipageComponentStateService, 'previous'); - service.setInstigator(component); + multipageComponentStateService.setInstigator(component); component.previousStep(); - expect(service.previous).toHaveBeenCalled(); - expect(component.onFinalPrevious).toHaveBeenCalled(); + expect(multipageComponentStateService.previous).toHaveBeenCalled(); }); it('should trigger next step with the multi-page component state service', () => { - const service: MultipageComponentStateService = new MultipageComponentStateService(); - const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service, caseEditDataService: new CaseEditDataService() }); - spyOn(service, 'next'); - spyOn(component, 'onFinalNext'); + const multipageComponentStateService: MultipageComponentStateService = new MultipageComponentStateService(); + const caseEditDataService: CaseEditDataService = new CaseEditDataService(); + const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService, caseEditDataService }); + spyOn(multipageComponentStateService, 'next'); - service.setInstigator(component); + multipageComponentStateService.setInstigator(component); component.nextStep(); - expect(service.next).toHaveBeenCalled(); - expect(component.onFinalNext).toHaveBeenCalled(); - }); - - it('should reset the multi-page component state service on initialisation', () => { - const service: MultipageComponentStateService = new MultipageComponentStateService(); - const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); - - spyOn(service, 'reset'); - service.setInstigator(component); - component.ngOnInit(); - - expect(service.reset).toHaveBeenCalled(); + expect(multipageComponentStateService.next).toHaveBeenCalled(); }); it('should reset the multi-page component state service on destruction', () => { - const service: MultipageComponentStateService = new MultipageComponentStateService(); - const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService: service }); - spyOn(service, 'reset'); + const multipageComponentStateService: MultipageComponentStateService = new MultipageComponentStateService(); + const component:CaseEditPageComponent = initializeComponent({ multipageComponentStateService }); + spyOn(multipageComponentStateService, 'reset'); - service.setInstigator(component); + multipageComponentStateService.setInstigator(component); component.ngOnDestroy(); - expect(service.reset).toHaveBeenCalled(); + expect(multipageComponentStateService.reset).toHaveBeenCalled(); }); }); @@ -406,6 +391,8 @@ describe('CaseEditPageComponent - all other tests', () => { const caseField1 = new CaseField(); const caseField2 = new CaseField(); const eventData = new CaseEventData(); + let multipageComponentStateService = new MultipageComponentStateService(); + const caseEventDataPrevious: CaseEventData = { data: { field1: 'Updated value', @@ -511,8 +498,7 @@ describe('CaseEditPageComponent - all other tests', () => { }; loadingServiceMock = createSpyObj('LoadingService', ['register', 'unregister']); const addressesServiceMock = jasmine.createSpyObj('addressesService', ['setMandatoryError']); - - const multipageComponentStateService = new MultipageComponentStateService(); + multipageComponentStateService = new MultipageComponentStateService(); TestBed.configureTestingModule({ imports: [FormsModule, ReactiveFormsModule], diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.spec.ts index 1a5ce82d3d..f4cb0c11d8 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.spec.ts @@ -8,7 +8,6 @@ import { AddCommentsComponent } from './add-comments.component'; describe('AddCommentsComponent', () => { let component: AddCommentsComponent; let fixture: ComponentFixture; - let nextButton: HTMLElement; let textareaInput: string; // Code for "Other" flag type as defined in Reference Data const otherFlagTypeCode = 'OT0001'; @@ -26,7 +25,6 @@ describe('AddCommentsComponent', () => { fixture = TestBed.createComponent(AddCommentsComponent); component = fixture.componentInstance; component.formGroup = new FormGroup({}); - nextButton = fixture.debugElement.nativeElement.querySelector('button[type="button"]'); // 200-character text input textareaInput = '0000000000' + '1111111111' + '2222222222' + '3333333333' + '4444444444' + '5555555555' + '6666666666' + '7777777777' + '8888888888' + '9999999999' + '0000000000' + '1111111111' + '2222222222' + '3333333333' + '4444444444' + @@ -42,7 +40,7 @@ describe('AddCommentsComponent', () => { spyOn(component, 'onNext').and.callThrough(); spyOn(component.caseFlagStateEmitter, 'emit'); component.isDisplayContextParameterExternal = false; - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -62,7 +60,7 @@ describe('AddCommentsComponent', () => { spyOn(component, 'onNext').and.callThrough(); spyOn(component.caseFlagStateEmitter, 'emit'); component.isDisplayContextParameterExternal = true; - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -83,7 +81,7 @@ describe('AddCommentsComponent', () => { spyOn(component.caseFlagStateEmitter, 'emit'); component.optional = true; component.ngOnInit(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -99,7 +97,7 @@ describe('AddCommentsComponent', () => { const textarea = fixture.debugElement.nativeElement.querySelector('.govuk-textarea'); textarea.value = `${textareaInput}0`; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages[0]).toEqual({ title: '', @@ -113,7 +111,7 @@ describe('AddCommentsComponent', () => { component.ngOnInit(); textarea.value = `${textareaInput}0`; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages[0]).toEqual({ title: '', @@ -128,7 +126,7 @@ describe('AddCommentsComponent', () => { const textarea = fixture.debugElement.nativeElement.querySelector('.govuk-textarea'); textarea.value = textareaInput; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); let errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); @@ -138,7 +136,7 @@ describe('AddCommentsComponent', () => { component.ngOnInit(); textarea.value = textareaInput; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/confirm-flag-status/confirm-flag-status.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/confirm-flag-status/confirm-flag-status.component.spec.ts index 92a44c7e22..4d482e148a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/confirm-flag-status/confirm-flag-status.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/confirm-flag-status/confirm-flag-status.component.spec.ts @@ -8,7 +8,6 @@ import { ConfirmFlagStatusComponent } from './confirm-flag-status.component'; describe('ConfirmFlagStatusComponent', () => { let component: ConfirmFlagStatusComponent; let fixture: ComponentFixture; - let nextButton: HTMLElement; let textareaInput: string; beforeEach(waitForAsync(() => { @@ -24,7 +23,6 @@ describe('ConfirmFlagStatusComponent', () => { fixture = TestBed.createComponent(ConfirmFlagStatusComponent); component = fixture.componentInstance; component.formGroup = new FormGroup({}); - nextButton = fixture.debugElement.nativeElement.querySelector('button[type="button"]'); // 200-character text input textareaInput = '0000000000' + '1111111111' + '2222222222' + '3333333333' + '4444444444' + '5555555555' + '6666666666' + '7777777777' + '8888888888' + '9999999999' + '0000000000' + '1111111111' + '2222222222' + '3333333333' + '4444444444' + @@ -64,7 +62,7 @@ describe('ConfirmFlagStatusComponent', () => { const radioButtons = fixture.debugElement.nativeElement.querySelectorAll('.govuk-radios__input') as HTMLInputElement[]; // Clicking third radio button with status "Not approved" makes entering comments mandatory radioButtons[2].click(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -87,7 +85,7 @@ describe('ConfirmFlagStatusComponent', () => { const radioButtons = fixture.debugElement.nativeElement.querySelectorAll('.govuk-radios__input') as HTMLInputElement[]; // Clicking first radio button with status "Requested" makes entering comments optional radioButtons[0].click(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -99,7 +97,7 @@ describe('ConfirmFlagStatusComponent', () => { expect(errorMessageElement).toBeNull(); // Clicking second radio button with status "Active" makes entering comments optional radioButtons[1].click(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -119,7 +117,7 @@ describe('ConfirmFlagStatusComponent', () => { const textarea = fixture.debugElement.nativeElement.querySelector('.govuk-textarea'); textarea.value = `${textareaInput}0`; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages[0]).toEqual({ title: '', @@ -132,7 +130,7 @@ describe('ConfirmFlagStatusComponent', () => { radioButtons[2].click(); textarea.value = `${textareaInput}0`; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages[0]).toEqual({ title: '', @@ -151,7 +149,7 @@ describe('ConfirmFlagStatusComponent', () => { const textarea = fixture.debugElement.nativeElement.querySelector('.govuk-textarea'); textarea.value = textareaInput; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); let errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); @@ -160,7 +158,7 @@ describe('ConfirmFlagStatusComponent', () => { radioButtons[2].click(); textarea.value = textareaInput; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts index 74b719a89d..3a4a91f998 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts @@ -595,7 +595,7 @@ describe('ManageCaseFlagsComponent', () => { spyOn(component.caseFlagStateEmitter, 'emit'); const nativeElement = fixture.debugElement.nativeElement; nativeElement.querySelector('#flag-selection-1').click(); - nativeElement.querySelector('.button').click(); + component.onNext(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS, @@ -622,7 +622,7 @@ describe('ManageCaseFlagsComponent', () => { expect(component.flagsDisplayData.length).toBe(4); expect(component.noFlagsError).toBe(false); const nativeElement = fixture.debugElement.nativeElement; - nativeElement.querySelector('.button').click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/search-language-interpreter/search-language-interpreter.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/search-language-interpreter/search-language-interpreter.component.spec.ts index e57c4d86d8..88c6743146 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/search-language-interpreter/search-language-interpreter.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/search-language-interpreter/search-language-interpreter.component.spec.ts @@ -13,7 +13,6 @@ import { SearchLanguageInterpreterComponent } from './search-language-interprete describe('SearchLanguageInterpreterComponent', () => { let component: SearchLanguageInterpreterComponent; let fixture: ComponentFixture; - let nextButton: HTMLElement; let fieldInput: string; let mockRpxTranslationService: any; const languageFlagCode = 'PF0015'; @@ -71,7 +70,6 @@ describe('SearchLanguageInterpreterComponent', () => { defaultStatus: 'Active', externallyAvailable: false, }; - nextButton = fixture.debugElement.nativeElement.querySelector('button[type="button"]'); // 80-character text input fieldInput = '0000000000' + '1111111111' + '2222222222' + '3333333333' + '4444444444' + '5555555555' + '6666666666' + '7777777777'; @@ -241,7 +239,7 @@ describe('SearchLanguageInterpreterComponent', () => { it('should show an error message on clicking "Next" if no language has been selected', () => { spyOn(component, 'onNext').and.callThrough(); spyOn(component.caseFlagStateEmitter, 'emit'); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -264,7 +262,7 @@ describe('SearchLanguageInterpreterComponent', () => { const checkboxElement = nativeElement.querySelector('.govuk-checkboxes__input'); checkboxElement.click(); fixture.detectChanges(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -293,7 +291,7 @@ describe('SearchLanguageInterpreterComponent', () => { const manualLanguageEntryField = nativeElement.querySelector('#manual-language-entry'); manualLanguageEntryField.value = `${fieldInput}0`; manualLanguageEntryField.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -322,7 +320,7 @@ describe('SearchLanguageInterpreterComponent', () => { const manualLanguageEntryField = nativeElement.querySelector('#manual-language-entry'); manualLanguageEntryField.value = fieldInput; manualLanguageEntryField.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -352,7 +350,7 @@ describe('SearchLanguageInterpreterComponent', () => { manualLanguageEntryField.value = fieldInput; manualLanguageEntryField.dispatchEvent(new Event('input')); expect(component.formGroup.get(SearchLanguageInterpreterControlNames.MANUAL_LANGUAGE_ENTRY).value).toEqual(fieldInput); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts index d2faa7ceca..a42d16550f 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts @@ -169,7 +169,7 @@ describe('SelectFlagLocationComponent', () => { spyOn(component.caseFlagStateEmitter, 'emit'); const nativeElement = fixture.debugElement.nativeElement; nativeElement.querySelector('#flag-location-0').click(); - nativeElement.querySelector('.button').click(); + component.onNext(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_LOCATION, @@ -184,7 +184,7 @@ describe('SelectFlagLocationComponent', () => { expect(component.filteredFlagsData.length).toBe(3); expect(component.caseFlagsConfigError).toBe(false); const nativeElement = fixture.debugElement.nativeElement; - nativeElement.querySelector('.button').click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts index 07295f574e..05b4ad7f2c 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts @@ -252,8 +252,8 @@ describe('SelectFlagTypeComponent', () => { const nativeElement = fixture.debugElement.nativeElement; // First radio button (with index 0) expected to be "Reasonable adjustment" from test data; flag type is a parent nativeElement.querySelector('#flag-type-0').click(); - const nextButtonElement = nativeElement.querySelector('.button'); - nextButtonElement.click(); + + component.onNext(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_TYPE, isParentFlagType: true, @@ -268,8 +268,8 @@ describe('SelectFlagTypeComponent', () => { const nativeElement = fixture.debugElement.nativeElement; // Second radio button (with index 1) expected to be "Potentially suicidal" from test data; flag type is a non-parent nativeElement.querySelector('#flag-type-1').click(); - const nextButtonElement = nativeElement.querySelector('.button'); - nextButtonElement.click(); + + component.onNext(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_TYPE, isParentFlagType: false, @@ -286,17 +286,17 @@ describe('SelectFlagTypeComponent', () => { const nativeElement = fixture.debugElement.nativeElement; // First radio button (with index 0) expected to be "Reasonable adjustment" from test data; flag type is a parent nativeElement.querySelector('#flag-type-0').click(); - const nextButtonElement = nativeElement.querySelector('.button'); - nextButtonElement.click(); + + component.onNext(); fixture.detectChanges(); // Second radio button (with index 1) at next level expected to be "I need help communicating and understanding" from test data nativeElement.querySelector('#flag-type-1').click(); - nextButtonElement.click(); + component.onNext(); fixture.detectChanges(); // First radio button (with index 0) at next level expected to be "Sign Language Interpreter" from test data, // with list of values nativeElement.querySelector('#flag-type-0').click(); - nextButtonElement.click(); + component.onNext(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_TYPE, isParentFlagType: false, @@ -311,8 +311,8 @@ describe('SelectFlagTypeComponent', () => { const nativeElement = fixture.debugElement.nativeElement; // Second radio button (with index 1) expected to be "Potentially suicidal" from test data; comments optional for this flag type nativeElement.querySelector('#flag-type-1').click(); - const nextButtonElement = nativeElement.querySelector('.button'); - nextButtonElement.click(); + + component.onNext(); expect(component.flagCommentsOptionalEmitter.emit).toHaveBeenCalledWith(null); }); @@ -322,8 +322,8 @@ describe('SelectFlagTypeComponent', () => { const nativeElement = fixture.debugElement.nativeElement; // First radio button (with index 0) expected to be "Reasonable adjustment" from test data; flag type is a parent nativeElement.querySelector('#flag-type-0').click(); - const nextButtonElement = nativeElement.querySelector('.button'); - nextButtonElement.click(); + + component.onNext(); expect(component.flagCommentsOptionalEmitter.emit).not.toHaveBeenCalled(); }); @@ -333,8 +333,8 @@ describe('SelectFlagTypeComponent', () => { const nativeElement = fixture.debugElement.nativeElement; // Third radio button (with index 2) expected to be "Other" from test data; comments mandatory for this flag type nativeElement.querySelector('#flag-type-2').click(); - const nextButtonElement = nativeElement.querySelector('.button'); - nextButtonElement.click(); + + component.onNext(); expect(component.flagCommentsOptionalEmitter.emit).not.toHaveBeenCalled(); }); @@ -342,7 +342,7 @@ describe('SelectFlagTypeComponent', () => { fixture.detectChanges(); spyOn(component.caseFlagStateEmitter, 'emit'); const nativeElement = fixture.debugElement.nativeElement; - nativeElement.querySelector('.button').click(); + component.onNext(); fixture.detectChanges(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_TYPE, @@ -364,9 +364,9 @@ describe('SelectFlagTypeComponent', () => { const nativeElement = fixture.debugElement.nativeElement; component.formGroup.get(CaseFlagFormFields.FLAG_TYPE).setValue(flagTypes[0].childFlags[0]); // Need twice - one for first selection which should pass validation and the second will fail - nativeElement.querySelector('.button').click(); + component.onNext(); expect(component.errorMessages).toEqual([]); - nativeElement.querySelector('.button').click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages[0]).toEqual({ @@ -385,7 +385,7 @@ describe('SelectFlagTypeComponent', () => { fixture.detectChanges(); const otherDescription: HTMLInputElement = nativeElement.querySelector('#other-flag-type-description'); expect(otherDescription).toBeTruthy(); - nativeElement.querySelector('.button').click(); + component.onNext(); fixture.detectChanges(); const errorSummaryElement = nativeElement.querySelector('#flag-type-error-message'); expect(errorSummaryElement.textContent).toContain(SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_ENTERED); @@ -401,7 +401,7 @@ describe('SelectFlagTypeComponent', () => { fixture.detectChanges(); otherDescription.value = 'OtherFlagTypeDescriptionTestWithMoreThanEightyCharactersShouldFailTheValidationAsExpected'; otherDescription.dispatchEvent(new Event('input')); - nativeElement.querySelector('.button').click(); + component.onNext(); fixture.detectChanges(); const errorSummaryElement = nativeElement.querySelector('#flag-type-error-message'); expect(errorSummaryElement.textContent).toContain(SelectFlagTypeErrorMessage.FLAG_TYPE_LIMIT_EXCEEDED); @@ -412,8 +412,7 @@ describe('SelectFlagTypeComponent', () => { const nativeElement = fixture.debugElement.nativeElement; // First radio button (with index 0) expected to be "Reasonable adjustment" from test data; flag type is a parent nativeElement.querySelector('#flag-type-0').click(); - const nextButtonElement = nativeElement.querySelector('.button'); - nextButtonElement.click(); + component.onNext(); expect(component.flagTypes).toEqual(flagTypes[0].childFlags[0].childFlags); expect(component.formGroup.get(CaseFlagFormFields.FLAG_TYPE).value).toEqual(null); expect(component.selectedFlagType).toBeNull(); @@ -486,10 +485,6 @@ describe('SelectFlagTypeComponent', () => { expect(component.caseFlagStateEmitter.emit) .toHaveBeenCalledWith({ currentCaseFlagFieldState: CaseFlagFieldState.FLAG_TYPE, errorMessages: component.errorMessages }); fixture.detectChanges(); - const nativeElement = fixture.debugElement.nativeElement; - const nextButtonElement = nativeElement.querySelector('.button'); - // The "Next" button should not be present if an error has occurred when retrieving the list of flag types - expect(nextButtonElement).toBeNull(); }); it('should unsubscribe from any Observables when the component is destroyed', () => { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag-add-translation-form/update-flag-add-translation-form.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag-add-translation-form/update-flag-add-translation-form.component.spec.ts index ac06d90401..d24290bbe3 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag-add-translation-form/update-flag-add-translation-form.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag-add-translation-form/update-flag-add-translation-form.component.spec.ts @@ -14,7 +14,6 @@ describe('UpdateFlagAddTranslationFormComponent', () => { let otherDescriptionWelshControl: DebugElement; let flagCommentsControl: DebugElement; let flagCommentsWelshControl: DebugElement; - let nextButton: HTMLElement; let otherDescriptionTextarea: HTMLInputElement; let otherDescriptionWelshTextarea: HTMLInputElement; let flagCommentsTextarea: HTMLInputElement; @@ -60,7 +59,6 @@ describe('UpdateFlagAddTranslationFormComponent', () => { '7777777777' + '8888888888' + '9999999999' + '0000000000' + '1111111111' + '2222222222' + '3333333333' + '4444444444' + '5555555555' + '6666666666' + '7777777777' + '8888888888' + '9999999999'; component.selectedFlag = selectedFlag1; - nextButton = fixture.debugElement.query(By.css('#updateFlagNextButton')).nativeElement; fixture.detectChanges(); otherDescriptionControl = fixture.debugElement.query(By.css(`#${CaseFlagFormFields.OTHER_FLAG_DESCRIPTION}`)); otherDescriptionWelshControl = fixture.debugElement.query(By.css(`#${CaseFlagFormFields.OTHER_FLAG_DESCRIPTION_WELSH}`)); @@ -109,7 +107,7 @@ describe('UpdateFlagAddTranslationFormComponent', () => { flagCommentsTextarea.dispatchEvent(new Event('input')); flagCommentsWelshTextarea.value = `${textareaInput}0`; flagCommentsWelshTextarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -157,7 +155,7 @@ describe('UpdateFlagAddTranslationFormComponent', () => { flagCommentsTextarea.dispatchEvent(new Event('input')); flagCommentsWelshTextarea.value = textareaInput; flagCommentsWelshTextarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); const errorMessageElements = fixture.debugElement.queryAll(By.css('.govuk-error-message')); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.spec.ts index b949e34487..0d3638fa70 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.spec.ts @@ -21,7 +21,6 @@ import { UpdateFlagComponent } from './update-flag.component'; describe('UpdateFlagComponent', () => { let component: UpdateFlagComponent; let fixture: ComponentFixture; - let nextButton: HTMLElement; let textareaInput: string; let mockRpxTranslationService: any; const activeFlag = { @@ -164,7 +163,7 @@ describe('UpdateFlagComponent', () => { component.formGroup = new FormGroup({ selectedManageCaseLocation: new FormControl(selectedFlag1) }); - nextButton = fixture.debugElement.query(By.css('#updateFlagNextButton')).nativeElement; + // 200-character text input textareaInput = '0000000000' + '1111111111' + '2222222222' + '3333333333' + '4444444444' + '5555555555' + '6666666666' + '7777777777' + '8888888888' + '9999999999' + '0000000000' + '1111111111' + '2222222222' + '3333333333' + '4444444444' + @@ -228,7 +227,7 @@ describe('UpdateFlagComponent', () => { const textarea = fixture.debugElement.query(By.css(`#${CaseFlagFormFields.COMMENTS}`)).nativeElement; textarea.value = ''; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(fixture.debugElement.nativeElement.querySelector('.govuk-error-message')).toBeNull(); @@ -245,7 +244,7 @@ describe('UpdateFlagComponent', () => { const textarea = fixture.debugElement.query(By.css(`#${CaseFlagFormFields.COMMENTS}`)).nativeElement; textarea.value = ''; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -273,7 +272,7 @@ describe('UpdateFlagComponent', () => { const textarea = fixture.debugElement.query(By.css(`#${CaseFlagFormFields.COMMENTS}`)).nativeElement; textarea.value = ''; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -297,7 +296,7 @@ describe('UpdateFlagComponent', () => { fixture.detectChanges(); const textarea = fixture.debugElement.query(By.css(`#${CaseFlagFormFields.COMMENTS}`)).nativeElement; expect(textarea.value).toEqual(''); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); const errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); @@ -310,7 +309,7 @@ describe('UpdateFlagComponent', () => { const textarea = fixture.debugElement.query(By.css(`#${CaseFlagFormFields.COMMENTS}`)).nativeElement; textarea.value = `${textareaInput}0`; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages[0]).toEqual({ title: '', @@ -327,7 +326,7 @@ describe('UpdateFlagComponent', () => { const textarea = fixture.debugElement.query(By.css(`#${CaseFlagFormFields.COMMENTS}`)).nativeElement; textarea.value = textareaInput; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); const errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); @@ -396,7 +395,7 @@ describe('UpdateFlagComponent', () => { const radioButtons = fixture.debugElement.nativeElement.querySelectorAll('.govuk-radios__input') as HTMLInputElement[]; // Clicking fourth radio button with status "Not approved" makes entering status reason mandatory radioButtons[3].click(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -425,7 +424,7 @@ describe('UpdateFlagComponent', () => { const radioButtons = fixture.debugElement.nativeElement.querySelectorAll('.govuk-radios__input') as HTMLInputElement[]; // Clicking first radio button with status "Requested" makes entering status reason optional radioButtons[0].click(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -438,7 +437,7 @@ describe('UpdateFlagComponent', () => { expect(errorMessageElement).toBeNull(); // Clicking second radio button with status "Active" makes entering status reason optional radioButtons[1].click(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -451,7 +450,7 @@ describe('UpdateFlagComponent', () => { expect(errorMessageElement).toBeNull(); // Clicking third radio button with status "Inactive" makes entering status reason optional radioButtons[2].click(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -477,7 +476,7 @@ describe('UpdateFlagComponent', () => { const textarea = fixture.debugElement.nativeElement.querySelector(`#${CaseFlagFormFields.STATUS_CHANGE_REASON}`); textarea.value = `${textareaInput}0`; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages[0]).toEqual({ title: '', @@ -490,7 +489,7 @@ describe('UpdateFlagComponent', () => { radioButtons[3].click(); textarea.value = `${textareaInput}0`; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages[0]).toEqual({ title: '', @@ -514,7 +513,7 @@ describe('UpdateFlagComponent', () => { const textarea = fixture.debugElement.nativeElement.querySelector(`#${CaseFlagFormFields.STATUS_CHANGE_REASON}`); textarea.value = textareaInput; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); let errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); @@ -523,7 +522,7 @@ describe('UpdateFlagComponent', () => { radioButtons[3].click(); textarea.value = textareaInput; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.errorMessages.length).toBe(0); errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); @@ -626,7 +625,7 @@ describe('UpdateFlagComponent', () => { fixture.detectChanges(); spyOn(component, 'onNext').and.callThrough(); spyOn(component.caseFlagStateEmitter, 'emit'); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -654,7 +653,7 @@ describe('UpdateFlagComponent', () => { const textarea = fixture.debugElement.nativeElement.querySelector(`#${CaseFlagFormFields.STATUS_CHANGE_REASON}`); textarea.value = textareaInput; textarea.dispatchEvent(new Event('input')); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onNext).toHaveBeenCalled(); expect(component.caseFlagStateEmitter.emit).toHaveBeenCalledWith({ @@ -730,7 +729,7 @@ describe('UpdateFlagComponent', () => { textarea.dispatchEvent(new Event('input')); // Click the "Make inactive" button to change the flag status fixture.debugElement.nativeElement.querySelector('.button-secondary').click(); - nextButton.click(); + component.onNext(); fixture.detectChanges(); expect(component.onMakeInactive).toHaveBeenCalled(); expect(component.onNext).toHaveBeenCalled(); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.spec.ts index 53a5bfb19c..d37114e968 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.spec.ts @@ -49,14 +49,6 @@ describe('BeforeYouStartComponent', () => { expect(component).toBeTruthy(); }); - it('should next event emit linked cases state with no error', () => { - fixture.detectChanges(); - const buttonElem = fixture.debugElement.query(By.css('.button-primary')); // change selector here - buttonElem.triggerEventHandler('click', null); - expect(component.linkedCasesStateEmitter.emit).toHaveBeenCalledWith( - { currentLinkedCasesPage: LinkedCasesPages.BEFORE_YOU_START, errorMessages: undefined, navigateToNextPage: true }); - }); - it('should display correct text content for link cases journey', () => { component.isLinkCasesJourney = true; fixture.detectChanges(); From 56dba5d0f16194e485dc84b314d8896bf44e17da Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 12 Jul 2024 09:17:35 +0100 Subject: [PATCH 19/75] Fix for navigating to select-flag-type from CYA not showing end node in journey --- .../abstract-field-write-journey.component.ts | 74 +++--- .../base-field/abstract-journey.component.ts | 91 ++++---- .../select-flag-type.component.ts | 61 ++--- .../multipage-component-state.service.ts | 216 +++++++++--------- 4 files changed, 228 insertions(+), 214 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts index 14c0122a33..4b295130af 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts @@ -1,72 +1,70 @@ -import { Directive, Input, OnChanges, ViewChild } from "@angular/core"; -import { AbstractFieldWriteComponent } from "./abstract-field-write.component"; -import { Journey } from "../../../domain"; -import { MultipageComponentStateService } from "../../../services"; +import { Directive, Input, OnChanges, ViewChild } from '@angular/core'; +import { AbstractFieldWriteComponent } from './abstract-field-write.component'; +import { Journey } from '../../../domain'; +import { MultipageComponentStateService } from '../../../services'; @Directive() export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWriteComponent implements OnChanges, Journey { - public journeyStartPageNumber: number = 0; - public journeyEndPageNumber: number = 0; - public journeyPageNumber: number = 0; + public journeyStartPageNumber: number = 0; + public journeyEndPageNumber: number = 0; + public journeyPageNumber: number = 0; @Input() - public journeyId: string = 'journey'; + public journeyId: string = 'journey'; // todo... @ViewChild('journeyChild') public childJourney!: Journey; public constructor(protected readonly multipageComponentStateService: MultipageComponentStateService) { - super(); - this.multipageComponentStateService.addTojourneyCollection(this); - this.journeyPageNumber = this.journeyStartPageNumber; + super(); + this.multipageComponentStateService.addTojourneyCollection(this); + this.journeyPageNumber = this.journeyStartPageNumber; } public next(): void { - if (!this.hasNext()) { - return; - } - - this.childJourney.next(); + if (!this.hasNext()) { + return; + } + this.childJourney.next(); } public previous(): void { - if (!this.hasPrevious()) { - return; - } - this.previousPage(); + if (!this.hasPrevious()) { + return; + } + this.previousPage(); } protected previousPage(): void { - if (this.hasPrevious()) { - this.journeyPageNumber--; - this.onPageChange(); - } + if (this.hasPrevious()) { + this.journeyPageNumber--; + this.onPageChange(); + } } protected nextPage(): void { - if (this.hasNext()) { - this.journeyPageNumber++; - this.onPageChange(); - } + if (this.hasNext()) { + this.journeyPageNumber++; + this.onPageChange(); + } } public ngOnInit(): void { - this.journeyPageNumber = this.journeyStartPageNumber; - - const state = this.multipageComponentStateService.getJourneyState(this); + this.journeyPageNumber = this.journeyStartPageNumber; + const state = this.multipageComponentStateService.getJourneyState(this); - if (state) { - const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; + if (state) { + const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; - this.journeyPageNumber = journeyPageNumber; - this.journeyStartPageNumber = journeyStartPageNumber; - this.journeyEndPageNumber = journeyEndPageNumber; - } + this.journeyPageNumber = journeyPageNumber; + this.journeyStartPageNumber = journeyStartPageNumber; + this.journeyEndPageNumber = journeyEndPageNumber; + } } public ngOnDestroy(): void { - this.multipageComponentStateService.setJourneyState(this); + this.multipageComponentStateService.setJourneyState(this); } public hasNext(): boolean { return this.journeyPageNumber < this.journeyEndPageNumber }; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts index 2c190b2c12..a5b9930a2c 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts @@ -1,74 +1,83 @@ -import { Directive, Input, ViewChild } from "@angular/core"; -import { Journey } from "../../../domain"; -import { MultipageComponentStateService } from "../../../services"; +import { Directive, Input, ViewChild } from '@angular/core'; +import { Journey } from '../../../domain'; +import { MultipageComponentStateService } from '../../../services'; @Directive() export abstract class AbstractJourneyComponent implements Journey { - - public journeyStartPageNumber: number = 0; - public journeyEndPageNumber: number = 0; - public journeyPageNumber: number = 0; + public journeyStartPageNumber: number = 0; + public journeyEndPageNumber: number = 0; + public journeyPageNumber: number = 0; @Input() - public journeyId: string = 'journey'; + public journeyId: string = 'journey'; // todo... @ViewChild('journeyChild') public childJourney!: Journey; public constructor(protected readonly multipageComponentStateService: MultipageComponentStateService) { - this.multipageComponentStateService.addTojourneyCollection(this); - this.journeyPageNumber = this.journeyStartPageNumber; + this.multipageComponentStateService.addTojourneyCollection(this); + this.journeyPageNumber = this.journeyStartPageNumber; + console.log(this.multipageComponentStateService.getJourneyCollection()); } public next(): void { - if (!this.hasNext()) { - return; - } - - this.childJourney.next(); + if (!this.hasNext()) { + return; + } + this.childJourney.next(); } public previous(): void { - if (!this.hasPrevious()) { - return; - } - this.previousPage(); + if (!this.hasPrevious()) { + return; + } + this.previousPage(); } protected previousPage(): void { - if (this.hasPrevious()) { - this.journeyPageNumber--; - } + if (this.hasPrevious()) { + this.journeyPageNumber--; + } } public ngOnInit(): void { - this.journeyPageNumber = this.journeyStartPageNumber; - - const state = this.multipageComponentStateService.getJourneyState(this); - - if (state) { - const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; - - this.journeyPageNumber = journeyPageNumber; - this.journeyStartPageNumber = journeyStartPageNumber; - this.journeyEndPageNumber = journeyEndPageNumber; - } + this.journeyPageNumber = this.journeyStartPageNumber; + + const state = this.multipageComponentStateService.getJourneyState(this); + console.log(this.journeyPageNumber); + if (state) { + const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; + console.log('abstract-journey.component.ts ngOnInit', journeyPageNumber); + this.journeyPageNumber = journeyPageNumber; + this.journeyStartPageNumber = journeyStartPageNumber; + this.journeyEndPageNumber = journeyEndPageNumber; + } } public ngOnDestroy(): void { - this.multipageComponentStateService.setJourneyState(this); + this.multipageComponentStateService.setJourneyState(this); } - public hasNext(): boolean { return this.journeyPageNumber < this.journeyEndPageNumber }; + public hasNext(): boolean { + return this.journeyPageNumber < this.journeyEndPageNumber; + } - public hasPrevious(): boolean { return this.journeyPageNumber > this.journeyStartPageNumber }; + public hasPrevious(): boolean { + return this.journeyPageNumber > this.journeyStartPageNumber; + } - public isFinished(): boolean { return this.journeyPageNumber === this.journeyEndPageNumber }; + public isFinished(): boolean { + return this.journeyPageNumber === this.journeyEndPageNumber; + } - public isStart(): boolean { return this.journeyPageNumber === this.journeyStartPageNumber }; + public isStart(): boolean { + return this.journeyPageNumber === this.journeyStartPageNumber; + } - public getId(): string { return this.journeyId }; + public getId(): string { + return this.journeyId; + } - public onPageChange(): void { /* To be implemented by some child classes. */ }; -} \ No newline at end of file + public onPageChange(): void { /* To be implemented by some child classes. */ } +} diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts index 943a46a32e..6ed60bf1c2 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Subscription } from 'rxjs'; import { catchError, switchMap } from 'rxjs/operators'; @@ -17,7 +17,6 @@ import { SearchLanguageInterpreterControlNames } from '../search-language-interp styleUrls: ['./select-flag-type.component.scss'] }) export class SelectFlagTypeComponent extends AbstractJourneyComponent implements OnInit, OnDestroy, Journey { - @Input() public formGroup: FormGroup; @@ -68,8 +67,8 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements public constructor(private readonly caseFlagRefdataService: CaseFlagRefdataService, pageStateService: MultipageComponentStateService) { super(pageStateService); - } - + } + public get selectedFlagType(): FlagType | null { return this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.value; } @@ -77,12 +76,11 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements public get otherFlagTypeSelected(): boolean { return this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.value?.flagCode === this.otherFlagTypeCode; } - + public ngOnInit(): void { this.isCaseLevelFlag = this.selectedFlagsLocation?.flags?.flagsCaseFieldId === this.caseLevelCaseFlagsFieldId; this.flagTypes = []; const flagType = this.isCaseLevelFlag ? RefdataCaseFlagType.CASE : RefdataCaseFlagType.PARTY; - this.formGroup.addControl(CaseFlagFormFields.FLAG_TYPE, new FormControl('')); this.formGroup.addControl(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION, new FormControl('')); // FormControl is linked to a checkbox input element, so initial value should be false @@ -90,7 +88,7 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements // Should clear descriptionControlName if flagTypeControlName is changed this.flagTypeControlChangesSubscription = this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.valueChanges - .subscribe(_ => { + .subscribe((_) => { this.formGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION)?.setValue(''); this.cachedPath = []; @@ -100,30 +98,30 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements [SearchLanguageInterpreterControlNames.MANUAL_LANGUAGE_ENTRY]: '' }); } - ); + ); // If hmctsServiceId is present, use this to retrieve the relevant list of flag types if (this.hmctsServiceId) { this.flagRefdata$ = this.caseFlagRefdataService .getCaseFlagsRefdata(this.hmctsServiceId, flagType, true, this.isDisplayContextParameterExternal) .subscribe({ - next: flagTypes => this.processFlagTypes(flagTypes), - error: error => this.onRefdataError(error) + next: (flagTypes) => this.processFlagTypes(flagTypes), + error: (error) => this.onRefdataError(error) }); } else { // Else, HMCTS service code is required to retrieve the relevant list of flag types; attempt to obtain it by case type ID first this.flagRefdata$ = this.caseFlagRefdataService.getHmctsServiceDetailsByCaseType(this.caseTypeId) .pipe( // If an error occurs retrieving HMCTS service details by case type ID, try by service name instead - catchError(_ => this.caseFlagRefdataService.getHmctsServiceDetailsByServiceName(this.jurisdiction)), + catchError((_) => this.caseFlagRefdataService.getHmctsServiceDetailsByServiceName(this.jurisdiction)), // Use switchMap to return an inner Observable of the flag types data, having received the service details // including service_code. This avoids having nested `subscribe`s, which is an anti-pattern! - switchMap(serviceDetails => this.caseFlagRefdataService.getCaseFlagsRefdata(serviceDetails[0].service_code, flagType, + switchMap((serviceDetails) => this.caseFlagRefdataService.getCaseFlagsRefdata(serviceDetails[0].service_code, flagType, true, this.isDisplayContextParameterExternal)) ) .subscribe({ - next: flagTypes => this.processFlagTypes(flagTypes), - error: error => this.onRefdataError(error) + next: (flagTypes) => this.processFlagTypes(flagTypes), + error: (error) => this.onRefdataError(error) }); } } @@ -150,6 +148,7 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements // If the selected flag type is a parent, load the list of child flag types and reset the current selection if (this.selectedFlagType?.isParent) { + console.log('is this hit?'); // Cache the current flag type selection before it is reset - this is needed for displaying its name as the title // when displaying the next set of child flags this.cachedFlagType = this.selectedFlagType; @@ -175,9 +174,9 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements if (this.cachedFlagType) { errorMessage = SelectFlagTypeErrorMessage.FLAG_TYPE_OPTION_NOT_SELECTED; } else { - errorMessage = this.isDisplayContextParameterExternal - ? SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_SELECTED_EXTERNAL - : SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_SELECTED; + errorMessage = this.isDisplayContextParameterExternal + ? SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_SELECTED_EXTERNAL + : SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_SELECTED; } this.flagTypeNotSelectedErrorMessage = errorMessage; this.errorMessages.push({ title: '', description: errorMessage, fieldId: 'conditional-radios-list' }); @@ -198,20 +197,28 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements } private processFlagTypes(flagTypes: FlagType[]): void { - // First (and only) object in the returned array should be the top-level "Party" flag type - // The "Other" flag type should be removed from the top level if the user is external - this.flagTypes = flagTypes[0].childFlags.filter((flag) => - this.isDisplayContextParameterExternal ? flag.flagCode !== this.otherFlagTypeCode : true); + if (this.selectedFlagType) { + const selectedFlagType = this.selectedFlagType; + const pathToSearch = selectedFlagType.Path.slice(1); + let currentPath = flagTypes[0]; + for (const pathElement of pathToSearch) { + const foundFlag = currentPath.childFlags.find((flag) => flag.name === pathElement); + if (foundFlag) { + currentPath = foundFlag; + } + } + this.flagTypes = currentPath.childFlags; + this.cachedFlagType = currentPath; + } else { + this.flagTypes = flagTypes[0].childFlags.filter((flag) => + this.isDisplayContextParameterExternal ? flag.flagCode !== this.otherFlagTypeCode : true); + } const formControl = this.formGroup.get(CaseFlagFormFields.FLAG_TYPE); if (formControl?.value) { - // Cache Path based on existing flagCode -- needed for nested choices const [foundFlagType, path] = FlagType.searchPathByFlagTypeObject(formControl.value as FlagType, this.flagTypes); - this.cachedPath = [ - ...path, - foundFlagType - ]; - formControl.setValue(this.cachedPath[0], { emitEvent: false }); + this.cachedPath = [...path, foundFlagType]; + formControl.setValue(this.selectedFlagType ? this.cachedPath[this.cachedPath.length - 1] : this.cachedPath[0], { emitEvent: false }); } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts index 643b1ea273..bff79e0351 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts @@ -2,129 +2,129 @@ import { Injectable } from '@angular/core'; import { Journey, JourneyInstigator } from '../../domain'; @Injectable({ - providedIn: 'root' + providedIn: 'root' }) export class MultipageComponentStateService { - //is journey at start will help keep track of the progress through the journey. - private isJourneyAtStart: boolean = false; - //journey collection references an upto date list of all the journey components currently rendered!!!! - private journeyCollection: Journey[] = new Array(); - //the instigator references the case-edit-page component that will invoke the next and previous methods - private instigator: JourneyInstigator | null = null; - //each journey will store its state here. this could include form data if needed - private journeyState: Map = new Map(); - - //setJourneyComponent will be called by the app component to update the journey collection - setJourneyCollection(journeyCollection: Journey[]): void { - this.journeyCollection = journeyCollection; + //is journey at start will help keep track of the progress through the journey. + private isJourneyAtStart: boolean = false; + //journey collection references an upto date list of all the journey components currently rendered!!!! + private journeyCollection: Journey[] = new Array(); + //the instigator references the case-edit-page component that will invoke the next and previous methods + private instigator: JourneyInstigator | null = null; + //each journey will store its state here. this could include form data if needed + private journeyState: Map = new Map(); + + //setJourneyComponent will be called by the app component to update the journey collection + setJourneyCollection(journeyCollection: Journey[]): void { + this.journeyCollection = journeyCollection; + } + + //getJourneyCollection will be called by the app component to get the journey collection + getJourneyCollection(): Journey[] { + return this.journeyCollection; + } + + //addToJourneyCollection will be called from the journey + addTojourneyCollection(journey: Journey): void { + this.journeyCollection.push(journey); + } + + //resetJourneyCollection will be called + resetJourneyCollection(): void { + this.journeyCollection = []; + } + + //setInstigator will be called by the app component to update the instigator + setInstigator(instigator: JourneyInstigator): void { + this.instigator = instigator; + } + + //getInstigator will be called by the app component to get the instigator + getInstigator(): JourneyInstigator | null { + return this.instigator; + } + + //setJourneyState will be called by the journey component to update the journey state + setJourneyState(journey: Journey): void { + this.journeyState.set(journey.journeyId, journey); + } + + //getJourneyState will be called by the journey component to get the journey state + getJourneyState(journey: Journey): Journey | null { + return this.journeyState.get(journey.journeyId) || null; + } + + //resetJourneyState will be called by the journey component to reset the journey state + resetJourneyState(): void { + this.journeyState.clear(); + } + + //reset will be called to ensure that the entire state is reset + reset(): void { + this.isJourneyAtStart = false; + this.journeyState.clear(); + this.instigator = null; + this.journeyCollection = []; + } + + //next will be called by the instigator that will invoke the next method of the journey component that will invoke the next method of the childpage component + public next(): void { + if (this.journeyCollection.length <= 0) { + this.instigator?.onFinalNext(); + return; } - //getJourneyCollection will be called by the app component to get the journey collection - getJourneyCollection(): Journey[] { - return this.journeyCollection; + const isAnyObjectNotFinished: boolean = this.journeyCollection.some((journey) => !journey.isFinished()); + console.log('isAnyObjectNotFinished', isAnyObjectNotFinished); + if (!isAnyObjectNotFinished) { + this.instigator?.onFinalNext(); + return; } - //addToJourneyCollection will be called from the journey - addTojourneyCollection(journey: Journey): void { - this.journeyCollection.push(journey); - } - - //resetJourneyCollection will be called - resetJourneyCollection(): void { - this.journeyCollection = []; - } - - //setInstigator will be called by the app component to update the instigator - setInstigator(instigator: JourneyInstigator): void { - this.instigator = instigator; - } - - //getInstigator will be called by the app component to get the instigator - getInstigator(): JourneyInstigator | null { - return this.instigator; - } - - //setJourneyState will be called by the journey component to update the journey state - setJourneyState(journey: Journey): void { - this.journeyState.set(journey.journeyId, journey); - } + for (const journey of this.journeyCollection) { + if (!journey) { + continue; + } - //getJourneyState will be called by the journey component to get the journey state - getJourneyState(journey: Journey): Journey | null { - return this.journeyState.get(journey.journeyId) || null; + if (!journey?.isFinished()) { + journey?.next(); + break; + } } + } - //resetJourneyState will be called by the journey component to reset the journey state - resetJourneyState(): void { - this.journeyState.clear(); + //previous will be called by the instigator that will invoke the previous method of the journey component that will invoke the previous method of the childpage component + public previous(): void { + if (this.journeyCollection.length <= 0) { + this.instigator?.onFinalPrevious(); + return; } - //reset will be called to ensure that the entire state is reset - reset(): void { - this.isJourneyAtStart = false; - this.journeyState.clear(); - this.instigator = null; - this.journeyCollection = []; - } + const isAnyObjectNotAtStart: boolean = this.journeyCollection.some((journey) => !journey.isStart()); - //next will be called by the instigator that will invoke the next method of the journey component that will invoke the next method of the childpage component - public next(): void { - if (this.journeyCollection.length <= 0) { - this.instigator?.onFinalNext(); - return; - } - - const isAnyObjectNotFinished: boolean = this.journeyCollection.some(journey => !journey.isFinished()); - - if (!isAnyObjectNotFinished) { - this.instigator?.onFinalNext(); - return; - } - - for (const journey of this.journeyCollection) { - if (!journey) { - continue; - } - - if (!journey?.isFinished()) { - journey?.next(); - break; - } - } + if (!isAnyObjectNotAtStart) { + this.instigator?.onFinalPrevious(); + return; } - //previous will be called by the instigator that will invoke the previous method of the journey component that will invoke the previous method of the childpage component - public previous(): void { - if (this.journeyCollection.length <= 0) { - this.instigator?.onFinalPrevious(); - return; - } - - const isAnyObjectNotAtStart: boolean = this.journeyCollection.some(journey => !journey.isStart()); - - if (!isAnyObjectNotAtStart) { - this.instigator?.onFinalPrevious(); - return; - } - - for (const journey of this.journeyCollection.slice().reverse()) { - if (!journey) { - continue; - } - if (!journey?.isStart()) { - journey?.previous(); - break; - } - } + for (const journey of this.journeyCollection.slice().reverse()) { + if (!journey) { + continue; + } + if (!journey?.isStart()) { + journey?.previous(); + break; + } } + } - //isAtStart can be used to inform the instigator if we're at the start. - public get isAtStart(): boolean { - return this.isJourneyAtStart; - } + //isAtStart can be used to inform the instigator if we're at the start. + public get isAtStart(): boolean { + return this.isJourneyAtStart; + } - //isAtStart can be used to update the value from a journey object, so the instigator knows. - public set isAtStart(isAtStart: boolean) { - this.isJourneyAtStart = isAtStart; - } + //isAtStart can be used to update the value from a journey object, so the instigator knows. + public set isAtStart(isAtStart: boolean) { + this.isJourneyAtStart = isAtStart; + } } From 37dd646af0661277242ac9369b3c23d31f47fc47 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 16 Jul 2024 10:08:40 +0100 Subject: [PATCH 20/75] Fix navigation through subjourney, fix flow when going forward and subjourney skips to last sub node --- .../abstract-field-write-journey.component.ts | 8 ++- .../base-field/abstract-journey.component.ts | 3 +- .../select-flag-type.component.html | 2 +- .../select-flag-type.component.ts | 59 ++++++++++++++++--- .../write-case-flag-field.component.ts | 6 +- .../shared/domain/journey/journey.model.ts | 1 + .../multipage-component-state.service.ts | 3 +- 7 files changed, 64 insertions(+), 18 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts index 4b295130af..6f8f19afd8 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts @@ -8,6 +8,7 @@ export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWr public journeyStartPageNumber: number = 0; public journeyEndPageNumber: number = 0; public journeyPageNumber: number = 0; + public journeyPreviousPageNumber: number = 0; @Input() public journeyId: string = 'journey'; @@ -33,7 +34,11 @@ export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWr if (!this.hasPrevious()) { return; } - this.previousPage(); + if (this.childJourney['cachedFlagType'] && this.childJourney['subJourneyIndex'] !== 0) { + this.childJourney.previous(); + } else { + this.previousPage(); + } } protected previousPage(): void { @@ -53,7 +58,6 @@ export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWr public ngOnInit(): void { this.journeyPageNumber = this.journeyStartPageNumber; const state = this.multipageComponentStateService.getJourneyState(this); - if (state) { const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts index a5b9930a2c..8ef57fa0af 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-journey.component.ts @@ -7,6 +7,7 @@ export abstract class AbstractJourneyComponent implements Journey { public journeyStartPageNumber: number = 0; public journeyEndPageNumber: number = 0; public journeyPageNumber: number = 0; + public journeyPreviousPageNumber: number; @Input() public journeyId: string = 'journey'; @@ -18,7 +19,6 @@ export abstract class AbstractJourneyComponent implements Journey { public constructor(protected readonly multipageComponentStateService: MultipageComponentStateService) { this.multipageComponentStateService.addTojourneyCollection(this); this.journeyPageNumber = this.journeyStartPageNumber; - console.log(this.multipageComponentStateService.getJourneyCollection()); } public next(): void { @@ -48,7 +48,6 @@ export abstract class AbstractJourneyComponent implements Journey { console.log(this.journeyPageNumber); if (state) { const { journeyPageNumber, journeyStartPageNumber, journeyEndPageNumber } = state; - console.log('abstract-journey.component.ts ngOnInit', journeyPageNumber); this.journeyPageNumber = journeyPageNumber; this.journeyStartPageNumber = journeyStartPageNumber; this.journeyEndPageNumber = journeyEndPageNumber; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.html index b7b32011ff..05f90ffeda 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.html @@ -3,7 +3,7 @@

- + {{ isDisplayContextParameterExternal ? (caseFlagWizardStepTitle.SELECT_CASE_FLAG_EXTERNAL | rpxTranslate) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts index 6ed60bf1c2..550e232553 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Subscription } from 'rxjs'; import { catchError, switchMap } from 'rxjs/operators'; @@ -55,6 +55,8 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements public flagTypeControlChangesSubscription: Subscription; public caseFlagFormField = CaseFlagFormFields; public isCaseLevelFlag = false; + private cachedRDFlagTypes; + public subJourneyIndex: number = 0; private readonly maxCharactersForOtherFlagType = 80; // Code for "Other" flag type as defined in Reference Data @@ -148,14 +150,42 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements // If the selected flag type is a parent, load the list of child flag types and reset the current selection if (this.selectedFlagType?.isParent) { - console.log('is this hit?'); // Cache the current flag type selection before it is reset - this is needed for displaying its name as the title // when displaying the next set of child flags this.cachedFlagType = this.selectedFlagType; this.flagTypes = this.selectedFlagType.childFlags; - this.cachedPath?.shift(); - this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.setValue(this.cachedPath?.length ? this.cachedPath[0] : null, { emitEvent: false }); + if (this.cachedPath.length !== 0 && this.cachedPath[this.subJourneyIndex] === this.selectedFlagType) { + this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.setValue(this.cachedPath[this.subJourneyIndex + 1], { emitEvent: false }); + } else { + this.cachedPath?.shift(); + const value = this.cachedPath?.length ? this.cachedPath[0] : null; + this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.setValue(value, { emitEvent: false }); + } + this.subJourneyIndex++; + } + } + + // Simplified version of the onPrevious method with optimized code + public onPrevious(): void { + if (this.cachedFlagType) { + if (this.cachedFlagType.Path.length === 1) { + this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.setValue(this.cachedFlagType, { emitEvent: false }); + this.flagTypes = this.cachedRDFlagTypes[0].childFlags; + } else { + let currentPath = this.cachedRDFlagTypes[0]; + const pathToSearch = this.cachedFlagType.Path.slice(1); + for (const pathElement of pathToSearch) { + const foundFlag = currentPath.childFlags.find((flag) => flag.name === pathElement); + if (foundFlag) { + currentPath = foundFlag; + } + } + this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.setValue(this.cachedFlagType, { emitEvent: false }); + this.flagTypes = currentPath.childFlags; + this.cachedFlagType = currentPath; + } } + this.subJourneyIndex = Math.max(0, this.subJourneyIndex - 1); } // Identity function for trackBy use by *ngFor for flagTypes in HTML template @@ -197,7 +227,10 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements } private processFlagTypes(flagTypes: FlagType[]): void { - if (this.selectedFlagType) { + const prevJourneyPage = this.multipageComponentStateService.getJourneyCollection()[0]; + const { journeyPreviousPageNumber, journeyPageNumber } = prevJourneyPage; + this.cachedRDFlagTypes = flagTypes; + if (this.selectedFlagType && (journeyPreviousPageNumber > journeyPageNumber)) { const selectedFlagType = this.selectedFlagType; const pathToSearch = selectedFlagType.Path.slice(1); let currentPath = flagTypes[0]; @@ -213,12 +246,14 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements this.flagTypes = flagTypes[0].childFlags.filter((flag) => this.isDisplayContextParameterExternal ? flag.flagCode !== this.otherFlagTypeCode : true); } - const formControl = this.formGroup.get(CaseFlagFormFields.FLAG_TYPE); if (formControl?.value) { - const [foundFlagType, path] = FlagType.searchPathByFlagTypeObject(formControl.value as FlagType, this.flagTypes); + const [foundFlagType, path] = FlagType.searchPathByFlagTypeObject(formControl.value as FlagType, this.cachedRDFlagTypes[0].childFlags); this.cachedPath = [...path, foundFlagType]; - formControl.setValue(this.selectedFlagType ? this.cachedPath[this.cachedPath.length - 1] : this.cachedPath[0], { emitEvent: false }); + formControl.setValue((this.selectedFlagType && (journeyPreviousPageNumber > journeyPageNumber)) ? this.cachedPath[this.cachedPath.length - 1] : this.cachedPath[0], { emitEvent: false }); + if (this.cachedPath.length !== 0){ + this.subJourneyIndex = this.cachedPath.length-1; + } } } @@ -238,4 +273,12 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements super.next(); } } + + public previous() { + this.onPrevious(); + + if (this.subJourneyIndex <= 0) { + super.previous(); + } + } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts index 9d5cd52f19..d416e4129a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts @@ -73,9 +73,7 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon // If it is start of the journey or navigation from check your answers page then fieldStateToNavigate property // in case flag state service will contain the field state to navigate based on create or manage journey this.fieldState = this.caseFlagStateService.fieldStateToNavigate; - if (this.fieldState === undefined || - this.fieldState === CaseFlagFieldState.FLAG_LOCATION || - this.fieldState === CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS) { + if (this.fieldState === undefined) { const params = this.route.snapshot.params; // Clear the form group, field state to navigate and set the page location this.caseFlagStateService.resetCache(`../${params['eid']}/${params['page']}`); @@ -259,6 +257,7 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon public proceedToNextState(): void { if (!this.isAtFinalState()) { + this.journeyPreviousPageNumber = this.fieldState; // Skip the "language interpreter" state if current state is CaseFlagFieldState.FLAG_TYPE and the flag type doesn't // have a "list of values" - currently, this is present only for those flag types that require language interpreter // selection @@ -290,6 +289,7 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon } public previousPage(): void { + this.journeyPreviousPageNumber = this.fieldState; if (this.hasPrevious() && this.fieldState === CaseFlagFieldState.FLAG_COMMENTS && !this.flagType?.listOfValues) { this.fieldState = CaseFlagFieldState.FLAG_TYPE; } else if (this.hasPrevious()) { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts index d12b3c39d6..a5485ead77 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts @@ -10,5 +10,6 @@ export interface Journey { journeyPageNumber: number; journeyStartPageNumber: number; journeyEndPageNumber: number; + journeyPreviousPageNumber: number; childJourney: Journey; } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts index bff79e0351..da7388ebad 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts @@ -75,7 +75,7 @@ export class MultipageComponentStateService { } const isAnyObjectNotFinished: boolean = this.journeyCollection.some((journey) => !journey.isFinished()); - console.log('isAnyObjectNotFinished', isAnyObjectNotFinished); + if (!isAnyObjectNotFinished) { this.instigator?.onFinalNext(); return; @@ -101,7 +101,6 @@ export class MultipageComponentStateService { } const isAnyObjectNotAtStart: boolean = this.journeyCollection.some((journey) => !journey.isStart()); - if (!isAnyObjectNotAtStart) { this.instigator?.onFinalPrevious(); return; From ad08e1b4fc21d8538bd3260c7140c0f4c5305498 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 16 Jul 2024 10:43:21 +0100 Subject: [PATCH 21/75] Fix broken tests --- .../journey/multipage-component-state.service.spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts index 7a6076cd7e..eb2e03a9e5 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts @@ -36,6 +36,7 @@ describe('PageStateService', () => { journeyId: 'test', journeyPageNumber: 1, journeyStartPageNumber: 0, + journeyPreviousPageNumber: 0, journeyEndPageNumber: 5, next: () => { }, previous: () => { }, @@ -57,6 +58,7 @@ describe('PageStateService', () => { journeyPageNumber: 1, journeyStartPageNumber: 0, journeyEndPageNumber: 5, + journeyPreviousPageNumber: 0, next: () => { }, previous: () => { }, hasNext: () => true, @@ -77,6 +79,7 @@ describe('PageStateService', () => { journeyId: 'test', journeyPageNumber: 1, journeyStartPageNumber: 0, + journeyPreviousPageNumber: 0, journeyEndPageNumber: 5, next: () => { }, previous: () => { }, @@ -99,6 +102,7 @@ describe('PageStateService', () => { journeyId: 'test', journeyPageNumber: 1, journeyStartPageNumber: 0, + journeyPreviousPageNumber: 0, journeyEndPageNumber: 5, next: () => { }, previous: () => { }, From e3b6d57af8eb62be443ef5811c53dc59f7fbff06 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 16 Jul 2024 14:38:55 +0100 Subject: [PATCH 22/75] Add unit tests --- .../add-comments.component.spec.ts | 24 +++++++++++++++++++ .../confirm-flag-status.component.spec.ts | 24 +++++++++++++++++++ .../manage-case-flags.component.spec.ts | 24 +++++++++++++++++++ ...rch-language-interpreter.component.spec.ts | 24 +++++++++++++++++++ .../select-flag-location.component.spec.ts | 24 +++++++++++++++++++ .../select-flag-type.component.ts | 2 +- ...lag-add-translation-form.component.spec.ts | 24 +++++++++++++++++++ .../update-flag/update-flag.component.spec.ts | 24 +++++++++++++++++++ .../before-you-start.component.spec.ts | 18 ++++++++++++++ .../before-you-start.component.ts | 9 ++++--- .../check-your-answers.component.ts | 2 +- .../link-cases/link-cases.component.spec.ts | 24 +++++++++++++++++++ .../unlink-cases.component.spec.ts | 24 +++++++++++++++++++ .../unlink-cases/unlink-cases.component.ts | 3 +-- ...write-linked-cases-field.component.spec.ts | 18 ++++++++++++++ 15 files changed, 259 insertions(+), 9 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.spec.ts index f4cb0c11d8..1b48b058d4 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/add-comments/add-comments.component.spec.ts @@ -211,4 +211,28 @@ describe('AddCommentsComponent', () => { const warningTextElement = fixture.debugElement.nativeElement.querySelector('.govuk-warning-text'); expect(warningTextElement).toBeNull(); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/confirm-flag-status/confirm-flag-status.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/confirm-flag-status/confirm-flag-status.component.spec.ts index 4d482e148a..750feb5a56 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/confirm-flag-status/confirm-flag-status.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/confirm-flag-status/confirm-flag-status.component.spec.ts @@ -164,4 +164,28 @@ describe('ConfirmFlagStatusComponent', () => { errorMessageElement = fixture.debugElement.nativeElement.querySelector('.govuk-error-message'); expect(errorMessageElement).toBeNull(); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts index 3a4a91f998..d4f7104f3a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts @@ -664,4 +664,28 @@ describe('ManageCaseFlagsComponent', () => { expect(component.setManageCaseFlagTitle(CaseFlagDisplayContextParameter.UPDATE_EXTERNAL)).toEqual(CaseFlagWizardStepTitle.MANAGE_SUPPORT); expect(component.setManageCaseFlagTitle(CaseFlagDisplayContextParameter.UPDATE_2_POINT_1)).toEqual(CaseFlagWizardStepTitle.MANAGE_CASE_FLAGS); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/search-language-interpreter/search-language-interpreter.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/search-language-interpreter/search-language-interpreter.component.spec.ts index 88c6743146..9e45fb5274 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/search-language-interpreter/search-language-interpreter.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/search-language-interpreter/search-language-interpreter.component.spec.ts @@ -430,4 +430,28 @@ describe('SearchLanguageInterpreterComponent', () => { fixture.detectChanges(); expect(titleElement.textContent).toContain(component.flagType.name_cy); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts index a42d16550f..d0fcee28fd 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts @@ -209,4 +209,28 @@ describe('SelectFlagLocationComponent', () => { expect(component.isDisplayContextParameterExternal).toEqual(true); expect(component.flagLocationTitle).toEqual(CaseFlagWizardStepTitle.SELECT_FLAG_LOCATION_EXTERNAL); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts index 550e232553..6f65b3cb1d 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts @@ -226,7 +226,7 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements } } - private processFlagTypes(flagTypes: FlagType[]): void { + public processFlagTypes(flagTypes: FlagType[]): void { const prevJourneyPage = this.multipageComponentStateService.getJourneyCollection()[0]; const { journeyPreviousPageNumber, journeyPageNumber } = prevJourneyPage; this.cachedRDFlagTypes = flagTypes; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag-add-translation-form/update-flag-add-translation-form.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag-add-translation-form/update-flag-add-translation-form.component.spec.ts index d24290bbe3..44086d27ab 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag-add-translation-form/update-flag-add-translation-form.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag-add-translation-form/update-flag-add-translation-form.component.spec.ts @@ -161,4 +161,28 @@ describe('UpdateFlagAddTranslationFormComponent', () => { const errorMessageElements = fixture.debugElement.queryAll(By.css('.govuk-error-message')); expect(errorMessageElements.length).toBe(0); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.spec.ts index 0d3638fa70..d48097b3f6 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.spec.ts @@ -763,4 +763,28 @@ describe('UpdateFlagComponent', () => { expect(component.validStatusProgressions).toEqual( Object.keys(CaseFlagStatus).filter((key) => !['REQUESTED', 'NOT_APPROVED'].includes(key))); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.spec.ts index d37114e968..57e428d6b2 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.spec.ts @@ -69,4 +69,22 @@ describe('BeforeYouStartComponent', () => { component.onBack(); expect(mockRouter.navigate).toHaveBeenCalled(); }); + + it('should emit linkedCasesStateEmitter when onNext is called', () => { + component.onNext(); + expect(component.linkedCasesStateEmitter.emit).toHaveBeenCalled(); + }); + + it('should call onNext when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super.next when next is called and errorMessages is an empty array', () => { + spyOn(component, 'next').and.callThrough(); + component.errorMessages = []; + component.next(); + expect(component.next).toHaveBeenCalled(); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts index 602934fbef..b880eb9e0f 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/before-you-start/before-you-start.component.ts @@ -1,12 +1,11 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { ErrorMessage } from '../../../../../domain'; +import { ErrorMessage, Journey } from '../../../../../domain'; import { LinkedCasesState } from '../../domain'; import { LinkedCasesPages } from '../../enums'; import { LinkedCasesService } from '../../services/linked-cases.service'; import { AbstractJourneyComponent } from '../../../base-field'; import { MultipageComponentStateService } from '../../../../../services'; -import { Journey } from '../../../../../domain'; @Component({ selector: 'ccd-linked-cases-before-you-start', @@ -24,13 +23,13 @@ export class BeforeYouStartComponent extends AbstractJourneyComponent implements constructor(private readonly router: Router, private readonly linkedCasesService: LinkedCasesService, multipageComponentStateService: MultipageComponentStateService) { - super(multipageComponentStateService); + super(multipageComponentStateService); this.isLinkCasesJourney = this.linkedCasesService.isLinkedCasesEventTrigger; this.serverLinkedApiError = this.linkedCasesService.serverLinkedApiError; // re-initiate the state based on the casefield value const linkedCaseRefereneIds = this.linkedCasesService.caseFieldValue.filter(item => item).map(item => item.id); this.linkedCasesService.linkedCases = this.linkedCasesService.linkedCases.filter - (item => linkedCaseRefereneIds.indexOf(item.caseReference) !== -1); + (item => linkedCaseRefereneIds.indexOf(item.caseReference) !== -1); this.linkedCasesService.initialCaseLinks = this.linkedCasesService.linkedCases; } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts index 27da45a880..0fd7e39697 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.ts @@ -47,7 +47,7 @@ export class CheckYourAnswersComponent extends AbstractJourneyComponent implemen navigateToPreviousPage: false, navigateToNextPage: true }); - + super.next(); } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.spec.ts index 9cb97b53ab..b100551952 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/link-cases/link-cases.component.spec.ts @@ -183,4 +183,28 @@ describe('LinkCasesComponent', () => { component.showErrorInfo(); expect(component.caseSelectionError).toBe(LinkedCasesErrorMessages.CasesLinkedError); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts index e87296de1c..8ed13aa3e1 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts @@ -193,4 +193,28 @@ describe('UnLinkCasesComponent', () => { expect(component.linkedCases[0].unlink).toBeUndefined(); expect(component.linkedCases[1].unlink).toBe(true); }); + + it('should call onNext method when next is called', () => { + spyOn(component, 'onNext'); + component.next(); + expect(component.onNext).toHaveBeenCalled(); + }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts index ba8842cfd0..065cedbb7f 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts @@ -1,13 +1,12 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; import { forkJoin, Observable } from 'rxjs'; -import { CaseView, ErrorMessage } from '../../../../../domain'; +import { CaseView, ErrorMessage, Journey } from '../../../../../domain'; import { CasesService } from '../../../../case-editor/services/cases.service'; import { CaseLink, LinkedCasesState } from '../../domain'; import { LinkedCasesErrorMessages, LinkedCasesPages } from '../../enums/write-linked-cases-field.enum'; import { LinkedCasesService } from '../../services/linked-cases.service'; import { AbstractFieldWriteJourneyComponent } from '../../../base-field'; -import { Journey } from '../../../../../domain'; import { MultipageComponentStateService } from '../../../../../services'; @Component({ diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts index 3210746b1a..2f53f0d025 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts @@ -442,4 +442,22 @@ describe('WriteLinkedCasesFieldComponent', () => { wp.order = order; return wp; } + + it('should decrement linkedCasesPage when not on CHECK_YOUR_ANSWERS or LINK_CASE', () => { + component.linkedCasesPage = LinkedCasesPages.BEFORE_YOU_START + 1; + component.previousPage(); + expect(component.linkedCasesPage).toEqual(LinkedCasesPages.BEFORE_YOU_START); + }); + + it('should set linkedCasesPage to LINK_CASE when on CHECK_YOUR_ANSWERS', () => { + component.linkedCasesPage = LinkedCasesPages.CHECK_YOUR_ANSWERS; + component.previousPage(); + expect(component.linkedCasesPage).toEqual(LinkedCasesPages.LINK_CASE); + }); + + it('should set linkedCasesPage to BEFORE_YOU_START when on LINK_CASE', () => { + component.linkedCasesPage = LinkedCasesPages.LINK_CASE; + component.previousPage(); + expect(component.linkedCasesPage).toEqual(LinkedCasesPages.BEFORE_YOU_START); + }); }); From ecc5a974242d52d068b7bd298ef30c0cd0a76dd5 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 16 Jul 2024 16:25:44 +0100 Subject: [PATCH 23/75] basic unit tests for select flag --- .../select-flag-type.component.spec.ts | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts index 05b4ad7f2c..7824e1261f 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts @@ -653,4 +653,40 @@ describe('SelectFlagTypeComponent', () => { flagVisibilityCheckboxEl.click(); expect(component.formGroup.get(CaseFlagFormFields.IS_VISIBLE_INTERNALLY_ONLY).value).toBe(true); }); + + it('should call super next method when errorMessages length is 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = []; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalled(); + }); + + it('should not call super next method when errorMessages length is not 0', () => { + spyOn(component, 'next').and.callThrough(); + spyOn(component, 'onNext'); + component.errorMessages = [{ title: 'string', description: 'string' }]; + component.next(); + expect(component.onNext).toHaveBeenCalled(); + expect(component.next).toHaveBeenCalledTimes(1); + }); + + it('should call super.previous when subJourneyIndex is less than or equal to 0', () => { + spyOn(component, 'previous').and.callThrough(); + spyOn(component, 'onPrevious'); + component.subJourneyIndex = 0; + component.previous(); + expect(component.onPrevious).toHaveBeenCalled(); + expect(component.previous).toHaveBeenCalled(); + }); + + it('should not call super.previous when subJourneyIndex is greater than 0', () => { + spyOn(component, 'previous').and.callThrough(); + spyOn(component, 'onPrevious'); + component.subJourneyIndex = 1; + component.previous(); + expect(component.onPrevious).toHaveBeenCalled(); + expect(component.previous).toHaveBeenCalled(); + }); }); From 40a9749a75f3b87ff9fbb40059b733146a94dffb Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 17 Jul 2024 09:12:47 +0100 Subject: [PATCH 24/75] Up code coverage --- .../select-flag-type.component.spec.ts | 56 ++++++++++++- .../select-flag-type.component.ts | 2 +- .../check-your-answers.component.spec.ts | 8 ++ .../multipage-component-state.service.spec.ts | 79 +++++++++++++++++++ 4 files changed, 143 insertions(+), 2 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts index 7824e1261f..f318998a27 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.spec.ts @@ -14,11 +14,13 @@ import { SearchLanguageInterpreterControlNames } from '../search-language-interp import { SelectFlagTypeComponent } from './select-flag-type.component'; import createSpyObj = jasmine.createSpyObj; +import { MultipageComponentStateService } from '../../../../../services'; describe('SelectFlagTypeComponent', () => { let component: SelectFlagTypeComponent; let fixture: ComponentFixture; let caseFlagRefdataService: jasmine.SpyObj; + let multipageComponentStateService: jasmine.SpyObj; let flagTypes: FlagType[]; let selectedFlagsLocation: FlagsWithFormGroupPath; let mockRpxTranslationService: any; @@ -177,6 +179,12 @@ describe('SelectFlagTypeComponent', () => { caseFlagRefdataService.getCaseFlagsRefdata.and.returnValue(of(flagTypes)); caseFlagRefdataService.getHmctsServiceDetailsByServiceName.and.returnValue(of(serviceDetails)); caseFlagRefdataService.getHmctsServiceDetailsByCaseType.and.returnValue(of(serviceDetails)); + + multipageComponentStateService = createSpyObj('MultipageComponentStateService', ['getJourneyCollection', 'addTojourneyCollection']); + const mockJourneyCollection = [{ journeyPreviousPageNumber: 1, journeyPageNumber: 2 }]; + multipageComponentStateService.getJourneyCollection.and.returnValue(mockJourneyCollection); + multipageComponentStateService.addTojourneyCollection.and.returnValue(mockJourneyCollection); + const source = new BehaviorSubject('en'); let currentLanguage: RpxLanguage = 'en'; mockRpxTranslationService = { @@ -195,7 +203,8 @@ describe('SelectFlagTypeComponent', () => { declarations: [SelectFlagTypeComponent, MockRpxTranslatePipe, FlagFieldDisplayPipe], providers: [ { provide: CaseFlagRefdataService, useValue: caseFlagRefdataService }, - { provide: RpxTranslationService, useValue: mockRpxTranslationService } + { provide: RpxTranslationService, useValue: mockRpxTranslationService }, + { provide: MultipageComponentStateService, useValue: multipageComponentStateService } ] }) .compileComponents(); @@ -689,4 +698,49 @@ describe('SelectFlagTypeComponent', () => { expect(component.onPrevious).toHaveBeenCalled(); expect(component.previous).toHaveBeenCalled(); }); + + it('should handle previous flag type selection correctly when path > 1', () => { + component.cachedRDFlagTypes = flagTypes; + component.cachedFlagType = flagTypes[0].childFlags[0].childFlags[0]; + component.formGroup = new FormGroup({ + [CaseFlagFormFields.FLAG_TYPE]: new FormControl(''), + [CaseFlagFormFields.OTHER_FLAG_DESCRIPTION]: new FormControl('') + }); + component.onPrevious(); + expect(component.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.value).toEqual(flagTypes[0].childFlags[0].childFlags[0]); + expect(component.flagTypes).toEqual(flagTypes[0].childFlags[0].childFlags); + }); + + it('should handle previous flag type selection correctly when path == 1', () => { + component.cachedRDFlagTypes = flagTypes; + component.cachedFlagType = flagTypes[0].childFlags[0]; + component.formGroup = new FormGroup({ + [CaseFlagFormFields.FLAG_TYPE]: new FormControl(''), + [CaseFlagFormFields.OTHER_FLAG_DESCRIPTION]: new FormControl('') + }); + component.onPrevious(); + expect(component.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.value).toEqual(flagTypes[0].childFlags[0]); + expect(component.flagTypes).toEqual(flagTypes[0].childFlags); + }); + + it('should set the flagTypes property correctly', () => { + component.formGroup = new FormGroup({ + [CaseFlagFormFields.FLAG_TYPE]: new FormControl(''), + [CaseFlagFormFields.OTHER_FLAG_DESCRIPTION]: new FormControl('') + }); + component.processFlagTypes(flagTypes); + expect(component.flagTypes).toEqual(flagTypes[0].childFlags); + }); + + it('should set the cachedFlagType property correctly', () => { + const mockJourneyCollection = [{ journeyPreviousPageNumber: 2, journeyPageNumber: 1 }]; + multipageComponentStateService.getJourneyCollection.and.returnValue(mockJourneyCollection); + component.formGroup = new FormGroup({ + [CaseFlagFormFields.FLAG_TYPE]: new FormControl(''), + [CaseFlagFormFields.OTHER_FLAG_DESCRIPTION]: new FormControl('') + }); + component.formGroup.get(CaseFlagFormFields.FLAG_TYPE).setValue(flagTypes[0].childFlags[0]); + component.processFlagTypes(flagTypes); + expect(component.cachedFlagType).toEqual(flagTypes[0]); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts index 6f65b3cb1d..82ae252f8a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts @@ -55,7 +55,7 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements public flagTypeControlChangesSubscription: Subscription; public caseFlagFormField = CaseFlagFormFields; public isCaseLevelFlag = false; - private cachedRDFlagTypes; + public cachedRDFlagTypes: FlagType[]; public subJourneyIndex: number = 0; private readonly maxCharactersForOtherFlagType = 80; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.spec.ts index bb5b9c28c3..6d4cd954e5 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/check-your-answers/check-your-answers.component.spec.ts @@ -186,4 +186,12 @@ describe('CheckYourAnswersComponent', () => { const changeLinkElement = linkedCasesTableElement.querySelector('.govuk-link'); expect(changeLinkElement).toBeNull(); }); + + it('should call next method', () => { + spyOn(component, 'next'); + + component.next(); + + expect(component.next).toHaveBeenCalledTimes(1); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts index eb2e03a9e5..dbc982788c 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.spec.ts @@ -120,3 +120,82 @@ describe('PageStateService', () => { expect(journey.previous).toHaveBeenCalled(); }); }); + +describe('MultipageComponentStateService next and previous', () => { + let service: MultipageComponentStateService; + let mockJourney: any; + let mockInstigator: any; + + beforeEach(() => { + mockJourney = { + journeyId: 'test', + journeyPageNumber: 1, + journeyStartPageNumber: 0, + journeyPreviousPageNumber: 0, + journeyEndPageNumber: 5, + next: () => { }, + previous: () => { }, + hasNext: () => true, + hasPrevious: () => true, + isFinished: () => false, + isStart: () => false, + childJourney: undefined, + onPageChange: () => { } + }; + + mockInstigator = { + onFinalNext: () => { }, + onFinalPrevious: () => { } + }; + + service = new MultipageComponentStateService(); + service.setJourneyCollection([mockJourney]); + service.setInstigator(mockInstigator); + }); + + describe('next', () => { + it('should call onFinalNext if journeyCollection is empty', () => { + spyOn(mockInstigator, 'onFinalNext'); + service.setJourneyCollection([]); + service.next(); + expect(mockInstigator.onFinalNext).toHaveBeenCalled(); + }); + + it('should call next on the first unfinished journey', () => { + spyOn(mockJourney, 'next'); + mockJourney.isFinished = jasmine.createSpy().and.returnValue(false); + service.next(); + expect(mockJourney.next).toHaveBeenCalled(); + }); + + it('should call onFinalNext if all journeys are finished', () => { + spyOn(mockInstigator, 'onFinalNext'); + mockJourney.isFinished = jasmine.createSpy().and.returnValue(true); + service.next(); + expect(mockInstigator.onFinalNext).toHaveBeenCalled(); + }); + }); + + describe('previous', () => { + it('should call onFinalPrevious if journeyCollection is empty', () => { + spyOn(mockInstigator, 'onFinalPrevious'); + service.setJourneyCollection([]); + service.previous(); + expect(mockInstigator.onFinalPrevious).toHaveBeenCalled(); + }); + + it('should call previous on the first journey not at start', () => { + spyOn(mockJourney, 'previous'); + mockJourney.isStart = jasmine.createSpy().and.returnValue(false); + service.previous(); + expect(mockJourney.previous).toHaveBeenCalled(); + }); + + it('should call onFinalPrevious if all journeys are at start', () => { + spyOn(mockInstigator, 'onFinalPrevious'); + mockJourney.isStart = jasmine.createSpy().and.returnValue(true); + service.previous(); + expect(mockInstigator.onFinalPrevious).toHaveBeenCalled(); + }); + }); +}); From c603a6a4af8118d83e9871f9987656495668efae Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 17 Jul 2024 09:24:13 +0100 Subject: [PATCH 25/75] change 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 4562e992b5..2685793344 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.48", + "version": "7.0.48-ungrey-back-button", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 9fa12e2240..202a496744 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.0.48", + "version": "7.0.48-ungrey-back-button", "engines": { "node": ">=18.19.0" }, From 6668e63e53b365141cc31c9d068f0c23e13c9806 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 17 Jul 2024 11:03:22 +0100 Subject: [PATCH 26/75] Fix when navigating from CYA not default to last sub journey --- .../palette/case-flag/write-case-flag-field.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts index d416e4129a..e8ca0d1ab1 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts @@ -176,6 +176,7 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon // journey page number to the field state. if (navigatedTo) { this.journeyPageNumber = this.fieldState; + this.journeyPreviousPageNumber = this.journeyEndPageNumber++; } // Provided we have some stored state, i.e. when going backwards, we want From 6854e7ace24d89498c9048909138e5a09c5c9751 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 17 Jul 2024 11:03:44 +0100 Subject: [PATCH 27/75] up ver num --- 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 2685793344..3c50bcac80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.48-ungrey-back-button", + "version": "7.0.48-ungrey-back-button-2", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 202a496744..d7330b4291 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.0.48-ungrey-back-button", + "version": "7.0.48-ungrey-back-button-2", "engines": { "node": ">=18.19.0" }, From 500e7d3d9ed83a62aa1adcd24796dc15c7f0233a Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 25 Jul 2024 16:08:37 +0100 Subject: [PATCH 28/75] change ver 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 db0348a178..40b63d7587 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.51-ungrey-back-button", + "version": "7.0.51-ungrey-back-button-2", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 2de664d513..abd736779d 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.0.51-ungrey-back-button", + "version": "7.0.51-ungrey-back-button-2", "engines": { "node": ">=18.19.0" }, From 3d7dba032a212c6749117b5af48e9fa8950de9e0 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 Aug 2024 12:15:38 +0100 Subject: [PATCH 29/75] exui-2208 --- .../components/case-editor/case-edit-page/case-edit-page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html index 059313e555..0c0160b610 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html @@ -62,7 +62,7 @@

- From 1aab82f0d5984f72c36aba33c178a1839c62562d Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 2 Aug 2024 14:55:26 +0100 Subject: [PATCH 30/75] 2210 --- .../case-edit-submit/case-edit-submit.component.ts | 9 ++++++++- .../case-editor/case-edit-submit/case-edit-submit.html | 2 +- .../case-editor/services/case-flag-state.service.ts | 2 ++ .../palette/case-flag/write-case-flag-field.component.ts | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts index 3ac88386f1..80ceb9ec97 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts @@ -18,6 +18,7 @@ import { CaseEditPageComponent } from '../case-edit-page/case-edit-page.componen import { CaseEditComponent } from '../case-edit/case-edit.component'; import { Wizard, WizardPage } from '../domain'; import { CaseEditSubmitTitles } from './case-edit-submit-titles.enum'; +import { CaseFlagStateService } from '../services/case-flag-state.service'; // @dynamic @Component({ @@ -74,7 +75,9 @@ export class CaseEditSubmitComponent implements OnInit, OnDestroy { private readonly orderService: OrderService, private readonly profileNotifier: ProfileNotifier, private readonly multipageComponentStateService: MultipageComponentStateService, - private readonly formValidatorsService: FormValidatorsService + private readonly formValidatorsService: FormValidatorsService, + private readonly caseFlagStateService: CaseFlagStateService, + ) { } @@ -238,6 +241,10 @@ export class CaseEditSubmitComponent implements OnInit, OnDestroy { } public previous(): void { + if (this.caseEdit.isCaseFlagSubmission){ + // if we are in the caseflag journey we need to store the last page index so that the previous button on CYA will take to correct page + this.caseFlagStateService.fieldStateToNavigate = this.caseFlagStateService.lastPageFieldState; + } /* istanbul ignore else */ if (this.hasPrevious()) { this.navigateToPage(this.getLastPageShown().id); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.html index ca3e268574..7748bc2eb3 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.html @@ -111,7 +111,7 @@

{{pageTitle | rpxTranslate }}

(eventCanBeCompleted)="onEventCanBeCompleted($event)">
-
- +
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts index 04d4e9aef7..25f7b7caea 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts @@ -5,6 +5,7 @@ import { FieldsUtils } from '../../../../../services/fields'; import { CaseFlagState, FlagDetail, FlagDetailDisplayWithFormGroupPath, Flags, FlagsWithFormGroupPath } from '../../domain'; import { CaseFlagDisplayContextParameter, CaseFlagFieldState, CaseFlagStatus, CaseFlagWizardStepTitle, SelectFlagErrorMessage } from '../../enums'; import { AbstractJourneyComponent } from '../../../base-field'; +import { cloneDeep } from 'lodash'; @Component({ selector: 'ccd-manage-case-flags', @@ -27,15 +28,25 @@ export class ManageCaseFlagsComponent extends AbstractJourneyComponent implement public noFlagsError = false; public readonly selectedControlName = 'selectedManageCaseLocation'; private readonly excludedFlagStatuses: CaseFlagStatus[] = [CaseFlagStatus.INACTIVE, CaseFlagStatus.NOT_APPROVED]; + public cachedControls; public ngOnInit(): void { this.manageCaseFlagTitle = this.setManageCaseFlagTitle(this.displayContextParameter); let originalStatus; + let originalPathToFlag; // if the user has progressed to CYA and then navigated away, the flag they selected will be set as inactive, we need to reset this - if (this.formGroup.get('selectedManageCaseLocation')) { - const locationControl = this.formGroup.get('selectedManageCaseLocation'); + const locationControl = this.formGroup.get(this.selectedControlName); + if (locationControl) { originalStatus = locationControl.value?.originalStatus; + originalPathToFlag = locationControl.value?.pathToFlagsFormGroup; + this.cachedControls = cloneDeep(this.formGroup.controls); + Object.keys(this.formGroup.controls).forEach((controlName) => { + if (controlName !== this.selectedControlName) { + this.formGroup.removeControl(controlName); + } + }); } + // Map flags instances to objects for display, filtering out any where the original status is either "Inactive" or // "Not approved" /* istanbul ignore else */ @@ -45,7 +56,7 @@ export class ManageCaseFlagsComponent extends AbstractJourneyComponent implement if (flagsInstance.flags.details && flagsInstance.flags.details.length > 0) { displayData = [ ...displayData, - ...flagsInstance.flags.details.map((detail) => this.mapFlagDetailForDisplay(detail, flagsInstance, originalStatus)) + ...flagsInstance.flags.details.map((detail) => this.mapFlagDetailForDisplay(detail, flagsInstance, originalStatus, originalPathToFlag)) ]; } return displayData; @@ -62,7 +73,20 @@ export class ManageCaseFlagsComponent extends AbstractJourneyComponent implement } } - public mapFlagDetailForDisplay(flagDetail: FlagDetail, flagsInstance: FlagsWithFormGroupPath, originalStatusFromFG: string): FlagDetailDisplayWithFormGroupPath { + onFlagSelectionChange(selectedFlag: FormControl): void { + this.formGroup.get(this.selectedControlName).setValue(selectedFlag); + } + + isSelected(flagDisplay: FlagDetailDisplayWithFormGroupPath): boolean { + const selectedFlag = this.formGroup.get(this.selectedControlName)?.value; + return selectedFlag && this.getFlagID(selectedFlag) === this.getFlagID(flagDisplay); + } + + getFlagID(flag: FlagDetailDisplayWithFormGroupPath){ + return flag?.flagDetailDisplay?.flagDetail?.id || ''; + } + + public mapFlagDetailForDisplay(flagDetail: FlagDetail, flagsInstance: FlagsWithFormGroupPath, originalStatusFromFG: string, originalPathToFlag: string): FlagDetailDisplayWithFormGroupPath { // Reset the flag status with the original persisted status. This is needed because ngOnInit() needs to filter // out any "Inactive" or "Not approved" flags based on their status *before* modification. If the user changes a // flag's status then decides to return to the start of the flag update journey, the flag's status would no @@ -85,7 +109,12 @@ export class ManageCaseFlagsComponent extends AbstractJourneyComponent implement } if (formattedValue && FieldsUtils.isNonEmptyObject(formattedValue)) { const originalFlagDetail = formattedValue.details?.find((detail) => detail.id === flagDetail.id); - const statusToUse = originalStatusFromFG ? (originalStatusFromFG === originalFlagDetail.value?.status ? originalFlagDetail.value?.status : originalStatusFromFG) : originalFlagDetail.value?.status; + let statusToUse; + if (flagsInstance.pathToFlagsFormGroup === originalPathToFlag){ + statusToUse = originalStatusFromFG ? (originalStatusFromFG === originalFlagDetail.value?.status ? originalFlagDetail.value?.status : originalStatusFromFG) : originalFlagDetail.value?.status; + } else { + statusToUse = originalFlagDetail.value?.status; + } if (originalFlagDetail) { originalStatus = statusToUse; flagDetail.flagComment = originalFlagDetail.value?.flagComment; @@ -164,9 +193,23 @@ export class ManageCaseFlagsComponent extends AbstractJourneyComponent implement public next() { this.onNext(); + const cachedControl = this.cachedControls?.[this.selectedControlName]; + if (cachedControl && this.getFlagID(cachedControl.value) === this.getFlagID(this.formGroup.value[this.selectedControlName])) { + this.reapplyCachedControls(); + } if (this.errorMessages.length === 0) { super.next(); } } + + public reapplyCachedControls(): void { + if (this.cachedControls) { + Object.keys(this.cachedControls).forEach((controlName) => { + if (!this.formGroup.contains(controlName)) { + this.formGroup.addControl(controlName, this.cachedControls[controlName]); + } + }); + } + } } From 4470a5fa7305645fe3eb71aab6c276be07e78cb2 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 16 Sep 2024 09:23:29 +0100 Subject: [PATCH 51/75] reset form values if flag location is changed --- .../select-flag-location.component.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts index 0146d49a44..61de65f3ed 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts @@ -24,8 +24,12 @@ export class SelectFlagLocationComponent extends AbstractJourneyComponent implem public readonly selectedLocationControlName = 'selectedLocation'; public readonly caseLevelFlagLabel = 'Case level'; private readonly caseLevelCaseFlagsFieldId = 'caseFlags'; + public cachedLocation: string; public ngOnInit(): void { + if (this.formGroup.get(this.selectedLocationControlName)){ + this.cachedLocation = this.formGroup.get(this.selectedLocationControlName).value.pathToFlagsFormGroup; + } this.flagLocationTitle = this.isDisplayContextParameterExternal ? CaseFlagWizardStepTitle.SELECT_FLAG_LOCATION_EXTERNAL : CaseFlagWizardStepTitle.SELECT_FLAG_LOCATION; @@ -63,6 +67,14 @@ export class SelectFlagLocationComponent extends AbstractJourneyComponent implem public onNext(): void { // Validate flag location selection this.validateSelection(); + //check if the user has changed their location selection + if (this.cachedLocation !== this.formGroup.get(this.selectedLocationControlName).value.pathToFlagsFormGroup) { + Object.keys(this.formGroup.controls).forEach((controlName) => { + if (controlName !== this.selectedLocationControlName) { + this.formGroup.removeControl(controlName); + } + }); + } // Return case flag field state, error messages, and selected FlagsWithFormGroupPath instance (i.e. flag location) to // the parent this.caseFlagStateEmitter.emit({ From 7d979433895263ad34abe846fdc92e36ad49ecbf Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 16 Sep 2024 09:23:49 +0100 Subject: [PATCH 52/75] 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 c2c760b92d..ab4f3552ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.64-ungrey-back-button-2", + "version": "7.0.64-ungrey-back-button-3", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 4c7ca28a2b..e890ef42d0 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.0.64-ungrey-back-button-2", + "version": "7.0.64-ungrey-back-button-3", "engines": { "node": ">=18.19.0" }, From 02373c7474b7eddc70daacdc2f6bfb0c35214cb6 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 16 Sep 2024 09:59:36 +0100 Subject: [PATCH 53/75] fix unit tests --- .../manage-case-flags.component.spec.ts | 16 ++++++++++++---- .../manage-case-flags.component.ts | 4 ++-- .../select-flag-location.component.spec.ts | 6 +++--- .../select-flag-location.component.ts | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts index 6b2af24d71..ec00daf08a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts @@ -126,6 +126,7 @@ describe('ManageCaseFlagsComponent', () => { } as FieldType, formatted_value: { partyName: 'Rose Bank', + pathToFlagsFormGroup: 'CaseFlag1', details: [ { id: '95de3cde-9f1b-468b-863b-8bc29ce7e600', @@ -139,6 +140,7 @@ describe('ManageCaseFlagsComponent', () => { }, value: { partyName: 'Rose Bank', + pathToFlagsFormGroup: 'CaseFlag1', details: [ { id: '95de3cde-9f1b-468b-863b-8bc29ce7e600', @@ -177,6 +179,7 @@ describe('ManageCaseFlagsComponent', () => { } as FieldType, formatted_value: { partyName: 'Tom Atin', + pathToFlagsFormGroup: 'CaseFlag2', details: [ { id: 'd9348799-1532-444a-b577-cd546e2f58f1', @@ -190,6 +193,7 @@ describe('ManageCaseFlagsComponent', () => { }, value: { partyName: 'Tom Atin', + pathToFlagsFormGroup: 'CaseFlag2', details: [ { id: 'd9348799-1532-444a-b577-cd546e2f58f1', @@ -223,6 +227,7 @@ describe('ManageCaseFlagsComponent', () => { } as FieldType, formatted_value: { partyName: '', + pathToFlagsFormGroup: 'caseFlags', details: [ { id: '573ce187-abae-4121-81d3-53fbba074e62', @@ -232,6 +237,7 @@ describe('ManageCaseFlagsComponent', () => { }, value: { partyName: '', + pathToFlagsFormGroup: 'caseFlags', details: [ { id: '573ce187-abae-4121-81d3-53fbba074e62', @@ -261,6 +267,7 @@ describe('ManageCaseFlagsComponent', () => { } as FieldType, formatted_value: { partyName: '', + pathToFlagsFormGroup: 'caseFlags', details: [ { id: 'aa692b36-9dc0-43de-b5f8-2dba78664376', @@ -270,6 +277,7 @@ describe('ManageCaseFlagsComponent', () => { }, value: { partyName: '', + pathToFlagsFormGroup: 'caseFlags', details: [ { id: 'aa692b36-9dc0-43de-b5f8-2dba78664376', @@ -362,7 +370,7 @@ describe('ManageCaseFlagsComponent', () => { pathToFlagsFormGroup: 'CaseFlag2' }; - const displayResult = component.mapFlagDetailForDisplay(flagDetail, flagsInstance, ''); + const displayResult = component.mapFlagDetailForDisplay(flagDetail, flagsInstance, '', ''); expect(displayResult.flagDetailDisplay.partyName).toEqual(flagsInstance.flags.partyName); expect(displayResult.flagDetailDisplay.flagDetail.name).toEqual(flagDetail.name); expect(displayResult.flagDetailDisplay.flagDetail.flagComment).toEqual(flagDetail.flagComment); @@ -465,7 +473,7 @@ describe('ManageCaseFlagsComponent', () => { } } as CaseField } as FlagsWithFormGroupPath; - const flagDetailMappedForDisplay = component.mapFlagDetailForDisplay(flag1Detail, flagsInstance, ''); + const flagDetailMappedForDisplay = component.mapFlagDetailForDisplay(flag1Detail, flagsInstance, '', ''); expect(flagDetailMappedForDisplay.flagDetailDisplay.partyName).toEqual(flagsInstance.flags.partyName); expect(flagDetailMappedForDisplay.flagDetailDisplay.flagDetail).toEqual(flag1Detail); expect(flagDetailMappedForDisplay.pathToFlagsFormGroup).toEqual(flagsInstance.pathToFlagsFormGroup); @@ -515,7 +523,7 @@ describe('ManageCaseFlagsComponent', () => { flagsInstance.flags.details[0].flagComment_cy = 'A new comment in Welsh'; flagsInstance.flags.details[0].otherDescription = 'A new description'; flagsInstance.flags.details[0].otherDescription_cy = 'A new description in Welsh'; - const flagDetailMappedForDisplay = component.mapFlagDetailForDisplay(flagWithOtherDescriptionDetail, flagsInstance, ''); + const flagDetailMappedForDisplay = component.mapFlagDetailForDisplay(flagWithOtherDescriptionDetail, flagsInstance, '', ''); // Expect all four fields to have been reset to the original persisted values expect(flagDetailMappedForDisplay.flagDetailDisplay.flagDetail.flagComment).toEqual( flagsInstance.caseField.formatted_value.details[0].value.flagComment); @@ -578,7 +586,7 @@ describe('ManageCaseFlagsComponent', () => { flagsInstance.flags.details[0].flagComment_cy = 'A new comment in Welsh'; flagsInstance.flags.details[0].otherDescription = 'A new description'; flagsInstance.flags.details[0].otherDescription_cy = 'A new description in Welsh'; - const flagDetailMappedForDisplay = component.mapFlagDetailForDisplay(flagWithOtherDescriptionCyDetail, flagsInstance, ''); + const flagDetailMappedForDisplay = component.mapFlagDetailForDisplay(flagWithOtherDescriptionCyDetail, flagsInstance, '', ''); // Expect all four fields to have been reset to the original persisted values expect(flagDetailMappedForDisplay.flagDetailDisplay.flagDetail.flagComment).toEqual( flagsInstance.caseField.formatted_value.partyFlags.details[0].value.flagComment); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts index 25f7b7caea..238d05581d 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts @@ -37,8 +37,8 @@ export class ManageCaseFlagsComponent extends AbstractJourneyComponent implement // if the user has progressed to CYA and then navigated away, the flag they selected will be set as inactive, we need to reset this const locationControl = this.formGroup.get(this.selectedControlName); if (locationControl) { - originalStatus = locationControl.value?.originalStatus; - originalPathToFlag = locationControl.value?.pathToFlagsFormGroup; + originalStatus = locationControl?.value?.originalStatus; + originalPathToFlag = locationControl?.value?.pathToFlagsFormGroup; this.cachedControls = cloneDeep(this.formGroup.controls); Object.keys(this.formGroup.controls).forEach((controlName) => { if (controlName !== this.selectedControlName) { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts index d0fcee28fd..8a0af5a2ab 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.spec.ts @@ -50,7 +50,7 @@ describe('SelectFlagLocationComponent', () => { } ] as FlagDetail[] }, - pathToFlagsFormGroup: '' + pathToFlagsFormGroup: 'flag1' }, { flags: { @@ -71,7 +71,7 @@ describe('SelectFlagLocationComponent', () => { groupId: 'e8f29388-633b-416b-a32c-814635d42dd6', visibility: null }, - pathToFlagsFormGroup: '' + pathToFlagsFormGroup: 'flag2' }, { flags: { @@ -92,7 +92,7 @@ describe('SelectFlagLocationComponent', () => { groupId: 'e8f29388-633b-416b-a32c-814635d42dd6', visibility: 'External' }, - pathToFlagsFormGroup: '' + pathToFlagsFormGroup: 'flag3' }, { flags: { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts index 61de65f3ed..67dbed8a30 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-location/select-flag-location.component.ts @@ -28,7 +28,7 @@ export class SelectFlagLocationComponent extends AbstractJourneyComponent implem public ngOnInit(): void { if (this.formGroup.get(this.selectedLocationControlName)){ - this.cachedLocation = this.formGroup.get(this.selectedLocationControlName).value.pathToFlagsFormGroup; + this.cachedLocation = this.formGroup.get(this.selectedLocationControlName).value?.pathToFlagsFormGroup; } this.flagLocationTitle = this.isDisplayContextParameterExternal ? CaseFlagWizardStepTitle.SELECT_FLAG_LOCATION_EXTERNAL : CaseFlagWizardStepTitle.SELECT_FLAG_LOCATION; @@ -68,7 +68,7 @@ export class SelectFlagLocationComponent extends AbstractJourneyComponent implem // Validate flag location selection this.validateSelection(); //check if the user has changed their location selection - if (this.cachedLocation !== this.formGroup.get(this.selectedLocationControlName).value.pathToFlagsFormGroup) { + if (this.cachedLocation !== this.formGroup.get(this.selectedLocationControlName).value?.pathToFlagsFormGroup) { Object.keys(this.formGroup.controls).forEach((controlName) => { if (controlName !== this.selectedLocationControlName) { this.formGroup.removeControl(controlName); From a9ed8649684592cfa878a0aa973265ffa6fad10a Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 16 Sep 2024 10:29:55 +0100 Subject: [PATCH 54/75] add test for new funciton --- .../manage-case-flags.component.spec.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts index ec00daf08a..be99398998 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts @@ -696,4 +696,20 @@ describe('ManageCaseFlagsComponent', () => { expect(component.onNext).toHaveBeenCalled(); expect(component.next).toHaveBeenCalledTimes(1); }); + + it('should return the correct flag ID when all properties are present', () => { + const flag: FlagDetailDisplayWithFormGroupPath = { + flagDetailDisplay: { + flagDetail: { + id: '123' + } + } + } as FlagDetailDisplayWithFormGroupPath; + expect(component.getFlagID(flag)).toBe('123'); + }); + + it('should return an empty string when any property is missing', () => { + const flag: FlagDetailDisplayWithFormGroupPath = {} as FlagDetailDisplayWithFormGroupPath; + expect(component.getFlagID(flag)).toBe(''); + }); }); From 46700e91cc29c327bfb32856a5b7dc068f0a33a4 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 16 Sep 2024 12:26:06 +0100 Subject: [PATCH 55/75] add new tests for new fuctions --- .../manage-case-flags.component.spec.ts | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts index be99398998..7ad81aab71 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.spec.ts @@ -1,6 +1,6 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { FormGroup, ReactiveFormsModule } from '@angular/forms'; +import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; import { RpxLanguage, RpxTranslationService } from 'rpx-xui-translation'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { CaseField, FieldType } from '../../../../../domain'; @@ -712,4 +712,36 @@ describe('ManageCaseFlagsComponent', () => { const flag: FlagDetailDisplayWithFormGroupPath = {} as FlagDetailDisplayWithFormGroupPath; expect(component.getFlagID(flag)).toBe(''); }); + + it('should call reapplyCachedControls when cached control flag ID matches form group selected control flag ID', () => { + spyOn(component, 'reapplyCachedControls'); + spyOn(component, 'getFlagID').and.returnValue('flagID'); + component.cachedControls = component.formGroup.controls; + component.cachedControls.selectedManageCaseLocation.setValue({ flagDetailDisplay: { flagDetail: { id: '456' } } }); + + component.formGroup.get('selectedManageCaseLocation').setValue({ flagDetailDisplay: { flagDetail: { id: '123' } } }); + component.next(); + + expect(component.reapplyCachedControls).toHaveBeenCalled(); + }); + + it('should not call reapplyCachedControls when cached control flag ID does not match form group selected control flag ID', () => { + spyOn(component, 'reapplyCachedControls'); + spyOn(component, 'getFlagID').and.returnValues('flagID1', 'flagID2'); + + component.formGroup.get('selectedManageCaseLocation').setValue({ flagDetailDisplay: { flagDetail: { id: '123' } } }); + component.cachedControls = component.formGroup.controls; + + component.next(); + + expect(component.reapplyCachedControls).not.toHaveBeenCalled(); + }); + + it('should reapply cachedcontrols if user does not change selection', () => { + const tempControls = component.formGroup; + tempControls.addControl('fakeComment', new FormControl('commentText')); + component.cachedControls = tempControls.controls; + component.reapplyCachedControls(); + expect(component.formGroup.get('fakeComment')).toBeTruthy(); + }); }); From d3f51734e98e8957c40a327064d4d6b00319ec74 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 25 Sep 2024 16:48:27 +0100 Subject: [PATCH 56/75] Resolve issues on navigating using previous button on CYA page --- .../case-edit-page.component.spec.ts | 30 ++++++++----- .../case-edit-page.component.ts | 11 ++++- .../read-case-flag-field.component.ts | 44 +++++++++++-------- ...write-linked-cases-field.component.spec.ts | 5 ++- .../shared/domain/journey/journey.model.ts | 1 + 5 files changed, 56 insertions(+), 35 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts index 35f1086f31..3316bb1c88 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts @@ -63,6 +63,7 @@ import { CaseEditPageComponent } from './case-edit-page.component'; import { ShowCondition } from '../../../directives'; import createSpyObj = jasmine.createSpyObj; import { LinkedCasesService } from '../../palette/linked-cases/services/linked-cases.service'; +import { CaseFlagStateService } from '../services/case-flag-state.service'; describe('CaseEditPageComponent - creation and update event trigger tests', () => { let component: CaseEditPageComponent; @@ -109,7 +110,8 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = validPageListCaseFieldsService = {}, multipageComponentStateService = new MultipageComponentStateService(), addressesService = {}, - linkedCasesService = {} + linkedCasesService = {}, + caseFlagStateService = new CaseFlagStateService() }) => new CaseEditPageComponent( caseEdit as CaseEditComponent, @@ -125,7 +127,8 @@ describe('CaseEditPageComponent - creation and update event trigger tests', () = validPageListCaseFieldsService as ValidPageListCaseFieldsService, multipageComponentStateService as MultipageComponentStateService, addressesService as AddressesService, - linkedCasesService as LinkedCasesService + linkedCasesService as LinkedCasesService, + caseFlagStateService as CaseFlagStateService ); it('should create', () => { @@ -453,7 +456,7 @@ describe('CaseEditPageComponent - all other tests', () => { const jurisdictionService = createSpyObj('JurisdictionService', ['getJurisdictions']); jurisdictionService.getJurisdictions.and.returnValue(of(MOCK_JURISDICTION)); const linkedCasesService = new LinkedCasesService(jurisdictionService, searchService); - + const caseFlagStateService = new CaseFlagStateService(); describe('Save and Resume enabled', () => { const eventTrigger = { @@ -575,8 +578,8 @@ describe('CaseEditPageComponent - all other tests', () => { { provide: ValidPageListCaseFieldsService, useValue: validPageListCaseFieldsService}, { provide: AddressesService, useValue: addressesServiceMock }, { provide: MultipageComponentStateService, useValue: multipageComponentStateService }, - { provide: LinkedCasesService, useValue: linkedCasesService } - + { provide: LinkedCasesService, useValue: linkedCasesService }, + { provide: CaseFlagStateService, useValue: caseFlagStateService } ], }).compileComponents(); fixture = TestBed.createComponent(CaseEditPageComponent); @@ -974,8 +977,8 @@ describe('CaseEditPageComponent - all other tests', () => { { provide: LoadingService, useValue: loadingServiceMock }, { provide: ValidPageListCaseFieldsService, useValue: validPageListCaseFieldsService}, { provide: AddressesService, useValue: addressesServiceMock }, - { provide: LinkedCasesService, useValue: linkedCasesService } - + { provide: LinkedCasesService, useValue: linkedCasesService }, + { provide: CaseFlagStateService, useValue: caseFlagStateService } ], }).compileComponents(); }) @@ -1143,7 +1146,8 @@ describe('CaseEditPageComponent - all other tests', () => { { provide: LoadingService, useValue: loadingServiceMock }, { provide: ValidPageListCaseFieldsService, useValue: validPageListCaseFieldsService}, { provide: AddressesService, useValue: addressesServiceMock }, - { provide: LinkedCasesService, useValue: linkedCasesService } + { provide: LinkedCasesService, useValue: linkedCasesService }, + { provide: CaseFlagStateService, useValue: caseFlagStateService } ], }).compileComponents(); }) @@ -1316,7 +1320,8 @@ describe('CaseEditPageComponent - all other tests', () => { { provide: LoadingService, useValue: loadingServiceMock }, { provide: ValidPageListCaseFieldsService, useValue: validPageListCaseFieldsService}, { provide: AddressesService, useValue: addressesServiceMock }, - { provide: LinkedCasesService, useValue: linkedCasesService } + { provide: LinkedCasesService, useValue: linkedCasesService }, + { provide: CaseFlagStateService, useValue: caseFlagStateService } ], }).compileComponents(); }) @@ -1664,7 +1669,8 @@ describe('CaseEditPageComponent - all other tests', () => { { provide: LoadingService, useValue: loadingServiceMock }, { provide: ValidPageListCaseFieldsService, useValue: validPageListCaseFieldsService}, { provide: AddressesService, useValue: addressesServiceMock}, - { provide: LinkedCasesService, useValue: linkedCasesService } + { provide: LinkedCasesService, useValue: linkedCasesService }, + { provide: CaseFlagStateService, useValue: caseFlagStateService } ], }).compileComponents(); }) @@ -1884,8 +1890,8 @@ describe('CaseEditPageComponent - all other tests', () => { { provide: LoadingService, useValue: loadingServiceMock }, { provide: ValidPageListCaseFieldsService, useValue: validPageListCaseFieldsService}, { provide: AddressesService, useValue: addressesServiceMock }, - { provide: LinkedCasesService, useValue: linkedCasesService } - + { provide: LinkedCasesService, useValue: linkedCasesService }, + { provide: CaseFlagStateService, useValue: caseFlagStateService } ], }).compileComponents(); }) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index 3a3ea9f42b..407376a6fe 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -24,6 +24,7 @@ import { PageValidationService } from '../services/page-validation.service'; import { ValidPageListCaseFieldsService } from '../services/valid-page-list-caseFields.service'; import { JourneyInstigator } from '../../../domain/journey'; import { LinkedCasesService } from '../../palette/linked-cases/services/linked-cases.service'; +import { CaseFlagStateService } from '../services/case-flag-state.service'; @Component({ selector: 'ccd-case-edit-page', @@ -90,6 +91,7 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro private readonly multipageComponentStateService: MultipageComponentStateService, private readonly addressService: AddressesService, private readonly linkedCasesService: LinkedCasesService, + private readonly caseFlagStateService: CaseFlagStateService ) { this.multipageComponentStateService.setInstigator(this); } @@ -103,11 +105,11 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } public isAtStart(): boolean { - return this.multipageComponentStateService.getJourneyCollection()[0]?.journeyPageNumber === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyStartPageNumber; + return this.multipageComponentStateService.getJourneyCollection()[0]?.fieldState === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyStartPageNumber; } public isAtEnd(): boolean { - return this.multipageComponentStateService.getJourneyCollection()[0]?.journeyPageNumber === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyEndPageNumber; + return this.multipageComponentStateService.getJourneyCollection()[0]?.fieldState === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyEndPageNumber; } // This method will be triggered by the next button in the app component @@ -334,6 +336,11 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } public submit(): void { + // in some scenarios the fieldstate can be set to 0 even though the user is at the end of a journey, check for this case and set vars + if ((this.caseFlagStateService.fieldStateToNavigate === 0) && (this.caseFlagStateService.fieldStateToNavigate !== this.multipageComponentStateService.getJourneyCollection()[0].journeyPageNumber)){ + this.caseFlagStateService.fieldStateToNavigate = this.multipageComponentStateService.getJourneyCollection()[0].journeyPageNumber; + this.caseFlagStateService.lastPageFieldState = this.multipageComponentStateService.getJourneyCollection()[0].journeyPageNumber; + } this.caseEditDataService.clearFormValidationErrors(); this.checkForStagesCompleted(); if (this.currentPageIsNotValid()) { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts index 252b8961e8..f988315b74 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts @@ -65,25 +65,25 @@ export class ReadCaseFlagFieldComponent extends AbstractFieldReadComponent imple // internal and external flags data for each party if (!this.caseFlagsExternalUser) { const groupedFlagsData = this.partyLevelCaseFlagData - .filter((f) => f.flags.groupId) - .reduce((mergedFlagDetails, f) => { - mergedFlagDetails[f.flags.groupId] = mergedFlagDetails[f.flags.groupId] || []; - // The flags.details property (which should be an array) could be falsy; spread an empty array if so - mergedFlagDetails[f.flags.groupId].push(...(f.flags.details || [])); - return mergedFlagDetails; - }, Object.create(null)); + .filter((f) => f.flags.groupId) + .reduce((mergedFlagDetails, f) => { + mergedFlagDetails[f.flags.groupId] = mergedFlagDetails[f.flags.groupId] || []; + // The flags.details property (which should be an array) could be falsy; spread an empty array if so + mergedFlagDetails[f.flags.groupId].push(...(f.flags.details || [])); + return mergedFlagDetails; + }, Object.create(null)); // Remove duplicate flags objects with the same groupId (which are going to be treated as one for display // purposes) const uniquePartyData = this.partyLevelCaseFlagData - .filter((f) => f.flags.groupId) - .reduce((flagsUniqueByGroupId, f) => { - if (flagsUniqueByGroupId.findIndex(flag => flag.flags.groupId === f.flags.groupId) === -1) { + .filter((f) => f.flags.groupId) + .reduce((flagsUniqueByGroupId, f) => { + if (flagsUniqueByGroupId.findIndex(flag => flag.flags.groupId === f.flags.groupId) === -1) { // Set the corresponding grouped flags data - f.flags.details = groupedFlagsData[f.flags.groupId]; - flagsUniqueByGroupId.push(f); - } - return flagsUniqueByGroupId; - }, []); + f.flags.details = groupedFlagsData[f.flags.groupId]; + flagsUniqueByGroupId.push(f); + } + return flagsUniqueByGroupId; + }, []); // Append flags objects with no groupId this.partyLevelCaseFlagData.filter((f) => !f.flags.groupId).forEach((f) => uniquePartyData.push(f)); this.partyLevelCaseFlagData = uniquePartyData; @@ -104,17 +104,23 @@ export class ReadCaseFlagFieldComponent extends AbstractFieldReadComponent imple flagLauncherComponent.caseField.display_context_parameter === CaseFlagDisplayContextParameter.CREATE_2_POINT_1 || flagLauncherComponent.caseField.display_context_parameter === CaseFlagDisplayContextParameter.CREATE_EXTERNAL) && flagLauncherComponent.selectedFlagsLocation) { - this.pathToFlagsFormGroup = flagLauncherComponent.selectedFlagsLocation.pathToFlagsFormGroup; - this.flagForSummaryDisplay = this.extractNewFlagToFlagDetailDisplayObject( - flagLauncherComponent.selectedFlagsLocation); + this.pathToFlagsFormGroup = flagLauncherComponent.selectedFlagsLocation.pathToFlagsFormGroup; + this.flagForSummaryDisplay = this.extractNewFlagToFlagDetailDisplayObject( + flagLauncherComponent.selectedFlagsLocation); // The FlagLauncher component holds a reference (selectedFlag), which gets set after the selection step of the // Manage Case Flags journey } else if ((flagLauncherComponent.caseField.display_context_parameter === CaseFlagDisplayContextParameter.UPDATE || flagLauncherComponent.caseField.display_context_parameter === CaseFlagDisplayContextParameter.UPDATE_2_POINT_1 || flagLauncherComponent.caseField.display_context_parameter === CaseFlagDisplayContextParameter.UPDATE_EXTERNAL) && - flagLauncherComponent.selectedFlag) { + (flagLauncherComponent.selectedFlag || + (this.caseFlagStateService.formGroup.get('selectedManageCaseLocation').value.flagDetailDisplay && this.displayContextParameter === CaseFlagDisplayContextParameter.UPDATE_2_POINT_1))) { + if (this.formGroup.get(flagLauncherControlName)['component']?.selectedFlag?.flagDetailDisplay !== undefined){ this.flagForSummaryDisplay = this.formGroup.get(flagLauncherControlName)['component'].selectedFlag.flagDetailDisplay; + } else { + this.flagForSummaryDisplay = + this.caseFlagStateService.formGroup.get('selectedManageCaseLocation').value.flagDetailDisplay; + } // TODO: not the best solution, the caseFlagStateService should have all the fields, then we can delete a lot of the transformations here // in Create Case Flag it already has all fields const caseFlagFormGroupValue = this.caseFlagStateService.formGroup?.value; diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts index 3f4b7b280c..8d2258654e 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.spec.ts @@ -32,6 +32,7 @@ import { ServiceOrg } from '../../../domain/case-view/service-org-response.model import { ValidPageListCaseFieldsService } from '../../case-editor/services/valid-page-list-caseFields.service'; import { JurisdictionService } from '../../../services/jurisdiction/jurisdiction.service'; import { Jurisdiction } from '../../../domain/definition/jurisdiction.model'; +import { CaseFlagStateService } from '../../case-editor/services/case-flag-state.service'; describe('WriteLinkedCasesFieldComponent', () => { let component: WriteLinkedCasesFieldComponent; @@ -91,7 +92,6 @@ describe('WriteLinkedCasesFieldComponent', () => { const fieldUtils = new FieldsUtils(); const validPageListCaseFieldsService = new ValidPageListCaseFieldsService(fieldUtils); const multipageComponentStateService = new MultipageComponentStateService(); - const CASE_TYPES_2 = [ { id: 'Benefit_Xui', @@ -124,7 +124,8 @@ describe('WriteLinkedCasesFieldComponent', () => { validPageListCaseFieldsService, multipageComponentStateService, new AddressesService(null, null), - new LinkedCasesService(jurisdictionService as any, searchService)); + new LinkedCasesService(jurisdictionService as any, searchService), + new CaseFlagStateService()); const caseInfo = { case_id: '1682374819203471', case_type: { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts index a5485ead77..d09124ba95 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts @@ -12,4 +12,5 @@ export interface Journey { journeyEndPageNumber: number; journeyPreviousPageNumber: number; childJourney: Journey; + fieldState?: number; } From d68b2a24a9b77d5d9f0c5bc8dba2339da2f70341 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 25 Sep 2024 16:49:00 +0100 Subject: [PATCH 57/75] Update version name to new pre-release ver --- 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 0bd494d48a..83000e7ec4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.65-ungrey-back-button", + "version": "7.0.65-ungrey-back-button-2", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 80be9b04b4..4768268ead 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.0.65-ungrey-back-button", + "version": "7.0.65-ungrey-back-button-2", "engines": { "node": ">=18.19.0" }, From 037f65ed480dfbf2dbf02439a2a010078b9a2029 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 26 Sep 2024 10:44:37 +0100 Subject: [PATCH 58/75] Update ver num, fix nav on CYA --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- .../case-edit-page/case-edit-page.component.ts | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 83000e7ec4..1fbf2b761d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.65-ungrey-back-button-2", + "version": "7.0.65-ungrey-back-button-3", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 4768268ead..48ee3196f3 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.0.65-ungrey-back-button-2", + "version": "7.0.65-ungrey-back-button-3", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index 407376a6fe..d8e0d8939a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -337,9 +337,13 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro public submit(): void { // in some scenarios the fieldstate can be set to 0 even though the user is at the end of a journey, check for this case and set vars - if ((this.caseFlagStateService.fieldStateToNavigate === 0) && (this.caseFlagStateService.fieldStateToNavigate !== this.multipageComponentStateService.getJourneyCollection()[0].journeyPageNumber)){ - this.caseFlagStateService.fieldStateToNavigate = this.multipageComponentStateService.getJourneyCollection()[0].journeyPageNumber; - this.caseFlagStateService.lastPageFieldState = this.multipageComponentStateService.getJourneyCollection()[0].journeyPageNumber; + const journeyPageNumber = this.multipageComponentStateService.getJourneyCollection()[0]?.journeyPageNumber; + const fieldState = this.caseFlagStateService?.fieldStateToNavigate; + if (this.eventTrigger.id === 'c100ManageFlags'){ + if ((fieldState === 0 || fieldState === undefined || journeyPageNumber > fieldState) && fieldState !== journeyPageNumber) { + this.caseFlagStateService.fieldStateToNavigate = journeyPageNumber; + this.caseFlagStateService.lastPageFieldState = journeyPageNumber; + } } this.caseEditDataService.clearFormValidationErrors(); this.checkForStagesCompleted(); From b20d3fa3dab61214d9c6ba5a00a873ae3de2f954 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 26 Sep 2024 11:24:13 +0100 Subject: [PATCH 59/75] add extra test case --- .../case-edit-page/case-edit-page.component.spec.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts index 3316bb1c88..48bce09de8 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.spec.ts @@ -463,6 +463,7 @@ describe('CaseEditPageComponent - all other tests', () => { case_fields: [caseField1], name: 'Test event trigger name', can_save_draft: true, + id: 'c100ManageFlags' }; let loadingServiceMock: LoadingService; @@ -859,6 +860,14 @@ describe('CaseEditPageComponent - all other tests', () => { expect(comp.saveDraftSub.unsubscribe).toHaveBeenCalled(); expect(comp.caseFormValidationErrorsSub.unsubscribe).toHaveBeenCalled(); }); + + it('should set the fieldStateToNavigate and lastPageFieldState when conditions are met', () => { + caseFlagStateService.fieldStateToNavigate = 0; + spyOn(multipageComponentStateService, 'getJourneyCollection').and.returnValue([{ journeyPageNumber: 3 }]); + comp.ngOnInit(); + expect(caseFlagStateService.fieldStateToNavigate).toEqual(3); + expect(caseFlagStateService.lastPageFieldState).toEqual(3); + }); }); describe('Save and Resume disabled', () => { From 2980b1cf9faa04e6f254ce09bf0eee568de0a887 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Sep 2024 16:04:48 +0100 Subject: [PATCH 60/75] Fix bugs on manage case links journey --- .../case-editor/case-edit-page/case-edit-page.component.ts | 3 ++- .../components/unlink-cases/unlink-cases.component.ts | 3 +++ .../palette/linked-cases/services/linked-cases.service.ts | 1 + .../palette/linked-cases/write-linked-cases-field.component.ts | 1 + .../src/lib/shared/domain/journey/journey.model.ts | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index d8e0d8939a..9c1058c8a9 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -105,7 +105,8 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } public isAtStart(): boolean { - return this.multipageComponentStateService.getJourneyCollection()[0]?.fieldState === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyStartPageNumber; + const pageNumberToUse = this.multipageComponentStateService.getJourneyCollection()[0]?.linkedCasesPage !== undefined ? this.multipageComponentStateService.getJourneyCollection()[0]?.linkedCasesPage : this.multipageComponentStateService.getJourneyCollection()[0]?.fieldState; + return pageNumberToUse === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyStartPageNumber; } public isAtEnd(): boolean { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts index 065cedbb7f..4b3cd780aa 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts @@ -44,6 +44,9 @@ export class UnLinkCasesComponent extends AbstractFieldWriteJourneyComponent imp public getLinkedCases(): void { this.caseId = this.linkedCasesService.caseId; + if (this.linkedCasesService.cachedFieldValues && this.linkedCasesService.linkedCases){ + this.linkedCasesService.caseFieldValue = this.linkedCasesService.cachedFieldValues; + } if (this.linkedCasesService.linkedCases.length > 0) { this.linkedCases = this.linkedCasesService.linkedCases; this.getAllLinkedCaseInformation(); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/services/linked-cases.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/services/linked-cases.service.ts index fff83ee0b0..8374304f43 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/services/linked-cases.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/services/linked-cases.service.ts @@ -28,6 +28,7 @@ export class LinkedCasesService { public storedCaseNumber = ''; public cameFromFinalStep = false; public hasNavigatedInJourney = false; + public cachedFieldValues; constructor(private readonly jurisdictionService: JurisdictionService, private readonly searchService: SearchService) { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts index f41596717c..fb68086d0b 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts @@ -151,6 +151,7 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom public submitLinkedCases(): void { if (!this.linkedCasesService.isLinkedCasesEventTrigger) { + this.linkedCasesService.cachedFieldValues = this.linkedCasesService.caseFieldValue; const unlinkedCaseRefereneIds = this.linkedCasesService.linkedCases.filter(item => item.unlink).map(item => item.caseReference); const caseFieldValue = this.linkedCasesService.caseFieldValue; this.linkedCasesService.caseFieldValue = caseFieldValue.filter(item => unlinkedCaseRefereneIds.indexOf(item.id) === -1); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts index d09124ba95..ca7b8e3066 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts @@ -13,4 +13,5 @@ export interface Journey { journeyPreviousPageNumber: number; childJourney: Journey; fieldState?: number; + linkedCasesPage?: number; } From 4ccd19872a5d61f2adde074d6f5b89ab8efde67a Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Sep 2024 16:05:47 +0100 Subject: [PATCH 61/75] Update ver 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 1fbf2b761d..6e116edf9c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.65-ungrey-back-button-3", + "version": "7.0.65-ungrey-back-button-4", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 48ee3196f3..c349176dd5 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.0.65-ungrey-back-button-3", + "version": "7.0.65-ungrey-back-button-4", "engines": { "node": ">=18.19.0" }, From 8fd59d3e4c0d23c565415e706aabfde8c4793f2f Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 4 Nov 2024 13:37:34 +0000 Subject: [PATCH 62/75] temp commit --- .../case-edit-page.component.ts | 2 ++ .../manage-case-flags.component.ts | 1 + .../select-flag-type.component.ts | 8 ++++++++ .../read-case-flag-field.component.ts | 20 +++++++++++++++++++ .../write-case-flag-field.component.ts | 4 +++- 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts index 9c1058c8a9..3799888960 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts @@ -194,6 +194,7 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro } public currentPageIsNotValid(): boolean { + this.editForm.updateValueAndValidity(); this.failingCaseFields = this.pageValidationService.getInvalidFields(this.currentPage, this.editForm); return this.failingCaseFields.length > 0 || (this.isLinkedCasesJourney() && !this.isLinkedCasesJourneyAtFinalStep); @@ -346,6 +347,7 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked, OnDestro this.caseFlagStateService.lastPageFieldState = journeyPageNumber; } } + this.caseEditDataService.clearFormValidationErrors(); this.checkForStagesCompleted(); if (this.currentPageIsNotValid()) { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts index 238d05581d..fa0f0699a5 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts @@ -53,6 +53,7 @@ export class ManageCaseFlagsComponent extends AbstractJourneyComponent implement if (this.flagsData) { this.flagsDisplayData = this.flagsData.reduce((displayData, flagsInstance) => { /* istanbul ignore else */ + console.log(displayData, flagsInstance); if (flagsInstance.flags.details && flagsInstance.flags.details.length > 0) { displayData = [ ...displayData, diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts index 76b13843e5..2b93ce9171 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts @@ -180,6 +180,14 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements this.formGroup.get(CaseFlagFormFields.FLAG_TYPE)?.setValue(value, { emitEvent: false }); } this.subJourneyIndex++; + } else { + // this code will run only when the sub journey is complete + const currentSelectedFlag = this.formGroup.controls.flagType; + const addedFlagValue = this.selectedFlagsLocation['caseField'].value.details; + if (addedFlagValue[Object.keys(addedFlagValue).length]?.name !== currentSelectedFlag.value.name) { + this.selectedFlagsLocation['caseField'].value.details.pop(); + this.selectedFlagsLocation['caseField'].formatted_value?.details.pop(); + } } } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts index f988315b74..886710a062 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/read-case-flag-field.component.ts @@ -104,6 +104,7 @@ export class ReadCaseFlagFieldComponent extends AbstractFieldReadComponent imple flagLauncherComponent.caseField.display_context_parameter === CaseFlagDisplayContextParameter.CREATE_2_POINT_1 || flagLauncherComponent.caseField.display_context_parameter === CaseFlagDisplayContextParameter.CREATE_EXTERNAL) && flagLauncherComponent.selectedFlagsLocation) { + this.cleanupNavigationFormAdditions(flagLauncherComponent.selectedFlagsLocation); this.pathToFlagsFormGroup = flagLauncherComponent.selectedFlagsLocation.pathToFlagsFormGroup; this.flagForSummaryDisplay = this.extractNewFlagToFlagDetailDisplayObject( flagLauncherComponent.selectedFlagsLocation); @@ -136,6 +137,25 @@ export class ReadCaseFlagFieldComponent extends AbstractFieldReadComponent imple } } + private cleanupNavigationFormAdditions(selectedFlagsLocation: FlagsWithFormGroupPath){ + const path = selectedFlagsLocation.pathToFlagsFormGroup; + Object.keys(this.formGroup.controls).forEach((controlName) => { + const control = this.formGroup.get(controlName); + if ((controlName !== path)) { + if (control['caseField'].formatted_value?.details){ + // we want to loop through the current flag details to ensure that there are no additional data from the usre restarting the flow that have been added. + for (const value in control['caseField'].formatted_value?.details){ + // if the id is undefined then the user has added this as part of their current flow and we should remove it so it doesnt get added to the case + if (!control['caseField'].formatted_value?.details[value].id){ + control['caseField'].value.details.pop(); + control['caseField'].formatted_value.details.pop(); + } + } + } + } + }); + } + private extractNewFlagToFlagDetailDisplayObject(selectedFlagsLocation: FlagsWithFormGroupPath): FlagDetailDisplay { // Use the pathToFlagsFormGroup property from the selected flag location to drill down to the correct part of the // CaseField value containing the new flag diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts index 0ddb69b46a..3a8e6448b5 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/write-case-flag-field.component.ts @@ -499,7 +499,9 @@ export class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyCompon // Cache the *original* status of the flag before it is modified. This is needed if the user changes the flag status // then decides to return to any part of the flag update journey. The ManageCaseFlagsComponent and UpdateFlagComponent // should refer to a flag's original status, not the one set via the UI because this hasn't been persisted yet - this.selectedFlag.originalStatus = flagDetailToUpdate.value?.status; + if (!this.selectedFlag.originalStatus){ + this.selectedFlag.originalStatus = flagDetailToUpdate.value?.status; + } // Update description fields only if flag type is "Other" (flag code OT0001); these fields apply only to that flag type // If their FormControls don't exist, it means these fields weren't visited as part of the "Update Flag" journey, so do // *not* update their values (otherwise they will become undefined) From ef639f5a748bda6f3854dffa7a1c4705b1999ac0 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 6 Nov 2024 14:01:27 +0000 Subject: [PATCH 63/75] Remove testing log --- .../components/manage-case-flags/manage-case-flags.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts index fa0f0699a5..238d05581d 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/manage-case-flags/manage-case-flags.component.ts @@ -53,7 +53,6 @@ export class ManageCaseFlagsComponent extends AbstractJourneyComponent implement if (this.flagsData) { this.flagsDisplayData = this.flagsData.reduce((displayData, flagsInstance) => { /* istanbul ignore else */ - console.log(displayData, flagsInstance); if (flagsInstance.flags.details && flagsInstance.flags.details.length > 0) { displayData = [ ...displayData, From bc5f4ff18d8240c519490c7fe933602b2d31bd90 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 6 Nov 2024 14:08:46 +0000 Subject: [PATCH 64/75] Avoid changing page number on specific pages --- .../base-field/abstract-field-write-journey.component.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts index 6f8f19afd8..208d60c05f 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts @@ -43,14 +43,18 @@ export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWr protected previousPage(): void { if (this.hasPrevious()) { - this.journeyPageNumber--; + if (!this.childJourney['searchLanguageInterpreterHint']){ + this.journeyPageNumber--; + } this.onPageChange(); } } protected nextPage(): void { if (this.hasNext()) { - this.journeyPageNumber++; + if (!this.childJourney['searchLanguageInterpreterHint']){ + this.journeyPageNumber++; + } this.onPageChange(); } } From 698af49a7717cc13fe15fd5fa0ea4cfce14c8bb4 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 6 Nov 2024 14:09:26 +0000 Subject: [PATCH 65/75] update to remove data that should not be included in request on update flag page --- .../update-flag/update-flag.component.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.ts index 77ffeeb3f6..5fc12278d9 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/update-flag/update-flag.component.ts @@ -132,6 +132,7 @@ export class UpdateFlagComponent extends AbstractJourneyComponent implements OnI public onNext(): void { // Validate flag comments and status reason entry this.validateTextEntry(); + this.validateTranslationNeeded(); // Set selected flag status to "Inactive" if update is by external user if (this.externalUserUpdate) { @@ -149,6 +150,23 @@ export class UpdateFlagComponent extends AbstractJourneyComponent implements OnI window.scrollTo(0, 0); } + public validateTranslationNeeded(){ + // it is possible that the user can select to have translation and then navigate back to remove the required translation in the same journey + // this function will check the user does not have any of the translation fields applied and remove if they do + console.log('validateTranslateNeeded'); + const flagDetails = this.selectedFlag.flagDetailDisplay.flagDetail; + const isTranslationRequired = this.formGroup.value.flagIsWelshTranslationNeeded; + const hasTranslationFields = (flagDetails.flagComment_cy || flagDetails.otherDescription || flagDetails.otherDescription_cy); + if (!isTranslationRequired && hasTranslationFields){ + flagDetails.flagComment_cy = null; + flagDetails.otherDescription = null; + flagDetails.otherDescription_cy = null; + this.formGroup.removeControl('flagComment_cy'); + this.formGroup.removeControl('otherDescription'); + this.formGroup.removeControl('otherDescription_cy'); + } + } + public onMakeInactive(): void { // Set selected flag status to "Inactive" on screen and in the FormGroup this.selectedFlag.flagDetailDisplay.flagDetail.status = CaseFlagStatus.INACTIVE; From 718ab5959b8d9bd43b047ea971521be3d23a2062 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 6 Nov 2024 14:53:56 +0000 Subject: [PATCH 66/75] Improve resilience when potential missing props, fix unit tests --- .../base-field/abstract-field-write-journey.component.ts | 4 ++-- .../components/select-flag-type/select-flag-type.component.ts | 4 ++-- .../src/lib/shared/domain/journey/journey.model.ts | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts index 208d60c05f..70f54adc50 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/base-field/abstract-field-write-journey.component.ts @@ -43,7 +43,7 @@ export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWr protected previousPage(): void { if (this.hasPrevious()) { - if (!this.childJourney['searchLanguageInterpreterHint']){ + if (!this.childJourney?.searchLanguageInterpreterHint){ this.journeyPageNumber--; } this.onPageChange(); @@ -52,7 +52,7 @@ export abstract class AbstractFieldWriteJourneyComponent extends AbstractFieldWr protected nextPage(): void { if (this.hasNext()) { - if (!this.childJourney['searchLanguageInterpreterHint']){ + if (!this.childJourney?.searchLanguageInterpreterHint){ this.journeyPageNumber++; } this.onPageChange(); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts index 2b93ce9171..ef0d46e182 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/case-flag/components/select-flag-type/select-flag-type.component.ts @@ -183,8 +183,8 @@ export class SelectFlagTypeComponent extends AbstractJourneyComponent implements } else { // this code will run only when the sub journey is complete const currentSelectedFlag = this.formGroup.controls.flagType; - const addedFlagValue = this.selectedFlagsLocation['caseField'].value.details; - if (addedFlagValue[Object.keys(addedFlagValue).length]?.name !== currentSelectedFlag.value.name) { + const addedFlagValue = this.selectedFlagsLocation?.caseField?.value?.details; + if (addedFlagValue && (addedFlagValue[Object.keys(addedFlagValue).length]?.name !== currentSelectedFlag.value.name)) { this.selectedFlagsLocation['caseField'].value.details.pop(); this.selectedFlagsLocation['caseField'].formatted_value?.details.pop(); } diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts index ca7b8e3066..59fd7b6099 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/domain/journey/journey.model.ts @@ -14,4 +14,5 @@ export interface Journey { childJourney: Journey; fieldState?: number; linkedCasesPage?: number; + searchLanguageInterpreterHint?; } From 53742f9afe5a0726e380bbe1a9529f57dda6e016 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 14 Nov 2024 15:28:50 +0000 Subject: [PATCH 67/75] resolve user geting stuck in navigation on manage case links --- .../unlink-cases.component.spec.ts | 42 ++++++++++++++++++- .../unlink-cases/unlink-cases.component.ts | 11 +++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts index 8ed13aa3e1..e00945a680 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts @@ -1,6 +1,6 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; import { PipesModule } from '../../../../../pipes'; @@ -8,6 +8,7 @@ import { CaseEditComponent, CasesService } from '../../../../case-editor'; import { CaseLink } from '../../domain/linked-cases.model'; import { LinkedCasesService } from '../../services'; import { UnLinkCasesComponent } from './unlink-cases.component'; +import { MultipageComponentStateService } from '../../../../../services'; import createSpyObj = jasmine.createSpyObj; describe('UnLinkCasesComponent', () => { @@ -217,4 +218,43 @@ describe('UnLinkCasesComponent', () => { expect(component.onNext).toHaveBeenCalled(); expect(component.next).toHaveBeenCalledTimes(1); }); + + it('should not set the journeyPageNumber if the linkedCasePage is not less than the journeyPageNumber', () => { + let service: MultipageComponentStateService; + const mockJourney = { + journeyId: 'test', + journeyPageNumber: 4, + journeyStartPageNumber: 0, + journeyPreviousPageNumber: 0, + journeyEndPageNumber: 4, + linkedCasesPage: 3, + next: () => { }, + previous: () => { }, + hasNext: () => true, + hasPrevious: () => true, + isFinished: () => false, + isStart: () => false, + childJourney: undefined, + onPageChange: () => { } + }; + + const mockInstigator = { + onFinalNext: () => { }, + onFinalPrevious: () => { } + }; + + service = new MultipageComponentStateService(); + service.setJourneyCollection([mockJourney]); + service.setInstigator(mockInstigator); + + component = new UnLinkCasesComponent( + TestBed.inject(FormBuilder), + TestBed.inject(CasesService), + TestBed.inject(LinkedCasesService), + service + ); + + component.ngOnInit(); + expect(component.getJourneyCollection().journeyPageNumber).toEqual(3); + }); }); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts index 4b3cd780aa..baecef8517 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts @@ -40,6 +40,17 @@ export class UnLinkCasesComponent extends AbstractFieldWriteJourneyComponent imp public ngOnInit(): void { this.getLinkedCases(); + // the journey can become broken in some situations as the journeyPageNumber is not correct, account for this and set to the correct value + const journeyPageNumber = this.getJourneyCollection()['journeyPageNumber']; + const linkedCasesPageNumber = this.getJourneyCollection()['linkedCasesPage']; + console.log(journeyPageNumber, linkedCasesPageNumber) + if (linkedCasesPageNumber < journeyPageNumber) { + this.getJourneyCollection()['journeyPageNumber'] = linkedCasesPageNumber; + } + } + + public getJourneyCollection(): Journey { + return this.multipageComponentStateService.getJourneyCollection()[0]; } public getLinkedCases(): void { From ffa917b78c205266e6f6f985b3b4a2bdddd9d813 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 14 Nov 2024 15:44:09 +0000 Subject: [PATCH 68/75] up ver num to test force build --- 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 f24c01940d..fe760583b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.76-ungrey-back-button", + "version": "7.0.77-ungrey-back-button", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index e66ddd0d53..d71d137ea7 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.0.76-ungrey-back-button", + "version": "7.0.77-ungrey-back-button", "engines": { "node": ">=18.19.0" }, From 39ff4a1346792cfeae335a0b1bc109f7a56aaece Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 20 Nov 2024 17:33:18 +0000 Subject: [PATCH 69/75] Fix reload issue --- .../palette/linked-cases/services/linked-cases.service.ts | 3 ++- .../linked-cases/write-linked-cases-field.component.ts | 4 ++++ .../services/journey/multipage-component-state.service.ts | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/services/linked-cases.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/services/linked-cases.service.ts index 8374304f43..82e2b75504 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/services/linked-cases.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/services/linked-cases.service.ts @@ -84,9 +84,10 @@ export class LinkedCasesService { public getAllLinkedCaseInformation(): void { const searchCasesResponse = []; const linkedCaseIds = this.groupLinkedCasesByCaseType(this.caseFieldValue, 'CaseType'); + const caseTypeId = this.caseDetails.case_type.id; Object.keys(linkedCaseIds).forEach(key => { const esQuery = this.constructElasticSearchQuery(linkedCaseIds[key], 100); - const query = this.searchService.searchCasesByIds(key, esQuery, SearchService.VIEW_WORKBASKET); + const query = this.searchService.searchCasesByIds(caseTypeId, esQuery, SearchService.VIEW_WORKBASKET); searchCasesResponse.push(query); }); if (searchCasesResponse.length) { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts index fb68086d0b..980d9d259a 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts @@ -98,6 +98,10 @@ export class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyCom this.caseEditDataService.clearFormValidationErrors(); if (linkedCasesState.navigateToNextPage) { this.linkedCasesPage = this.getNextPage(linkedCasesState); + // when the user navigates with change link the journey page number should be set to the linkedCasesPage + if (this.multipageComponentStateService.getJourneyCollectionMainObject().journeyPageNumber > this.linkedCasesPage){ + this.multipageComponentStateService.getJourneyCollectionMainObject().journeyPageNumber = this.linkedCasesPage; + } this.proceedToNextPage(); } else { if (linkedCasesState.errorMessages && linkedCasesState.errorMessages.length) { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts index da7388ebad..0536c6d408 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/services/journey/multipage-component-state.service.ts @@ -59,6 +59,10 @@ export class MultipageComponentStateService { this.journeyState.clear(); } + getJourneyCollectionMainObject(){ + return this.journeyCollection[0]; + } + //reset will be called to ensure that the entire state is reset reset(): void { this.isJourneyAtStart = false; From a8fe846d16bac029f7c79927d4f2a100897ea264 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 20 Nov 2024 17:33:40 +0000 Subject: [PATCH 70/75] change ver num --- 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 fe760583b5..bad01d5f55 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.77-ungrey-back-button", + "version": "7.0.77-ungrey-back-button-2", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index d71d137ea7..3e6b3dbbee 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.0.77-ungrey-back-button", + "version": "7.0.77-ungrey-back-button-2", "engines": { "node": ">=18.19.0" }, From 58795a2997689c3deea022fd930f5d8d8787f79e Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 20 Nov 2024 17:34:39 +0000 Subject: [PATCH 71/75] update yarn audit --- yarn-audit-known-issues | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/yarn-audit-known-issues b/yarn-audit-known-issues index f6ae578c82..00840674be 100644 --- a/yarn-audit-known-issues +++ b/yarn-audit-known-issues @@ -5,8 +5,10 @@ {"value":"cookie","children":{"ID":1099846,"Issue":"cookie accepts cookie name, path, and domain with out of bounds characters","URL":"https://github.com/advisories/GHSA-pxg6-pf52-xh8x","Severity":"low","Vulnerable Versions":"<0.7.0","Tree Versions":["0.6.0"],"Dependents":["express@npm:4.19.2"]}} {"value":"copy-concurrently","children":{"ID":"copy-concurrently (deprecation)","Issue":"This package is no longer supported.","Severity":"moderate","Vulnerable Versions":"1.0.5","Tree Versions":["1.0.5"],"Dependents":["move-concurrently@npm:1.0.1"]}} {"value":"core-js","children":{"ID":"core-js (deprecation)","Issue":"core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.","Severity":"moderate","Vulnerable Versions":"1.2.7","Tree Versions":["1.2.7"],"Dependents":["fbjs@npm:0.8.18"]}} +{"value":"cross-spawn","children":{"ID":1100562,"Issue":"Regular Expression Denial of Service (ReDoS) in cross-spawn","URL":"https://github.com/advisories/GHSA-3xgq-45jj-v275","Severity":"high","Vulnerable Versions":"<6.0.6","Tree Versions":["5.1.0"],"Dependents":["execa@npm:0.7.0"]}} +{"value":"cross-spawn","children":{"ID":1100563,"Issue":"Regular Expression Denial of Service (ReDoS) in cross-spawn","URL":"https://github.com/advisories/GHSA-3xgq-45jj-v275","Severity":"high","Vulnerable Versions":">=7.0.0 <7.0.5","Tree Versions":["7.0.3"],"Dependents":["foreground-child@npm:3.2.1"]}} {"value":"domexception","children":{"ID":"domexception (deprecation)","Issue":"Use your platform's native DOMException instead","Severity":"moderate","Vulnerable Versions":"4.0.0","Tree Versions":["4.0.0"],"Dependents":["jsdom@virtual:ce56289c4b7a2e9003d709997e253c1c80dcaee4c6fbe440cbe9ba5de5db8af3a7b7ad41bbdec5a5e3d40dc9c3c54bef92dd6885ff84cd436d636d5a1b380a61#npm:20.0.3"]}} -{"value":"express","children":{"ID":1099529,"Issue":"express vulnerable to XSS via response.redirect()","URL":"https://github.com/advisories/GHSA-qw6h-vgh9-j6wx","Severity":"moderate","Vulnerable Versions":"<4.20.0","Tree Versions":["4.19.2"],"Dependents":["json-server@npm:0.15.1"]}} +{"value":"express","children":{"ID":1100530,"Issue":"express vulnerable to XSS via response.redirect()","URL":"https://github.com/advisories/GHSA-qw6h-vgh9-j6wx","Severity":"low","Vulnerable Versions":"<4.20.0","Tree Versions":["4.19.2"],"Dependents":["json-server@npm:0.15.1"]}} {"value":"figgy-pudding","children":{"ID":"figgy-pudding (deprecation)","Issue":"This module is no longer supported.","Severity":"moderate","Vulnerable Versions":"3.5.2","Tree Versions":["3.5.2"],"Dependents":["npm-registry-fetch@npm:4.0.7"]}} {"value":"fs-write-stream-atomic","children":{"ID":"fs-write-stream-atomic (deprecation)","Issue":"This package is no longer supported.","Severity":"moderate","Vulnerable Versions":"1.0.10","Tree Versions":["1.0.10"],"Dependents":["move-concurrently@npm:1.0.1"]}} {"value":"gauge","children":{"ID":"gauge (deprecation)","Issue":"This package is no longer supported.","Severity":"moderate","Vulnerable Versions":"3.0.2","Tree Versions":["3.0.2"],"Dependents":["npmlog@npm:5.0.1"]}} @@ -32,9 +34,9 @@ {"value":"request","children":{"ID":1096727,"Issue":"Server-Side Request Forgery in Request","URL":"https://github.com/advisories/GHSA-p8p7-x288-28g6","Severity":"moderate","Vulnerable Versions":"<=2.88.2","Tree Versions":["2.88.2"],"Dependents":["json-server@npm:0.15.1"]}} {"value":"resolve-url","children":{"ID":"resolve-url (deprecation)","Issue":"https://github.com/lydell/resolve-url#deprecated","Severity":"moderate","Vulnerable Versions":"0.2.1","Tree Versions":["0.2.1"],"Dependents":["source-map-resolve@npm:0.5.3"]}} {"value":"rimraf","children":{"ID":"rimraf (deprecation)","Issue":"Rimraf versions prior to v4 are no longer supported","Severity":"moderate","Vulnerable Versions":"3.0.2","Tree Versions":["3.0.2"],"Dependents":["@mapbox/node-pre-gyp@npm:1.0.11"]}} -{"value":"send","children":{"ID":1099525,"Issue":"send vulnerable to template injection that can lead to XSS","URL":"https://github.com/advisories/GHSA-m6fv-jmcg-4jfg","Severity":"moderate","Vulnerable Versions":"<0.19.0","Tree Versions":["0.18.0"],"Dependents":["express@npm:4.19.2"]}} -{"value":"serve-static","children":{"ID":1099527,"Issue":"serve-static vulnerable to template injection that can lead to XSS","URL":"https://github.com/advisories/GHSA-cm22-4g7w-348p","Severity":"moderate","Vulnerable Versions":"<1.16.0","Tree Versions":["1.15.0"],"Dependents":["express@npm:4.19.2"]}} -{"value":"socket.io-parser","children":{"ID":1098329,"Issue":"Insufficient validation when decoding a Socket.IO packet","URL":"https://github.com/advisories/GHSA-cqmj-92xf-r6r9","Severity":"high","Vulnerable Versions":">=4.0.4 <4.2.3","Tree Versions":["4.0.5"],"Dependents":["socket.io-client@npm:3.1.3"]}} +{"value":"send","children":{"ID":1100526,"Issue":"send vulnerable to template injection that can lead to XSS","URL":"https://github.com/advisories/GHSA-m6fv-jmcg-4jfg","Severity":"low","Vulnerable Versions":"<0.19.0","Tree Versions":["0.18.0"],"Dependents":["express@npm:4.19.2"]}} +{"value":"serve-static","children":{"ID":1100528,"Issue":"serve-static vulnerable to template injection that can lead to XSS","URL":"https://github.com/advisories/GHSA-cm22-4g7w-348p","Severity":"low","Vulnerable Versions":"<1.16.0","Tree Versions":["1.15.0"],"Dependents":["express@npm:4.19.2"]}} +{"value":"socket.io-parser","children":{"ID":1100541,"Issue":"Insufficient validation when decoding a Socket.IO packet","URL":"https://github.com/advisories/GHSA-cqmj-92xf-r6r9","Severity":"moderate","Vulnerable Versions":">=4.0.4 <4.2.3","Tree Versions":["4.0.5"],"Dependents":["socket.io-client@npm:3.1.3"]}} {"value":"source-map-resolve","children":{"ID":"source-map-resolve (deprecation)","Issue":"See https://github.com/lydell/source-map-resolve#deprecated","Severity":"moderate","Vulnerable Versions":"0.5.3","Tree Versions":["0.5.3"],"Dependents":["snapdragon@npm:0.8.2"]}} {"value":"source-map-url","children":{"ID":"source-map-url (deprecation)","Issue":"See https://github.com/lydell/source-map-url#deprecated","Severity":"moderate","Vulnerable Versions":"0.4.1","Tree Versions":["0.4.1"],"Dependents":["source-map-resolve@npm:0.5.3"]}} {"value":"tough-cookie","children":{"ID":1097682,"Issue":"tough-cookie Prototype Pollution vulnerability","URL":"https://github.com/advisories/GHSA-72xf-g2v4-qvf3","Severity":"moderate","Vulnerable Versions":"<4.1.3","Tree Versions":["2.5.0"],"Dependents":["request@npm:2.88.2"]}} From 944aade9cbeb34ce5acc1de65e1adff669b25404 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 22 Nov 2024 15:09:12 +0000 Subject: [PATCH 72/75] Update code to account for challenged cases, add test --- .../unlink-cases.component.spec.ts | 19 ++++++++++ .../unlink-cases/unlink-cases.component.ts | 37 ++++++++++++++----- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts index e00945a680..93128d66cc 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.spec.ts @@ -75,6 +75,16 @@ describe('UnLinkCasesComponent', () => { ] }; + const caseInfoChallengedAccess = { + case_id: '1682374819203471', + case_type: { + name: 'SSCS type', + jurisdiction: { name: '' } + }, + state: { name: 'With FTA' }, + tabs: [] + }; + const linkedCases: CaseLink[] = [ { caseReference: '1682374819203471', @@ -176,6 +186,15 @@ describe('UnLinkCasesComponent', () => { expect(component.linkedCases[1].caseReference).toEqual('1682897456391875'); }); + it('should getLinkedCases populate linked cases if there is challenged access cases', () => { + casesService.getCaseViewV2.and.returnValue(of(caseInfoChallengedAccess)); + linkedCasesService.linkedCases = []; + component.getLinkedCases(); + expect(component.linkedCases.length).toEqual(2); + expect(component.linkedCases[0].caseReference).toEqual('1682374819203471'); + expect(component.linkedCases[1].caseReference).toEqual('1682897456391875'); + }); + it('should update the unlink property of linked case with correct value', () => { component.linkedCases = linkedCases; const caseSelected1 = { diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts index baecef8517..339f2d0c3b 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/linked-cases/components/unlink-cases/unlink-cases.component.ts @@ -17,6 +17,7 @@ export class UnLinkCasesComponent extends AbstractFieldWriteJourneyComponent imp private static readonly LINKED_CASES_TAB_ID = 'linked_cases_sscs'; private static readonly CASE_NAME_MISSING_TEXT = 'Case name missing'; + private static readonly LINKED_CASES_TAB_ID_2 = 'caseLinksTab'; @Output() public linkedCasesStateEmitter: EventEmitter = new EventEmitter(); @@ -63,7 +64,9 @@ export class UnLinkCasesComponent extends AbstractFieldWriteJourneyComponent imp this.getAllLinkedCaseInformation(); } else { this.casesService.getCaseViewV2(this.caseId).subscribe((caseView: CaseView) => { - const linkedCasesTab = caseView.tabs.find(tab => tab.id === UnLinkCasesComponent.LINKED_CASES_TAB_ID); + const linkedCasesTab = caseView.tabs.find((tab) => { + return tab.id === UnLinkCasesComponent.LINKED_CASES_TAB_ID || tab.id === UnLinkCasesComponent.LINKED_CASES_TAB_ID_2; + }); if (linkedCasesTab) { const linkedCases: CaseLink[] = linkedCasesTab.fields[0].value; this.linkedCases = linkedCases; @@ -74,28 +77,44 @@ export class UnLinkCasesComponent extends AbstractFieldWriteJourneyComponent imp } } + public getLinkedCaseId(linkedCase): string { + // challenged access doesnt return props in the same format, account for this + return linkedCase.caseReference ? linkedCase.caseReference : linkedCase['id']; + } + public getAllLinkedCaseInformation(): void { const searchCasesResponse = []; - this.linkedCases.forEach(linkedCase => { - searchCasesResponse.push(this.casesService.getCaseViewV2(linkedCase.caseReference)); + this.linkedCases.forEach((linkedCase) => { + const caseRefToSearch = this.getLinkedCaseId(linkedCase); + searchCasesResponse.push(this.casesService.getCaseViewV2(caseRefToSearch)); }); if (searchCasesResponse.length) { this.searchCasesByCaseIds(searchCasesResponse).subscribe((searchCases: any) => { searchCases.forEach((response: CaseView) => { - const linkedCaseFromList = this.linkedCases.find(linkedCase => linkedCase.caseReference === response.case_id); + const linkedCaseFromList = this.linkedCases.find((linkedCase) => { + const caseRefToUse = this.getLinkedCaseId(linkedCase); + return caseRefToUse === response.case_id; + }); if (linkedCaseFromList) { const caseName = this.linkedCasesService.getCaseName(response); - this.linkedCases.find(linkedCase => linkedCase.caseReference === response.case_id).caseName = caseName; + const linkedCase = this.linkedCases.find((linkedCase) => { + const caseRefToUse = this.getLinkedCaseId(linkedCase); + return caseRefToUse === response.case_id; + }); + if (linkedCase) { + linkedCase.caseName = caseName; + linkedCase.caseReference = response.case_id; + } } }); this.initForm(); this.linkedCasesService.linkedCases = this.linkedCases; this.isServerError = false; }, - err => { - this.isServerError = true; - this.notifyAPIFailure.emit(true); - }); + err => { + this.isServerError = true; + this.notifyAPIFailure.emit(true); + }); } } From 4b142ee4e14f1eccc5d79d09e27c527ac61149f5 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 22 Nov 2024 15:09:42 +0000 Subject: [PATCH 73/75] up ver num --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bad01d5f55..0aa4f11313 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.77-ungrey-back-button-2", + "version": "7.0.77-ungrey-back-button-3", "engines": { "node": ">=18.19.0" }, From 51929462f23cc8f78b112b6033780bc07eace349 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 22 Nov 2024 15:25:26 +0000 Subject: [PATCH 74/75] fix ver num --- projects/ccd-case-ui-toolkit/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 3e6b3dbbee..83cef94452 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.0.77-ungrey-back-button-2", + "version": "7.0.77-ungrey-back-button-3", "engines": { "node": ">=18.19.0" }, From c99fa77d7168c441e9e09ec83b26095448de7c9a Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 22 Nov 2024 15:26:31 +0000 Subject: [PATCH 75/75] set ver num --- 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 0aa4f11313..def66c9525 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.77-ungrey-back-button-3", + "version": "7.0.77-ungrey-back-button-4", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 83cef94452..1e2b46c2a9 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.0.77-ungrey-back-button-3", + "version": "7.0.77-ungrey-back-button-4", "engines": { "node": ">=18.19.0" },