Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cb2-12006): prevent error message duplication #1492

Merged
merged 2 commits into from
Jul 19, 2024
Merged

fix(cb2-12006): prevent error message duplication #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e167c12
fix(cb2-12006): prevent error message duplication
pbardy2000 May 9, 2024
2da117f
fix(cb2-12006): fix unit test
pbardy2000 May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@ describe('TechRecordChangeTypeComponent', () => {

describe('handleSubmit', () => {
it('should add an error when no vehicle type is selected', () => {
const addErrorSpy = jest.spyOn(errorService, 'addError');
const setErrorsSpy = jest.spyOn(errorService, 'setErrors');

component.handleSubmit(null as unknown as VehicleTypes);

expect(addErrorSpy).toHaveBeenCalledWith({ error: 'You must provide a new vehicle type', anchorLink: 'selectedVehicleType' });
expect(setErrorsSpy).toHaveBeenCalledWith([{ error: 'You must provide a new vehicle type', anchorLink: 'selectedVehicleType' }]);
});

it('should dispatch the changeVehicleType action', () => {
Expand Down
6 changes: 3 additions & 3 deletions ...tures/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,18 @@ export class ChangeVehicleTypeComponent implements OnInit {

handleSubmit(selectedVehicleType: VehicleTypes): void {
if (!selectedVehicleType) {
return this.globalErrorService.addError({ error: 'You must provide a new vehicle type', anchorLink: 'selectedVehicleType' });
return this.globalErrorService.setErrors([{ error: 'You must provide a new vehicle type', anchorLink: 'selectedVehicleType' }]);
}

if (
selectedVehicleType === VehicleTypes.TRL
&& ((this.techRecord as TechRecordTypeByVehicle<'trl'>)?.techRecord_euVehicleCategory === EUVehicleCategory.O1
|| (this.techRecord as TechRecordTypeByVehicle<'trl'>)?.techRecord_euVehicleCategory === EUVehicleCategory.O2)
) {
return this.globalErrorService.addError({
return this.globalErrorService.setErrors([{
error: 'You cannot change vehicle type to TRL when EU vehicle category is set to \'O1\' or \'O2\'',
anchorLink: 'selectedVehicleType',
});
}]);
}

this.store.dispatch(changeVehicleType({ techRecord_vehicleType: selectedVehicleType }));
Expand Down
Loading