fix(cb2-10343): correct logic for determining whether to autopopulate… (

#1347)

* fix(cb2-10343): correct logic for determining whether to autopopulate able to carry dangerous goods

* fix(cb2-10343): fix broken test

src/app/forms/custom-sections/adr/adr.component.spec.ts

@@ -40,10 +40,5 @@ describe('AdrComponent', () => {
  component.ngOnInit();
  expect(spy).toHaveBeenCalled();
  });
- it('should populate the tank statement select property', () => {
- const spy = jest.spyOn(component.adrService, 'determineTankStatementSelect');
- component.ngOnInit();
- expect(spy).toHaveBeenCalled();
- });
  });
 });

src/app/forms/custom-sections/adr/adr.component.ts

@@ -41,7 +41,9 @@ export class AdrComponent implements OnInit, OnDestroy {
  this.template = this.isReviewScreen ? AdrSummaryTemplate : AdrTemplate;
  this.form = this.dfs.createForm(this.template, this.techRecord) as CustomFormGroup;
  this.techRecord.techRecord_adrDetails_dangerousGoods = this.adrService.carriesDangerousGoods(this.techRecord);
- this.techRecord.techRecord_adrDetails_tank_tankDetails_tankStatement_select = this.adrService.determineTankStatementSelect(this.techRecord);
+ if (this.techRecord.techRecord_adrDetails_dangerousGoods) {
+ this.techRecord.techRecord_adrDetails_tank_tankDetails_tankStatement_select = this.adrService.determineTankStatementSelect(this.techRecord);
+ }
  this.handleSubmit();
  }
 

src/app/services/adr/adr.service.ts

@@ -22,6 +22,9 @@ export class AdrService {
 
  carriesDangerousGoods(techRecord: TechRecordType<'hgv' | 'lgv' | 'trl'>) {
  return techRecord.techRecord_adrDetails_dangerousGoods
- || Boolean(Object.keys(techRecord).find((key) => key !== 'techRecord_adrDetails_dangerousGoods' && key.includes('adrDetails')));
+ || (techRecord.techRecord_adrDetails_dangerousGoods !== false && Boolean(Object.keys(techRecord).find((key) =>
+ key !== 'techRecord_adrDetails_dangerousGoods'
+ && key.includes('adrDetails')
+ && techRecord[key as keyof TechRecordType<'hgv' | 'lgv' | 'trl'>] != null)));
  }
 }