WIP: EXUI-2272

src/hearings/containers/request-hearing/hearing-attendance/hearing-attendance.component.spec.ts

@@ -167,7 +167,6 @@ describe('HearingAttendanceComponent', () => {
 
     fixture = TestBed.createComponent(HearingAttendanceComponent);
     component = fixture.componentInstance;
-    spyOn(component, 'initialiseFromHearingValues').and.callThrough();
     spyOn(component, 'prepareHearingRequestData').and.callThrough();
     spyOn(component, 'isFormValid').and.callThrough();
     lovRefDataService.getListOfValues.and.returnValue(of([]));
@@ -279,16 +278,6 @@ describe('HearingAttendanceComponent', () => {
     expect(formValid).toEqual(false);
   });
 
-  it('should render parties from the hearingvaluemodel', () => {
-    const store = jasmine.createSpyObj('store', ['pipe', 'dispatch', 'select']);
-    store.select.and.returnValue(of(initialState));
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-    component.initialiseFromHearingValues();
-    expect(component.initialiseFromHearingValues).toHaveBeenCalled();
-    expect((component.attendanceFormGroup.controls.parties as FormArray).length).toBeGreaterThan(0);
-  });
-
   it('should not consider the party details from in-memory object for create new hearing request journey', () => {
     component.hearingCondition = {
       mode: 'create'
@@ -308,7 +297,6 @@ describe('HearingAttendanceComponent', () => {
       }
     };
     component.ngOnInit();
-    expect(component.initialiseFromHearingValues).not.toHaveBeenCalled();
     expect(component.attendanceFormGroup.controls.parties.value.length).toEqual(2);
   });
 
@@ -317,22 +305,8 @@ describe('HearingAttendanceComponent', () => {
     component.hearingCondition = {
       mode: 'view-edit'
     };
-    hearingsService.propertiesUpdatedOnPageVisit = {
-      hearingId: 'h000001',
-      caseFlags: null,
-      parties: partyDetailsFromLatestSHV,
-      hearingWindow: null,
-      afterPageVisit: {
-        reasonableAdjustmentChangesRequired: true,
-        nonReasonableAdjustmentChangesRequired: false,
-        partyDetailsChangesRequired: true,
-        hearingWindowChangesRequired: true,
-        hearingFacilitiesChangesRequired: false,
-        hearingUnavailabilityDatesChanged: false
-      }
-    };
     component.ngOnInit();
-    expect(component.attendanceFormGroup.controls.parties.value.length).toEqual(1);
+    expect(component.attendanceFormGroup.controls.parties.value.length).toEqual(2);
   });
 
   it('should call initialiseFromHearingValuesForAmendments for manual amendments journey with party changes', () => {

src/hearings/containers/request-hearing/hearing-attendance/hearing-attendance.component.ts

@@ -74,38 +74,39 @@ export class HearingAttendanceComponent extends RequestHearingPageFlow implement
   }
 
   public ngOnInit(): void {
-    if ((this.hearingCondition.mode === Mode.VIEW_EDIT &&
-      this.hearingsService.propertiesUpdatedOnPageVisit?.hasOwnProperty('parties') &&
-      this.hearingsService.propertiesUpdatedOnPageVisit?.afterPageVisit.partyDetailsChangesRequired)) {
-      this.initialiseFromHearingValuesForAmendments();
-    } else if (!this.hearingRequestMainModel.partyDetails.length) {
-      this.initialiseFromHearingValues();
+    if (this.hearingCondition.mode === Mode.VIEW_EDIT) {
+      // This will be triggered due to changes in the hearing service call
+      if (this.hearingsService.propertiesUpdatedOnPageVisit?.hasOwnProperty('parties') &&
+      this.hearingsService.propertiesUpdatedOnPageVisit?.afterPageVisit.partyDetailsChangesRequired) {
+        this.initialiseFromHearingValuesForAmendments();
+      }
+      // This will be triggered when a user is amending
+      this.initialiseFormValues(this.hearingRequestMainModel.partyDetails);
     } else {
-      this.hearingRequestMainModel.partyDetails.filter((party) => party.partyType === PartyType.IND)
-        .forEach((partyDetail) => {
-          (this.attendanceFormGroup.controls.parties as FormArray).push(this.patchValues({
-            partyID: partyDetail.partyID,
-            partyType: partyDetail.partyType,
-            partyRole: partyDetail.partyRole,
-            partyName: `${partyDetail.individualDetails.firstName} ${partyDetail.individualDetails.lastName}`,
-            individualDetails: {
-              ...partyDetail.individualDetails,
-              preferredHearingChannel: partyDetail.individualDetails?.preferredHearingChannel ? partyDetail.individualDetails?.preferredHearingChannel : ''
-            },
-            organisationDetails: partyDetail.organisationDetails,
-            unavailabilityDOW: partyDetail.unavailabilityDOW,
-            unavailabilityRanges: partyDetail.unavailabilityRanges
-          } as PartyDetailsModel) as FormGroup);
-        });
+      // This will be triggered on a create request
+      this.initialiseFormValues(this.serviceHearingValuesModel.parties);
     }
     this.attendanceFormGroup.controls.estimation.setValue(this.hearingRequestMainModel.hearingDetails.numberOfPhysicalAttendees || 0);
     this.partiesFormArray = this.attendanceFormGroup.controls.parties as FormArray;
   }
 
-  public initialiseFromHearingValues(): void {
-    this.serviceHearingValuesModel.parties.forEach((partyDetailsModel: PartyDetailsModel) => {
-      (this.attendanceFormGroup.controls.parties as FormArray).push(this.patchValues(partyDetailsModel) as FormGroup);
-    });
+  public initialiseFormValues(source: PartyDetailsModel[]): void {
+    source.filter((party) => party.partyType === PartyType.IND)
+      .forEach((partyDetail) => {
+        (this.attendanceFormGroup.controls.parties as FormArray).push(this.patchValues({
+          partyID: partyDetail.partyID,
+          partyType: partyDetail.partyType,
+          partyRole: partyDetail.partyRole,
+          partyName: `${partyDetail.individualDetails.firstName} ${partyDetail.individualDetails.lastName}`,
+          individualDetails: {
+            ...partyDetail.individualDetails,
+            preferredHearingChannel: partyDetail.individualDetails?.preferredHearingChannel ? partyDetail.individualDetails?.preferredHearingChannel : ''
+          },
+          organisationDetails: partyDetail.organisationDetails,
+          unavailabilityDOW: partyDetail.unavailabilityDOW,
+          unavailabilityRanges: partyDetail.unavailabilityRanges
+        } as PartyDetailsModel) as FormGroup);
+      });
   }
 
   public initialiseFromHearingValuesForAmendments(): void {