From 9a9bf045d7825327ce4a033bdb51a64758c8816a Mon Sep 17 00:00:00 2001 From: Thomas Crawley Date: Wed, 4 Sep 2024 14:21:31 +0100 Subject: [PATCH 1/8] feat(cb2-13727): start refactor of folder structure --- .../__tests__}/app-no-space.directive.spec.ts | 2 +- .../app-no-space}/app-no-space.directive.ts | 0 .../__tests__}/app-number-only.directive.spec.ts | 2 +- .../app-number-only}/app-number-only.directive.ts | 0 .../__tests__}/app-role-required.directive.spec.ts | 4 ++-- .../app-role-required.directive.ts | 0 .../__tests__}/app-to-uppercase.directive.spec.ts | 2 +- .../app-to-uppercase}/app-to-uppercase.directive.ts | 0 .../__tests__}/app-trim-whitespace.directive.spec.ts | 2 +- .../app-trim-whitespace.directive.ts | 0 .../__tests__}/feature-toggle.directive.spec.ts | 2 +- .../{ => feature-toggle}/feature-toggle.directive.ts | 0 .../prefix/__tests__}/prefix.directive.spec.ts | 2 +- .../prefix}/prefix.directive.ts | 0 .../suffix/__tests__}/suffix.directive.spec.ts | 2 +- .../suffix}/suffix.directive.ts | 0 src/app/features/home/home.component.spec.ts | 2 +- .../reference-data-add.component.spec.ts | 4 ++-- .../reference-data-add.component.ts | 4 ++-- .../reference-data-amend-history.component.spec.ts | 4 ++-- .../reference-data-amend.component.spec.ts | 4 ++-- .../reference-data-amend.component.ts | 4 ++-- .../reference-data-delete.component.spec.ts | 4 ++-- .../reference-data-delete.component.ts | 6 +++--- .../reference-data-deleted-list.component.spec.ts | 6 +++--- .../reference-data-list.component.spec.ts | 8 ++++---- .../reference-data-list.component.ts | 4 ++-- .../reference-data-select-type.component.spec.ts | 8 ++++---- .../reference-data-select-type.component.ts | 4 ++-- .../search/{ => __tests__}/search.component.spec.ts | 4 ++-- .../multiple-search-results.component.spec.ts | 8 ++++---- .../single-search-result.component.spec.ts | 6 +++--- .../single-search-result.component.ts | 2 +- .../adr-generate-certificate.component.spec.ts | 2 +- .../adr-generate-certificate.component.ts | 2 +- .../tech-record-amend-reason.component.ts | 2 +- .../tech-record-amend-vin.component.spec.ts | 2 +- .../tech-record-amend-vin.component.ts | 4 ++-- .../tech-record-amend-vrm-reason.component.spec.ts | 2 +- .../tech-record-amend-vrm-reason.component.ts | 4 ++-- .../tech-record-amend-vrm.component.spec.ts | 2 +- .../tech-record-amend-vrm.component.ts | 4 ++-- .../tech-record-change-status.component.ts | 2 +- .../tech-record-change-type.component.spec.ts | 2 +- .../tech-record-change-type.component.ts | 4 ++-- .../tech-record-change-visibility.component.ts | 2 +- ...record-edit-additional-examiner-note.component.ts | 2 +- .../tech-record-generate-letter.component.spec.ts | 2 +- .../tech-record-generate-letter.component.ts | 4 ++-- .../tech-record-generate-plate.component.spec.ts | 2 +- .../tech-record-generate-plate.component.ts | 2 +- .../tech-record-search-tyres.component.spec.ts | 2 +- .../tech-record-search-tyres.component.ts | 6 +++--- .../tech-record-summary-changes.component.spec.ts | 2 +- .../tech-record-summary-changes.component.ts | 2 +- .../tech-record-summary.component.spec.ts | 2 +- .../tech-record-summary.component.ts | 4 ++-- .../tech-record-unarchive-component.ts | 2 +- .../vehicle-technical-record.component.spec.ts | 2 +- .../batch-vehicle-details.component.ts | 4 ++-- .../batch-vehicle-template.component.ts | 6 +++--- .../select-vehicle-type.component.ts | 4 ++-- .../create/create-tech-record.component.spec.ts | 2 +- .../create/create-tech-record.component.ts | 6 +++--- .../amended-test-record.component.ts | 2 +- .../confirm-cancellation.component.ts | 2 +- .../test-amend-reason/test-amend-reason.component.ts | 2 +- .../amend/views/test-record/test-record.component.ts | 4 ++-- .../test-result-summary.component.ts | 2 +- .../base-test-record.component.spec.ts | 4 ++-- .../base-test-record/base-test-record.component.ts | 4 ++-- .../test-type-select.component.spec.ts | 2 +- .../vehicle-header/vehicle-header.component.ts | 2 +- .../create-test-record.component.spec.ts | 4 ++-- .../create-test-record.component.ts | 2 +- .../approval-type/approval-type.component.spec.ts | 2 +- .../approval-type/approval-type.component.ts | 2 +- .../autocomplete/autocomplete.component.spec.ts | 2 +- .../base-control/base-control.component.spec.ts | 2 +- .../base-control/base-control.component.ts | 8 ++++---- .../checkbox-group/checkbox-group.component.spec.ts | 4 ++-- .../checkbox-group/checkbox-group.component.ts | 2 +- .../components/checkbox/checkbox.component.spec.ts | 2 +- src/app/forms/components/date/date.component.spec.ts | 2 +- src/app/forms/components/date/date.component.ts | 2 +- .../dynamic-form-field.component.spec.ts | 2 +- .../dynamic-form-field.component.ts | 4 ++-- .../dynamic-form-group.component.spec.ts | 4 ++-- .../dynamic-form-group.component.ts | 4 ++-- .../number-input/number-input.component.spec.ts | 2 +- .../radio-group/radio-group.component.spec.ts | 2 +- .../components/radio-group/radio-group.component.ts | 2 +- .../components/read-only/read-only.component.spec.ts | 2 +- .../forms/components/select/select.component.spec.ts | 2 +- src/app/forms/components/select/select.component.ts | 2 +- .../suggestive-input.component.spec.ts | 4 ++-- .../suggestive-input/suggestive-input.component.ts | 2 +- .../switchable-input.component.spec.ts | 4 ++-- .../switchable-input/switchable-input.component.ts | 4 ++-- .../components/text-area/text-area.component.spec.ts | 2 +- .../components/text-area/text-area.component.ts | 2 +- .../text-input/text-input.component.spec.ts | 2 +- .../view-combination.component.spec.ts | 2 +- .../view-combination/view-combination.component.ts | 2 +- .../view-list-item/view-list-item.component.spec.ts | 2 +- .../view-list-item/view-list-item.component.ts | 2 +- .../abandon-dialog/abandon-dialog.component.spec.ts | 6 +++--- .../abandon-dialog/abandon-dialog.component.ts | 8 ++++---- .../adr-examiner-notes-history.component-edit.ts | 2 +- ...adr-examiner-notes-history-view.component.spec.ts | 2 +- ...r-new-certificate-required-view.component.spec.ts | 2 +- ...details-initial-inspection-view.component.spec.ts | 2 +- .../adr-tank-details-m145-view.component.spec.ts | 2 +- ...ils-subsequent-inspections-edit.component.spec.ts | 2 +- ...-details-subsequent-inspections-edit.component.ts | 4 ++-- ...ils-subsequent-inspections-view.component.spec.ts | 2 +- ...r-tank-statement-un-number-edit.component.spec.ts | 2 +- .../adr-tank-statement-un-number-edit.component.ts | 2 +- ...r-tank-statement-un-number-view.component.spec.ts | 2 +- src/app/forms/custom-sections/adr/adr.component.ts | 4 ++-- .../approval-type/approval-type.component.ts | 4 ++-- .../custom-sections/body/body.component.spec.ts | 6 +++--- src/app/forms/custom-sections/body/body.component.ts | 8 ++++---- .../custom-defect/custom-defect.component.ts | 2 +- .../custom-defects/custom-defects.component.spec.ts | 4 ++-- .../custom-defects/custom-defects.component.ts | 4 ++-- .../custom-form-control.component.ts | 2 +- .../forms/custom-sections/defect/defect.component.ts | 4 ++-- .../defects/defects.component.spec.ts | 2 +- .../custom-sections/defects/defects.component.ts | 4 ++-- .../dimensions/dimensions.component.ts | 4 ++-- .../custom-sections/letters/letters.component.ts | 4 ++-- .../modified-weights/modified-weights.component.ts | 2 +- .../custom-sections/plates/plates.component.spec.ts | 2 +- .../forms/custom-sections/plates/plates.component.ts | 6 +++--- .../psv-brakes/psv-brakes.component.spec.ts | 2 +- .../psv-brakes/psv-brakes.component.ts | 8 ++++---- .../required-standard.component.spec.ts | 4 ++-- .../required-standard/required-standard.component.ts | 4 ++-- .../required-standards.component.spec.ts | 2 +- .../required-standards.component.ts | 4 ++-- .../trl-brakes/trl-brakes.component.ts | 6 +++--- .../forms/custom-sections/tyres/tyres.component.ts | 6 +++--- .../custom-sections/weights/weights.component.ts | 4 ++-- src/app/forms/dynamic-forms.module.ts | 12 ++++++------ .../forms/templates/car/car-tech-record.template.ts | 4 ++-- .../templates/general/adr-certificate.template.ts | 2 +- .../forms/templates/general/adr-summary.template.ts | 4 ++-- src/app/forms/templates/general/adr.template.ts | 4 ++-- .../templates/general/applicant-details.template.ts | 4 ++-- .../templates/general/approval-type.template.ts | 4 ++-- src/app/forms/templates/general/audit.template.ts | 2 +- src/app/forms/templates/general/defect.template.ts | 4 ++-- src/app/forms/templates/general/document-types.ts | 2 +- .../forms/templates/general/documents.template.ts | 4 ++-- .../forms/templates/general/hgv-trl-body.template.ts | 6 +++--- src/app/forms/templates/general/letter-types.ts | 2 +- src/app/forms/templates/general/letters.template.ts | 2 +- .../forms/templates/general/manufacturer.template.ts | 4 ++-- src/app/forms/templates/general/notes.template.ts | 4 ++-- src/app/forms/templates/general/plates.template.ts | 2 +- .../general/reason-for-creation.template.ts | 4 ++-- .../templates/general/required-standards.template.ts | 2 +- .../forms/templates/hgv/hgv-dimensions.template.ts | 4 ++-- .../forms/templates/hgv/hgv-tech-record.template.ts | 4 ++-- src/app/forms/templates/hgv/hgv-tyres.template.ts | 4 ++-- src/app/forms/templates/hgv/hgv-weight.template.ts | 4 ++-- .../forms/templates/lgv/lgv-tech-record.template.ts | 4 ++-- .../motorcycle/motorcycle-tech-record.template.ts | 4 ++-- .../templates/psv/psv-approval-type.template.ts | 4 ++-- src/app/forms/templates/psv/psv-body.template.ts | 4 ++-- src/app/forms/templates/psv/psv-brakes.template.ts | 4 ++-- src/app/forms/templates/psv/psv-dda.template.ts | 4 ++-- .../forms/templates/psv/psv-dimensions.template.ts | 4 ++-- src/app/forms/templates/psv/psv-notes.template.ts | 4 ++-- .../forms/templates/psv/psv-tech-record.template.ts | 4 ++-- src/app/forms/templates/psv/psv-tyres.template.ts | 4 ++-- src/app/forms/templates/psv/psv-weight.template.ts | 4 ++-- .../search/single-search-result.template.ts | 4 ++-- .../small-trailer-tech-record.template.ts | 4 ++-- .../tech-records/vehicle-summary.template.ts | 2 +- .../templates/test-records/create-master.template.ts | 4 ++-- .../forms/templates/test-records/master.template.ts | 4 ++-- .../additional-defects-section.template.ts | 4 ++-- .../customDefects/custom-defects-section.template.ts | 4 ++-- .../desk-based-emissions-section.template.ts | 6 +++--- .../emissions/emissions-section.template.ts | 6 +++--- .../notes/adr-notes-section.template.ts | 6 +++--- .../notes/notes-section.template.ts | 4 ++-- .../reasonForCreation/reasonForCreation.template.ts | 4 ++-- ...gency-required-hidden-section-hgv-trl.template.ts | 2 +- ...gency-required-hidden-section-lgv-car.template.ts | 2 +- ...cy-required-hidden-section-motorcycle.template.ts | 2 +- .../contingency-required-hidden-section.template.ts | 2 +- .../custom-defects-hidden-section.template.ts | 2 +- .../required/defect-hidden-section.template.ts | 2 +- ...desk-based-required-hidden-group4-lgv.template.ts | 2 +- ...quired-hidden-group4-motorcycle-amend.template.ts | 2 +- ...sed-required-hidden-group4-motorcycle.template.ts | 2 +- ...desk-based-required-hidden-group5-lgv.template.ts | 2 +- ...based-required-hidden-section-hgv-trl.template.ts | 2 +- ...esk-based-required-hidden-section-psv.template.ts | 2 +- ...k-based-required-section-group4-amend.template.ts | 2 +- .../required-hidden-section-hgv-trl.template.ts | 2 +- .../required/required-hidden-section.template.ts | 2 +- .../required/seatbelt-hidden-section.template.ts | 2 +- ...alist-required-hidden-section-hgv-trl.template.ts | 2 +- ...alist-required-hidden-section-lgv-car.template.ts | 2 +- ...st-required-hidden-section-motorcycle.template.ts | 2 +- .../specialist-required-hidden-section.template.ts | 2 +- .../seatbelt/seatbelt-section.template.ts | 6 +++--- .../contingency-test-section-group1.template.ts | 4 ++-- ...contingency-test-section-group12and14.template.ts | 4 ++-- ...contingency-test-section-group15and16.template.ts | 6 +++--- ...ntingency-test-section-group3And4And8.template.ts | 6 +++--- .../contingency-test-section-group5And13.template.ts | 6 +++--- .../contingency-test-section-group6And11.template.ts | 4 ++-- .../contingency-test-section-group7.template.ts | 6 +++--- ...ingency-test-section-group8Notifiable.template.ts | 6 +++--- .../contingency-test-section-group9And10.template.ts | 4 ++-- ...y-test-section-group9And10CentralDocs.template.ts | 4 ++-- ...ngency-test-section-specialist-group1.template.ts | 8 ++++---- ...ngency-test-section-specialist-group2.template.ts | 6 +++--- ...cy-test-section-specialist-group3And4.template.ts | 6 +++--- ...ngency-test-section-specialist-group5.template.ts | 8 ++++---- .../old-contingency-specialist-group1.template.ts | 6 +++--- .../old-contingency-specialist-group5.template.ts | 6 +++--- .../desk-based-test-section-group1-PSV.template.ts | 4 ++-- ...based-test-section-group1And4-HGV-TRL.template.ts | 2 +- .../desk-based-test-section-group2.template.ts | 4 ++-- .../desk-based-test-section-group3.template.ts | 4 ++-- .../desk-based-test-section-group4-PSV.template.ts | 4 ++-- .../desk-based-test-section-group4-lgv-template.ts | 4 ++-- .../desk-based/desk-based-test-section-group5-LGV.ts | 4 ++-- .../old-specialist-test-section-group1.template.ts | 6 +++--- .../old-specialist-test-section-group5.template.ts | 6 +++--- .../specialist-test-section-group1.template.ts | 8 ++++---- .../specialist-test-section-group2.template.ts | 6 +++--- .../specialist-test-section-group3.template.ts | 6 +++--- .../specialist-test-section-group3And4.template.ts | 6 +++--- .../specialist-test-section-group5.template.ts | 8 ++++---- .../test/test-section-group1.template.ts | 6 +++--- .../test/test-section-group12And14.template.ts | 6 +++--- .../test/test-section-group15And16.template.ts | 8 ++++---- .../test/test-section-group2.template.ts | 6 +++--- .../test/test-section-group3And4And8.template.ts | 8 ++++---- .../test/test-section-group5And13.template.ts | 6 +++--- .../test/test-section-group6And11.template.ts | 6 +++--- .../test/test-section-group7.template.ts | 8 ++++---- .../test/test-section-group8Notifiable.template.ts | 8 ++++---- .../test/test-section-group9And10.template.ts | 6 +++--- .../test-section-group9And10CentralDocs.template.ts | 6 +++--- .../section-templates/test/test-section.template.ts | 4 ++-- .../vehicle/amend-iva-msva-psv-hgv-light.template.ts | 4 ++-- ...default-psv-hgv-light-vehicle-section.template.ts | 6 +++--- ...ntingency-default-trl-vehicle-section.template.ts | 6 +++--- .../contingency-iva-msva-vehicle-section.template.ts | 6 +++--- ...default-psv-hgv-light-vehicle-section.template.ts | 4 ++-- .../vehicle/default-trl-vehicle-section.template.ts | 4 ++-- ...based-default-psv-hgv-vehicle-section.template.ts | 4 ++-- ...esk-based-default-trl-vehicle-section.template.ts | 4 ++-- ...st-hgv-vehicle-section-group1And2And4.template.ts | 4 ++-- ...desk-based-vehicle-section-group4-lgv.template.ts | 4 ++-- ...desk-based-vehicle-section-group5-lgv.template.ts | 2 +- .../group-3-light-vehicle-section.template.ts | 4 ++-- .../visit/contingency-visit-section.template.ts | 8 ++++---- .../visit/visit-section.template.ts | 8 ++++---- .../templates/trl/trl-auth-into-service.template.ts | 4 ++-- src/app/forms/templates/trl/trl-brakes.template.ts | 4 ++-- .../forms/templates/trl/trl-dimensions.template.ts | 4 ++-- .../forms/templates/trl/trl-purchaser.template.ts | 4 ++-- .../forms/templates/trl/trl-tech-record.template.ts | 4 ++-- src/app/forms/templates/trl/trl-tyres.template.ts | 4 ++-- src/app/forms/templates/trl/trl-weight.template.ts | 4 ++-- src/app/forms/utils/enum-map.ts | 2 +- src/app/forms/utils/error-message-map.spec.ts | 4 ++-- src/app/forms/utils/error-message-map.ts | 4 ++-- src/app/forms/utils/tech-record-constants.ts | 2 +- src/app/forms/validators/adr/adr.validators.spec.ts | 2 +- src/app/forms/validators/adr/adr.validators.ts | 2 +- .../forms/validators/custom-async-validators.spec.ts | 4 ++-- src/app/forms/validators/custom-async-validators.ts | 4 ++-- src/app/forms/validators/custom-validators.spec.ts | 4 ++-- src/app/forms/validators/custom-validators.ts | 2 +- .../validators/defects/defect.validators.spec.ts | 2 +- src/app/{forms => }/models/async-validators.enum.ts | 0 src/app/{forms => }/models/condition.model.ts | 0 src/app/models/coupling-type-enum.ts | 2 +- src/app/{forms => }/models/options.model.ts | 0 .../{forms => }/models/plateRequiredFields.model.ts | 0 src/app/{forms => }/models/testTypeId.enum.ts | 0 src/app/{forms => }/models/validators.enum.ts | 0 .../batch-technical-record.service.spec.ts | 2 +- .../batch-technical-record.service.ts | 2 +- .../dynamic-forms}/dynamic-form.service.spec.ts | 4 ++-- .../dynamic-forms}/dynamic-form.service.ts | 6 +++--- .../dynamic-forms}/dynamic-form.types.spec.ts | 2 +- .../dynamic-forms}/dynamic-form.types.ts | 8 ++++---- .../multi-options}/multi-options.service.ts | 2 +- .../reference-data/reference-data.service.spec.ts | 2 +- .../reference-data/reference-data.service.ts | 2 +- .../services/test-records/test-records.service.ts | 4 ++-- .../services/test-stations/test-stations.service.ts | 2 +- .../test-certificate/test-certificate.component.ts | 2 +- .../get-control-label/get-control-label.pipe.spec.ts | 2 +- .../get-control-label/get-control-label.pipe.ts | 2 +- .../pipes/ref-data-decode/ref-data-decode.pipe.ts | 2 +- src/app/shared/shared.module.ts | 4 ++-- .../effects/technical-record-service.effects.ts | 2 +- .../test-records/actions/test-records.actions.ts | 2 +- .../effects/test-records.effects.spec.ts | 4 ++-- .../test-records/effects/test-records.effects.ts | 4 ++-- .../test-records/reducers/test-records.reducer.ts | 4 ++-- 313 files changed, 553 insertions(+), 553 deletions(-) rename src/app/{forms/directives => directives/app-no-space/__tests__}/app-no-space.directive.spec.ts (98%) rename src/app/{forms/directives => directives/app-no-space}/app-no-space.directive.ts (100%) rename src/app/{forms/directives => directives/app-number-only/__tests__}/app-number-only.directive.spec.ts (94%) rename src/app/{forms/directives => directives/app-number-only}/app-number-only.directive.ts (100%) rename src/app/directives/{ => app-role-required/__tests__}/app-role-required.directive.spec.ts (96%) rename src/app/directives/{ => app-role-required}/app-role-required.directive.ts (100%) rename src/app/{forms/directives => directives/app-to-uppercase/__tests__}/app-to-uppercase.directive.spec.ts (94%) rename src/app/{forms/directives => directives/app-to-uppercase}/app-to-uppercase.directive.ts (100%) rename src/app/{forms/directives => directives/app-trim-whitespace/__tests__}/app-trim-whitespace.directive.spec.ts (97%) rename src/app/{forms/directives => directives/app-trim-whitespace}/app-trim-whitespace.directive.ts (100%) rename src/app/directives/{ => feature-toggle/__tests__}/feature-toggle.directive.spec.ts (96%) rename src/app/directives/{ => feature-toggle}/feature-toggle.directive.ts (100%) rename src/app/{forms/directives => directives/prefix/__tests__}/prefix.directive.spec.ts (92%) rename src/app/{forms/directives => directives/prefix}/prefix.directive.ts (100%) rename src/app/{forms/directives => directives/suffix/__tests__}/suffix.directive.spec.ts (92%) rename src/app/{forms/directives => directives/suffix}/suffix.directive.ts (100%) rename src/app/features/reference-data/reference-data-add/{ => __tests__}/reference-data-add.component.spec.ts (96%) rename src/app/features/reference-data/reference-data-amend-history/{ => __tests__}/reference-data-amend-history.component.spec.ts (90%) rename src/app/features/reference-data/reference-data-amend/{ => __tests__}/reference-data-amend.component.spec.ts (96%) rename src/app/features/reference-data/reference-data-delete/{ => __tests__}/reference-data-delete.component.spec.ts (96%) rename src/app/features/reference-data/reference-data-deleted-list/{ => __tests__}/reference-data-deleted-list.component.spec.ts (89%) rename src/app/features/reference-data/reference-data-list/{ => __tests__}/reference-data-list.component.spec.ts (95%) rename src/app/features/reference-data/reference-data-select-type/{ => __tests__}/reference-data-select-type.component.spec.ts (92%) rename src/app/features/search/{ => __tests__}/search.component.spec.ts (97%) rename src/app/features/search/multiple-search-results/{ => __tests__}/multiple-search-results.component.spec.ts (94%) rename src/app/features/search/single-search-result/{ => __tests__}/single-search-result.component.spec.ts (91%) rename src/app/{forms => }/models/async-validators.enum.ts (100%) rename src/app/{forms => }/models/condition.model.ts (100%) rename src/app/{forms => }/models/options.model.ts (100%) rename src/app/{forms => }/models/plateRequiredFields.model.ts (100%) rename src/app/{forms => }/models/testTypeId.enum.ts (100%) rename src/app/{forms => }/models/validators.enum.ts (100%) rename src/app/{forms/services => services/dynamic-forms}/dynamic-form.service.spec.ts (98%) rename src/app/{forms/services => services/dynamic-forms}/dynamic-form.service.ts (98%) rename src/app/{forms/services => services/dynamic-forms}/dynamic-form.types.spec.ts (97%) rename src/app/{forms/services => services/dynamic-forms}/dynamic-form.types.ts (97%) rename src/app/{forms/services => services/multi-options}/multi-options.service.ts (97%) diff --git a/src/app/forms/directives/app-no-space.directive.spec.ts b/src/app/directives/app-no-space/__tests__/app-no-space.directive.spec.ts similarity index 98% rename from src/app/forms/directives/app-no-space.directive.spec.ts rename to src/app/directives/app-no-space/__tests__/app-no-space.directive.spec.ts index 7061a3bde..ce819d0cc 100644 --- a/src/app/forms/directives/app-no-space.directive.spec.ts +++ b/src/app/directives/app-no-space/__tests__/app-no-space.directive.spec.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { NoSpaceDirective } from './app-no-space.directive'; +import { NoSpaceDirective } from '../app-no-space.directive'; @Component({ template: `
diff --git a/src/app/forms/directives/app-no-space.directive.ts b/src/app/directives/app-no-space/app-no-space.directive.ts similarity index 100% rename from src/app/forms/directives/app-no-space.directive.ts rename to src/app/directives/app-no-space/app-no-space.directive.ts diff --git a/src/app/forms/directives/app-number-only.directive.spec.ts b/src/app/directives/app-number-only/__tests__/app-number-only.directive.spec.ts similarity index 94% rename from src/app/forms/directives/app-number-only.directive.spec.ts rename to src/app/directives/app-number-only/__tests__/app-number-only.directive.spec.ts index 8fea9835c..b25496650 100644 --- a/src/app/forms/directives/app-number-only.directive.spec.ts +++ b/src/app/directives/app-number-only/__tests__/app-number-only.directive.spec.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { NumberOnlyDirective } from './app-number-only.directive'; +import { NumberOnlyDirective } from '../app-number-only.directive'; @Component({ template: ' ', diff --git a/src/app/forms/directives/app-number-only.directive.ts b/src/app/directives/app-number-only/app-number-only.directive.ts similarity index 100% rename from src/app/forms/directives/app-number-only.directive.ts rename to src/app/directives/app-number-only/app-number-only.directive.ts diff --git a/src/app/directives/app-role-required.directive.spec.ts b/src/app/directives/app-role-required/__tests__/app-role-required.directive.spec.ts similarity index 96% rename from src/app/directives/app-role-required.directive.spec.ts rename to src/app/directives/app-role-required/__tests__/app-role-required.directive.spec.ts index a588898f5..58185c91d 100644 --- a/src/app/directives/app-role-required.directive.spec.ts +++ b/src/app/directives/app-role-required/__tests__/app-role-required.directive.spec.ts @@ -4,9 +4,9 @@ import { By } from '@angular/platform-browser'; import { Roles } from '@models/roles.enum'; import { provideMockStore } from '@ngrx/store/testing'; import { UserService } from '@services/user-service/user-service'; -import { initialAppState } from '@store/.'; +import { initialAppState } from '@store/index'; import { of } from 'rxjs'; -import { RoleRequiredDirective } from './app-role-required.directive'; +import { RoleRequiredDirective } from '../app-role-required.directive'; @Component({ template: ` diff --git a/src/app/directives/app-role-required.directive.ts b/src/app/directives/app-role-required/app-role-required.directive.ts similarity index 100% rename from src/app/directives/app-role-required.directive.ts rename to src/app/directives/app-role-required/app-role-required.directive.ts diff --git a/src/app/forms/directives/app-to-uppercase.directive.spec.ts b/src/app/directives/app-to-uppercase/__tests__/app-to-uppercase.directive.spec.ts similarity index 94% rename from src/app/forms/directives/app-to-uppercase.directive.spec.ts rename to src/app/directives/app-to-uppercase/__tests__/app-to-uppercase.directive.spec.ts index 71a7a0535..eb67cdcfc 100644 --- a/src/app/forms/directives/app-to-uppercase.directive.spec.ts +++ b/src/app/directives/app-to-uppercase/__tests__/app-to-uppercase.directive.spec.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { ToUppercaseDirective } from './app-to-uppercase.directive'; +import { ToUppercaseDirective } from '../app-to-uppercase.directive'; @Component({ template: '
', diff --git a/src/app/forms/directives/app-to-uppercase.directive.ts b/src/app/directives/app-to-uppercase/app-to-uppercase.directive.ts similarity index 100% rename from src/app/forms/directives/app-to-uppercase.directive.ts rename to src/app/directives/app-to-uppercase/app-to-uppercase.directive.ts diff --git a/src/app/forms/directives/app-trim-whitespace.directive.spec.ts b/src/app/directives/app-trim-whitespace/__tests__/app-trim-whitespace.directive.spec.ts similarity index 97% rename from src/app/forms/directives/app-trim-whitespace.directive.spec.ts rename to src/app/directives/app-trim-whitespace/__tests__/app-trim-whitespace.directive.spec.ts index 62ccc51b4..7efdebfc0 100644 --- a/src/app/forms/directives/app-trim-whitespace.directive.spec.ts +++ b/src/app/directives/app-trim-whitespace/__tests__/app-trim-whitespace.directive.spec.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { TrimWhitespaceDirective } from './app-trim-whitespace.directive'; +import { TrimWhitespaceDirective } from '../app-trim-whitespace.directive'; @Component({ template: `
diff --git a/src/app/forms/directives/app-trim-whitespace.directive.ts b/src/app/directives/app-trim-whitespace/app-trim-whitespace.directive.ts similarity index 100% rename from src/app/forms/directives/app-trim-whitespace.directive.ts rename to src/app/directives/app-trim-whitespace/app-trim-whitespace.directive.ts diff --git a/src/app/directives/feature-toggle.directive.spec.ts b/src/app/directives/feature-toggle/__tests__/feature-toggle.directive.spec.ts similarity index 96% rename from src/app/directives/feature-toggle.directive.spec.ts rename to src/app/directives/feature-toggle/__tests__/feature-toggle.directive.spec.ts index a740497a8..82f3acab2 100644 --- a/src/app/directives/feature-toggle.directive.spec.ts +++ b/src/app/directives/feature-toggle/__tests__/feature-toggle.directive.spec.ts @@ -3,7 +3,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { FeatureToggleService } from '@services/feature-toggle-service/feature-toggle-service'; -import { FeatureToggleDirective } from './feature-toggle.directive'; +import { FeatureToggleDirective } from '../feature-toggle.directive'; @Component({ template: ` diff --git a/src/app/directives/feature-toggle.directive.ts b/src/app/directives/feature-toggle/feature-toggle.directive.ts similarity index 100% rename from src/app/directives/feature-toggle.directive.ts rename to src/app/directives/feature-toggle/feature-toggle.directive.ts diff --git a/src/app/forms/directives/prefix.directive.spec.ts b/src/app/directives/prefix/__tests__/prefix.directive.spec.ts similarity index 92% rename from src/app/forms/directives/prefix.directive.spec.ts rename to src/app/directives/prefix/__tests__/prefix.directive.spec.ts index 0ba9243be..bf4380a8f 100644 --- a/src/app/forms/directives/prefix.directive.spec.ts +++ b/src/app/directives/prefix/__tests__/prefix.directive.spec.ts @@ -1,6 +1,6 @@ import { Component, TemplateRef } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { PrefixDirective } from './prefix.directive'; +import { PrefixDirective } from '../prefix.directive'; @Component({ template: '', diff --git a/src/app/forms/directives/prefix.directive.ts b/src/app/directives/prefix/prefix.directive.ts similarity index 100% rename from src/app/forms/directives/prefix.directive.ts rename to src/app/directives/prefix/prefix.directive.ts diff --git a/src/app/forms/directives/suffix.directive.spec.ts b/src/app/directives/suffix/__tests__/suffix.directive.spec.ts similarity index 92% rename from src/app/forms/directives/suffix.directive.spec.ts rename to src/app/directives/suffix/__tests__/suffix.directive.spec.ts index a7d14644a..d4090359f 100644 --- a/src/app/forms/directives/suffix.directive.spec.ts +++ b/src/app/directives/suffix/__tests__/suffix.directive.spec.ts @@ -1,6 +1,6 @@ import { Component, TemplateRef } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { SuffixDirective } from './suffix.directive'; +import { SuffixDirective } from '../suffix.directive'; @Component({ template: '', diff --git a/src/app/forms/directives/suffix.directive.ts b/src/app/directives/suffix/suffix.directive.ts similarity index 100% rename from src/app/forms/directives/suffix.directive.ts rename to src/app/directives/suffix/suffix.directive.ts diff --git a/src/app/features/home/home.component.spec.ts b/src/app/features/home/home.component.spec.ts index 3d3e56ae4..74b081344 100644 --- a/src/app/features/home/home.component.spec.ts +++ b/src/app/features/home/home.component.spec.ts @@ -2,7 +2,7 @@ import { HttpClientModule } from '@angular/common/http'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormBuilder } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; -import { RoleRequiredDirective } from '@directives/app-role-required.directive'; +import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { UserService } from '@services/user-service/user-service'; diff --git a/src/app/features/reference-data/reference-data-add/reference-data-add.component.spec.ts b/src/app/features/reference-data/reference-data-add/__tests__/reference-data-add.component.spec.ts similarity index 96% rename from src/app/features/reference-data/reference-data-add/reference-data-add.component.spec.ts rename to src/app/features/reference-data/reference-data-add/__tests__/reference-data-add.component.spec.ts index 5ef1ceacc..ecf063c65 100644 --- a/src/app/features/reference-data/reference-data-add/reference-data-add.component.spec.ts +++ b/src/app/features/reference-data/reference-data-add/__tests__/reference-data-add.component.spec.ts @@ -6,9 +6,9 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; -import { State, initialAppState } from '@store/.'; +import { State, initialAppState } from '@store/index'; import { of } from 'rxjs'; -import { ReferenceDataCreateComponent } from './reference-data-add.component'; +import { ReferenceDataCreateComponent } from '../reference-data-add.component'; const mockRefDataService = { loadReferenceData: jest.fn(), diff --git a/src/app/features/reference-data/reference-data-add/reference-data-add.component.ts b/src/app/features/reference-data/reference-data-add/reference-data-add.component.ts index c1624909a..9cb47f0e4 100644 --- a/src/app/features/reference-data/reference-data-add/reference-data-add.component.ts +++ b/src/app/features/reference-data/reference-data-add/reference-data-add.component.ts @@ -3,8 +3,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/features/reference-data/reference-data-amend-history/reference-data-amend-history.component.spec.ts b/src/app/features/reference-data/reference-data-amend-history/__tests__/reference-data-amend-history.component.spec.ts similarity index 90% rename from src/app/features/reference-data/reference-data-amend-history/reference-data-amend-history.component.spec.ts rename to src/app/features/reference-data/reference-data-amend-history/__tests__/reference-data-amend-history.component.spec.ts index 2b271cda8..3582c8f6a 100644 --- a/src/app/features/reference-data/reference-data-amend-history/reference-data-amend-history.component.spec.ts +++ b/src/app/features/reference-data/reference-data-amend-history/__tests__/reference-data-amend-history.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ReferenceDataService } from '@api/reference-data'; import { provideMockStore } from '@ngrx/store/testing'; import { UserService } from '@services/user-service/user-service'; -import { initialAppState } from '@store/.'; -import { ReferenceDataAmendHistoryComponent } from './reference-data-amend-history.component'; +import { initialAppState } from '@store/index'; +import { ReferenceDataAmendHistoryComponent } from '../reference-data-amend-history.component'; describe('ReferenceDataAmendHistoryComponent', () => { let component: ReferenceDataAmendHistoryComponent; diff --git a/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.spec.ts b/src/app/features/reference-data/reference-data-amend/__tests__/reference-data-amend.component.spec.ts similarity index 96% rename from src/app/features/reference-data/reference-data-amend/reference-data-amend.component.spec.ts rename to src/app/features/reference-data/reference-data-amend/__tests__/reference-data-amend.component.spec.ts index 7f50174b6..28a7a5a3b 100644 --- a/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.spec.ts +++ b/src/app/features/reference-data/reference-data-amend/__tests__/reference-data-amend.component.spec.ts @@ -6,8 +6,8 @@ import { ReferenceDataService } from '@api/reference-data'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { UserService } from '@services/user-service/user-service'; -import { State, initialAppState } from '@store/.'; -import { ReferenceDataAmendComponent } from './reference-data-amend.component'; +import { State, initialAppState } from '@store/index'; +import { ReferenceDataAmendComponent } from '../reference-data-amend.component'; const mockRefDataService = { loadReferenceData: jest.fn(), diff --git a/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.ts b/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.ts index 3a7bb8346..d1b811fef 100644 --- a/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.ts +++ b/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.ts @@ -3,8 +3,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.spec.ts b/src/app/features/reference-data/reference-data-delete/__tests__/reference-data-delete.component.spec.ts similarity index 96% rename from src/app/features/reference-data/reference-data-delete/reference-data-delete.component.spec.ts rename to src/app/features/reference-data/reference-data-delete/__tests__/reference-data-delete.component.spec.ts index de0205b75..9a9f4dbad 100644 --- a/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.spec.ts +++ b/src/app/features/reference-data/reference-data-delete/__tests__/reference-data-delete.component.spec.ts @@ -7,8 +7,8 @@ import { ReferenceDataResourceType } from '@models/reference-data.model'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; -import { State, initialAppState } from '@store/.'; -import { ReferenceDataDeleteComponent } from './reference-data-delete.component'; +import { State, initialAppState } from '@store/index'; +import { ReferenceDataDeleteComponent } from '../reference-data-delete.component'; describe('ReferenceDataAddComponent', () => { let component: ReferenceDataDeleteComponent; diff --git a/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.ts b/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.ts index 5b6dc4997..129382f3f 100644 --- a/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.ts +++ b/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.ts @@ -3,9 +3,9 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; -import { ValidatorNames } from '@forms/models/validators.enum'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/features/reference-data/reference-data-deleted-list/reference-data-deleted-list.component.spec.ts b/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts similarity index 89% rename from src/app/features/reference-data/reference-data-deleted-list/reference-data-deleted-list.component.spec.ts rename to src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts index 8ea4c02b9..6f7aacf0d 100644 --- a/src/app/features/reference-data/reference-data-deleted-list/reference-data-deleted-list.component.spec.ts +++ b/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts @@ -2,15 +2,15 @@ import { HttpClientModule } from '@angular/common/http'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { RoleRequiredDirective } from '@directives/app-role-required.directive'; +import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { Roles } from '@models/roles.enum'; import { provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; import { PaginationComponent } from '@shared/components/pagination/pagination.component'; -import { initialAppState } from '@store/.'; +import { initialAppState } from '@store/index'; import { of } from 'rxjs'; -import { ReferenceDataDeletedListComponent } from './reference-data-deleted-list.component'; +import { ReferenceDataDeletedListComponent } from '../reference-data-deleted-list.component'; describe('DataTypeListComponent', () => { let component: ReferenceDataDeletedListComponent; diff --git a/src/app/features/reference-data/reference-data-list/reference-data-list.component.spec.ts b/src/app/features/reference-data/reference-data-list/__tests__/reference-data-list.component.spec.ts similarity index 95% rename from src/app/features/reference-data/reference-data-list/reference-data-list.component.spec.ts rename to src/app/features/reference-data/reference-data-list/__tests__/reference-data-list.component.spec.ts index ca02ef182..e241c7009 100644 --- a/src/app/features/reference-data/reference-data-list/reference-data-list.component.spec.ts +++ b/src/app/features/reference-data/reference-data-list/__tests__/reference-data-list.component.spec.ts @@ -4,17 +4,17 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { ReferenceDataItem } from '@api/reference-data'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { RoleRequiredDirective } from '@directives/app-role-required.directive'; +import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { createSelector } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; -import { initialAppState } from '@store/.'; +import { initialAppState } from '@store/index'; import { of } from 'rxjs'; -import * as refSelectors from '../../../store/reference-data/selectors/reference-data.selectors'; -import { ReferenceDataListComponent } from './reference-data-list.component'; +import * as refSelectors from '@store/reference-data/selectors/reference-data.selectors'; +import { ReferenceDataListComponent } from '../reference-data-list.component'; describe('DataTypeListComponent', () => { let component: ReferenceDataListComponent; diff --git a/src/app/features/reference-data/reference-data-list/reference-data-list.component.ts b/src/app/features/reference-data/reference-data-list/reference-data-list.component.ts index 5dd21cbc3..e389ce2c2 100644 --- a/src/app/features/reference-data/reference-data-list/reference-data-list.component.ts +++ b/src/app/features/reference-data/reference-data-list/reference-data-list.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataModelBase, ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.spec.ts b/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts similarity index 92% rename from src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.spec.ts rename to src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts index b118e4e9e..634f81d71 100644 --- a/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.spec.ts +++ b/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts @@ -3,18 +3,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { RoleRequiredDirective } from '@directives/app-role-required.directive'; +import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { RadioGroupComponent } from '@forms/components/radio-group/radio-group.component'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; import { ButtonComponent } from '@shared/components/button/button.component'; -import { initialAppState } from '@store/.'; +import { initialAppState } from '@store/index'; import { of } from 'rxjs'; -import { ReferenceDataSelectTypeComponent } from './reference-data-select-type.component'; +import { ReferenceDataSelectTypeComponent } from '../reference-data-select-type.component'; describe('ReferenceDataComponent', () => { let component: ReferenceDataSelectTypeComponent; diff --git a/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.ts b/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.ts index 97a3cd732..4cdb13136 100644 --- a/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.ts +++ b/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.ts @@ -3,8 +3,8 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/features/search/search.component.spec.ts b/src/app/features/search/__tests__/search.component.spec.ts similarity index 97% rename from src/app/features/search/search.component.spec.ts rename to src/app/features/search/__tests__/search.component.spec.ts index 6949a5144..ed6a9bba2 100644 --- a/src/app/features/search/search.component.spec.ts +++ b/src/app/features/search/__tests__/search.component.spec.ts @@ -8,10 +8,10 @@ import { Roles } from '@models/roles.enum'; import { SEARCH_TYPES } from '@models/search-types-enum'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; -import { State, initialAppState } from '@store/.'; +import { State, initialAppState } from '@store/index'; import { globalErrorState } from '@store/global-error/reducers/global-error-service.reducer'; import { of } from 'rxjs'; -import { SearchComponent } from './search.component'; +import { SearchComponent } from '../search.component'; describe('SearchComponent', () => { let component: SearchComponent; diff --git a/src/app/features/search/multiple-search-results/multiple-search-results.component.spec.ts b/src/app/features/search/multiple-search-results/__tests__/multiple-search-results.component.spec.ts similarity index 94% rename from src/app/features/search/multiple-search-results/multiple-search-results.component.spec.ts rename to src/app/features/search/multiple-search-results/__tests__/multiple-search-results.component.spec.ts index 3b0983a7a..e9ab18ba6 100644 --- a/src/app/features/search/multiple-search-results/multiple-search-results.component.spec.ts +++ b/src/app/features/search/multiple-search-results/__tests__/multiple-search-results.component.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { RoleRequiredDirective } from '@directives/app-role-required.directive'; +import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { TechRecordSearchSchema } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/search'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; import { provideMockActions } from '@ngrx/effects/testing'; @@ -10,11 +10,11 @@ import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { TechnicalRecordHttpService } from '@services/technical-record-http/technical-record-http.service'; import { UserService } from '@services/user-service/user-service'; -import { State, initialAppState } from '@store/.'; +import { State, initialAppState } from '@store/index'; import { selectQueryParams } from '@store/router/selectors/router.selectors'; import { BehaviorSubject, ReplaySubject, firstValueFrom, of } from 'rxjs'; -import { SingleSearchResultComponent } from '../single-search-result/single-search-result.component'; -import { MultipleSearchResultsComponent } from './multiple-search-results.component'; +import { SingleSearchResultComponent } from '../../single-search-result/single-search-result.component'; +import { MultipleSearchResultsComponent } from '../multiple-search-results.component'; describe('MultipleSearchResultsComponent', () => { let component: MultipleSearchResultsComponent; diff --git a/src/app/features/search/single-search-result/single-search-result.component.spec.ts b/src/app/features/search/single-search-result/__tests__/single-search-result.component.spec.ts similarity index 91% rename from src/app/features/search/single-search-result/single-search-result.component.spec.ts rename to src/app/features/search/single-search-result/__tests__/single-search-result.component.spec.ts index 8218f51ef..351888f67 100644 --- a/src/app/features/search/single-search-result/single-search-result.component.spec.ts +++ b/src/app/features/search/single-search-result/__tests__/single-search-result.component.spec.ts @@ -1,15 +1,15 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { RoleRequiredDirective } from '@directives/app-role-required.directive'; +import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; import { UserService } from '@services/user-service/user-service'; -import { initialAppState } from '@store/.'; +import { initialAppState } from '@store/index'; import { ReplaySubject, of } from 'rxjs'; -import { SingleSearchResultComponent } from './single-search-result.component'; +import { SingleSearchResultComponent } from '../single-search-result.component'; describe('SingleSearchResultComponent', () => { let component: SingleSearchResultComponent; diff --git a/src/app/features/search/single-search-result/single-search-result.component.ts b/src/app/features/search/single-search-result/single-search-result.component.ts index 205aee4a8..ccd416d33 100644 --- a/src/app/features/search/single-search-result/single-search-result.component.ts +++ b/src/app/features/search/single-search-result/single-search-result.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { TechRecordSearchSchema } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/search'; -import { FormNode } from '@forms/services/dynamic-form.types'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { createSingleSearchResult } from '@forms/templates/search/single-search-result.template'; import { Roles } from '@models/roles.enum'; diff --git a/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.spec.ts b/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.spec.ts index 8db81d122..8c41647d8 100644 --- a/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.spec.ts +++ b/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.spec.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; diff --git a/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.ts b/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.ts index 3bfad2424..334d4390e 100644 --- a/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.ts +++ b/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.ts @@ -3,7 +3,7 @@ import { FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { ADRCertificateTypes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/adrCertificateTypes.enum.js'; -import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { UserService } from '@services/user-service/user-service'; diff --git a/src/app/features/tech-record/components/tech-record-amend-reason/tech-record-amend-reason.component.ts b/src/app/features/tech-record/components/tech-record-amend-reason/tech-record-amend-reason.component.ts index 4e0c759b6..9f32119c9 100644 --- a/src/app/features/tech-record/components/tech-record-amend-reason/tech-record-amend-reason.component.ts +++ b/src/app/features/tech-record/components/tech-record-amend-reason/tech-record-amend-reason.component.ts @@ -3,7 +3,7 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReasonForEditing } from '@models/vehicle-tech-record.model'; @Component({ diff --git a/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.spec.ts b/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.spec.ts index c07c9b74b..0f42bcd4f 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.spec.ts @@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.ts b/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.ts index 62dfa64f2..8b3f95df3 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.ts @@ -4,8 +4,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; import { V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.spec.ts b/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.spec.ts index 10719b606..a61cf3b43 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.spec.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, ActivatedRouteSnapshot, Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.ts b/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.ts index 1cc889cb7..735eb344e 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.ts @@ -3,8 +3,8 @@ import { FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleTypes, VehiclesOtherThan } from '@models/vehicle-tech-record.model'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { Subject, take, takeUntil } from 'rxjs'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.spec.ts b/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.spec.ts index 0f25609fc..be368062d 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.spec.ts @@ -4,7 +4,7 @@ import { ActivatedRoute, ActivatedRouteSnapshot, Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { mockVehicleTechnicalRecord } from '@mocks/mock-vehicle-technical-record.mock'; import { VehiclesOtherThan } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.ts b/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.ts index c67054315..c29c111d0 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.ts @@ -5,8 +5,8 @@ import { GlobalError } from '@core/components/global-error/global-error.interfac import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; import { VehicleTypes, VehiclesOtherThan } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; diff --git a/src/app/features/tech-record/components/tech-record-change-status/tech-record-change-status.component.ts b/src/app/features/tech-record/components/tech-record-change-status/tech-record-change-status.component.ts index 89aa6a175..24fa5c5a8 100644 --- a/src/app/features/tech-record/components/tech-record-change-status/tech-record-change-status.component.ts +++ b/src/app/features/tech-record/components/tech-record-change-status/tech-record-change-status.component.ts @@ -3,7 +3,7 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; diff --git a/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts b/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts index c3294cb4b..eb403f47d 100644 --- a/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts @@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { getOptionsFromEnumAcronym } from '@forms/utils/enum-map'; import { V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; diff --git a/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts b/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts index 373e44d10..21386d657 100644 --- a/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts +++ b/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts @@ -4,8 +4,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { TechRecordType as TechRecordTypeByVehicle } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { MultiOptions } from '@forms/models/options.model'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { MultiOptions } from '@models/options.model'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnumAcronym } from '@forms/utils/enum-map'; import { StatusCodes, V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; diff --git a/src/app/features/tech-record/components/tech-record-change-visibility/tech-record-change-visibility.component.ts b/src/app/features/tech-record/components/tech-record-change-visibility/tech-record-change-visibility.component.ts index 5981efd8d..39b5cad20 100644 --- a/src/app/features/tech-record/components/tech-record-change-visibility/tech-record-change-visibility.component.ts +++ b/src/app/features/tech-record/components/tech-record-change-visibility/tech-record-change-visibility.component.ts @@ -3,7 +3,7 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; diff --git a/src/app/features/tech-record/components/tech-record-edit-additional-examiner-note/tech-record-edit-additional-examiner-note.component.ts b/src/app/features/tech-record/components/tech-record-edit-additional-examiner-note/tech-record-edit-additional-examiner-note.component.ts index 4ac33b1d1..884cbc28d 100644 --- a/src/app/features/tech-record/components/tech-record-edit-additional-examiner-note/tech-record-edit-additional-examiner-note.component.ts +++ b/src/app/features/tech-record/components/tech-record-edit-additional-examiner-note/tech-record-edit-additional-examiner-note.component.ts @@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { AdditionalExaminerNotes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { CustomFormControl, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { Store } from '@ngrx/store'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { State } from '@store/index'; diff --git a/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.spec.ts b/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.spec.ts index a93992cbf..83c8c66ea 100644 --- a/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.spec.ts @@ -6,7 +6,7 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { mockVehicleTechnicalRecord } from '@mocks/mock-vehicle-technical-record.mock'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; diff --git a/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.ts b/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.ts index 0161005f9..2a6f7a8f4 100644 --- a/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.ts +++ b/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.ts @@ -4,8 +4,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { LETTER_TYPES } from '@forms/templates/general/letter-types'; import { StatusCodes, V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; diff --git a/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.spec.ts b/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.spec.ts index 82c3c5613..9949b39e6 100644 --- a/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.spec.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; diff --git a/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.ts b/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.ts index d329add78..cdb6c0bec 100644 --- a/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.ts +++ b/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.ts @@ -3,7 +3,7 @@ import { FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { PlatesInner } from '@api/vehicle'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { Actions, ofType } from '@ngrx/effects'; import { Store, select } from '@ngrx/store'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; diff --git a/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.spec.ts b/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.spec.ts index f3a8ec16d..9160b3d55 100644 --- a/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.spec.ts @@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ReferenceDataResourceType, ReferenceDataTyre } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; diff --git a/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.ts b/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.ts index 9f10a98a0..ae135ecfe 100644 --- a/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.ts +++ b/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.ts @@ -4,9 +4,9 @@ import { GlobalError } from '@core/components/global-error/global-error.interfac import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType as TechRecordTypeByVerb } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { MultiOptions } from '@forms/models/options.model'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeTypes, SearchParams } from '@forms/services/dynamic-form.types'; +import { MultiOptions } from '@models/options.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNode, FormNodeTypes, SearchParams } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType, ReferenceDataTyre, ReferenceDataTyreLoadIndex } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; diff --git a/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.spec.ts b/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.spec.ts index 59b57aef1..692fc01b3 100644 --- a/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.spec.ts @@ -4,7 +4,7 @@ import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { FormNode, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TechRecordReasonForCreationSection } from '@forms/templates/general/reason-for-creation.template'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; diff --git a/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.ts b/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.ts index d8e289615..2ffd1127e 100644 --- a/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.ts +++ b/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.ts @@ -9,7 +9,7 @@ import { TechRecordGETPSV, TechRecordGETTRL, } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { FormNode, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleSummary } from '@forms/templates/tech-records/vehicle-summary.template'; import { vehicleTemplateMap } from '@forms/utils/tech-record-constants'; import { Axles, VehicleTypes } from '@models/vehicle-tech-record.model'; diff --git a/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.spec.ts b/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.spec.ts index 247eecb5c..3a6b123b8 100644 --- a/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.spec.ts @@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; import { LettersComponent } from '@forms/custom-sections/letters/letters.component'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { MultiOptionsService } from '@forms/services/multi-options.service'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { TechRecordType as TechRecordTypeByVehicle } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; diff --git a/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.ts b/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.ts index a96a974f2..5ede06821 100644 --- a/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.ts +++ b/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.ts @@ -26,8 +26,8 @@ import { PsvBrakesComponent } from '@forms/custom-sections/psv-brakes/psv-brakes import { TrlBrakesComponent } from '@forms/custom-sections/trl-brakes/trl-brakes.component'; import { TyresComponent } from '@forms/custom-sections/tyres/tyres.component'; import { WeightsComponent } from '@forms/custom-sections/weights/weights.component'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { vehicleTemplateMap } from '@forms/utils/tech-record-constants'; import { ReasonForEditing, StatusCodes, V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; diff --git a/src/app/features/tech-record/components/tech-record-unarchive/tech-record-unarchive-component.ts b/src/app/features/tech-record/components/tech-record-unarchive/tech-record-unarchive-component.ts index 284793c9c..c32a7fdeb 100644 --- a/src/app/features/tech-record/components/tech-record-unarchive/tech-record-unarchive-component.ts +++ b/src/app/features/tech-record/components/tech-record-unarchive/tech-record-unarchive-component.ts @@ -3,7 +3,7 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { StatusCodes } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; diff --git a/src/app/features/tech-record/components/vehicle-technical-record/vehicle-technical-record.component.spec.ts b/src/app/features/tech-record/components/vehicle-technical-record/vehicle-technical-record.component.spec.ts index 2d4ae4b74..261aac102 100644 --- a/src/app/features/tech-record/components/vehicle-technical-record/vehicle-technical-record.component.spec.ts +++ b/src/app/features/tech-record/components/vehicle-technical-record/vehicle-technical-record.component.spec.ts @@ -6,7 +6,7 @@ import { RouterModule } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { ApiModule } from '@api/test-results'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { MultiOptionsService } from '@forms/services/multi-options.service'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { StatusCodes, TechRecordModel, V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { EffectsModule } from '@ngrx/effects'; import { StoreModule } from '@ngrx/store'; diff --git a/src/app/features/tech-record/create-batch/components/batch-vehicle-details/batch-vehicle-details.component.ts b/src/app/features/tech-record/create-batch/components/batch-vehicle-details/batch-vehicle-details.component.ts index fc9f6c7cb..218108b18 100644 --- a/src/app/features/tech-record/create-batch/components/batch-vehicle-details/batch-vehicle-details.component.ts +++ b/src/app/features/tech-record/create-batch/components/batch-vehicle-details/batch-vehicle-details.component.ts @@ -3,14 +3,14 @@ import { AbstractControl, FormArray, FormBuilder, FormControlStatus, FormGroup, import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormControl, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { BatchTechnicalRecordService } from '@services/batch-technical-record/batch-technical-record.service'; diff --git a/src/app/features/tech-record/create-batch/components/batch-vehicle-template/batch-vehicle-template.component.ts b/src/app/features/tech-record/create-batch/components/batch-vehicle-template/batch-vehicle-template.component.ts index 4a7d7933d..0408155a4 100644 --- a/src/app/features/tech-record/create-batch/components/batch-vehicle-template/batch-vehicle-template.component.ts +++ b/src/app/features/tech-record/create-batch/components/batch-vehicle-template/batch-vehicle-template.component.ts @@ -4,9 +4,9 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { MultiOptions } from '@forms/models/options.model'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { MultiOptions } from '@models/options.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BatchUpdateVehicleModel, StatusCodes, diff --git a/src/app/features/tech-record/create-batch/components/select-vehicle-type/select-vehicle-type.component.ts b/src/app/features/tech-record/create-batch/components/select-vehicle-type/select-vehicle-type.component.ts index 196ad264a..85d8f729a 100644 --- a/src/app/features/tech-record/create-batch/components/select-vehicle-type/select-vehicle-type.component.ts +++ b/src/app/features/tech-record/create-batch/components/select-vehicle-type/select-vehicle-type.component.ts @@ -4,8 +4,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; import { StatusCodes, TrailerFormType, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; diff --git a/src/app/features/tech-record/create/create-tech-record.component.spec.ts b/src/app/features/tech-record/create/create-tech-record.component.spec.ts index 3d7af5f5f..f6f44bab5 100644 --- a/src/app/features/tech-record/create/create-tech-record.component.spec.ts +++ b/src/app/features/tech-record/create/create-tech-record.component.spec.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { SEARCH_TYPES } from '@models/search-types-enum'; import { provideMockStore } from '@ngrx/store/testing'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; diff --git a/src/app/features/tech-record/create/create-tech-record.component.ts b/src/app/features/tech-record/create/create-tech-record.component.ts index c71dc0e36..6c9912087 100644 --- a/src/app/features/tech-record/create/create-tech-record.component.ts +++ b/src/app/features/tech-record/create/create-tech-record.component.ts @@ -5,9 +5,9 @@ import { GlobalError } from '@core/components/global-error/global-error.interfac import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { CheckboxGroupComponent } from '@forms/components/checkbox-group/checkbox-group.component'; -import { MultiOptions } from '@forms/models/options.model'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { MultiOptions } from '@models/options.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; import { SEARCH_TYPES } from '@models/search-types-enum'; import { StatusCodes, V3TechRecordModel, VehicleTypes, VehiclesOtherThan } from '@models/vehicle-tech-record.model'; diff --git a/src/app/features/test-records/amend/views/amended-test-record/amended-test-record.component.ts b/src/app/features/test-records/amend/views/amended-test-record/amended-test-record.component.ts index b2cb3fec0..0dd69a32b 100644 --- a/src/app/features/test-records/amend/views/amended-test-record/amended-test-record.component.ts +++ b/src/app/features/test-records/amend/views/amended-test-record/amended-test-record.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { FormNode } from '@forms/services/dynamic-form.types'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultDefects } from '@models/test-results/test-result-defects.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TestRecordsService } from '@services/test-records/test-records.service'; diff --git a/src/app/features/test-records/amend/views/confirm-cancellation/confirm-cancellation.component.ts b/src/app/features/test-records/amend/views/confirm-cancellation/confirm-cancellation.component.ts index 499dc4390..65b09098a 100644 --- a/src/app/features/test-records/amend/views/confirm-cancellation/confirm-cancellation.component.ts +++ b/src/app/features/test-records/amend/views/confirm-cancellation/confirm-cancellation.component.ts @@ -3,7 +3,7 @@ import { Component, OnDestroy } from '@angular/core'; import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultModel } from '@models/test-results/test-result.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/features/test-records/amend/views/test-amend-reason/test-amend-reason.component.ts b/src/app/features/test-records/amend/views/test-amend-reason/test-amend-reason.component.ts index 2a3bc33f0..75dd93798 100644 --- a/src/app/features/test-records/amend/views/test-amend-reason/test-amend-reason.component.ts +++ b/src/app/features/test-records/amend/views/test-amend-reason/test-amend-reason.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; @Component({ selector: 'app-test-amend-reason', diff --git a/src/app/features/test-records/amend/views/test-record/test-record.component.ts b/src/app/features/test-records/amend/views/test-record/test-record.component.ts index 17f21594a..72003f8b9 100644 --- a/src/app/features/test-records/amend/views/test-record/test-record.component.ts +++ b/src/app/features/test-records/amend/views/test-record/test-record.component.ts @@ -3,8 +3,8 @@ import { FormGroup } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { FormNode } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { Roles } from '@models/roles.enum'; import { TestModeEnum } from '@models/test-results/test-result-view.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; diff --git a/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.ts b/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.ts index 8c0dff868..d76958523 100644 --- a/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.ts +++ b/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { FormNode } from '@forms/services/dynamic-form.types'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TestRecordsService } from '@services/test-records/test-records.service'; import { Observable, of, skipWhile, switchMap, take } from 'rxjs'; diff --git a/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts b/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts index f4b6bd5bf..6e6c7eed7 100644 --- a/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts +++ b/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts @@ -10,8 +10,8 @@ import { import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { Roles } from '@models/roles.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; diff --git a/src/app/features/test-records/components/base-test-record/base-test-record.component.ts b/src/app/features/test-records/components/base-test-record/base-test-record.component.ts index 54ff4e0cf..43c5c1eb1 100644 --- a/src/app/features/test-records/components/base-test-record/base-test-record.component.ts +++ b/src/app/features/test-records/components/base-test-record/base-test-record.component.ts @@ -15,8 +15,8 @@ import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/ import { CustomDefectsComponent } from '@forms/custom-sections/custom-defects/custom-defects.component'; import { DefectsComponent } from '@forms/custom-sections/defects/defects.component'; import { RequiredStandardsComponent } from '@forms/custom-sections/required-standards/required-standards.component'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormControl, FormNode } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { Defect } from '@models/defects/defect.model'; import { Roles } from '@models/roles.enum'; import { TestResultStatus } from '@models/test-results/test-result-status.enum'; diff --git a/src/app/features/test-records/components/test-type-select/test-type-select.component.spec.ts b/src/app/features/test-records/components/test-type-select/test-type-select.component.spec.ts index 240dea8a3..9e8c2a206 100644 --- a/src/app/features/test-records/components/test-type-select/test-type-select.component.spec.ts +++ b/src/app/features/test-records/components/test-type-select/test-type-select.component.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { createMockTestTypeCategory } from '@mocks/test-type-category.mock'; import { provideMockStore } from '@ngrx/store/testing'; import { TestTypesService } from '@services/test-types/test-types.service'; diff --git a/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts b/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts index bdb067ec1..e74760049 100644 --- a/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts +++ b/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { TestTypesTaxonomy } from '@api/test-types'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { TEST_TYPES_GROUP7 } from '@forms/models/testTypeId.enum'; +import { TEST_TYPES_GROUP7 } from '@models/testTypeId.enum'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { TestResultStatus } from '@models/test-results/test-result-status.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; diff --git a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts index 027368c62..fa312fc2d 100644 --- a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts +++ b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts @@ -8,10 +8,10 @@ import { UpdateTestResultsService, } from '@api/test-results'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { RoleRequiredDirective } from '@directives/app-role-required.directive'; +import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { AbandonDialogComponent } from '@forms/custom-sections/abandon-dialog/abandon-dialog.component'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { contingencyTestTemplates } from '@forms/templates/test-records/create-master.template'; import { mockTestResult } from '@mocks/mock-test-result'; import { Roles } from '@models/roles.enum'; diff --git a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.ts b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.ts index 0dbec068c..56cfac017 100644 --- a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.ts +++ b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.ts @@ -5,7 +5,7 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { GlobalWarning } from '@core/components/global-warning/global-warning.interface'; import { GlobalWarningService } from '@core/components/global-warning/global-warning.service'; import { AbandonDialogComponent } from '@forms/custom-sections/abandon-dialog/abandon-dialog.component'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TestModeEnum } from '@models/test-results/test-result-view.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TypeOfTest } from '@models/test-results/typeOfTest.enum'; diff --git a/src/app/forms/components/approval-type/approval-type.component.spec.ts b/src/app/forms/components/approval-type/approval-type.component.spec.ts index b3671be13..05e793111 100644 --- a/src/app/forms/components/approval-type/approval-type.component.spec.ts +++ b/src/app/forms/components/approval-type/approval-type.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { initialAppState } from '@store/index'; import { BaseControlComponent } from '../base-control/base-control.component'; diff --git a/src/app/forms/components/approval-type/approval-type.component.ts b/src/app/forms/components/approval-type/approval-type.component.ts index 4d4ae1a8b..479ab68bf 100644 --- a/src/app/forms/components/approval-type/approval-type.component.ts +++ b/src/app/forms/components/approval-type/approval-type.component.ts @@ -11,7 +11,7 @@ import { import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; -import { FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { BehaviorSubject, Observable, Subscription, combineLatest } from 'rxjs'; import { BaseControlComponent } from '../base-control/base-control.component'; diff --git a/src/app/forms/components/autocomplete/autocomplete.component.spec.ts b/src/app/forms/components/autocomplete/autocomplete.component.spec.ts index 4cd953f53..8e9525ed9 100644 --- a/src/app/forms/components/autocomplete/autocomplete.component.spec.ts +++ b/src/app/forms/components/autocomplete/autocomplete.component.spec.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { of } from 'rxjs'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; import { AutocompleteComponent } from './autocomplete.component'; diff --git a/src/app/forms/components/base-control/base-control.component.spec.ts b/src/app/forms/components/base-control/base-control.component.spec.ts index ff05f29a7..713f1bc6c 100644 --- a/src/app/forms/components/base-control/base-control.component.spec.ts +++ b/src/app/forms/components/base-control/base-control.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, NgControl, Validators } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '../../services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from './base-control.component'; describe('BaseControlComponent', () => { diff --git a/src/app/forms/components/base-control/base-control.component.ts b/src/app/forms/components/base-control/base-control.component.ts index 5027f797b..5dac9996c 100644 --- a/src/app/forms/components/base-control/base-control.component.ts +++ b/src/app/forms/components/base-control/base-control.component.ts @@ -8,11 +8,11 @@ import { Input, } from '@angular/core'; import { ControlValueAccessor, NgControl } from '@angular/forms'; -import { PrefixDirective } from '@forms/directives/prefix.directive'; -import { SuffixDirective } from '@forms/directives/suffix.directive'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { PrefixDirective } from '@directives/prefix/prefix.directive'; +import { SuffixDirective } from '@directives/suffix/suffix.directive'; +import { ValidatorNames } from '@models/validators.enum'; // eslint-disable-next-line import/no-cycle -import { CustomControl, FormNodeViewTypes, FormNodeWidth } from '../../services/dynamic-form.types'; +import { CustomControl, FormNodeViewTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { ErrorMessageMap } from '../../utils/error-message-map'; @Component({ diff --git a/src/app/forms/components/checkbox-group/checkbox-group.component.spec.ts b/src/app/forms/components/checkbox-group/checkbox-group.component.spec.ts index 19b676e85..7a183f5fc 100644 --- a/src/app/forms/components/checkbox-group/checkbox-group.component.spec.ts +++ b/src/app/forms/components/checkbox-group/checkbox-group.component.spec.ts @@ -2,8 +2,8 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { MultiOptions } from '../../models/options.model'; -import { CustomFormControl, FormNodeTypes } from '../../services/dynamic-form.types'; +import { MultiOptions } from '@models/options.model'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; import { CheckboxGroupComponent } from './checkbox-group.component'; diff --git a/src/app/forms/components/checkbox-group/checkbox-group.component.ts b/src/app/forms/components/checkbox-group/checkbox-group.component.ts index 00c9982fa..bdaa58745 100644 --- a/src/app/forms/components/checkbox-group/checkbox-group.component.ts +++ b/src/app/forms/components/checkbox-group/checkbox-group.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { FormNodeOption } from '@forms/services/dynamic-form.types'; +import { FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; type OptionsType = string | number | boolean; diff --git a/src/app/forms/components/checkbox/checkbox.component.spec.ts b/src/app/forms/components/checkbox/checkbox.component.spec.ts index 4ff559b98..94f0473f6 100644 --- a/src/app/forms/components/checkbox/checkbox.component.spec.ts +++ b/src/app/forms/components/checkbox/checkbox.component.spec.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { CheckboxComponent } from './checkbox.component'; @Component({ diff --git a/src/app/forms/components/date/date.component.spec.ts b/src/app/forms/components/date/date.component.spec.ts index fdc68ba2d..b08dcee68 100644 --- a/src/app/forms/components/date/date.component.spec.ts +++ b/src/app/forms/components/date/date.component.spec.ts @@ -3,7 +3,7 @@ import { Component, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { initialAppState } from '@store/.'; import { BaseControlComponent } from '../base-control/base-control.component'; diff --git a/src/app/forms/components/date/date.component.ts b/src/app/forms/components/date/date.component.ts index e686f2ce2..954399c49 100644 --- a/src/app/forms/components/date/date.component.ts +++ b/src/app/forms/components/date/date.component.ts @@ -13,7 +13,7 @@ import { } from '@angular/core'; import { AbstractControlDirective, NG_VALUE_ACCESSOR } from '@angular/forms'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { BehaviorSubject, Observable, Subscription, combineLatest } from 'rxjs'; import validateDate from 'validate-govuk-date'; import { DateValidators } from '../../validators/date/date.validators'; diff --git a/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.spec.ts b/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.spec.ts index 6d2aea465..7e76cd5d7 100644 --- a/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.spec.ts +++ b/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; diff --git a/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.ts b/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.ts index 485609cac..c3cdfe4a6 100644 --- a/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.ts +++ b/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.ts @@ -2,8 +2,8 @@ import { KeyValue } from '@angular/common'; import { AfterContentInit, Component, InjectionToken, Injector, Input, OnInit } from '@angular/core'; import { FormGroup, NgControl } from '@angular/forms'; // eslint-disable-next-line import/no-cycle -import { CustomFormControl, FormNodeEditTypes, FormNodeOption } from '@forms/services/dynamic-form.types'; -import { MultiOptionsService } from '@forms/services/multi-options.service'; +import { CustomFormControl, FormNodeEditTypes, FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { Observable, map, of } from 'rxjs'; @Component({ diff --git a/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.spec.ts b/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.spec.ts index a13d9dc03..fe7be6a3f 100644 --- a/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.spec.ts +++ b/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.spec.ts @@ -9,8 +9,8 @@ import { TestStationsService } from '@services/test-stations/test-stations.servi import { UserService } from '@services/user-service/user-service'; import { initialAppState } from '@store/.'; import { DynamicFormsModule } from '../../dynamic-forms.module'; -import { DynamicFormService } from '../../services/dynamic-form.service'; -import { FormNode, FormNodeTypes, FormNodeViewTypes } from '../../services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { DynamicFormGroupComponent } from './dynamic-form-group.component'; describe('DynamicFormGroupComponent', () => { diff --git a/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.ts b/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.ts index 4989d18fb..d2d076d9b 100644 --- a/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.ts +++ b/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.ts @@ -11,14 +11,14 @@ import { } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { Subject, debounceTime, takeUntil } from 'rxjs'; -import { DynamicFormService } from '../../services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormArray, CustomFormGroup, FormNode, FormNodeTypes, FormNodeViewTypes, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; @Component({ selector: 'app-dynamic-form-group', diff --git a/src/app/forms/components/number-input/number-input.component.spec.ts b/src/app/forms/components/number-input/number-input.component.spec.ts index e75b95bb9..35b7b5fef 100644 --- a/src/app/forms/components/number-input/number-input.component.spec.ts +++ b/src/app/forms/components/number-input/number-input.component.spec.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '../../services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; import { FieldWarningMessageComponent } from '../field-warning-message/field-warning-message.component'; diff --git a/src/app/forms/components/radio-group/radio-group.component.spec.ts b/src/app/forms/components/radio-group/radio-group.component.spec.ts index bda7a4d03..30be982cc 100644 --- a/src/app/forms/components/radio-group/radio-group.component.spec.ts +++ b/src/app/forms/components/radio-group/radio-group.component.spec.ts @@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser'; import { provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { initialAppState } from '@store/.'; -import { CustomFormControl, FormNodeOption, FormNodeTypes } from '../../services/dynamic-form.types'; +import { CustomFormControl, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; import { RadioGroupComponent } from './radio-group.component'; diff --git a/src/app/forms/components/radio-group/radio-group.component.ts b/src/app/forms/components/radio-group/radio-group.component.ts index eb8873fd8..4c901b2ef 100644 --- a/src/app/forms/components/radio-group/radio-group.component.ts +++ b/src/app/forms/components/radio-group/radio-group.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { FormNodeOption } from '@forms/services/dynamic-form.types'; +import { FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; @Component({ diff --git a/src/app/forms/components/read-only/read-only.component.spec.ts b/src/app/forms/components/read-only/read-only.component.spec.ts index ec72b6c37..70bf5f054 100644 --- a/src/app/forms/components/read-only/read-only.component.spec.ts +++ b/src/app/forms/components/read-only/read-only.component.spec.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { SharedModule } from '@shared/shared.module'; import { BaseControlComponent } from '../base-control/base-control.component'; import { ReadOnlyComponent } from './read-only.component'; diff --git a/src/app/forms/components/select/select.component.spec.ts b/src/app/forms/components/select/select.component.spec.ts index 5d599a204..b6134d163 100644 --- a/src/app/forms/components/select/select.component.spec.ts +++ b/src/app/forms/components/select/select.component.spec.ts @@ -2,7 +2,7 @@ import { Component, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { CustomFormControl, FormNodeOption, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; diff --git a/src/app/forms/components/select/select.component.ts b/src/app/forms/components/select/select.component.ts index 290e91da2..a02352109 100644 --- a/src/app/forms/components/select/select.component.ts +++ b/src/app/forms/components/select/select.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { FormNodeOption } from '@forms/services/dynamic-form.types'; +import { FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; @Component({ diff --git a/src/app/forms/components/suggestive-input/suggestive-input.component.spec.ts b/src/app/forms/components/suggestive-input/suggestive-input.component.spec.ts index ad3775512..d86d365b3 100644 --- a/src/app/forms/components/suggestive-input/suggestive-input.component.spec.ts +++ b/src/app/forms/components/suggestive-input/suggestive-input.component.spec.ts @@ -2,8 +2,8 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { MultiOption } from '@forms/models/options.model'; -import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { MultiOption } from '@models/options.model'; +import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { Observable, of } from 'rxjs'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; import { SuggestiveInputComponent } from './suggestive-input.component'; diff --git a/src/app/forms/components/suggestive-input/suggestive-input.component.ts b/src/app/forms/components/suggestive-input/suggestive-input.component.ts index ee36c0ce7..98d91b36d 100644 --- a/src/app/forms/components/suggestive-input/suggestive-input.component.ts +++ b/src/app/forms/components/suggestive-input/suggestive-input.component.ts @@ -1,6 +1,6 @@ import { AfterContentInit, ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { MultiOption } from '@forms/models/options.model'; +import { MultiOption } from '@models/options.model'; import { CustomValidators } from '@forms/validators/custom-validators'; import { Observable, firstValueFrom, skipWhile, take } from 'rxjs'; import { BaseControlComponent } from '../base-control/base-control.component'; diff --git a/src/app/forms/components/switchable-input/switchable-input.component.spec.ts b/src/app/forms/components/switchable-input/switchable-input.component.spec.ts index ee1328e75..1db818fd9 100644 --- a/src/app/forms/components/switchable-input/switchable-input.component.spec.ts +++ b/src/app/forms/components/switchable-input/switchable-input.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { SuffixDirective } from '@forms/directives/suffix.directive'; -import { CustomFormControl, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { SuffixDirective } from '@directives/suffix/suffix.directive'; +import { CustomFormControl, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { AutocompleteComponent } from '../autocomplete/autocomplete.component'; import { DateComponent } from '../date/date.component'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; diff --git a/src/app/forms/components/switchable-input/switchable-input.component.ts b/src/app/forms/components/switchable-input/switchable-input.component.ts index 921060ab5..f86eb7331 100644 --- a/src/app/forms/components/switchable-input/switchable-input.component.ts +++ b/src/app/forms/components/switchable-input/switchable-input.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MultiOptions } from '@forms/models/options.model'; -import { FormNodeEditTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { MultiOptions } from '@models/options.model'; +import { FormNodeEditTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { Observable, of } from 'rxjs'; @Component({ diff --git a/src/app/forms/components/text-area/text-area.component.spec.ts b/src/app/forms/components/text-area/text-area.component.spec.ts index 6bca85037..8c1c7bd91 100644 --- a/src/app/forms/components/text-area/text-area.component.spec.ts +++ b/src/app/forms/components/text-area/text-area.component.spec.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '../../services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TextAreaComponent } from './text-area.component'; @Component({ diff --git a/src/app/forms/components/text-area/text-area.component.ts b/src/app/forms/components/text-area/text-area.component.ts index cd6f5ab68..77d99ec9c 100644 --- a/src/app/forms/components/text-area/text-area.component.ts +++ b/src/app/forms/components/text-area/text-area.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { BaseControlComponent } from '../base-control/base-control.component'; @Component({ diff --git a/src/app/forms/components/text-input/text-input.component.spec.ts b/src/app/forms/components/text-input/text-input.component.spec.ts index 8294e04e9..7d77732b4 100644 --- a/src/app/forms/components/text-input/text-input.component.spec.ts +++ b/src/app/forms/components/text-input/text-input.component.spec.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '../../services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TextInputComponent } from './text-input.component'; @Component({ diff --git a/src/app/forms/components/view-combination/view-combination.component.spec.ts b/src/app/forms/components/view-combination/view-combination.component.spec.ts index 9c0238efa..b130e5184 100644 --- a/src/app/forms/components/view-combination/view-combination.component.spec.ts +++ b/src/app/forms/components/view-combination/view-combination.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { SharedModule } from '@shared/shared.module'; -import { CustomFormControl, FormNode, FormNodeTypes } from '../../services/dynamic-form.types'; +import { CustomFormControl, FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ViewCombinationComponent } from './view-combination.component'; describe('ViewCombinationComponent', () => { diff --git a/src/app/forms/components/view-combination/view-combination.component.ts b/src/app/forms/components/view-combination/view-combination.component.ts index b6cedb56e..12ab54c17 100644 --- a/src/app/forms/components/view-combination/view-combination.component.ts +++ b/src/app/forms/components/view-combination/view-combination.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { CustomFormControl, FormNode, FormNodeCombinationOptions } from '../../services/dynamic-form.types'; +import { CustomFormControl, FormNode, FormNodeCombinationOptions } from '@services/dynamic-forms/dynamic-form.types'; @Component({ selector: '[app-view-combination]', diff --git a/src/app/forms/components/view-list-item/view-list-item.component.spec.ts b/src/app/forms/components/view-list-item/view-list-item.component.spec.ts index f60934808..ada937591 100644 --- a/src/app/forms/components/view-list-item/view-list-item.component.spec.ts +++ b/src/app/forms/components/view-list-item/view-list-item.component.spec.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '../../services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ViewListItemComponent } from './view-list-item.component'; @Component({ diff --git a/src/app/forms/components/view-list-item/view-list-item.component.ts b/src/app/forms/components/view-list-item/view-list-item.component.ts index bac47102d..3e766eb88 100644 --- a/src/app/forms/components/view-list-item/view-list-item.component.ts +++ b/src/app/forms/components/view-list-item/view-list-item.component.ts @@ -1,6 +1,6 @@ import { Component, Injector } from '@angular/core'; import { NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; -import { FormNodeViewTypes } from '../../services/dynamic-form.types'; +import { FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; @Component({ diff --git a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.spec.ts b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.spec.ts index 266da1ad8..773549fae 100644 --- a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.spec.ts +++ b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.spec.ts @@ -2,9 +2,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { SPECIALIST_TEST_TYPE_IDS, TEST_TYPES_GROUP5_13 } from '@forms/models/testTypeId.enum'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +import { SPECIALIST_TEST_TYPE_IDS, TEST_TYPES_GROUP5_13 } from '@models/testTypeId.enum'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { provideMockStore } from '@ngrx/store/testing'; diff --git a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts index a7d10cb5b..9677ec977 100644 --- a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts +++ b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { TEST_TYPES_GROUP5_13 } from '@forms/models/testTypeId.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +import { TEST_TYPES_GROUP5_13 } from '@models/testTypeId.enum'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TestRecordsService } from '@services/test-records/test-records.service'; diff --git a/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts b/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts index b65f75355..07f28b943 100644 --- a/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts +++ b/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { AdditionalExaminerNotes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { BaseControlComponent } from '@forms/components/base-control/base-control.component'; -import { CustomControl, CustomFormControl } from '@forms/services/dynamic-form.types'; +import { CustomControl, CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { ReasonForEditing } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; diff --git a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts index fb57508ff..4930b2099 100644 --- a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { mockVehicleTechnicalRecord } from '@mocks/mock-vehicle-technical-record.mock'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { provideMockStore } from '@ngrx/store/testing'; diff --git a/src/app/forms/custom-sections/adr-new-certificate-required-view/adr-new-certificate-required-view.component.spec.ts b/src/app/forms/custom-sections/adr-new-certificate-required-view/adr-new-certificate-required-view.component.spec.ts index 1b81207b1..2a2921275 100644 --- a/src/app/forms/custom-sections/adr-new-certificate-required-view/adr-new-certificate-required-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-new-certificate-required-view/adr-new-certificate-required-view.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { SharedModule } from '@shared/shared.module'; import { State, initialAppState } from '@store/index'; diff --git a/src/app/forms/custom-sections/adr-tank-details-initial-inspection-view/adr-tank-details-initial-inspection-view.component.spec.ts b/src/app/forms/custom-sections/adr-tank-details-initial-inspection-view/adr-tank-details-initial-inspection-view.component.spec.ts index 095c294d9..81c6d8e57 100644 --- a/src/app/forms/custom-sections/adr-tank-details-initial-inspection-view/adr-tank-details-initial-inspection-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-details-initial-inspection-view/adr-tank-details-initial-inspection-view.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsInitialInspectionViewComponent } from './adr-tank-details-initial-inspection-view.component'; diff --git a/src/app/forms/custom-sections/adr-tank-details-m145-view/adr-tank-details-m145-view.component.spec.ts b/src/app/forms/custom-sections/adr-tank-details-m145-view/adr-tank-details-m145-view.component.spec.ts index d57f55483..b5efa1812 100644 --- a/src/app/forms/custom-sections/adr-tank-details-m145-view/adr-tank-details-m145-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-details-m145-view/adr-tank-details-m145-view.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, NG_VALUE_ACCESSOR, NgControl, ReactiveFormsModule } from '@angular/forms'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsM145ViewComponent } from './adr-tank-details-m145-view.component'; diff --git a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.spec.ts b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.spec.ts index b5788ad7d..a6cc92931 100644 --- a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.spec.ts @@ -12,7 +12,7 @@ import { CustomFormGroup, FormNodeTypes, FormNodeViewTypes, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsSubsequentInspectionsEditComponent } from './adr-tank-details-subsequent-inspections-edit.component'; diff --git a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.ts b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.ts index afed41635..a48d3018d 100644 --- a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.ts +++ b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.ts @@ -1,14 +1,14 @@ import { AfterContentInit, Component, OnDestroy, OnInit } from '@angular/core'; import { FormArray, NG_VALUE_ACCESSOR, Validators } from '@angular/forms'; import { TC3Types } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tc3Types.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { CustomFormControl, CustomFormGroup, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { CustomValidators } from '@forms/validators/custom-validators'; import { ReplaySubject, takeUntil } from 'rxjs'; diff --git a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component.spec.ts b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component.spec.ts index 69f7ebd74..915addffc 100644 --- a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, NG_VALUE_ACCESSOR, NgControl, ReactiveFormsModule } from '@angular/forms'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsSubsequentInspectionsViewComponent } from './adr-tank-details-subsequent-inspections-view.component'; diff --git a/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.spec.ts b/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.spec.ts index 8c9281728..59182e03e 100644 --- a/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.spec.ts @@ -4,7 +4,7 @@ import { FormBuilder, FormControl, FormGroup, NG_VALUE_ACCESSOR, NgControl } fro import { GlobalWarningService } from '@core/components/global-warning/global-warning.service'; import { FORM_INJECTION_TOKEN } from '@forms/components/dynamic-form-field/dynamic-form-field.component'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { SharedModule } from '@shared/shared.module'; import { initialAppState } from '@store/index'; diff --git a/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.ts b/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.ts index fc1572a6f..f88e2307b 100644 --- a/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.ts +++ b/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, inject } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { Subject, takeUntil } from 'rxjs'; import { CustomFormControlComponent } from '../custom-form-control/custom-form-control.component'; diff --git a/src/app/forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component.spec.ts b/src/app/forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component.spec.ts index 98d641953..5487086c1 100644 --- a/src/app/forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { SharedModule } from '@shared/shared.module'; import { State, initialAppState } from '@store/index'; diff --git a/src/app/forms/custom-sections/adr/adr.component.ts b/src/app/forms/custom-sections/adr/adr.component.ts index 18c1101dc..8bac7b0f0 100644 --- a/src/app/forms/custom-sections/adr/adr.component.ts +++ b/src/app/forms/custom-sections/adr/adr.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType as TechRecordTypeVerb } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNode } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { AdrTemplate } from '@forms/templates/general/adr.template'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; diff --git a/src/app/forms/custom-sections/approval-type/approval-type.component.ts b/src/app/forms/custom-sections/approval-type/approval-type.component.ts index 1a00f4992..f1df3ec25 100644 --- a/src/app/forms/custom-sections/approval-type/approval-type.component.ts +++ b/src/app/forms/custom-sections/approval-type/approval-type.component.ts @@ -4,14 +4,14 @@ import { TechRecord } from '@api/vehicle'; import { ApprovalType as approvalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { ApprovalType as approvalTypeHgvOrPsv } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalTypeHgvOrPsv.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { HgvAndTrlTypeApprovalTemplate } from '@forms/templates/general/approval-type.template'; import { PsvTypeApprovalTemplate } from '@forms/templates/psv/psv-approval-type.template'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; diff --git a/src/app/forms/custom-sections/body/body.component.spec.ts b/src/app/forms/custom-sections/body/body.component.spec.ts index ebd9fcd41..16ffd4da1 100644 --- a/src/app/forms/custom-sections/body/body.component.spec.ts +++ b/src/app/forms/custom-sections/body/body.component.spec.ts @@ -3,14 +3,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { MultiOptionsService } from '@forms/services/multi-options.service'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { initialAppState } from '@store/index'; import { SimpleChanges } from '@angular/core'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { FormNodeEditTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { FormNodeEditTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { HgvAndTrlBodyTemplate } from '@forms/templates/general/hgv-trl-body.template'; import { PsvBodyTemplate } from '@forms/templates/psv/psv-body.template'; import { createMockHgv } from '@mocks/hgv-record.mock'; diff --git a/src/app/forms/custom-sections/body/body.component.ts b/src/app/forms/custom-sections/body/body.component.ts index 4f847f17c..64f302d2e 100644 --- a/src/app/forms/custom-sections/body/body.component.ts +++ b/src/app/forms/custom-sections/body/body.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { TechRecordType as TechRecordVehicleType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { MultiOptions } from '@forms/models/options.model'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; -import { MultiOptionsService } from '@forms/services/multi-options.service'; +import { MultiOptions } from '@models/options.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { HgvAndTrlBodyTemplate } from '@forms/templates/general/hgv-trl-body.template'; import { PsvBodyTemplate } from '@forms/templates/psv/psv-body.template'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; diff --git a/src/app/forms/custom-sections/custom-defect/custom-defect.component.ts b/src/app/forms/custom-sections/custom-defect/custom-defect.component.ts index 255faab4b..a78fe7e4a 100644 --- a/src/app/forms/custom-sections/custom-defect/custom-defect.component.ts +++ b/src/app/forms/custom-sections/custom-defect/custom-defect.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { CustomFormGroup } from '@forms/services/dynamic-form.types'; +import { CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; @Component({ selector: 'app-custom-defect[index][form]', diff --git a/src/app/forms/custom-sections/custom-defects/custom-defects.component.spec.ts b/src/app/forms/custom-sections/custom-defects/custom-defects.component.spec.ts index 9c8e35ab4..45fb2b4f5 100644 --- a/src/app/forms/custom-sections/custom-defects/custom-defects.component.spec.ts +++ b/src/app/forms/custom-sections/custom-defects/custom-defects.component.spec.ts @@ -4,8 +4,8 @@ import { ComponentFixture, TestBed, inject } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; import { CustomDefectComponent } from '../custom-defect/custom-defect.component'; import { CustomDefectsComponent } from './custom-defects.component'; diff --git a/src/app/forms/custom-sections/custom-defects/custom-defects.component.ts b/src/app/forms/custom-sections/custom-defects/custom-defects.component.ts index f8a254efb..18628ed3d 100644 --- a/src/app/forms/custom-sections/custom-defects/custom-defects.component.ts +++ b/src/app/forms/custom-sections/custom-defects/custom-defects.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { CustomDefect, CustomDefects } from '@api/test-results'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { Subscription } from 'rxjs'; @Component({ diff --git a/src/app/forms/custom-sections/custom-form-control/custom-form-control.component.ts b/src/app/forms/custom-sections/custom-form-control/custom-form-control.component.ts index 284fb8c15..38ae8d21f 100644 --- a/src/app/forms/custom-sections/custom-form-control/custom-form-control.component.ts +++ b/src/app/forms/custom-sections/custom-form-control/custom-form-control.component.ts @@ -3,7 +3,7 @@ import { Component } from '@angular/core'; import { FormGroup, NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; import { BaseControlComponent } from '@forms/components/base-control/base-control.component'; import { FORM_INJECTION_TOKEN } from '@forms/components/dynamic-form-field/dynamic-form-field.component'; -import { CustomControl } from '@forms/services/dynamic-form.types'; +import { CustomControl } from '@services/dynamic-forms/dynamic-form.types'; @Component({ selector: 'app-custom-form-control', diff --git a/src/app/forms/custom-sections/defect/defect.component.ts b/src/app/forms/custom-sections/defect/defect.component.ts index 270dee2d2..fde032eb8 100644 --- a/src/app/forms/custom-sections/defect/defect.component.ts +++ b/src/app/forms/custom-sections/defect/defect.component.ts @@ -3,8 +3,8 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNodeOption } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; import { DefectsTpl } from '@forms/templates/general/defect.template'; import { AdditionalInfoSection } from '@models/defects/additional-information.model'; import { Defect } from '@models/defects/defect.model'; diff --git a/src/app/forms/custom-sections/defects/defects.component.spec.ts b/src/app/forms/custom-sections/defects/defects.component.spec.ts index 57ecf9db3..abfe5adbd 100644 --- a/src/app/forms/custom-sections/defects/defects.component.spec.ts +++ b/src/app/forms/custom-sections/defects/defects.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { provideMockStore } from '@ngrx/store/testing'; import { ButtonComponent } from '@shared/components/button/button.component'; import { TagComponent } from '@shared/components/tag/tag.component'; diff --git a/src/app/forms/custom-sections/defects/defects.component.ts b/src/app/forms/custom-sections/defects/defects.component.ts index 6aa682007..b88f3090d 100644 --- a/src/app/forms/custom-sections/defects/defects.component.ts +++ b/src/app/forms/custom-sections/defects/defects.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { Defect } from '@models/defects/defect.model'; import { TestResultDefect } from '@models/test-results/test-result-defect.model'; import { TestResultModel } from '@models/test-results/test-result.model'; diff --git a/src/app/forms/custom-sections/dimensions/dimensions.component.ts b/src/app/forms/custom-sections/dimensions/dimensions.component.ts index 79dc58a25..1156dde57 100644 --- a/src/app/forms/custom-sections/dimensions/dimensions.component.ts +++ b/src/app/forms/custom-sections/dimensions/dimensions.component.ts @@ -1,13 +1,13 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormArray, CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { HgvDimensionsTemplate } from '@forms/templates/hgv/hgv-dimensions.template'; import { PsvDimensionsTemplate } from '@forms/templates/psv/psv-dimensions.template'; import { TrlDimensionsTemplate } from '@forms/templates/trl/trl-dimensions.template'; diff --git a/src/app/forms/custom-sections/letters/letters.component.ts b/src/app/forms/custom-sections/letters/letters.component.ts index ceb21c8d6..28e2be392 100644 --- a/src/app/forms/custom-sections/letters/letters.component.ts +++ b/src/app/forms/custom-sections/letters/letters.component.ts @@ -6,8 +6,8 @@ import { TechRecordSearchSchema } from '@dvsa/cvs-type-definitions/types/v3/tech import { ParagraphIds } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/trl/complete'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType as TechRecordTypeVehicleVerb } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNodeEditTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { LettersTemplate } from '@forms/templates/general/letters.template'; import { Roles } from '@models/roles.enum'; import { LettersIntoAuthApprovalType, LettersOfAuth, StatusCodes } from '@models/vehicle-tech-record.model'; diff --git a/src/app/forms/custom-sections/modified-weights/modified-weights.component.ts b/src/app/forms/custom-sections/modified-weights/modified-weights.component.ts index 10d73cb45..f24c08179 100644 --- a/src/app/forms/custom-sections/modified-weights/modified-weights.component.ts +++ b/src/app/forms/custom-sections/modified-weights/modified-weights.component.ts @@ -4,7 +4,7 @@ import { TechRecordGETPSV, TechRecordGETTRL, } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { FormNode } from '@forms/services/dynamic-form.types'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { vehicleTemplateMap } from '@forms/utils/tech-record-constants'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; diff --git a/src/app/forms/custom-sections/plates/plates.component.spec.ts b/src/app/forms/custom-sections/plates/plates.component.spec.ts index ff51aa45a..c76f983f9 100644 --- a/src/app/forms/custom-sections/plates/plates.component.spec.ts +++ b/src/app/forms/custom-sections/plates/plates.component.spec.ts @@ -7,7 +7,7 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { hgvRequiredFields } from '@forms/models/plateRequiredFields.model'; +import { hgvRequiredFields } from '@models/plateRequiredFields.model'; import { Roles } from '@models/roles.enum'; import { VehicleConfigurations } from '@models/vehicle-tech-record.model'; import { StoreModule } from '@ngrx/store'; diff --git a/src/app/forms/custom-sections/plates/plates.component.ts b/src/app/forms/custom-sections/plates/plates.component.ts index b76a8969e..29bb00a95 100644 --- a/src/app/forms/custom-sections/plates/plates.component.ts +++ b/src/app/forms/custom-sections/plates/plates.component.ts @@ -5,9 +5,9 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { HGVPlates } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete'; import { TRLPlates } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/trl/complete'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { hgvRequiredFields, trlRequiredFields, tyreRequiredFields } from '@forms/models/plateRequiredFields.model'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNodeEditTypes } from '@forms/services/dynamic-form.types'; +import { hgvRequiredFields, trlRequiredFields, tyreRequiredFields } from '@models/plateRequiredFields.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { PlatesTemplate } from '@forms/templates/general/plates.template'; import { Roles } from '@models/roles.enum'; import { Axle, StatusCodes } from '@models/vehicle-tech-record.model'; diff --git a/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.spec.ts b/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.spec.ts index 9be07a56a..52280e193 100644 --- a/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.spec.ts +++ b/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.spec.ts @@ -7,7 +7,7 @@ import { TechRecordType, } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { MultiOptionsService } from '@forms/services/multi-options.service'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { mockVehicleTechnicalRecord } from '@mocks/mock-vehicle-technical-record.mock'; import { provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; diff --git a/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.ts b/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.ts index cfc142c26..6bd882c4f 100644 --- a/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.ts +++ b/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { FormArray, FormGroup } from '@angular/forms'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { MultiOptions } from '@forms/models/options.model'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; -import { MultiOptionsService } from '@forms/services/multi-options.service'; +import { MultiOptions } from '@models/options.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { PsvBrakesTemplate } from '@forms/templates/psv/psv-brakes.template'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { Brake, ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/custom-sections/required-standard/required-standard.component.spec.ts b/src/app/forms/custom-sections/required-standard/required-standard.component.spec.ts index d8b0e9ed9..238bd4d63 100644 --- a/src/app/forms/custom-sections/required-standard/required-standard.component.spec.ts +++ b/src/app/forms/custom-sections/required-standard/required-standard.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { mockTestResult } from '@mocks/mock-test-result'; import { INSPECTION_TYPE, TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; diff --git a/src/app/forms/custom-sections/required-standard/required-standard.component.ts b/src/app/forms/custom-sections/required-standard/required-standard.component.ts index 4d8f11297..10fcc9180 100644 --- a/src/app/forms/custom-sections/required-standard/required-standard.component.ts +++ b/src/app/forms/custom-sections/required-standard/required-standard.component.ts @@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; import { RequiredStandardsTpl } from '@forms/templates/general/required-standards.template'; import { INSPECTION_TYPE, TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts b/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts index 74a5ec555..1bc6313a7 100644 --- a/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts +++ b/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts @@ -6,7 +6,7 @@ import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { provideMockStore } from '@ngrx/store/testing'; import { ButtonComponent } from '@shared/components/button/button.component'; import { TagComponent } from '@shared/components/tag/tag.component'; diff --git a/src/app/forms/custom-sections/required-standards/required-standards.component.ts b/src/app/forms/custom-sections/required-standards/required-standards.component.ts index e2c34e3a1..91c210a8a 100644 --- a/src/app/forms/custom-sections/required-standards/required-standards.component.ts +++ b/src/app/forms/custom-sections/required-standards/required-standards.component.ts @@ -2,8 +2,8 @@ import { ViewportScroller } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/forms/custom-sections/trl-brakes/trl-brakes.component.ts b/src/app/forms/custom-sections/trl-brakes/trl-brakes.component.ts index 4e7bdb361..3a3c0f58c 100644 --- a/src/app/forms/custom-sections/trl-brakes/trl-brakes.component.ts +++ b/src/app/forms/custom-sections/trl-brakes/trl-brakes.component.ts @@ -1,9 +1,9 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { FormArray, FormGroup } from '@angular/forms'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { MultiOptions } from '@forms/models/options.model'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormGroup, FormNodeEditTypes } from '@forms/services/dynamic-form.types'; +import { MultiOptions } from '@models/options.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TrlBrakesTemplate } from '@forms/templates/trl/trl-brakes.template'; import { Subject, debounceTime, takeUntil } from 'rxjs'; diff --git a/src/app/forms/custom-sections/tyres/tyres.component.ts b/src/app/forms/custom-sections/tyres/tyres.component.ts index 03c7108d1..8dbffdb7c 100644 --- a/src/app/forms/custom-sections/tyres/tyres.component.ts +++ b/src/app/forms/custom-sections/tyres/tyres.component.ts @@ -4,15 +4,15 @@ import { ActivatedRoute, Router } from '@angular/router'; import { TyreUseCode as HgvTyreUseCode } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tyreUseCodeHgv.enum.js'; import { TyreUseCode as TrlTyreUseCode } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tyreUseCodeTrl.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { MultiOptions } from '@forms/models/options.model'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { MultiOptions } from '@models/options.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormArray, CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { tyresTemplateHgv } from '@forms/templates/hgv/hgv-tyres.template'; import { PsvTyresTemplate } from '@forms/templates/psv/psv-tyres.template'; import { tyresTemplateTrl } from '@forms/templates/trl/trl-tyres.template'; diff --git a/src/app/forms/custom-sections/weights/weights.component.ts b/src/app/forms/custom-sections/weights/weights.component.ts index 954b552da..b8431d321 100644 --- a/src/app/forms/custom-sections/weights/weights.component.ts +++ b/src/app/forms/custom-sections/weights/weights.component.ts @@ -1,8 +1,8 @@ /* eslint-disable no-underscore-dangle */ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode, FormNodeEditTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNode, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { HgvWeight } from '@forms/templates/hgv/hgv-weight.template'; import { PsvWeightsTemplate } from '@forms/templates/psv/psv-weight.template'; import { TrlWeight } from '@forms/templates/trl/trl-weight.template'; diff --git a/src/app/forms/dynamic-forms.module.ts b/src/app/forms/dynamic-forms.module.ts index ad435ca70..069d3fed4 100644 --- a/src/app/forms/dynamic-forms.module.ts +++ b/src/app/forms/dynamic-forms.module.ts @@ -58,12 +58,12 @@ import { RequiredStandardsComponent } from './custom-sections/required-standards import { TrlBrakesComponent } from './custom-sections/trl-brakes/trl-brakes.component'; import { TyresComponent } from './custom-sections/tyres/tyres.component'; import { WeightsComponent } from './custom-sections/weights/weights.component'; -import { NoSpaceDirective } from './directives/app-no-space.directive'; -import { NumberOnlyDirective } from './directives/app-number-only.directive'; -import { ToUppercaseDirective } from './directives/app-to-uppercase.directive'; -import { TrimWhitespaceDirective } from './directives/app-trim-whitespace.directive'; -import { PrefixDirective } from './directives/prefix.directive'; -import { SuffixDirective } from './directives/suffix.directive'; +import { NoSpaceDirective } from '@directives/app-no-space/app-no-space.directive'; +import { NumberOnlyDirective } from '@directives/app-number-only/app-number-only.directive'; +import { ToUppercaseDirective } from '@directives/app-to-uppercase/app-to-uppercase.directive'; +import { TrimWhitespaceDirective } from '@directives/app-trim-whitespace/app-trim-whitespace.directive'; +import { PrefixDirective } from '@directives/prefix/prefix.directive'; +import { SuffixDirective } from '@directives/suffix/suffix.directive'; @NgModule({ declarations: [ diff --git a/src/app/forms/templates/car/car-tech-record.template.ts b/src/app/forms/templates/car/car-tech-record.template.ts index fa57a0c0c..17830c62b 100644 --- a/src/app/forms/templates/car/car-tech-record.template.ts +++ b/src/app/forms/templates/car/car-tech-record.template.ts @@ -1,6 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, @@ -8,7 +8,7 @@ import { FormNodeViewTypes, FormNodeWidth, TagTypeLabels, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { TagType } from '@shared/components/tag/tag.component'; diff --git a/src/app/forms/templates/general/adr-certificate.template.ts b/src/app/forms/templates/general/adr-certificate.template.ts index 97842c5a0..d6d7d9baf 100644 --- a/src/app/forms/templates/general/adr-certificate.template.ts +++ b/src/app/forms/templates/general/adr-certificate.template.ts @@ -1,5 +1,5 @@ import { AdrCertificateHistoryComponent } from '@forms/custom-sections/adr-certificate-history/adr-certificate-history.component'; -import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const AdrCertificateTemplate: FormNode = { name: 'adrCertificateSection', diff --git a/src/app/forms/templates/general/adr-summary.template.ts b/src/app/forms/templates/general/adr-summary.template.ts index 3f8ea2bc4..28da9a2a9 100644 --- a/src/app/forms/templates/general/adr-summary.template.ts +++ b/src/app/forms/templates/general/adr-summary.template.ts @@ -13,7 +13,7 @@ import { AdrTankDetailsSubsequentInspectionsEditComponent } from '@forms/custom- import { AdrTankDetailsSubsequentInspectionsViewComponent } from '@forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component'; import { AdrTankStatementUnNumberEditComponent } from '@forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component'; import { AdrTankStatementUnNumberViewComponent } from '@forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TC2Types } from '@models/adr.enum'; import { @@ -22,7 +22,7 @@ import { FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const AdrSummaryTemplate: FormNode = { name: 'adrSection', diff --git a/src/app/forms/templates/general/adr.template.ts b/src/app/forms/templates/general/adr.template.ts index d3c153d77..8cb8e749a 100644 --- a/src/app/forms/templates/general/adr.template.ts +++ b/src/app/forms/templates/general/adr.template.ts @@ -13,7 +13,7 @@ import { AdrTankDetailsSubsequentInspectionsEditComponent } from '@forms/custom- import { AdrTankDetailsSubsequentInspectionsViewComponent } from '@forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component'; import { AdrTankStatementUnNumberEditComponent } from '@forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component'; import { AdrTankStatementUnNumberViewComponent } from '@forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { AdrValidators } from '@forms/validators/adr/adr.validators'; import { TC2Types } from '@models/adr.enum'; @@ -23,7 +23,7 @@ import { FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const AdrTemplate: FormNode = { name: 'adrSection', diff --git a/src/app/forms/templates/general/applicant-details.template.ts b/src/app/forms/templates/general/applicant-details.template.ts index 7601205ed..5a903810b 100644 --- a/src/app/forms/templates/general/applicant-details.template.ts +++ b/src/app/forms/templates/general/applicant-details.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeTypes, FormNodeWidth } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; export const ApplicantDetails: FormNode = { name: 'techRecord', diff --git a/src/app/forms/templates/general/approval-type.template.ts b/src/app/forms/templates/general/approval-type.template.ts index e14850585..9d185b7f7 100644 --- a/src/app/forms/templates/general/approval-type.template.ts +++ b/src/app/forms/templates/general/approval-type.template.ts @@ -1,5 +1,5 @@ import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TagType } from '@shared/components/tag/tag.component'; import { @@ -8,7 +8,7 @@ import { FormNodeTypes, FormNodeWidth, TagTypeLabels, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const HgvAndTrlTypeApprovalTemplate: FormNode = { name: 'approvalSection', diff --git a/src/app/forms/templates/general/audit.template.ts b/src/app/forms/templates/general/audit.template.ts index 4e0449c7b..88fde4cfb 100644 --- a/src/app/forms/templates/general/audit.template.ts +++ b/src/app/forms/templates/general/audit.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const Audit: FormNode = { name: 'audit', diff --git a/src/app/forms/templates/general/defect.template.ts b/src/app/forms/templates/general/defect.template.ts index 2b4684d18..f5e0db080 100644 --- a/src/app/forms/templates/general/defect.template.ts +++ b/src/app/forms/templates/general/defect.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const DefectsTpl: FormNode = { name: 'defects', diff --git a/src/app/forms/templates/general/document-types.ts b/src/app/forms/templates/general/document-types.ts index 4dbffe83b..6acd5e801 100644 --- a/src/app/forms/templates/general/document-types.ts +++ b/src/app/forms/templates/general/document-types.ts @@ -1,4 +1,4 @@ -import { FormNodeOption } from '@forms/services/dynamic-form.types'; +import { FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; export const DOCUMENT_TYPES: FormNodeOption[] = [ { diff --git a/src/app/forms/templates/general/documents.template.ts b/src/app/forms/templates/general/documents.template.ts index a3cd51d7f..206e9be51 100644 --- a/src/app/forms/templates/general/documents.template.ts +++ b/src/app/forms/templates/general/documents.template.ts @@ -1,6 +1,6 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { DOCUMENT_TYPES } from '@forms/templates/general/document-types'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '../../services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const DocumentsTemplate: FormNode = { name: 'documentsSection', diff --git a/src/app/forms/templates/general/hgv-trl-body.template.ts b/src/app/forms/templates/general/hgv-trl-body.template.ts index a22b12d78..0d5ef308f 100644 --- a/src/app/forms/templates/general/hgv-trl-body.template.ts +++ b/src/app/forms/templates/general/hgv-trl-body.template.ts @@ -1,5 +1,5 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, @@ -8,7 +8,7 @@ import { FormNodeViewTypes, FormNodeWidth, TagTypeLabels, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const HgvAndTrlBodyTemplate: FormNode = { name: 'bodySection', diff --git a/src/app/forms/templates/general/letter-types.ts b/src/app/forms/templates/general/letter-types.ts index 655c3d66e..f3280943d 100644 --- a/src/app/forms/templates/general/letter-types.ts +++ b/src/app/forms/templates/general/letter-types.ts @@ -1,4 +1,4 @@ -import { FormNodeOption } from '@forms/services/dynamic-form.types'; +import { FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; export const LETTER_TYPES: FormNodeOption[] = [ { diff --git a/src/app/forms/templates/general/letters.template.ts b/src/app/forms/templates/general/letters.template.ts index bfb8e5bbe..3fed08340 100644 --- a/src/app/forms/templates/general/letters.template.ts +++ b/src/app/forms/templates/general/letters.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeTypes, FormNodeViewTypes } from '../../services/dynamic-form.types'; +import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { LETTER_TYPES } from './letter-types'; export const LettersTemplate: FormNode = { diff --git a/src/app/forms/templates/general/manufacturer.template.ts b/src/app/forms/templates/general/manufacturer.template.ts index 1631c1dee..e05c3fd71 100644 --- a/src/app/forms/templates/general/manufacturer.template.ts +++ b/src/app/forms/templates/general/manufacturer.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; export const ManufacturerTemplate: FormNode = { name: 'manufacturerSection', diff --git a/src/app/forms/templates/general/notes.template.ts b/src/app/forms/templates/general/notes.template.ts index 877fff80a..b3791067e 100644 --- a/src/app/forms/templates/general/notes.template.ts +++ b/src/app/forms/templates/general/notes.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const NotesTemplate: FormNode = { name: 'notesSection', diff --git a/src/app/forms/templates/general/plates.template.ts b/src/app/forms/templates/general/plates.template.ts index 0d007a066..e4e2f977b 100644 --- a/src/app/forms/templates/general/plates.template.ts +++ b/src/app/forms/templates/general/plates.template.ts @@ -1,6 +1,6 @@ import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { PlateReasonForIssue } from '@models/vehicle-tech-record.model'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '../../services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; export const PlatesTemplate: FormNode = { name: 'platesSection', diff --git a/src/app/forms/templates/general/reason-for-creation.template.ts b/src/app/forms/templates/general/reason-for-creation.template.ts index 88bf70cd3..3ee673fc9 100644 --- a/src/app/forms/templates/general/reason-for-creation.template.ts +++ b/src/app/forms/templates/general/reason-for-creation.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, TagTypeLabels, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { TagType } from '@shared/components/tag/tag.component'; export const TechRecordReasonForCreationSection: FormNode = { diff --git a/src/app/forms/templates/general/required-standards.template.ts b/src/app/forms/templates/general/required-standards.template.ts index dcb9bda82..39ec121ed 100644 --- a/src/app/forms/templates/general/required-standards.template.ts +++ b/src/app/forms/templates/general/required-standards.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const RequiredStandardsTpl: FormNode = { name: 'requiredStandards', diff --git a/src/app/forms/templates/hgv/hgv-dimensions.template.ts b/src/app/forms/templates/hgv/hgv-dimensions.template.ts index e65329446..1f0e276e4 100644 --- a/src/app/forms/templates/hgv/hgv-dimensions.template.ts +++ b/src/app/forms/templates/hgv/hgv-dimensions.template.ts @@ -1,6 +1,6 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { TagType } from '@shared/components/tag/tag.component'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '../../services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '@services/dynamic-forms/dynamic-form.types'; export const HgvDimensionsTemplate: FormNode = { name: 'dimensionsSection', diff --git a/src/app/forms/templates/hgv/hgv-tech-record.template.ts b/src/app/forms/templates/hgv/hgv-tech-record.template.ts index 33cf2e8a8..60264420b 100644 --- a/src/app/forms/templates/hgv/hgv-tech-record.template.ts +++ b/src/app/forms/templates/hgv/hgv-tech-record.template.ts @@ -1,6 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategoryHgv.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { EmissionStandard } from '@models/test-types/emissions.enum'; import { FuelTypes } from '@models/vehicle-tech-record.model'; @@ -12,7 +12,7 @@ import { FormNodeViewTypes, FormNodeWidth, TagTypeLabels, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const HgvTechRecord: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/hgv/hgv-tyres.template.ts b/src/app/forms/templates/hgv/hgv-tyres.template.ts index 70664e3d2..7ad2d0706 100644 --- a/src/app/forms/templates/hgv/hgv-tyres.template.ts +++ b/src/app/forms/templates/hgv/hgv-tyres.template.ts @@ -1,12 +1,12 @@ import { TyreUseCode } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tyreUseCodeHgv.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeWidth, TagTypeLabels, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TagType } from '@shared/components/tag/tag.component'; diff --git a/src/app/forms/templates/hgv/hgv-weight.template.ts b/src/app/forms/templates/hgv/hgv-weight.template.ts index 9fa08e91d..f3b21a0de 100644 --- a/src/app/forms/templates/hgv/hgv-weight.template.ts +++ b/src/app/forms/templates/hgv/hgv-weight.template.ts @@ -1,6 +1,6 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { TagType } from '@shared/components/tag/tag.component'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '../../services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '@services/dynamic-forms/dynamic-form.types'; const requiredValidation = [ { name: ValidatorNames.Numeric, args: 99999 }, diff --git a/src/app/forms/templates/lgv/lgv-tech-record.template.ts b/src/app/forms/templates/lgv/lgv-tech-record.template.ts index 657f282f8..813a5b9b6 100644 --- a/src/app/forms/templates/lgv/lgv-tech-record.template.ts +++ b/src/app/forms/templates/lgv/lgv-tech-record.template.ts @@ -1,6 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, @@ -8,7 +8,7 @@ import { FormNodeViewTypes, FormNodeWidth, TagTypeLabels, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { TagType } from '@shared/components/tag/tag.component'; diff --git a/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts b/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts index d17d4a31f..742b8505a 100644 --- a/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts +++ b/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts @@ -1,6 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, @@ -8,7 +8,7 @@ import { FormNodeViewTypes, FormNodeWidth, TagTypeLabels, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TagType } from '@shared/components/tag/tag.component'; diff --git a/src/app/forms/templates/psv/psv-approval-type.template.ts b/src/app/forms/templates/psv/psv-approval-type.template.ts index 53e053b6f..b367e984d 100644 --- a/src/app/forms/templates/psv/psv-approval-type.template.ts +++ b/src/app/forms/templates/psv/psv-approval-type.template.ts @@ -1,5 +1,5 @@ import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { FormNode, @@ -7,7 +7,7 @@ import { FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const PsvTypeApprovalTemplate: FormNode = { name: 'approvalSection', diff --git a/src/app/forms/templates/psv/psv-body.template.ts b/src/app/forms/templates/psv/psv-body.template.ts index 3e9451eac..05c710c2c 100644 --- a/src/app/forms/templates/psv/psv-body.template.ts +++ b/src/app/forms/templates/psv/psv-body.template.ts @@ -1,4 +1,4 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, @@ -6,7 +6,7 @@ import { FormNodeTypes, FormNodeWidth, TagTypeLabels, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const PsvBodyTemplate: FormNode = { name: 'bodySection', diff --git a/src/app/forms/templates/psv/psv-brakes.template.ts b/src/app/forms/templates/psv/psv-brakes.template.ts index ce7ecfdf1..7cb14574e 100644 --- a/src/app/forms/templates/psv/psv-brakes.template.ts +++ b/src/app/forms/templates/psv/psv-brakes.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const PsvBrakesTemplate: FormNode = { name: 'psvBrakesSection', diff --git a/src/app/forms/templates/psv/psv-dda.template.ts b/src/app/forms/templates/psv/psv-dda.template.ts index 943ddfa05..12a16658b 100644 --- a/src/app/forms/templates/psv/psv-dda.template.ts +++ b/src/app/forms/templates/psv/psv-dda.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const PsvDdaTemplate: FormNode = { name: 'dda', diff --git a/src/app/forms/templates/psv/psv-dimensions.template.ts b/src/app/forms/templates/psv/psv-dimensions.template.ts index 2fad617a7..1145eeb50 100644 --- a/src/app/forms/templates/psv/psv-dimensions.template.ts +++ b/src/app/forms/templates/psv/psv-dimensions.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const PsvDimensionsTemplate: FormNode = { name: 'dimensionsSection', diff --git a/src/app/forms/templates/psv/psv-notes.template.ts b/src/app/forms/templates/psv/psv-notes.template.ts index dfce3af85..52b318d53 100644 --- a/src/app/forms/templates/psv/psv-notes.template.ts +++ b/src/app/forms/templates/psv/psv-notes.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const PsvNotes: FormNode = { name: 'notesSection', diff --git a/src/app/forms/templates/psv/psv-tech-record.template.ts b/src/app/forms/templates/psv/psv-tech-record.template.ts index 4232786c7..e2f115603 100644 --- a/src/app/forms/templates/psv/psv-tech-record.template.ts +++ b/src/app/forms/templates/psv/psv-tech-record.template.ts @@ -1,6 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategoryPsv.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { EmissionStandard } from '@models/test-types/emissions.enum'; import { VehicleSize } from '@models/vehicle-size.enum'; @@ -13,7 +13,7 @@ import { FormNodeViewTypes, FormNodeWidth, TagTypeLabels, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const PsvTechRecord: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/psv/psv-tyres.template.ts b/src/app/forms/templates/psv/psv-tyres.template.ts index 7fcb0a696..e59afa3fd 100644 --- a/src/app/forms/templates/psv/psv-tyres.template.ts +++ b/src/app/forms/templates/psv/psv-tyres.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const PsvTyresTemplate: FormNode = { name: 'tyreSection', diff --git a/src/app/forms/templates/psv/psv-weight.template.ts b/src/app/forms/templates/psv/psv-weight.template.ts index 2fdcca4cc..c33b1a7e6 100644 --- a/src/app/forms/templates/psv/psv-weight.template.ts +++ b/src/app/forms/templates/psv/psv-weight.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; const requiredValidation = [ { name: ValidatorNames.Numeric, args: 99999 }, diff --git a/src/app/forms/templates/search/single-search-result.template.ts b/src/app/forms/templates/search/single-search-result.template.ts index 9ea4bb66a..6244eb3b0 100644 --- a/src/app/forms/templates/search/single-search-result.template.ts +++ b/src/app/forms/templates/search/single-search-result.template.ts @@ -1,6 +1,6 @@ import { Params } from '@angular/router'; -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeTypes, FormNodeViewTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export function createSingleSearchResult( systemNumber: string, diff --git a/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts b/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts index fddd9ead0..f8ec277e5 100644 --- a/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts +++ b/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts @@ -1,6 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, @@ -8,7 +8,7 @@ import { FormNodeViewTypes, FormNodeWidth, TagTypeLabels, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { TagType } from '@shared/components/tag/tag.component'; diff --git a/src/app/forms/templates/tech-records/vehicle-summary.template.ts b/src/app/forms/templates/tech-records/vehicle-summary.template.ts index 5ce6be3ef..3993b4f38 100644 --- a/src/app/forms/templates/tech-records/vehicle-summary.template.ts +++ b/src/app/forms/templates/tech-records/vehicle-summary.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const VehicleSummary: FormNode = { name: 'vehicleSummary', diff --git a/src/app/forms/templates/test-records/create-master.template.ts b/src/app/forms/templates/test-records/create-master.template.ts index af7c51f37..e3b08852a 100644 --- a/src/app/forms/templates/test-records/create-master.template.ts +++ b/src/app/forms/templates/test-records/create-master.template.ts @@ -1,5 +1,5 @@ -import { TEST_TYPES } from '@forms/models/testTypeId.enum'; -import { FormNode } from '@forms/services/dynamic-form.types'; +import { TEST_TYPES } from '@models/testTypeId.enum'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { DefectsTpl } from '../general/defect.template'; import { RequiredStandardsTpl } from '../general/required-standards.template'; diff --git a/src/app/forms/templates/test-records/master.template.ts b/src/app/forms/templates/test-records/master.template.ts index d137a8617..f3d45270e 100644 --- a/src/app/forms/templates/test-records/master.template.ts +++ b/src/app/forms/templates/test-records/master.template.ts @@ -1,5 +1,5 @@ -import { TEST_TYPES } from '@forms/models/testTypeId.enum'; -import { FormNode } from '@forms/services/dynamic-form.types'; +import { TEST_TYPES } from '@models/testTypeId.enum'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { DefectsTpl } from '../general/defect.template'; import { RequiredStandardsTpl } from '../general/required-standards.template'; diff --git a/src/app/forms/templates/test-records/section-templates/additionalDefects/additional-defects-section.template.ts b/src/app/forms/templates/test-records/section-templates/additionalDefects/additional-defects-section.template.ts index 809de0aa3..0c81e2deb 100644 --- a/src/app/forms/templates/test-records/section-templates/additionalDefects/additional-defects-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/additionalDefects/additional-defects-section.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const AdditionalDefectsSection: FormNode = { name: 'additionalDefectsSection', diff --git a/src/app/forms/templates/test-records/section-templates/customDefects/custom-defects-section.template.ts b/src/app/forms/templates/test-records/section-templates/customDefects/custom-defects-section.template.ts index 830080d06..500c5837e 100644 --- a/src/app/forms/templates/test-records/section-templates/customDefects/custom-defects-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/customDefects/custom-defects-section.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeTypes, FormNodeWidth } from '@forms/services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; export const CustomDefectsSection: FormNode = { name: 'customDefectsSection', diff --git a/src/app/forms/templates/test-records/section-templates/emissions/desk-based-emissions-section.template.ts b/src/app/forms/templates/test-records/section-templates/emissions/desk-based-emissions-section.template.ts index 8668a118f..d4dda6a06 100644 --- a/src/app/forms/templates/test-records/section-templates/emissions/desk-based-emissions-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/emissions/desk-based-emissions-section.template.ts @@ -1,6 +1,6 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { EmissionStandard } from '@models/test-types/emissions.enum'; diff --git a/src/app/forms/templates/test-records/section-templates/emissions/emissions-section.template.ts b/src/app/forms/templates/test-records/section-templates/emissions/emissions-section.template.ts index 77b3a33b5..327e9e205 100644 --- a/src/app/forms/templates/test-records/section-templates/emissions/emissions-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/emissions/emissions-section.template.ts @@ -1,6 +1,6 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { EmissionStandard } from '@models/test-types/emissions.enum'; diff --git a/src/app/forms/templates/test-records/section-templates/notes/adr-notes-section.template.ts b/src/app/forms/templates/test-records/section-templates/notes/adr-notes-section.template.ts index 5d9fdacf6..032502b54 100644 --- a/src/app/forms/templates/test-records/section-templates/notes/adr-notes-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/notes/adr-notes-section.template.ts @@ -1,6 +1,6 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; -import { CustomFormControl, FormNode, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; +import { CustomFormControl, FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { Store, select } from '@ngrx/store'; import { State } from '@store/index'; diff --git a/src/app/forms/templates/test-records/section-templates/notes/notes-section.template.ts b/src/app/forms/templates/test-records/section-templates/notes/notes-section.template.ts index 0253c707c..5ab00edf2 100644 --- a/src/app/forms/templates/test-records/section-templates/notes/notes-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/notes/notes-section.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const NotesSection: FormNode = { name: 'notesSection', diff --git a/src/app/forms/templates/test-records/section-templates/reasonForCreation/reasonForCreation.template.ts b/src/app/forms/templates/test-records/section-templates/reasonForCreation/reasonForCreation.template.ts index fa7669e89..fb70e35c7 100644 --- a/src/app/forms/templates/test-records/section-templates/reasonForCreation/reasonForCreation.template.ts +++ b/src/app/forms/templates/test-records/section-templates/reasonForCreation/reasonForCreation.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const reasonForCreationSection: FormNode = { name: 'reasonForCreationSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-hgv-trl.template.ts b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-hgv-trl.template.ts index 5172a8b32..36ccbda82 100644 --- a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-hgv-trl.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-hgv-trl.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const CreateRequiredSectionHgvTrl: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-lgv-car.template.ts b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-lgv-car.template.ts index 1782b0978..3fe4473fe 100644 --- a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-lgv-car.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-lgv-car.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const CreateRequiredSectionLgvCar: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-motorcycle.template.ts b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-motorcycle.template.ts index ffc717355..e07d0a033 100644 --- a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-motorcycle.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-motorcycle.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const CreateRequiredSectionMotorcycle: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section.template.ts index 553a9ab81..057e9ec29 100644 --- a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const CreateRequiredSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/custom-defects-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/custom-defects-hidden-section.template.ts index c2520add4..ca119f8ce 100644 --- a/src/app/forms/templates/test-records/section-templates/required/custom-defects-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/custom-defects-hidden-section.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const CustomDefectsHiddenSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/defect-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/defect-hidden-section.template.ts index 840d86c20..1ec695f32 100644 --- a/src/app/forms/templates/test-records/section-templates/required/defect-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/defect-hidden-section.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const defectsHiddenSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-lgv.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-lgv.template.ts index dd14878fc..8d60f325b 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-lgv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-lgv.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredHiddenSectionGroup4And5Lgv: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle-amend.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle-amend.template.ts index 2f7725dbf..d3d68ad40 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle-amend.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle-amend.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const AmendDeskBasedRequiredHiddenSectionGroup4Motorcyle: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle.template.ts index 04b613f05..cb2022ec5 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredHiddenSectionGroup4Motorcyle: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group5-lgv.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group5-lgv.template.ts index fe89b9d19..948086e17 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group5-lgv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group5-lgv.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredHiddenSectionGroup5Lgv: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-hgv-trl.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-hgv-trl.template.ts index 0ba707c9a..3eec2c87c 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-hgv-trl.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-hgv-trl.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredSectionHgvTrl: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-psv.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-psv.template.ts index 8ee62b9e7..866cccb89 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-psv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-psv.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredSectionPsv: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-section-group4-amend.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-section-group4-amend.template.ts index ff767ab95..961695f2c 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-section-group4-amend.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-section-group4-amend.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const AmendDeskBasedRequiredHiddenSectionGroup4: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/required-hidden-section-hgv-trl.template.ts b/src/app/forms/templates/test-records/section-templates/required/required-hidden-section-hgv-trl.template.ts index a70c28ad2..12007d7cd 100644 --- a/src/app/forms/templates/test-records/section-templates/required/required-hidden-section-hgv-trl.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/required-hidden-section-hgv-trl.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const RequiredSectionHGVTRL: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/required-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/required-hidden-section.template.ts index 38f517026..21da93095 100644 --- a/src/app/forms/templates/test-records/section-templates/required/required-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/required-hidden-section.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const RequiredSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/seatbelt-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/seatbelt-hidden-section.template.ts index 13669f33f..62d20ae70 100644 --- a/src/app/forms/templates/test-records/section-templates/required/seatbelt-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/seatbelt-hidden-section.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const SeatbeltHiddenSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-hgv-trl.template.ts b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-hgv-trl.template.ts index 952d73d7e..6fb46763e 100644 --- a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-hgv-trl.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-hgv-trl.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const SpecialistRequiredSectionHGVTRL: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-lgv-car.template.ts b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-lgv-car.template.ts index 67253a0b3..c34191bf8 100644 --- a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-lgv-car.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-lgv-car.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const SpecialistRequiredSectionLgvCarSmallTrl: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-motorcycle.template.ts b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-motorcycle.template.ts index 1e3cd6ad7..643556e47 100644 --- a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-motorcycle.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-motorcycle.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const RequiredSpecialistSectionMotorcycle: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section.template.ts index 9cfb6fe24..4a437d0e8 100644 --- a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section.template.ts @@ -1,4 +1,4 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@forms/services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const RequiredSpecialistSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/seatbelt/seatbelt-section.template.ts b/src/app/forms/templates/test-records/section-templates/seatbelt/seatbelt-section.template.ts index 4f20ce2fe..40fa14582 100644 --- a/src/app/forms/templates/test-records/section-templates/seatbelt/seatbelt-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/seatbelt/seatbelt-section.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const SeatbeltSection: FormNode = { name: 'seatbeltSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group1.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group1.template.ts index 1b6ae39ce..d112b5eaa 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group1.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group1.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup1: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group12and14.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group12and14.template.ts index ce0bb27e9..4f6c574ff 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group12and14.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group12and14.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup12and14: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group15and16.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group15and16.template.ts index b0c30a31a..4fc3101b3 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group15and16.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group15and16.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup15and16: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group3And4And8.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group3And4And8.template.ts index ae79b30ac..fbb491dbe 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group3And4And8.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group3And4And8.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup3And4And8: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group5And13.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group5And13.template.ts index 512e57aed..7ac7cecd4 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group5And13.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group5And13.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup5And13: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group6And11.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group6And11.template.ts index edae8e876..31e4f6cb6 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group6And11.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group6And11.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup6And11: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group7.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group7.template.ts index 4b5f02ff7..eb6faff39 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group7.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group7.template.ts @@ -1,13 +1,13 @@ import { ContingencyAdrGenerateCertComponent } from '@forms/components/contingency-adr-generate-cert/contingency-adr-generate-cert.component'; -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup7: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group8Notifiable.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group8Notifiable.template.ts index d3eff21dc..472457cf1 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group8Notifiable.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group8Notifiable.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup8Notifiable: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group9And10.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group9And10.template.ts index 481994a6b..a2f94b6b0 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group9And10.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group9And10.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup9And10: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group9And10CentralDocs.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group9And10CentralDocs.template.ts index ef825e6eb..0a11d5f40 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group9And10CentralDocs.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-group9And10CentralDocs.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionGroup9And10CentralDocs: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group1.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group1.template.ts index c057b0871..d27033951 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group1.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group1.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { TEST_TYPES_GROUP1_SPEC_TEST } from '@forms/models/testTypeId.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { TEST_TYPES_GROUP1_SPEC_TEST } from '@models/testTypeId.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionSpecialistGroup1: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group2.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group2.template.ts index c170f9462..b23e6c74f 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group2.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group2.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionSpecialistGroup2: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group3And4.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group3And4.template.ts index 6fe6638d6..092f14884 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group3And4.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group3And4.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionSpecialistGroup3And4: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group5.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group5.template.ts index f88e62215..daaa05b3a 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group5.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/contingency-test-section-specialist-group5.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { TEST_TYPES_GROUP5_SPEC_TEST } from '@forms/models/testTypeId.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const ContingencyTestSectionSpecialistGroup5: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/old-contingency-specialist-group1.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/old-contingency-specialist-group1.template.ts index 69942f4ea..325e8a91d 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/old-contingency-specialist-group1.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/old-contingency-specialist-group1.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const OldIVAContingencyTestSectionSpecialistGroup1: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/contingency/old-contingency-specialist-group5.template.ts b/src/app/forms/templates/test-records/section-templates/test/contingency/old-contingency-specialist-group5.template.ts index dea912e76..51093503a 100644 --- a/src/app/forms/templates/test-records/section-templates/test/contingency/old-contingency-specialist-group5.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/contingency/old-contingency-specialist-group5.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const OldIVAContingencyTestSectionSpecialistGroup5: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group1-PSV.template.ts b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group1-PSV.template.ts index b7f14c607..7f5faa9ad 100644 --- a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group1-PSV.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group1-PSV.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedTestSectionGroup1Psv: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group1And4-HGV-TRL.template.ts b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group1And4-HGV-TRL.template.ts index be890a4ba..37dd52231 100644 --- a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group1And4-HGV-TRL.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group1And4-HGV-TRL.template.ts @@ -4,7 +4,7 @@ import { FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedTestSectionGroup1And4HgvTrl: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group2.template.ts b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group2.template.ts index 7b4f52935..ea30c4ca3 100644 --- a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group2.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group2.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedTestSectionGroup2And5: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group3.template.ts b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group3.template.ts index 0694519ab..7246b79f1 100644 --- a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group3.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group3.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedTestSectionGroup3: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group4-PSV.template.ts b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group4-PSV.template.ts index c3409ef04..eef61e6a6 100644 --- a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group4-PSV.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group4-PSV.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedTestSectionGroup4Psv: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group4-lgv-template.ts b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group4-lgv-template.ts index 63a8e2fc8..74ba5b117 100644 --- a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group4-lgv-template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group4-lgv-template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedTestSectionGroup4LgvCarMotorcycle: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group5-LGV.ts b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group5-LGV.ts index c3b1b468b..aa245510f 100644 --- a/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group5-LGV.ts +++ b/src/app/forms/templates/test-records/section-templates/test/desk-based/desk-based-test-section-group5-LGV.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedTestSectionLgvGroup5: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group1.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group1.template.ts index e9b3a4c0d..8dc3a7da7 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group1.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group1.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const OldIVASpecialistTestSectionGroup1: FormNode = { diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group5.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group5.template.ts index 21e58b9b1..757832d11 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group5.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group5.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const OldIVASpecialistTestSectionGroup5: FormNode = { diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group1.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group1.template.ts index 579f6349d..af33f598b 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group1.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group1.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { TEST_TYPES_GROUP1_SPEC_TEST } from '@forms/models/testTypeId.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { TEST_TYPES_GROUP1_SPEC_TEST } from '@models/testTypeId.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const SpecialistTestSectionGroup1: FormNode = { diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group2.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group2.template.ts index 58774d1f8..7f37b902a 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group2.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group2.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const SpecialistTestSectionGroup2: FormNode = { diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3.template.ts index fcd6b8c29..be03dca73 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const SpecialistTestSectionGroup3: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3And4.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3And4.template.ts index 3d1fd3963..aac7ceb49 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3And4.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3And4.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const SpecialistTestSectionGroup3And4: FormNode = { diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group5.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group5.template.ts index 3be0910d7..68e7b59ab 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group5.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group5.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { TEST_TYPES_GROUP5_SPEC_TEST } from '@forms/models/testTypeId.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const SpecialistTestSectionGroup5: FormNode = { diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group1.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group1.template.ts index 93ea50f50..868820323 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group1.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group1.template.ts @@ -1,12 +1,12 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup1: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group12And14.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group12And14.template.ts index 9d351798d..c63cfe448 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group12And14.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group12And14.template.ts @@ -1,12 +1,12 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup12And14: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group15And16.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group15And16.template.ts index 9f67630e1..f53fcac15 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group15And16.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group15And16.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup15And16: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group2.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group2.template.ts index ead79f0fc..7ccced7eb 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group2.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group2.template.ts @@ -1,12 +1,12 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup2: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group3And4And8.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group3And4And8.template.ts index 6c1341a7f..ddceec927 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group3And4And8.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group3And4And8.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup3And4And8: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group5And13.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group5And13.template.ts index d354eca3d..f384d27ec 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group5And13.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group5And13.template.ts @@ -1,12 +1,12 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const TestSectionGroup5And13: FormNode = { diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group6And11.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group6And11.template.ts index ffe0286d4..86f0a9171 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group6And11.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group6And11.template.ts @@ -1,12 +1,12 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup6And11: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group7.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group7.template.ts index 660820ac4..f9349a165 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group7.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group7.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup7: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group8Notifiable.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group8Notifiable.template.ts index 5606f71cc..057a5eb9c 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group8Notifiable.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group8Notifiable.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup8Notifiable: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group9And10.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group9And10.template.ts index 04b6a0b31..40a7470b2 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group9And10.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group9And10.template.ts @@ -1,12 +1,12 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup9And10: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group9And10CentralDocs.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group9And10CentralDocs.template.ts index 51bbe40a0..0dabf86c8 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group9And10CentralDocs.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group9And10CentralDocs.template.ts @@ -1,12 +1,12 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export const TestSectionGroup9And10CentralDocs: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section.template.ts index c6b43f12a..426e3a14b 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section.template.ts @@ -1,11 +1,11 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const TestSection: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/amend-iva-msva-psv-hgv-light.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/amend-iva-msva-psv-hgv-light.template.ts index 8f5f769a5..3ad675c18 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/amend-iva-msva-psv-hgv-light.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/amend-iva-msva-psv-hgv-light.template.ts @@ -1,12 +1,12 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-psv-hgv-light-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-psv-hgv-light-vehicle-section.template.ts index faf6aff75..790c231af 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-psv-hgv-light-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-psv-hgv-light-vehicle-section.template.ts @@ -1,13 +1,13 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-trl-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-trl-vehicle-section.template.ts index 16c7844e8..ac67b26bc 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-trl-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-trl-vehicle-section.template.ts @@ -1,13 +1,13 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-iva-msva-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-iva-msva-vehicle-section.template.ts index 9ab2a2455..b9f15bcbc 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-iva-msva-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-iva-msva-vehicle-section.template.ts @@ -1,13 +1,13 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/default-psv-hgv-light-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/default-psv-hgv-light-vehicle-section.template.ts index 5fd370085..2c0c6927e 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/default-psv-hgv-light-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/default-psv-hgv-light-vehicle-section.template.ts @@ -1,12 +1,12 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/default-trl-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/default-trl-vehicle-section.template.ts index a6ca32a54..1e42922b7 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/default-trl-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/default-trl-vehicle-section.template.ts @@ -1,12 +1,12 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-psv-hgv-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-psv-hgv-vehicle-section.template.ts index 8d07aefd3..8798691f3 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-psv-hgv-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-psv-hgv-vehicle-section.template.ts @@ -1,12 +1,12 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-trl-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-trl-vehicle-section.template.ts index 34257dcfd..c024b46a7 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-trl-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-trl-vehicle-section.template.ts @@ -1,12 +1,12 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-test-hgv-vehicle-section-group1And2And4.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-test-hgv-vehicle-section-group1And2And4.template.ts index 849f44117..c8a06e760 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-test-hgv-vehicle-section-group1And2And4.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-test-hgv-vehicle-section-group1And2And4.template.ts @@ -1,12 +1,12 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group4-lgv.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group4-lgv.template.ts index 07a058157..774043ab6 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group4-lgv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group4-lgv.template.ts @@ -1,12 +1,12 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group5-lgv.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group5-lgv.template.ts index bccfc1242..c9804b04e 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group5-lgv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group5-lgv.template.ts @@ -5,7 +5,7 @@ import { FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/group-3-light-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/group-3-light-vehicle-section.template.ts index b0e9330be..79d6f36be 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/group-3-light-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/group-3-light-vehicle-section.template.ts @@ -1,12 +1,12 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ReferenceDataResourceType } from '@models/reference-data.model'; diff --git a/src/app/forms/templates/test-records/section-templates/visit/contingency-visit-section.template.ts b/src/app/forms/templates/test-records/section-templates/visit/contingency-visit-section.template.ts index da90c13b3..495e94813 100644 --- a/src/app/forms/templates/test-records/section-templates/visit/contingency-visit-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/visit/contingency-visit-section.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const ContingencyVisitSection: FormNode = { diff --git a/src/app/forms/templates/test-records/section-templates/visit/visit-section.template.ts b/src/app/forms/templates/test-records/section-templates/visit/visit-section.template.ts index d525947a3..2a095976b 100644 --- a/src/app/forms/templates/test-records/section-templates/visit/visit-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/visit/visit-section.template.ts @@ -1,13 +1,13 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes, FormNodeWidth, -} from '@forms/services/dynamic-form.types'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +} from '@services/dynamic-forms/dynamic-form.types'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { ReferenceDataResourceType } from '@models/reference-data.model'; export const VisitSection: FormNode = { diff --git a/src/app/forms/templates/trl/trl-auth-into-service.template.ts b/src/app/forms/templates/trl/trl-auth-into-service.template.ts index 35d8550f8..3264ae402 100644 --- a/src/app/forms/templates/trl/trl-auth-into-service.template.ts +++ b/src/app/forms/templates/trl/trl-auth-into-service.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; export const TrlAuthIntoServiceTemplate: FormNode = { name: 'authorizationIntoServiceSection', diff --git a/src/app/forms/templates/trl/trl-brakes.template.ts b/src/app/forms/templates/trl/trl-brakes.template.ts index 11e33a81b..0eba5ec55 100644 --- a/src/app/forms/templates/trl/trl-brakes.template.ts +++ b/src/app/forms/templates/trl/trl-brakes.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const TrlBrakesTemplate: FormNode = { name: 'trlBrakesSection', diff --git a/src/app/forms/templates/trl/trl-dimensions.template.ts b/src/app/forms/templates/trl/trl-dimensions.template.ts index ca46759d4..073c8a72f 100644 --- a/src/app/forms/templates/trl/trl-dimensions.template.ts +++ b/src/app/forms/templates/trl/trl-dimensions.template.ts @@ -1,6 +1,6 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { TagType } from '@shared/components/tag/tag.component'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '../../services/dynamic-form.types'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '@services/dynamic-forms/dynamic-form.types'; export const TrlDimensionsTemplate: FormNode = { name: 'dimensionsSection', diff --git a/src/app/forms/templates/trl/trl-purchaser.template.ts b/src/app/forms/templates/trl/trl-purchaser.template.ts index b33f96414..d9d221944 100644 --- a/src/app/forms/templates/trl/trl-purchaser.template.ts +++ b/src/app/forms/templates/trl/trl-purchaser.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; export const TrlPurchasers: FormNode = { name: 'purchaserSection', diff --git a/src/app/forms/templates/trl/trl-tech-record.template.ts b/src/app/forms/templates/trl/trl-tech-record.template.ts index 95d578d5a..e4e6cc342 100644 --- a/src/app/forms/templates/trl/trl-tech-record.template.ts +++ b/src/app/forms/templates/trl/trl-tech-record.template.ts @@ -1,6 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationTrl.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { CouplingTypeOptions } from '@models/coupling-type-enum'; import { FrameDescriptions } from '@models/vehicle-tech-record.model'; @@ -12,7 +12,7 @@ import { FormNodeViewTypes, FormNodeWidth, TagTypeLabels, -} from '../../services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; export const TrlTechRecordTemplate: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/trl/trl-tyres.template.ts b/src/app/forms/templates/trl/trl-tyres.template.ts index 96d7d8a4c..a836a3077 100644 --- a/src/app/forms/templates/trl/trl-tyres.template.ts +++ b/src/app/forms/templates/trl/trl-tyres.template.ts @@ -1,12 +1,12 @@ import { TyreUseCode } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tyreUseCodeTrl.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeWidth, TagTypeLabels, -} from '@forms/services/dynamic-form.types'; +} from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TagType } from '@shared/components/tag/tag.component'; diff --git a/src/app/forms/templates/trl/trl-weight.template.ts b/src/app/forms/templates/trl/trl-weight.template.ts index 5db450a1a..e73d00c94 100644 --- a/src/app/forms/templates/trl/trl-weight.template.ts +++ b/src/app/forms/templates/trl/trl-weight.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@forms/models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes } from '../../services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; const requiredValidation = [ { name: ValidatorNames.Numeric, args: 99999 }, diff --git a/src/app/forms/utils/enum-map.ts b/src/app/forms/utils/enum-map.ts index d58ac8ff1..0e60d14c8 100644 --- a/src/app/forms/utils/enum-map.ts +++ b/src/app/forms/utils/enum-map.ts @@ -1,4 +1,4 @@ -import { MultiOptions } from '@forms/models/options.model'; +import { MultiOptions } from '@models/options.model'; export function getOptionsFromEnum(object: object): MultiOptions { // eslint-disable-next-line @typescript-eslint/restrict-plus-operands diff --git a/src/app/forms/utils/error-message-map.spec.ts b/src/app/forms/utils/error-message-map.spec.ts index 2be790f88..abe2114ae 100644 --- a/src/app/forms/utils/error-message-map.spec.ts +++ b/src/app/forms/utils/error-message-map.spec.ts @@ -1,5 +1,5 @@ -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { ErrorMessageMap } from './error-message-map'; describe('ErrorMessageMap', () => { diff --git a/src/app/forms/utils/error-message-map.ts b/src/app/forms/utils/error-message-map.ts index 9f301062a..76732a52c 100644 --- a/src/app/forms/utils/error-message-map.ts +++ b/src/app/forms/utils/error-message-map.ts @@ -1,6 +1,6 @@ import { formatDate } from '@angular/common'; -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; const DEFAULT_LABEL = 'This field'; export const ErrorMessageMap: Record = { diff --git a/src/app/forms/utils/tech-record-constants.ts b/src/app/forms/utils/tech-record-constants.ts index dacd898c4..dd05b3046 100644 --- a/src/app/forms/utils/tech-record-constants.ts +++ b/src/app/forms/utils/tech-record-constants.ts @@ -1,4 +1,4 @@ -import { FormNode } from '@forms/services/dynamic-form.types'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { CarTechRecord } from '@forms/templates/car/car-tech-record.template'; import { ApplicantDetails } from '@forms/templates/general/applicant-details.template'; import { HgvAndTrlTypeApprovalTemplate } from '@forms/templates/general/approval-type.template'; diff --git a/src/app/forms/validators/adr/adr.validators.spec.ts b/src/app/forms/validators/adr/adr.validators.spec.ts index f1831beda..d8027b7b5 100644 --- a/src/app/forms/validators/adr/adr.validators.spec.ts +++ b/src/app/forms/validators/adr/adr.validators.spec.ts @@ -1,4 +1,4 @@ -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { AdrValidators } from './adr.validators'; describe('ADR Validators', () => { diff --git a/src/app/forms/validators/adr/adr.validators.ts b/src/app/forms/validators/adr/adr.validators.ts index c6440d1db..2851a031a 100644 --- a/src/app/forms/validators/adr/adr.validators.ts +++ b/src/app/forms/validators/adr/adr.validators.ts @@ -1,5 +1,5 @@ import { ValidationErrors } from '@angular/forms'; -import { CustomFormControl } from '@forms/services/dynamic-form.types'; +import { CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; export class AdrValidators { static validateProductListRefNo = (control: CustomFormControl): ValidationErrors | null => { diff --git a/src/app/forms/validators/custom-async-validators.spec.ts b/src/app/forms/validators/custom-async-validators.spec.ts index 5208b7a64..a25806f85 100644 --- a/src/app/forms/validators/custom-async-validators.spec.ts +++ b/src/app/forms/validators/custom-async-validators.spec.ts @@ -1,8 +1,8 @@ import { TestBed } from '@angular/core/testing'; import { AbstractControl, FormGroup, ValidationErrors } from '@angular/forms'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { operatorEnum } from '@forms/models/condition.model'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { operatorEnum } from '@models/condition.model'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { createMockCustomDefect } from '@mocks/custom-defect.mock'; import { mockTestResult } from '@mocks/mock-test-result'; import { TestResultModel } from '@models/test-results/test-result.model'; diff --git a/src/app/forms/validators/custom-async-validators.ts b/src/app/forms/validators/custom-async-validators.ts index 228338da9..00ddf5c33 100644 --- a/src/app/forms/validators/custom-async-validators.ts +++ b/src/app/forms/validators/custom-async-validators.ts @@ -1,7 +1,7 @@ import { AbstractControl, AsyncValidatorFn, ValidationErrors, Validators } from '@angular/forms'; -import { Condition, operatorEnum } from '@forms/models/condition.model'; +import { Condition, operatorEnum } from '@models/condition.model'; // eslint-disable-next-line import/no-cycle -import { CustomFormControl } from '@forms/services/dynamic-form.types'; +import { CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { User } from '@models/reference-data.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TestStation } from '@models/test-stations/test-station.model'; diff --git a/src/app/forms/validators/custom-validators.spec.ts b/src/app/forms/validators/custom-validators.spec.ts index 24533c2ff..2491f4690 100644 --- a/src/app/forms/validators/custom-validators.spec.ts +++ b/src/app/forms/validators/custom-validators.spec.ts @@ -2,8 +2,8 @@ import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/for import { ADRDangerousGood } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/adrDangerousGood.enum.js'; import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { VehicleClassDescription } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleClassDescription.enum.js'; -import { ValidatorNames } from '@forms/models/validators.enum'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { ValidatorNames } from '@models/validators.enum'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleSizes, VehicleTypes } from '@models/vehicle-tech-record.model'; import { CustomValidators } from './custom-validators'; diff --git a/src/app/forms/validators/custom-validators.ts b/src/app/forms/validators/custom-validators.ts index 3a69388b7..afc1db3b2 100644 --- a/src/app/forms/validators/custom-validators.ts +++ b/src/app/forms/validators/custom-validators.ts @@ -1,7 +1,7 @@ import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms'; import { VehicleClassDescription } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleClassDescription.enum.js'; // eslint-disable-next-line import/no-cycle -import { CustomFormControl, CustomFormGroup } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleSizes, VehicleTypes } from '@models/vehicle-tech-record.model'; import validateDate from 'validate-govuk-date'; diff --git a/src/app/forms/validators/defects/defect.validators.spec.ts b/src/app/forms/validators/defects/defect.validators.spec.ts index b5ec5e6cc..2e03bef69 100644 --- a/src/app/forms/validators/defects/defect.validators.spec.ts +++ b/src/app/forms/validators/defects/defect.validators.spec.ts @@ -1,5 +1,5 @@ import { AbstractControl, FormGroup } from '@angular/forms'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { deficiencyCategory } from '@models/defects/deficiency-category.enum'; import { DefectValidators } from './defect.validators'; diff --git a/src/app/forms/models/async-validators.enum.ts b/src/app/models/async-validators.enum.ts similarity index 100% rename from src/app/forms/models/async-validators.enum.ts rename to src/app/models/async-validators.enum.ts diff --git a/src/app/forms/models/condition.model.ts b/src/app/models/condition.model.ts similarity index 100% rename from src/app/forms/models/condition.model.ts rename to src/app/models/condition.model.ts diff --git a/src/app/models/coupling-type-enum.ts b/src/app/models/coupling-type-enum.ts index 22d0a4c1e..892d32663 100644 --- a/src/app/models/coupling-type-enum.ts +++ b/src/app/models/coupling-type-enum.ts @@ -1,4 +1,4 @@ -import { MultiOptions } from '@forms/models/options.model'; +import { MultiOptions } from '@models/options.model'; export enum CouplingTypeCodeEnum { F = 'F', diff --git a/src/app/forms/models/options.model.ts b/src/app/models/options.model.ts similarity index 100% rename from src/app/forms/models/options.model.ts rename to src/app/models/options.model.ts diff --git a/src/app/forms/models/plateRequiredFields.model.ts b/src/app/models/plateRequiredFields.model.ts similarity index 100% rename from src/app/forms/models/plateRequiredFields.model.ts rename to src/app/models/plateRequiredFields.model.ts diff --git a/src/app/forms/models/testTypeId.enum.ts b/src/app/models/testTypeId.enum.ts similarity index 100% rename from src/app/forms/models/testTypeId.enum.ts rename to src/app/models/testTypeId.enum.ts diff --git a/src/app/forms/models/validators.enum.ts b/src/app/models/validators.enum.ts similarity index 100% rename from src/app/forms/models/validators.enum.ts rename to src/app/models/validators.enum.ts diff --git a/src/app/services/batch-technical-record/batch-technical-record.service.spec.ts b/src/app/services/batch-technical-record/batch-technical-record.service.spec.ts index 4b477fd78..1e94efc16 100644 --- a/src/app/services/batch-technical-record/batch-technical-record.service.spec.ts +++ b/src/app/services/batch-technical-record/batch-technical-record.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { AbstractControl, FormControl, FormGroup, ValidationErrors } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { TechRecordSearchSchema } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/search'; -import { CustomFormControl, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { StatusCodes, VehicleTypes } from '@models/vehicle-tech-record.model'; import { provideMockStore } from '@ngrx/store/testing'; import { TechnicalRecordHttpService } from '@services/technical-record-http/technical-record-http.service'; diff --git a/src/app/services/batch-technical-record/batch-technical-record.service.ts b/src/app/services/batch-technical-record/batch-technical-record.service.ts index 2f11df802..9c4826f49 100644 --- a/src/app/services/batch-technical-record/batch-technical-record.service.ts +++ b/src/app/services/batch-technical-record/batch-technical-record.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { AbstractControl, AsyncValidatorFn, ValidationErrors } from '@angular/forms'; -import { CustomFormControl } from '@forms/services/dynamic-form.types'; +import { CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { SEARCH_TYPES } from '@models/search-types-enum'; import { StatusCodes, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store, select } from '@ngrx/store'; diff --git a/src/app/forms/services/dynamic-form.service.spec.ts b/src/app/services/dynamic-forms/dynamic-form.service.spec.ts similarity index 98% rename from src/app/forms/services/dynamic-form.service.spec.ts rename to src/app/services/dynamic-forms/dynamic-form.service.spec.ts index 634d7b751..802077d04 100644 --- a/src/app/forms/services/dynamic-form.service.spec.ts +++ b/src/app/services/dynamic-forms/dynamic-form.service.spec.ts @@ -3,9 +3,9 @@ import { TestBed } from '@angular/core/testing'; import { AbstractControl, FormArray, ValidatorFn, Validators } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { GlobalError } from '@core/components/global-error/global-error.interface'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { provideMockStore } from '@ngrx/store/testing'; -import { initialAppState } from '@store/.'; +import { initialAppState } from '@store/index'; import { DynamicFormService } from './dynamic-form.service'; import { CustomControl, diff --git a/src/app/forms/services/dynamic-form.service.ts b/src/app/services/dynamic-forms/dynamic-form.service.ts similarity index 98% rename from src/app/forms/services/dynamic-form.service.ts rename to src/app/services/dynamic-forms/dynamic-form.service.ts index de464f663..b3d6418c6 100644 --- a/src/app/forms/services/dynamic-form.service.ts +++ b/src/app/services/dynamic-forms/dynamic-form.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { AsyncValidatorFn, FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { GlobalError } from '@core/components/global-error/global-error.interface'; -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { Condition } from '@forms/models/condition.model'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { Condition } from '@models/condition.model'; +import { ValidatorNames } from '@models/validators.enum'; import { ErrorMessageMap } from '@forms/utils/error-message-map'; // eslint-disable-next-line import/no-cycle import { CustomAsyncValidators } from '@forms/validators/custom-async-validators'; diff --git a/src/app/forms/services/dynamic-form.types.spec.ts b/src/app/services/dynamic-forms/dynamic-form.types.spec.ts similarity index 97% rename from src/app/forms/services/dynamic-form.types.spec.ts rename to src/app/services/dynamic-forms/dynamic-form.types.spec.ts index a9737423a..535acdfbc 100644 --- a/src/app/forms/services/dynamic-form.types.spec.ts +++ b/src/app/services/dynamic-forms/dynamic-form.types.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TestBed, inject } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { provideMockStore } from '@ngrx/store/testing'; -import { initialAppState } from '@store/.'; +import { initialAppState } from '@store/index'; import { DynamicFormService } from './dynamic-form.service'; import { FormNode, FormNodeTypes } from './dynamic-form.types'; diff --git a/src/app/forms/services/dynamic-form.types.ts b/src/app/services/dynamic-forms/dynamic-form.types.ts similarity index 97% rename from src/app/forms/services/dynamic-form.types.ts rename to src/app/services/dynamic-forms/dynamic-form.types.ts index 7cfa9a36b..638aec334 100644 --- a/src/app/forms/services/dynamic-form.types.ts +++ b/src/app/services/dynamic-forms/dynamic-form.types.ts @@ -13,17 +13,17 @@ import { import { Params } from '@angular/router'; // eslint-disable-next-line import/no-cycle import { BaseControlComponent } from '@forms/components/base-control/base-control.component'; -import { AsyncValidatorNames } from '@forms/models/async-validators.enum'; -import { ValidatorNames } from '@forms/models/validators.enum'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Store } from '@ngrx/store'; import { TagTypes } from '@shared/components/tag/tag.component'; // eslint-disable-next-line import/no-cycle -import { State } from '@store/.'; +import { State } from '@store/index'; import { Observable, map } from 'rxjs'; // eslint-disable-next-line import/no-cycle import { DynamicFormService } from './dynamic-form.service'; -import { SpecialRefData } from './multi-options.service'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; export enum FormNodeViewTypes { DATE = 'date', diff --git a/src/app/forms/services/multi-options.service.ts b/src/app/services/multi-options/multi-options.service.ts similarity index 97% rename from src/app/forms/services/multi-options.service.ts rename to src/app/services/multi-options/multi-options.service.ts index d0393b46b..6c5b660ac 100644 --- a/src/app/forms/services/multi-options.service.ts +++ b/src/app/services/multi-options/multi-options.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MultiOptions } from '@forms/models/options.model'; +import { MultiOptions } from '@models/options.model'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Store, select } from '@ngrx/store'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; diff --git a/src/app/services/reference-data/reference-data.service.spec.ts b/src/app/services/reference-data/reference-data.service.spec.ts index db229ec40..c4ac3b091 100644 --- a/src/app/services/reference-data/reference-data.service.spec.ts +++ b/src/app/services/reference-data/reference-data.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { ReferenceDataApiResponse, ReferenceDataItem } from '@api/reference-data'; -import { MultiOptions } from '@forms/models/options.model'; +import { MultiOptions } from '@models/options.model'; import { ReferenceDataModelBase, ReferenceDataResourceType, diff --git a/src/app/services/reference-data/reference-data.service.ts b/src/app/services/reference-data/reference-data.service.ts index 5aef4fd69..c1b994991 100644 --- a/src/app/services/reference-data/reference-data.service.ts +++ b/src/app/services/reference-data/reference-data.service.ts @@ -7,7 +7,7 @@ import { ReferenceDataService as ReferenceDataApiService, ReferenceDataItemApiResponse, } from '@api/reference-data'; -import { MultiOptions } from '@forms/models/options.model'; +import { MultiOptions } from '@models/options.model'; import { ReferenceDataModelBase, ReferenceDataResourceType, diff --git a/src/app/services/test-records/test-records.service.ts b/src/app/services/test-records/test-records.service.ts index db0d0ca0e..e47c6bb3a 100644 --- a/src/app/services/test-records/test-records.service.ts +++ b/src/app/services/test-records/test-records.service.ts @@ -5,8 +5,8 @@ import { GetTestResultsService, UpdateTestResultsService, } from '@api/test-results'; -import { TEST_TYPES, TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST } from '@forms/models/testTypeId.enum'; -import { FormNode } from '@forms/services/dynamic-form.types'; +import { TEST_TYPES, TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { contingencyTestTemplates } from '@forms/templates/test-records/create-master.template'; import { masterTpl } from '@forms/templates/test-records/master.template'; import { TestResultStatus } from '@models/test-results/test-result-status.enum'; diff --git a/src/app/services/test-stations/test-stations.service.ts b/src/app/services/test-stations/test-stations.service.ts index 6790bf169..1bd7db659 100644 --- a/src/app/services/test-stations/test-stations.service.ts +++ b/src/app/services/test-stations/test-stations.service.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { MultiOptions } from '@forms/models/options.model'; +import { MultiOptions } from '@models/options.model'; import { TestStation } from '@models/test-stations/test-station.model'; import { Store } from '@ngrx/store'; import { TestStationsState, testStations } from '@store/test-stations'; diff --git a/src/app/shared/components/test-certificate/test-certificate.component.ts b/src/app/shared/components/test-certificate/test-certificate.component.ts index add1f5bec..2251670e8 100644 --- a/src/app/shared/components/test-certificate/test-certificate.component.ts +++ b/src/app/shared/components/test-certificate/test-certificate.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, inject } from '@angular/core'; -import { TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST } from '@forms/models/testTypeId.enum'; +import { TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { Store, select } from '@ngrx/store'; import { FeatureToggleService } from '@services/feature-toggle-service/feature-toggle-service'; diff --git a/src/app/shared/pipes/get-control-label/get-control-label.pipe.spec.ts b/src/app/shared/pipes/get-control-label/get-control-label.pipe.spec.ts index 1740b4b00..e359a1b96 100644 --- a/src/app/shared/pipes/get-control-label/get-control-label.pipe.spec.ts +++ b/src/app/shared/pipes/get-control-label/get-control-label.pipe.spec.ts @@ -1,4 +1,4 @@ -import { FormNodeOption } from '@forms/services/dynamic-form.types'; +import { FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; import { GetControlLabelPipe } from './get-control-label.pipe'; describe('GetControlLabelPipe', () => { diff --git a/src/app/shared/pipes/get-control-label/get-control-label.pipe.ts b/src/app/shared/pipes/get-control-label/get-control-label.pipe.ts index f3001aa8f..519e9d170 100644 --- a/src/app/shared/pipes/get-control-label/get-control-label.pipe.ts +++ b/src/app/shared/pipes/get-control-label/get-control-label.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { FormNodeCombinationOptions, FormNodeOption } from '@forms/services/dynamic-form.types'; +import { FormNodeCombinationOptions, FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; @Pipe({ name: 'getControlLabel', diff --git a/src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.ts b/src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.ts index 9e972bb65..8cf38f647 100644 --- a/src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.ts +++ b/src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.ts @@ -1,5 +1,5 @@ import { OnDestroy, Pipe, PipeTransform } from '@angular/core'; -import { SpecialRefData } from '@forms/services/multi-options.service'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { ReferenceDataModelBase, ReferenceDataResourceType, diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 5c2117b41..4d7e464d8 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { DocumentRetrievalService } from '@api/document-retrieval'; -import { RoleRequiredDirective } from '@directives/app-role-required.directive'; -import { FeatureToggleDirective } from '@directives/feature-toggle.directive'; +import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; +import { FeatureToggleDirective } from '@directives/feature-toggle/feature-toggle.directive'; import { CollapsibleTextComponent } from '@shared/components/collapsible-text/collapsible-text.component'; import { AccordionControlComponent } from './components/accordion-control/accordion-control.component'; import { AccordionComponent } from './components/accordion/accordion.component'; diff --git a/src/app/store/technical-records/effects/technical-record-service.effects.ts b/src/app/store/technical-records/effects/technical-record-service.effects.ts index 1bcaabe10..360116c0f 100644 --- a/src/app/store/technical-records/effects/technical-record-service.effects.ts +++ b/src/app/store/technical-records/effects/technical-record-service.effects.ts @@ -7,7 +7,7 @@ import { TechRecordGETPSV, TechRecordGETTRL, } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { vehicleTemplateMap } from '@forms/utils/tech-record-constants'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Actions, createEffect, ofType } from '@ngrx/effects'; diff --git a/src/app/store/test-records/actions/test-records.actions.ts b/src/app/store/test-records/actions/test-records.actions.ts index 72efdfc1a..2d50b29b8 100644 --- a/src/app/store/test-records/actions/test-records.actions.ts +++ b/src/app/store/test-records/actions/test-records.actions.ts @@ -1,6 +1,6 @@ import { GlobalError } from '@core/components/global-error/global-error.interface'; // eslint-disable-next-line import/no-cycle -import { FormNode } from '@forms/services/dynamic-form.types'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultDefect } from '@models/test-results/test-result-defect.model'; import { TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { TestResultModel } from '@models/test-results/test-result.model'; diff --git a/src/app/store/test-records/effects/test-records.effects.spec.ts b/src/app/store/test-records/effects/test-records.effects.spec.ts index 17d07d9d9..23f11df9f 100644 --- a/src/app/store/test-records/effects/test-records.effects.spec.ts +++ b/src/app/store/test-records/effects/test-records.effects.spec.ts @@ -6,8 +6,8 @@ import { ApiModule as TestResultsApiModule } from '@api/test-results'; import { TestTypesService } from '@api/test-types'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategoryPsv.enum.js'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; -import { FormNode, FormNodeTypes } from '@forms/services/dynamic-form.types'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { contingencyTestTemplates } from '@forms/templates/test-records/create-master.template'; import { createMockTestResult } from '@mocks/test-result.mock'; import { createMockTestType } from '@mocks/test-type.mock'; diff --git a/src/app/store/test-records/effects/test-records.effects.ts b/src/app/store/test-records/effects/test-records.effects.ts index aa08c8d8a..82c88adc1 100644 --- a/src/app/store/test-records/effects/test-records.effects.ts +++ b/src/app/store/test-records/effects/test-records.effects.ts @@ -2,8 +2,8 @@ import { Injectable, inject } from '@angular/core'; import { Router } from '@angular/router'; import { TestTypesService } from '@api/test-types'; import { GlobalError } from '@core/components/global-error/global-error.interface'; -import { TEST_TYPES } from '@forms/models/testTypeId.enum'; -import { DynamicFormService } from '@forms/services/dynamic-form.service'; +import { TEST_TYPES } from '@models/testTypeId.enum'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { contingencyTestTemplates } from '@forms/templates/test-records/create-master.template'; import { masterTpl } from '@forms/templates/test-records/master.template'; import { TestResultModel } from '@models/test-results/test-result.model'; diff --git a/src/app/store/test-records/reducers/test-records.reducer.ts b/src/app/store/test-records/reducers/test-records.reducer.ts index c41f5822d..870fd5171 100644 --- a/src/app/store/test-records/reducers/test-records.reducer.ts +++ b/src/app/store/test-records/reducers/test-records.reducer.ts @@ -2,9 +2,9 @@ import { TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST, TEST_TYPES_GROUP9_10_CENTRAL_DOCS, -} from '@forms/models/testTypeId.enum'; +} from '@models/testTypeId.enum'; // eslint-disable-next-line import/no-cycle -import { FormNode } from '@forms/services/dynamic-form.types'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { DeficiencyCategoryEnum, TestResultDefect } from '@models/test-results/test-result-defect.model'; import { TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { TestResultModel } from '@models/test-results/test-result.model'; From 0dfebb72d8793ac73ca71edf0aadc062a3de60ac Mon Sep 17 00:00:00 2001 From: Thomas Crawley Date: Thu, 5 Sep 2024 08:58:33 +0100 Subject: [PATCH 2/8] feat(cb2-13727): move shared components to top level --- .../accordion-control.component.html | 0 .../accordion-control.component.scss | 0 .../accordion-control.component.spec.ts | 0 .../accordion-control.component.ts | 0 .../accordion/accordion.component.html | 0 .../accordion/accordion.component.scss | 0 .../accordion/accordion.component.spec.ts | 0 .../accordion/accordion.component.ts | 0 .../components/banner/banner.component.html | 0 .../banner/banner.component.spec.ts | 0 .../components/banner/banner.component.ts | 0 .../base-dialog/base-dialog.component.spec.ts | 0 .../base-dialog/base-dialog.component.ts | 0 .../button-group/button-group.component.html | 0 .../button-group/button-group.component.scss | 0 .../button-group.component.spec.ts | 0 .../button-group/button-group.component.ts | 0 .../components/button/button.component.html | 0 .../components/button/button.component.scss | 0 .../button/button.component.spec.ts | 0 .../components/button/button.component.ts | 0 .../collapsible-text.component.html | 0 .../collapsible-text.component.scss | 0 .../collapsible-text.component.spec.ts | 0 .../collapsible-text.component.ts | 0 .../components/icon/icon.component.html | 0 .../components/icon/icon.component.spec.ts | 0 .../components/icon/icon.component.ts | 0 .../input-spinner.component.html | 0 .../input-spinner.component.scss | 0 .../input-spinner.component.spec.ts | 0 .../input-spinner/input-spinner.component.ts | 0 .../number-plate/number-plate.component.html | 0 .../number-plate/number-plate.component.scss | 0 .../number-plate.component.spec.ts | 0 .../number-plate/number-plate.component.ts | 0 .../pagination/pagination.component.html | 0 .../pagination/pagination.component.scss | 0 .../pagination/pagination.component.spec.ts | 0 .../pagination/pagination.component.ts | 0 .../router-outlet.component.html | 0 .../router-outlet.component.spec.ts | 0 .../router-outlet/router-outlet.component.ts | 0 .../components/tag/tag.component.html | 0 .../components/tag/tag.component.spec.ts | 0 .../components/tag/tag.component.ts | 0 .../test-certificate.component.html | 0 .../test-certificate.component.scss | 0 .../test-certificate.component.spec.ts | 0 .../test-certificate.component.ts | 0 .../reference-data-routing.module.ts | 2 +- .../create-batch-routing.module.ts | 2 +- .../vehicle-header.component.ts | 2 +- .../abandon-dialog.component.ts | 2 +- .../templates/car/car-tech-record.template.ts | 2 +- .../general/approval-type.template.ts | 2 +- .../general/hgv-trl-body.template.ts | 2 +- .../general/reason-for-creation.template.ts | 2 +- .../templates/hgv/hgv-dimensions.template.ts | 2 +- .../templates/hgv/hgv-tech-record.template.ts | 2 +- .../forms/templates/hgv/hgv-tyres.template.ts | 2 +- .../templates/hgv/hgv-weight.template.ts | 2 +- .../templates/lgv/lgv-tech-record.template.ts | 2 +- .../motorcycle-tech-record.template.ts | 2 +- .../forms/templates/psv/psv-body.template.ts | 2 +- .../templates/psv/psv-tech-record.template.ts | 2 +- .../small-trailer-tech-record.template.ts | 2 +- .../templates/trl/trl-dimensions.template.ts | 2 +- .../templates/trl/trl-tech-record.template.ts | 2 +- .../forms/templates/trl/trl-tyres.template.ts | 2 +- .../dynamic-forms/dynamic-form.types.ts | 2 +- src/app/shared/shared.module.ts | 28 +++++++++---------- 72 files changed, 35 insertions(+), 35 deletions(-) rename src/app/{shared => }/components/accordion-control/accordion-control.component.html (100%) rename src/app/{shared => }/components/accordion-control/accordion-control.component.scss (100%) rename src/app/{shared => }/components/accordion-control/accordion-control.component.spec.ts (100%) rename src/app/{shared => }/components/accordion-control/accordion-control.component.ts (100%) rename src/app/{shared => }/components/accordion/accordion.component.html (100%) rename src/app/{shared => }/components/accordion/accordion.component.scss (100%) rename src/app/{shared => }/components/accordion/accordion.component.spec.ts (100%) rename src/app/{shared => }/components/accordion/accordion.component.ts (100%) rename src/app/{shared => }/components/banner/banner.component.html (100%) rename src/app/{shared => }/components/banner/banner.component.spec.ts (100%) rename src/app/{shared => }/components/banner/banner.component.ts (100%) rename src/app/{shared => }/components/base-dialog/base-dialog.component.spec.ts (100%) rename src/app/{shared => }/components/base-dialog/base-dialog.component.ts (100%) rename src/app/{shared => }/components/button-group/button-group.component.html (100%) rename src/app/{shared => }/components/button-group/button-group.component.scss (100%) rename src/app/{shared => }/components/button-group/button-group.component.spec.ts (100%) rename src/app/{shared => }/components/button-group/button-group.component.ts (100%) rename src/app/{shared => }/components/button/button.component.html (100%) rename src/app/{shared => }/components/button/button.component.scss (100%) rename src/app/{shared => }/components/button/button.component.spec.ts (100%) rename src/app/{shared => }/components/button/button.component.ts (100%) rename src/app/{shared => }/components/collapsible-text/collapsible-text.component.html (100%) rename src/app/{shared => }/components/collapsible-text/collapsible-text.component.scss (100%) rename src/app/{shared => }/components/collapsible-text/collapsible-text.component.spec.ts (100%) rename src/app/{shared => }/components/collapsible-text/collapsible-text.component.ts (100%) rename src/app/{shared => }/components/icon/icon.component.html (100%) rename src/app/{shared => }/components/icon/icon.component.spec.ts (100%) rename src/app/{shared => }/components/icon/icon.component.ts (100%) rename src/app/{shared => }/components/input-spinner/input-spinner.component.html (100%) rename src/app/{shared => }/components/input-spinner/input-spinner.component.scss (100%) rename src/app/{shared => }/components/input-spinner/input-spinner.component.spec.ts (100%) rename src/app/{shared => }/components/input-spinner/input-spinner.component.ts (100%) rename src/app/{shared => }/components/number-plate/number-plate.component.html (100%) rename src/app/{shared => }/components/number-plate/number-plate.component.scss (100%) rename src/app/{shared => }/components/number-plate/number-plate.component.spec.ts (100%) rename src/app/{shared => }/components/number-plate/number-plate.component.ts (100%) rename src/app/{shared => }/components/pagination/pagination.component.html (100%) rename src/app/{shared => }/components/pagination/pagination.component.scss (100%) rename src/app/{shared => }/components/pagination/pagination.component.spec.ts (100%) rename src/app/{shared => }/components/pagination/pagination.component.ts (100%) rename src/app/{shared => }/components/router-outlet/router-outlet.component.html (100%) rename src/app/{shared => }/components/router-outlet/router-outlet.component.spec.ts (100%) rename src/app/{shared => }/components/router-outlet/router-outlet.component.ts (100%) rename src/app/{shared => }/components/tag/tag.component.html (100%) rename src/app/{shared => }/components/tag/tag.component.spec.ts (100%) rename src/app/{shared => }/components/tag/tag.component.ts (100%) rename src/app/{shared => }/components/test-certificate/test-certificate.component.html (100%) rename src/app/{shared => }/components/test-certificate/test-certificate.component.scss (100%) rename src/app/{shared => }/components/test-certificate/test-certificate.component.spec.ts (100%) rename src/app/{shared => }/components/test-certificate/test-certificate.component.ts (100%) diff --git a/src/app/shared/components/accordion-control/accordion-control.component.html b/src/app/components/accordion-control/accordion-control.component.html similarity index 100% rename from src/app/shared/components/accordion-control/accordion-control.component.html rename to src/app/components/accordion-control/accordion-control.component.html diff --git a/src/app/shared/components/accordion-control/accordion-control.component.scss b/src/app/components/accordion-control/accordion-control.component.scss similarity index 100% rename from src/app/shared/components/accordion-control/accordion-control.component.scss rename to src/app/components/accordion-control/accordion-control.component.scss diff --git a/src/app/shared/components/accordion-control/accordion-control.component.spec.ts b/src/app/components/accordion-control/accordion-control.component.spec.ts similarity index 100% rename from src/app/shared/components/accordion-control/accordion-control.component.spec.ts rename to src/app/components/accordion-control/accordion-control.component.spec.ts diff --git a/src/app/shared/components/accordion-control/accordion-control.component.ts b/src/app/components/accordion-control/accordion-control.component.ts similarity index 100% rename from src/app/shared/components/accordion-control/accordion-control.component.ts rename to src/app/components/accordion-control/accordion-control.component.ts diff --git a/src/app/shared/components/accordion/accordion.component.html b/src/app/components/accordion/accordion.component.html similarity index 100% rename from src/app/shared/components/accordion/accordion.component.html rename to src/app/components/accordion/accordion.component.html diff --git a/src/app/shared/components/accordion/accordion.component.scss b/src/app/components/accordion/accordion.component.scss similarity index 100% rename from src/app/shared/components/accordion/accordion.component.scss rename to src/app/components/accordion/accordion.component.scss diff --git a/src/app/shared/components/accordion/accordion.component.spec.ts b/src/app/components/accordion/accordion.component.spec.ts similarity index 100% rename from src/app/shared/components/accordion/accordion.component.spec.ts rename to src/app/components/accordion/accordion.component.spec.ts diff --git a/src/app/shared/components/accordion/accordion.component.ts b/src/app/components/accordion/accordion.component.ts similarity index 100% rename from src/app/shared/components/accordion/accordion.component.ts rename to src/app/components/accordion/accordion.component.ts diff --git a/src/app/shared/components/banner/banner.component.html b/src/app/components/banner/banner.component.html similarity index 100% rename from src/app/shared/components/banner/banner.component.html rename to src/app/components/banner/banner.component.html diff --git a/src/app/shared/components/banner/banner.component.spec.ts b/src/app/components/banner/banner.component.spec.ts similarity index 100% rename from src/app/shared/components/banner/banner.component.spec.ts rename to src/app/components/banner/banner.component.spec.ts diff --git a/src/app/shared/components/banner/banner.component.ts b/src/app/components/banner/banner.component.ts similarity index 100% rename from src/app/shared/components/banner/banner.component.ts rename to src/app/components/banner/banner.component.ts diff --git a/src/app/shared/components/base-dialog/base-dialog.component.spec.ts b/src/app/components/base-dialog/base-dialog.component.spec.ts similarity index 100% rename from src/app/shared/components/base-dialog/base-dialog.component.spec.ts rename to src/app/components/base-dialog/base-dialog.component.spec.ts diff --git a/src/app/shared/components/base-dialog/base-dialog.component.ts b/src/app/components/base-dialog/base-dialog.component.ts similarity index 100% rename from src/app/shared/components/base-dialog/base-dialog.component.ts rename to src/app/components/base-dialog/base-dialog.component.ts diff --git a/src/app/shared/components/button-group/button-group.component.html b/src/app/components/button-group/button-group.component.html similarity index 100% rename from src/app/shared/components/button-group/button-group.component.html rename to src/app/components/button-group/button-group.component.html diff --git a/src/app/shared/components/button-group/button-group.component.scss b/src/app/components/button-group/button-group.component.scss similarity index 100% rename from src/app/shared/components/button-group/button-group.component.scss rename to src/app/components/button-group/button-group.component.scss diff --git a/src/app/shared/components/button-group/button-group.component.spec.ts b/src/app/components/button-group/button-group.component.spec.ts similarity index 100% rename from src/app/shared/components/button-group/button-group.component.spec.ts rename to src/app/components/button-group/button-group.component.spec.ts diff --git a/src/app/shared/components/button-group/button-group.component.ts b/src/app/components/button-group/button-group.component.ts similarity index 100% rename from src/app/shared/components/button-group/button-group.component.ts rename to src/app/components/button-group/button-group.component.ts diff --git a/src/app/shared/components/button/button.component.html b/src/app/components/button/button.component.html similarity index 100% rename from src/app/shared/components/button/button.component.html rename to src/app/components/button/button.component.html diff --git a/src/app/shared/components/button/button.component.scss b/src/app/components/button/button.component.scss similarity index 100% rename from src/app/shared/components/button/button.component.scss rename to src/app/components/button/button.component.scss diff --git a/src/app/shared/components/button/button.component.spec.ts b/src/app/components/button/button.component.spec.ts similarity index 100% rename from src/app/shared/components/button/button.component.spec.ts rename to src/app/components/button/button.component.spec.ts diff --git a/src/app/shared/components/button/button.component.ts b/src/app/components/button/button.component.ts similarity index 100% rename from src/app/shared/components/button/button.component.ts rename to src/app/components/button/button.component.ts diff --git a/src/app/shared/components/collapsible-text/collapsible-text.component.html b/src/app/components/collapsible-text/collapsible-text.component.html similarity index 100% rename from src/app/shared/components/collapsible-text/collapsible-text.component.html rename to src/app/components/collapsible-text/collapsible-text.component.html diff --git a/src/app/shared/components/collapsible-text/collapsible-text.component.scss b/src/app/components/collapsible-text/collapsible-text.component.scss similarity index 100% rename from src/app/shared/components/collapsible-text/collapsible-text.component.scss rename to src/app/components/collapsible-text/collapsible-text.component.scss diff --git a/src/app/shared/components/collapsible-text/collapsible-text.component.spec.ts b/src/app/components/collapsible-text/collapsible-text.component.spec.ts similarity index 100% rename from src/app/shared/components/collapsible-text/collapsible-text.component.spec.ts rename to src/app/components/collapsible-text/collapsible-text.component.spec.ts diff --git a/src/app/shared/components/collapsible-text/collapsible-text.component.ts b/src/app/components/collapsible-text/collapsible-text.component.ts similarity index 100% rename from src/app/shared/components/collapsible-text/collapsible-text.component.ts rename to src/app/components/collapsible-text/collapsible-text.component.ts diff --git a/src/app/shared/components/icon/icon.component.html b/src/app/components/icon/icon.component.html similarity index 100% rename from src/app/shared/components/icon/icon.component.html rename to src/app/components/icon/icon.component.html diff --git a/src/app/shared/components/icon/icon.component.spec.ts b/src/app/components/icon/icon.component.spec.ts similarity index 100% rename from src/app/shared/components/icon/icon.component.spec.ts rename to src/app/components/icon/icon.component.spec.ts diff --git a/src/app/shared/components/icon/icon.component.ts b/src/app/components/icon/icon.component.ts similarity index 100% rename from src/app/shared/components/icon/icon.component.ts rename to src/app/components/icon/icon.component.ts diff --git a/src/app/shared/components/input-spinner/input-spinner.component.html b/src/app/components/input-spinner/input-spinner.component.html similarity index 100% rename from src/app/shared/components/input-spinner/input-spinner.component.html rename to src/app/components/input-spinner/input-spinner.component.html diff --git a/src/app/shared/components/input-spinner/input-spinner.component.scss b/src/app/components/input-spinner/input-spinner.component.scss similarity index 100% rename from src/app/shared/components/input-spinner/input-spinner.component.scss rename to src/app/components/input-spinner/input-spinner.component.scss diff --git a/src/app/shared/components/input-spinner/input-spinner.component.spec.ts b/src/app/components/input-spinner/input-spinner.component.spec.ts similarity index 100% rename from src/app/shared/components/input-spinner/input-spinner.component.spec.ts rename to src/app/components/input-spinner/input-spinner.component.spec.ts diff --git a/src/app/shared/components/input-spinner/input-spinner.component.ts b/src/app/components/input-spinner/input-spinner.component.ts similarity index 100% rename from src/app/shared/components/input-spinner/input-spinner.component.ts rename to src/app/components/input-spinner/input-spinner.component.ts diff --git a/src/app/shared/components/number-plate/number-plate.component.html b/src/app/components/number-plate/number-plate.component.html similarity index 100% rename from src/app/shared/components/number-plate/number-plate.component.html rename to src/app/components/number-plate/number-plate.component.html diff --git a/src/app/shared/components/number-plate/number-plate.component.scss b/src/app/components/number-plate/number-plate.component.scss similarity index 100% rename from src/app/shared/components/number-plate/number-plate.component.scss rename to src/app/components/number-plate/number-plate.component.scss diff --git a/src/app/shared/components/number-plate/number-plate.component.spec.ts b/src/app/components/number-plate/number-plate.component.spec.ts similarity index 100% rename from src/app/shared/components/number-plate/number-plate.component.spec.ts rename to src/app/components/number-plate/number-plate.component.spec.ts diff --git a/src/app/shared/components/number-plate/number-plate.component.ts b/src/app/components/number-plate/number-plate.component.ts similarity index 100% rename from src/app/shared/components/number-plate/number-plate.component.ts rename to src/app/components/number-plate/number-plate.component.ts diff --git a/src/app/shared/components/pagination/pagination.component.html b/src/app/components/pagination/pagination.component.html similarity index 100% rename from src/app/shared/components/pagination/pagination.component.html rename to src/app/components/pagination/pagination.component.html diff --git a/src/app/shared/components/pagination/pagination.component.scss b/src/app/components/pagination/pagination.component.scss similarity index 100% rename from src/app/shared/components/pagination/pagination.component.scss rename to src/app/components/pagination/pagination.component.scss diff --git a/src/app/shared/components/pagination/pagination.component.spec.ts b/src/app/components/pagination/pagination.component.spec.ts similarity index 100% rename from src/app/shared/components/pagination/pagination.component.spec.ts rename to src/app/components/pagination/pagination.component.spec.ts diff --git a/src/app/shared/components/pagination/pagination.component.ts b/src/app/components/pagination/pagination.component.ts similarity index 100% rename from src/app/shared/components/pagination/pagination.component.ts rename to src/app/components/pagination/pagination.component.ts diff --git a/src/app/shared/components/router-outlet/router-outlet.component.html b/src/app/components/router-outlet/router-outlet.component.html similarity index 100% rename from src/app/shared/components/router-outlet/router-outlet.component.html rename to src/app/components/router-outlet/router-outlet.component.html diff --git a/src/app/shared/components/router-outlet/router-outlet.component.spec.ts b/src/app/components/router-outlet/router-outlet.component.spec.ts similarity index 100% rename from src/app/shared/components/router-outlet/router-outlet.component.spec.ts rename to src/app/components/router-outlet/router-outlet.component.spec.ts diff --git a/src/app/shared/components/router-outlet/router-outlet.component.ts b/src/app/components/router-outlet/router-outlet.component.ts similarity index 100% rename from src/app/shared/components/router-outlet/router-outlet.component.ts rename to src/app/components/router-outlet/router-outlet.component.ts diff --git a/src/app/shared/components/tag/tag.component.html b/src/app/components/tag/tag.component.html similarity index 100% rename from src/app/shared/components/tag/tag.component.html rename to src/app/components/tag/tag.component.html diff --git a/src/app/shared/components/tag/tag.component.spec.ts b/src/app/components/tag/tag.component.spec.ts similarity index 100% rename from src/app/shared/components/tag/tag.component.spec.ts rename to src/app/components/tag/tag.component.spec.ts diff --git a/src/app/shared/components/tag/tag.component.ts b/src/app/components/tag/tag.component.ts similarity index 100% rename from src/app/shared/components/tag/tag.component.ts rename to src/app/components/tag/tag.component.ts diff --git a/src/app/shared/components/test-certificate/test-certificate.component.html b/src/app/components/test-certificate/test-certificate.component.html similarity index 100% rename from src/app/shared/components/test-certificate/test-certificate.component.html rename to src/app/components/test-certificate/test-certificate.component.html diff --git a/src/app/shared/components/test-certificate/test-certificate.component.scss b/src/app/components/test-certificate/test-certificate.component.scss similarity index 100% rename from src/app/shared/components/test-certificate/test-certificate.component.scss rename to src/app/components/test-certificate/test-certificate.component.scss diff --git a/src/app/shared/components/test-certificate/test-certificate.component.spec.ts b/src/app/components/test-certificate/test-certificate.component.spec.ts similarity index 100% rename from src/app/shared/components/test-certificate/test-certificate.component.spec.ts rename to src/app/components/test-certificate/test-certificate.component.spec.ts diff --git a/src/app/shared/components/test-certificate/test-certificate.component.ts b/src/app/components/test-certificate/test-certificate.component.ts similarity index 100% rename from src/app/shared/components/test-certificate/test-certificate.component.ts rename to src/app/components/test-certificate/test-certificate.component.ts diff --git a/src/app/features/reference-data/reference-data-routing.module.ts b/src/app/features/reference-data/reference-data-routing.module.ts index d04c2c100..8a287f862 100644 --- a/src/app/features/reference-data/reference-data-routing.module.ts +++ b/src/app/features/reference-data/reference-data-routing.module.ts @@ -4,13 +4,13 @@ import { MsalGuard } from '@azure/msal-angular'; import { RoleGuard } from '@guards/role-guard/roles.guard'; import { Roles } from '@models/roles.enum'; import { ReferenceDataRoutes } from '@models/routes.enum'; -import { RouterOutletComponent } from '@shared/components/router-outlet/router-outlet.component'; import { ReferenceDataCreateComponent } from './reference-data-add/reference-data-add.component'; import { ReferenceDataAmendComponent } from './reference-data-amend/reference-data-amend.component'; import { ReferenceDataDeleteComponent } from './reference-data-delete/reference-data-delete.component'; import { ReferenceDataDeletedListComponent } from './reference-data-deleted-list/reference-data-deleted-list.component'; import { ReferenceDataListComponent } from './reference-data-list/reference-data-list.component'; import { ReferenceDataSelectTypeComponent } from './reference-data-select-type/reference-data-select-type.component'; +import { RouterOutletComponent } from '../../components/router-outlet/router-outlet.component'; const routes: Routes = [ { diff --git a/src/app/features/tech-record/create-batch/create-batch-routing.module.ts b/src/app/features/tech-record/create-batch/create-batch-routing.module.ts index 0f4b59f4c..614daf2bf 100644 --- a/src/app/features/tech-record/create-batch/create-batch-routing.module.ts +++ b/src/app/features/tech-record/create-batch/create-batch-routing.module.ts @@ -4,13 +4,13 @@ import { MsalGuard } from '@azure/msal-angular'; import { RoleGuard } from '@guards/role-guard/roles.guard'; import { Roles } from '@models/roles.enum'; import { TechRecordCreateBatchRoutes } from '@models/routes.enum'; -import { RouterOutletComponent } from '@shared/components/router-outlet/router-outlet.component'; import { techRecordDataResolver } from 'src/app/resolvers/tech-record-data/tech-record-data.resolver'; import { TechRecordSearchTyresComponent } from '../components/tech-record-search-tyres/tech-record-search-tyres.component'; import { BatchVehicleDetailsComponent } from './components/batch-vehicle-details/batch-vehicle-details.component'; import { BatchVehicleResultsComponent } from './components/batch-vehicle-results/batch-vehicle-results.component'; import { BatchVehicleTemplateComponent } from './components/batch-vehicle-template/batch-vehicle-template.component'; import { SelectVehicleTypeComponent } from './components/select-vehicle-type/select-vehicle-type.component'; +import { RouterOutletComponent } from '../../../components/router-outlet/router-outlet.component'; const routes: Routes = [ { diff --git a/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts b/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts index e74760049..1f57b6fc4 100644 --- a/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts +++ b/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts @@ -10,9 +10,9 @@ import { TestType, resultOfTestEnum } from '@models/test-types/test-type.model'; import { V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; import { TestTypesService } from '@services/test-types/test-types.service'; -import { TagType, TagTypes } from '@shared/components/tag/tag.component'; import { techRecord } from '@store/technical-records'; import { Observable } from 'rxjs'; +import { TagType, TagTypes } from '../../../../components/tag/tag.component'; @Component({ selector: 'app-vehicle-header', diff --git a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts index 9677ec977..9266ae99c 100644 --- a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts +++ b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts @@ -6,9 +6,9 @@ import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TestRecordsService } from '@services/test-records/test-records.service'; -import { BaseDialogComponent } from '@shared/components/base-dialog/base-dialog.component'; import merge from 'lodash.merge'; import { DynamicFormGroupComponent } from '../../components/dynamic-form-group/dynamic-form-group.component'; +import { BaseDialogComponent } from '../../../components/base-dialog/base-dialog.component'; const ABANDON_FORM = (ReasonsForAbandoning: ReferenceDataResourceType | SpecialRefData): FormNode => ({ name: 'abandonSection', diff --git a/src/app/forms/templates/car/car-tech-record.template.ts b/src/app/forms/templates/car/car-tech-record.template.ts index 17830c62b..f96aa1e78 100644 --- a/src/app/forms/templates/car/car-tech-record.template.ts +++ b/src/app/forms/templates/car/car-tech-record.template.ts @@ -11,7 +11,7 @@ import { } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { VehicleSubclass } from '@models/vehicle-tech-record.model'; -import { TagType } from '@shared/components/tag/tag.component'; +import { TagType } from '../../../components/tag/tag.component'; export const CarTechRecord: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/general/approval-type.template.ts b/src/app/forms/templates/general/approval-type.template.ts index 9d185b7f7..576a38f51 100644 --- a/src/app/forms/templates/general/approval-type.template.ts +++ b/src/app/forms/templates/general/approval-type.template.ts @@ -1,7 +1,6 @@ import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, @@ -9,6 +8,7 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; export const HgvAndTrlTypeApprovalTemplate: FormNode = { name: 'approvalSection', diff --git a/src/app/forms/templates/general/hgv-trl-body.template.ts b/src/app/forms/templates/general/hgv-trl-body.template.ts index 0d5ef308f..369f798a5 100644 --- a/src/app/forms/templates/general/hgv-trl-body.template.ts +++ b/src/app/forms/templates/general/hgv-trl-body.template.ts @@ -1,6 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; import { ValidatorNames } from '@models/validators.enum'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, @@ -9,6 +8,7 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; export const HgvAndTrlBodyTemplate: FormNode = { name: 'bodySection', diff --git a/src/app/forms/templates/general/reason-for-creation.template.ts b/src/app/forms/templates/general/reason-for-creation.template.ts index 3ee673fc9..bb1f224a2 100644 --- a/src/app/forms/templates/general/reason-for-creation.template.ts +++ b/src/app/forms/templates/general/reason-for-creation.template.ts @@ -6,7 +6,7 @@ import { FormNodeViewTypes, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; -import { TagType } from '@shared/components/tag/tag.component'; +import { TagType } from '../../../components/tag/tag.component'; export const TechRecordReasonForCreationSection: FormNode = { name: 'reasonForCreationSection', diff --git a/src/app/forms/templates/hgv/hgv-dimensions.template.ts b/src/app/forms/templates/hgv/hgv-dimensions.template.ts index 1f0e276e4..821f6f7f6 100644 --- a/src/app/forms/templates/hgv/hgv-dimensions.template.ts +++ b/src/app/forms/templates/hgv/hgv-dimensions.template.ts @@ -1,6 +1,6 @@ import { ValidatorNames } from '@models/validators.enum'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; export const HgvDimensionsTemplate: FormNode = { name: 'dimensionsSection', diff --git a/src/app/forms/templates/hgv/hgv-tech-record.template.ts b/src/app/forms/templates/hgv/hgv-tech-record.template.ts index 60264420b..c9ee77b0a 100644 --- a/src/app/forms/templates/hgv/hgv-tech-record.template.ts +++ b/src/app/forms/templates/hgv/hgv-tech-record.template.ts @@ -4,7 +4,6 @@ import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { EmissionStandard } from '@models/test-types/emissions.enum'; import { FuelTypes } from '@models/vehicle-tech-record.model'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, @@ -13,6 +12,7 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; export const HgvTechRecord: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/hgv/hgv-tyres.template.ts b/src/app/forms/templates/hgv/hgv-tyres.template.ts index 7ad2d0706..105590f69 100644 --- a/src/app/forms/templates/hgv/hgv-tyres.template.ts +++ b/src/app/forms/templates/hgv/hgv-tyres.template.ts @@ -8,7 +8,7 @@ import { TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { TagType } from '@shared/components/tag/tag.component'; +import { TagType } from '../../../components/tag/tag.component'; export const tyresTemplateHgv: FormNode = { name: 'tyreSection', diff --git a/src/app/forms/templates/hgv/hgv-weight.template.ts b/src/app/forms/templates/hgv/hgv-weight.template.ts index f3b21a0de..c02e7f4ac 100644 --- a/src/app/forms/templates/hgv/hgv-weight.template.ts +++ b/src/app/forms/templates/hgv/hgv-weight.template.ts @@ -1,6 +1,6 @@ import { ValidatorNames } from '@models/validators.enum'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; const requiredValidation = [ { name: ValidatorNames.Numeric, args: 99999 }, diff --git a/src/app/forms/templates/lgv/lgv-tech-record.template.ts b/src/app/forms/templates/lgv/lgv-tech-record.template.ts index 813a5b9b6..b21c717d4 100644 --- a/src/app/forms/templates/lgv/lgv-tech-record.template.ts +++ b/src/app/forms/templates/lgv/lgv-tech-record.template.ts @@ -11,7 +11,7 @@ import { } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { VehicleSubclass } from '@models/vehicle-tech-record.model'; -import { TagType } from '@shared/components/tag/tag.component'; +import { TagType } from '../../../components/tag/tag.component'; export const LgvTechRecord: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts b/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts index 742b8505a..50c3d193f 100644 --- a/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts +++ b/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts @@ -10,7 +10,7 @@ import { TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { TagType } from '@shared/components/tag/tag.component'; +import { TagType } from '../../../components/tag/tag.component'; export const MotorcycleTechRecord: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/psv/psv-body.template.ts b/src/app/forms/templates/psv/psv-body.template.ts index 05c710c2c..43b802b6d 100644 --- a/src/app/forms/templates/psv/psv-body.template.ts +++ b/src/app/forms/templates/psv/psv-body.template.ts @@ -1,5 +1,4 @@ import { ValidatorNames } from '@models/validators.enum'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, @@ -7,6 +6,7 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; export const PsvBodyTemplate: FormNode = { name: 'bodySection', diff --git a/src/app/forms/templates/psv/psv-tech-record.template.ts b/src/app/forms/templates/psv/psv-tech-record.template.ts index e2f115603..33b3bd0c1 100644 --- a/src/app/forms/templates/psv/psv-tech-record.template.ts +++ b/src/app/forms/templates/psv/psv-tech-record.template.ts @@ -5,7 +5,6 @@ import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { EmissionStandard } from '@models/test-types/emissions.enum'; import { VehicleSize } from '@models/vehicle-size.enum'; import { FuelTypes } from '@models/vehicle-tech-record.model'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, @@ -14,6 +13,7 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; export const PsvTechRecord: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts b/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts index f8ec277e5..110c249c5 100644 --- a/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts +++ b/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts @@ -11,7 +11,7 @@ import { } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { VehicleSubclass } from '@models/vehicle-tech-record.model'; -import { TagType } from '@shared/components/tag/tag.component'; +import { TagType } from '../../../components/tag/tag.component'; export const SmallTrailerTechRecord: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/trl/trl-dimensions.template.ts b/src/app/forms/templates/trl/trl-dimensions.template.ts index 073c8a72f..1aaa42448 100644 --- a/src/app/forms/templates/trl/trl-dimensions.template.ts +++ b/src/app/forms/templates/trl/trl-dimensions.template.ts @@ -1,6 +1,6 @@ import { ValidatorNames } from '@models/validators.enum'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, FormNodeTypes, TagTypeLabels } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; export const TrlDimensionsTemplate: FormNode = { name: 'dimensionsSection', diff --git a/src/app/forms/templates/trl/trl-tech-record.template.ts b/src/app/forms/templates/trl/trl-tech-record.template.ts index e4e6cc342..d3c86509b 100644 --- a/src/app/forms/templates/trl/trl-tech-record.template.ts +++ b/src/app/forms/templates/trl/trl-tech-record.template.ts @@ -4,7 +4,6 @@ import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { CouplingTypeOptions } from '@models/coupling-type-enum'; import { FrameDescriptions } from '@models/vehicle-tech-record.model'; -import { TagType } from '@shared/components/tag/tag.component'; import { FormNode, FormNodeEditTypes, @@ -13,6 +12,7 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; +import { TagType } from '../../../components/tag/tag.component'; export const TrlTechRecordTemplate: FormNode = { name: 'techRecordSummary', diff --git a/src/app/forms/templates/trl/trl-tyres.template.ts b/src/app/forms/templates/trl/trl-tyres.template.ts index a836a3077..5d66c8a59 100644 --- a/src/app/forms/templates/trl/trl-tyres.template.ts +++ b/src/app/forms/templates/trl/trl-tyres.template.ts @@ -8,7 +8,7 @@ import { TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { TagType } from '@shared/components/tag/tag.component'; +import { TagType } from '../../../components/tag/tag.component'; export const tyresTemplateTrl: FormNode = { name: 'tyreSection', diff --git a/src/app/services/dynamic-forms/dynamic-form.types.ts b/src/app/services/dynamic-forms/dynamic-form.types.ts index 638aec334..6cd1aafb9 100644 --- a/src/app/services/dynamic-forms/dynamic-form.types.ts +++ b/src/app/services/dynamic-forms/dynamic-form.types.ts @@ -17,13 +17,13 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; import { ValidatorNames } from '@models/validators.enum'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Store } from '@ngrx/store'; -import { TagTypes } from '@shared/components/tag/tag.component'; // eslint-disable-next-line import/no-cycle import { State } from '@store/index'; import { Observable, map } from 'rxjs'; // eslint-disable-next-line import/no-cycle import { DynamicFormService } from './dynamic-form.service'; import { SpecialRefData } from '@services/multi-options/multi-options.service'; +import { TagTypes } from '../../components/tag/tag.component'; export enum FormNodeViewTypes { DATE = 'date', diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 4d7e464d8..5be70b320 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -4,20 +4,6 @@ import { RouterModule } from '@angular/router'; import { DocumentRetrievalService } from '@api/document-retrieval'; import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { FeatureToggleDirective } from '@directives/feature-toggle/feature-toggle.directive'; -import { CollapsibleTextComponent } from '@shared/components/collapsible-text/collapsible-text.component'; -import { AccordionControlComponent } from './components/accordion-control/accordion-control.component'; -import { AccordionComponent } from './components/accordion/accordion.component'; -import { BannerComponent } from './components/banner/banner.component'; -import { BaseDialogComponent } from './components/base-dialog/base-dialog.component'; -import { ButtonGroupComponent } from './components/button-group/button-group.component'; -import { ButtonComponent } from './components/button/button.component'; -import { IconComponent } from './components/icon/icon.component'; -import { InputSpinnerComponent } from './components/input-spinner/input-spinner.component'; -import { NumberPlateComponent } from './components/number-plate/number-plate.component'; -import { PaginationComponent } from './components/pagination/pagination.component'; -import { RouterOutletComponent } from './components/router-outlet/router-outlet.component'; -import { TagComponent } from './components/tag/tag.component'; -import { TestCertificateComponent } from './components/test-certificate/test-certificate.component'; import { PreventDoubleClickDirective } from './directives/prevent-double-click/prevent-double-click.directive'; import { RetrieveDocumentDirective } from './directives/retrieve-document/retrieve-document.directive'; import { DefaultNullOrEmpty } from './pipes/default-null-or-empty/default-null-or-empty.pipe'; @@ -27,6 +13,20 @@ import { GetControlLabelPipe } from './pipes/get-control-label/get-control-label import { RefDataDecodePipe } from './pipes/ref-data-decode/ref-data-decode.pipe'; import { TestTypeNamePipe } from './pipes/test-type-name/test-type-name.pipe'; import { TyreAxleLoadPipe } from './pipes/tyre-axle-load/tyre-axle-load.pipe'; +import { TestCertificateComponent } from '../components/test-certificate/test-certificate.component'; +import { ButtonGroupComponent } from '../components/button-group/button-group.component'; +import { ButtonComponent } from '../components/button/button.component'; +import { BannerComponent } from '../components/banner/banner.component'; +import { TagComponent } from '../components/tag/tag.component'; +import { NumberPlateComponent } from '../components/number-plate/number-plate.component'; +import { IconComponent } from '../components/icon/icon.component'; +import { AccordionComponent } from '../components/accordion/accordion.component'; +import { AccordionControlComponent } from '../components/accordion-control/accordion-control.component'; +import { PaginationComponent } from '../components/pagination/pagination.component'; +import { BaseDialogComponent } from '../components/base-dialog/base-dialog.component'; +import { InputSpinnerComponent } from '../components/input-spinner/input-spinner.component'; +import { RouterOutletComponent } from '../components/router-outlet/router-outlet.component'; +import { CollapsibleTextComponent } from '../components/collapsible-text/collapsible-text.component'; @NgModule({ declarations: [ From b1be4540e03fc9503e2ef1d62b1c66b6a55d2b1d Mon Sep 17 00:00:00 2001 From: Thomas Crawley Date: Thu, 5 Sep 2024 12:59:57 +0100 Subject: [PATCH 3/8] feat(cb2-13727): move pipes to top level and add shortened url paths --- .../test-certificate.component.ts | 2 +- .../reference-data-add.component.ts | 4 +-- .../reference-data-amend.component.ts | 4 +-- .../reference-data-delete.component.ts | 11 ++++-- .../reference-data-list.component.spec.ts | 2 +- .../reference-data-list.component.ts | 4 +-- .../reference-data-routing.module.ts | 2 +- ...ference-data-select-type.component.spec.ts | 2 +- .../reference-data-select-type.component.ts | 9 +++-- .../search/__tests__/search.component.spec.ts | 2 +- .../single-search-result.component.ts | 2 +- ...adr-generate-certificate.component.spec.ts | 2 +- .../adr-generate-certificate.component.ts | 7 +++- .../tech-record-amend-reason.component.ts | 7 +++- .../tech-record-amend-vin.component.spec.ts | 2 +- .../tech-record-amend-vin.component.ts | 4 +-- ...-record-amend-vrm-reason.component.spec.ts | 2 +- .../tech-record-amend-vrm-reason.component.ts | 9 +++-- .../tech-record-amend-vrm.component.spec.ts | 2 +- .../tech-record-amend-vrm.component.ts | 4 +-- .../tech-record-change-status.component.ts | 2 +- .../tech-record-change-type.component.spec.ts | 2 +- .../tech-record-change-type.component.ts | 2 +- ...tech-record-change-visibility.component.ts | 2 +- ...edit-additional-examiner-note.component.ts | 7 +++- ...h-record-generate-letter.component.spec.ts | 2 +- .../tech-record-generate-letter.component.ts | 9 +++-- ...ch-record-generate-plate.component.spec.ts | 2 +- .../tech-record-generate-plate.component.ts | 7 +++- ...tech-record-search-tyres.component.spec.ts | 2 +- .../tech-record-search-tyres.component.ts | 4 +-- ...h-record-summary-changes.component.spec.ts | 2 +- .../tech-record-summary-changes.component.ts | 2 +- .../tech-record-summary.component.ts | 4 +-- .../tech-record-unarchive-component.ts | 7 +++- ...vehicle-technical-record.component.spec.ts | 2 +- .../batch-vehicle-details.component.ts | 6 ++-- .../batch-vehicle-template.component.ts | 4 +-- .../select-vehicle-type.component.ts | 9 +++-- .../create-batch-routing.module.ts | 2 +- .../create-tech-record.component.spec.ts | 2 +- .../create/create-tech-record.component.ts | 6 ++-- .../amended-test-record.component.ts | 2 +- .../confirm-cancellation.component.ts | 2 +- .../test-amend-reason.component.ts | 7 +++- .../test-record/test-record.component.ts | 4 +-- .../test-result-summary.component.ts | 2 +- .../base-test-record.component.spec.ts | 4 +-- .../base-test-record.component.ts | 4 +-- .../test-type-select.component.spec.ts | 2 +- .../vehicle-header.component.ts | 2 +- .../create-test-record.component.spec.ts | 2 +- .../create-test-record.component.ts | 2 +- .../approval-type.component.spec.ts | 7 +++- .../components/date/date.component.spec.ts | 2 +- .../dynamic-form-field.component.spec.ts | 2 +- .../dynamic-form-group.component.spec.ts | 4 +-- .../dynamic-form-group.component.ts | 2 +- .../radio-group/radio-group.component.spec.ts | 2 +- .../suggestive-input.component.ts | 2 +- .../view-combination.component.spec.ts | 2 +- .../abandon-dialog.component.spec.ts | 6 ++-- .../abandon-dialog.component.ts | 6 ++-- ...r-examiner-notes-history.component-edit.ts | 2 +- ...miner-notes-history-view.component.spec.ts | 2 +- ...ertificate-required-view.component.spec.ts | 2 +- ...-initial-inspection-view.component.spec.ts | 2 +- ...r-tank-details-m145-view.component.spec.ts | 2 +- ...sequent-inspections-edit.component.spec.ts | 2 +- ...s-subsequent-inspections-edit.component.ts | 4 +-- ...sequent-inspections-view.component.spec.ts | 2 +- ...statement-un-number-edit.component.spec.ts | 2 +- ...statement-un-number-view.component.spec.ts | 2 +- .../custom-sections/adr/adr.component.ts | 2 +- .../approval-type/approval-type.component.ts | 8 ++--- .../body/body.component.spec.ts | 6 ++-- .../custom-sections/body/body.component.ts | 13 ++++--- .../custom-defects.component.spec.ts | 2 +- .../defect/defect.component.ts | 6 ++-- .../defects/defects.component.spec.ts | 2 +- .../defects/defects.component.ts | 4 +-- .../dimensions/dimensions.component.ts | 8 ++--- .../letters/letters.component.ts | 4 +-- .../modified-weights.component.ts | 2 +- .../plates/plates.component.ts | 6 ++-- .../psv-brakes/psv-brakes.component.spec.ts | 2 +- .../psv-brakes/psv-brakes.component.ts | 13 ++++--- .../required-standard.component.spec.ts | 4 +-- .../required-standard.component.ts | 6 ++-- .../required-standards.component.spec.ts | 2 +- .../required-standards.component.ts | 4 +-- .../trl-brakes/trl-brakes.component.ts | 2 +- .../custom-sections/tyres/tyres.component.ts | 18 +++++----- .../weights/weights.component.ts | 9 +++-- src/app/forms/dynamic-forms.module.ts | 14 ++++---- .../templates/car/car-tech-record.template.ts | 4 +-- .../templates/general/adr-summary.template.ts | 2 +- .../forms/templates/general/adr.template.ts | 2 +- .../general/approval-type.template.ts | 2 +- .../templates/general/documents.template.ts | 2 +- .../forms/templates/general/notes.template.ts | 7 +++- .../templates/hgv/hgv-tech-record.template.ts | 2 +- .../forms/templates/hgv/hgv-tyres.template.ts | 2 +- .../templates/lgv/lgv-tech-record.template.ts | 4 +-- .../motorcycle-tech-record.template.ts | 2 +- .../psv/psv-approval-type.template.ts | 2 +- .../forms/templates/psv/psv-notes.template.ts | 7 +++- .../templates/psv/psv-tech-record.template.ts | 2 +- .../small-trailer-tech-record.template.ts | 4 +-- .../tech-records/vehicle-summary.template.ts | 7 +++- .../test-records/create-master.template.ts | 2 +- .../templates/test-records/master.template.ts | 2 +- .../desk-based-emissions-section.template.ts | 4 +-- .../emissions/emissions-section.template.ts | 4 +-- .../notes/adr-notes-section.template.ts | 9 +++-- .../reasonForCreation.template.ts | 7 +++- ...equired-hidden-section-hgv-trl.template.ts | 7 +++- ...equired-hidden-section-lgv-car.template.ts | 7 +++- ...ired-hidden-section-motorcycle.template.ts | 7 +++- ...ngency-required-hidden-section.template.ts | 7 +++- .../custom-defects-hidden-section.template.ts | 7 +++- .../defect-hidden-section.template.ts | 7 +++- ...sed-required-hidden-group4-lgv.template.ts | 7 +++- ...hidden-group4-motorcycle-amend.template.ts | 7 +++- ...uired-hidden-group4-motorcycle.template.ts | 7 +++- ...sed-required-hidden-group5-lgv.template.ts | 7 +++- ...equired-hidden-section-hgv-trl.template.ts | 7 +++- ...ed-required-hidden-section-psv.template.ts | 7 +++- ...-required-section-group4-amend.template.ts | 7 +++- ...equired-hidden-section-hgv-trl.template.ts | 7 +++- .../required-hidden-section.template.ts | 7 +++- .../seatbelt-hidden-section.template.ts | 7 +++- ...equired-hidden-section-hgv-trl.template.ts | 7 +++- ...equired-hidden-section-lgv-car.template.ts | 7 +++- ...ired-hidden-section-motorcycle.template.ts | 7 +++- ...ialist-required-hidden-section.template.ts | 7 +++- ...specialist-test-section-group1.template.ts | 2 +- ...specialist-test-section-group5.template.ts | 2 +- ...specialist-test-section-group1.template.ts | 2 +- ...specialist-test-section-group2.template.ts | 2 +- ...ialist-test-section-group3And4.template.ts | 2 +- ...specialist-test-section-group5.template.ts | 2 +- .../test/test-section-group5And13.template.ts | 2 +- .../amend-iva-msva-psv-hgv-light.template.ts | 4 +-- ...-psv-hgv-light-vehicle-section.template.ts | 4 +-- ...cy-default-trl-vehicle-section.template.ts | 4 +-- ...gency-iva-msva-vehicle-section.template.ts | 4 +-- ...-psv-hgv-light-vehicle-section.template.ts | 4 +-- .../default-trl-vehicle-section.template.ts | 4 +-- ...efault-psv-hgv-vehicle-section.template.ts | 4 +-- ...ed-default-trl-vehicle-section.template.ts | 4 +-- ...vehicle-section-group1And2And4.template.ts | 4 +-- ...sed-vehicle-section-group4-lgv.template.ts | 4 +-- ...sed-vehicle-section-group5-lgv.template.ts | 4 +-- .../group-3-light-vehicle-section.template.ts | 4 +-- .../contingency-visit-section.template.ts | 2 +- .../visit/visit-section.template.ts | 2 +- .../trl/trl-auth-into-service.template.ts | 7 +++- .../templates/trl/trl-tech-record.template.ts | 2 +- .../forms/templates/trl/trl-tyres.template.ts | 2 +- src/app/forms/utils/tech-record-constants.ts | 2 +- .../custom-async-validators.spec.ts | 4 +-- .../validators/custom-async-validators.ts | 4 +-- .../validators/custom-validators.spec.ts | 2 +- src/app/forms/validators/custom-validators.ts | 2 +- .../defects/defect.validators.spec.ts | 2 +- .../default-null-or-empty.pipe.spec.ts | 0 .../default-null-or-empty.pipe.ts | 0 .../digit-group-separator.pipe.spec.ts | 0 .../digit-group-separator.pipe.ts | 0 .../format-vehicle-type.pipe.spec.ts | 0 .../format-vehicle-type.pipe.ts | 0 .../get-control-label.pipe.spec.ts | 0 .../get-control-label.pipe.ts | 0 .../ref-data-decode.pipe.spec.ts | 0 .../ref-data-decode/ref-data-decode.pipe.ts | 2 +- .../test-type-name.pipe.spec.ts | 0 .../test-type-name/test-type-name.pipe.ts | 0 .../pipes/truncate/truncate.pipe.spec.ts | 0 .../pipes/truncate/truncate.pipe.ts | 0 .../tyre-axle-load.pipe.spec.ts | 0 .../tyre-axle-load/tyre-axle-load.pipe.ts | 0 .../batch-technical-record.service.spec.ts | 2 +- .../batch-technical-record.service.ts | 2 +- .../dynamic-forms/dynamic-form.service.ts | 6 ++-- .../dynamic-forms/dynamic-form.types.ts | 6 ++-- .../test-records/test-records.service.ts | 4 +-- src/app/shared/shared.module.ts | 36 +++++++++---------- .../technical-record-service.effects.ts | 2 +- .../actions/test-records.actions.ts | 4 +-- .../effects/test-records.effects.spec.ts | 4 +-- .../effects/test-records.effects.ts | 4 +-- .../reducers/test-records.reducer.ts | 14 ++++---- tsconfig.json | 2 ++ 194 files changed, 502 insertions(+), 295 deletions(-) rename src/app/{shared => }/pipes/default-null-or-empty/default-null-or-empty.pipe.spec.ts (100%) rename src/app/{shared => }/pipes/default-null-or-empty/default-null-or-empty.pipe.ts (100%) rename src/app/{shared => }/pipes/digit-group-separator/digit-group-separator.pipe.spec.ts (100%) rename src/app/{shared => }/pipes/digit-group-separator/digit-group-separator.pipe.ts (100%) rename src/app/{shared => }/pipes/format-vehicle-type/format-vehicle-type.pipe.spec.ts (100%) rename src/app/{shared => }/pipes/format-vehicle-type/format-vehicle-type.pipe.ts (100%) rename src/app/{shared => }/pipes/get-control-label/get-control-label.pipe.spec.ts (100%) rename src/app/{shared => }/pipes/get-control-label/get-control-label.pipe.ts (100%) rename src/app/{shared => }/pipes/ref-data-decode/ref-data-decode.pipe.spec.ts (100%) rename src/app/{shared => }/pipes/ref-data-decode/ref-data-decode.pipe.ts (100%) rename src/app/{shared => }/pipes/test-type-name/test-type-name.pipe.spec.ts (100%) rename src/app/{shared => }/pipes/test-type-name/test-type-name.pipe.ts (100%) rename src/app/{shared => }/pipes/truncate/truncate.pipe.spec.ts (100%) rename src/app/{shared => }/pipes/truncate/truncate.pipe.ts (100%) rename src/app/{shared => }/pipes/tyre-axle-load/tyre-axle-load.pipe.spec.ts (100%) rename src/app/{shared => }/pipes/tyre-axle-load/tyre-axle-load.pipe.ts (100%) diff --git a/src/app/components/test-certificate/test-certificate.component.ts b/src/app/components/test-certificate/test-certificate.component.ts index 2251670e8..41e289ce2 100644 --- a/src/app/components/test-certificate/test-certificate.component.ts +++ b/src/app/components/test-certificate/test-certificate.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, inject } from '@angular/core'; -import { TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; +import { TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; import { Store, select } from '@ngrx/store'; import { FeatureToggleService } from '@services/feature-toggle-service/feature-toggle-service'; import { State } from '@store/index'; diff --git a/src/app/features/reference-data/reference-data-add/reference-data-add.component.ts b/src/app/features/reference-data/reference-data-add/reference-data-add.component.ts index 9cb47f0e4..4cb1f3420 100644 --- a/src/app/features/reference-data/reference-data-add/reference-data-add.component.ts +++ b/src/app/features/reference-data/reference-data-add/reference-data-add.component.ts @@ -3,11 +3,11 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { ReferenceDataState, createReferenceDataItem, selectReferenceDataByResourceKey } from '@store/reference-data'; import { Observable, catchError, filter, of, switchMap, take, throwError } from 'rxjs'; diff --git a/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.ts b/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.ts index d1b811fef..7eeaa3cb8 100644 --- a/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.ts +++ b/src/app/features/reference-data/reference-data-amend/reference-data-amend.component.ts @@ -3,11 +3,11 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { ReferenceDataState, amendReferenceDataItem, selectReferenceDataByResourceKey } from '@store/reference-data'; import { Observable, first } from 'rxjs'; diff --git a/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.ts b/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.ts index 129382f3f..0eab5df31 100644 --- a/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.ts +++ b/src/app/features/reference-data/reference-data-delete/reference-data-delete.component.ts @@ -3,12 +3,17 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; -import { ValidatorNames } from '@models/validators.enum'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormGroup, + FormNodeEditTypes, + FormNodeTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { ReferenceDataState, diff --git a/src/app/features/reference-data/reference-data-list/__tests__/reference-data-list.component.spec.ts b/src/app/features/reference-data/reference-data-list/__tests__/reference-data-list.component.spec.ts index e241c7009..3f51f2f10 100644 --- a/src/app/features/reference-data/reference-data-list/__tests__/reference-data-list.component.spec.ts +++ b/src/app/features/reference-data/reference-data-list/__tests__/reference-data-list.component.spec.ts @@ -12,8 +12,8 @@ import { provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; import { initialAppState } from '@store/index'; -import { of } from 'rxjs'; import * as refSelectors from '@store/reference-data/selectors/reference-data.selectors'; +import { of } from 'rxjs'; import { ReferenceDataListComponent } from '../reference-data-list.component'; describe('DataTypeListComponent', () => { diff --git a/src/app/features/reference-data/reference-data-list/reference-data-list.component.ts b/src/app/features/reference-data/reference-data-list/reference-data-list.component.ts index e389ce2c2..9c2e0fab2 100644 --- a/src/app/features/reference-data/reference-data-list/reference-data-list.component.ts +++ b/src/app/features/reference-data/reference-data-list/reference-data-list.component.ts @@ -1,11 +1,11 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataModelBase, ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { selectAllReferenceDataByResourceType, diff --git a/src/app/features/reference-data/reference-data-routing.module.ts b/src/app/features/reference-data/reference-data-routing.module.ts index 8a287f862..0f60e3cf2 100644 --- a/src/app/features/reference-data/reference-data-routing.module.ts +++ b/src/app/features/reference-data/reference-data-routing.module.ts @@ -4,13 +4,13 @@ import { MsalGuard } from '@azure/msal-angular'; import { RoleGuard } from '@guards/role-guard/roles.guard'; import { Roles } from '@models/roles.enum'; import { ReferenceDataRoutes } from '@models/routes.enum'; +import { RouterOutletComponent } from '../../components/router-outlet/router-outlet.component'; import { ReferenceDataCreateComponent } from './reference-data-add/reference-data-add.component'; import { ReferenceDataAmendComponent } from './reference-data-amend/reference-data-amend.component'; import { ReferenceDataDeleteComponent } from './reference-data-delete/reference-data-delete.component'; import { ReferenceDataDeletedListComponent } from './reference-data-deleted-list/reference-data-deleted-list.component'; import { ReferenceDataListComponent } from './reference-data-list/reference-data-list.component'; import { ReferenceDataSelectTypeComponent } from './reference-data-select-type/reference-data-select-type.component'; -import { RouterOutletComponent } from '../../components/router-outlet/router-outlet.component'; const routes: Routes = [ { diff --git a/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts b/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts index 634f81d71..b0d7156b2 100644 --- a/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts +++ b/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts @@ -5,10 +5,10 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { RadioGroupComponent } from '@forms/components/radio-group/radio-group.component'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; import { ButtonComponent } from '@shared/components/button/button.component'; diff --git a/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.ts b/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.ts index 4cdb13136..b5049b9a8 100644 --- a/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.ts +++ b/src/app/features/reference-data/reference-data-select-type/reference-data-select-type.component.ts @@ -3,11 +3,16 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormControl, + CustomFormGroup, + FormNodeOption, + FormNodeTypes, +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { ReferenceDataState, selectAllReferenceDataByResourceType } from '@store/reference-data'; import { Observable, map, take } from 'rxjs'; diff --git a/src/app/features/search/__tests__/search.component.spec.ts b/src/app/features/search/__tests__/search.component.spec.ts index ed6a9bba2..fd110495e 100644 --- a/src/app/features/search/__tests__/search.component.spec.ts +++ b/src/app/features/search/__tests__/search.component.spec.ts @@ -8,8 +8,8 @@ import { Roles } from '@models/roles.enum'; import { SEARCH_TYPES } from '@models/search-types-enum'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; -import { State, initialAppState } from '@store/index'; import { globalErrorState } from '@store/global-error/reducers/global-error-service.reducer'; +import { State, initialAppState } from '@store/index'; import { of } from 'rxjs'; import { SearchComponent } from '../search.component'; diff --git a/src/app/features/search/single-search-result/single-search-result.component.ts b/src/app/features/search/single-search-result/single-search-result.component.ts index ccd416d33..7eba1c473 100644 --- a/src/app/features/search/single-search-result/single-search-result.component.ts +++ b/src/app/features/search/single-search-result/single-search-result.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { TechRecordSearchSchema } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/search'; -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { createSingleSearchResult } from '@forms/templates/search/single-search-result.template'; import { Roles } from '@models/roles.enum'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; @Component({ selector: 'app-single-search-result[searchResult]', diff --git a/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.spec.ts b/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.spec.ts index 8c41647d8..9cc811b06 100644 --- a/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.spec.ts +++ b/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.spec.ts @@ -5,11 +5,11 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { UserService } from '@services/user-service/user-service'; import { SharedModule } from '@shared/shared.module'; diff --git a/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.ts b/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.ts index 334d4390e..a2e56232a 100644 --- a/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.ts +++ b/src/app/features/tech-record/components/adr-generate-certificate/adr-generate-certificate.component.ts @@ -3,9 +3,14 @@ import { FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { ADRCertificateTypes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/adrCertificateTypes.enum.js'; -import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { + CustomFormControl, + FormNodeOption, + FormNodeTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; import { UserService } from '@services/user-service/user-service'; import { State } from '@store/index'; import { generateADRCertificate, generateADRCertificateSuccess } from '@store/technical-records'; diff --git a/src/app/features/tech-record/components/tech-record-amend-reason/tech-record-amend-reason.component.ts b/src/app/features/tech-record/components/tech-record-amend-reason/tech-record-amend-reason.component.ts index 9f32119c9..99673bcfe 100644 --- a/src/app/features/tech-record/components/tech-record-amend-reason/tech-record-amend-reason.component.ts +++ b/src/app/features/tech-record/components/tech-record-amend-reason/tech-record-amend-reason.component.ts @@ -3,8 +3,13 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReasonForEditing } from '@models/vehicle-tech-record.model'; +import { + CustomFormControl, + CustomFormGroup, + FormNodeOption, + FormNodeTypes, +} from '@services/dynamic-forms/dynamic-form.types'; @Component({ selector: 'app-tech-amend-reason', diff --git a/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.spec.ts b/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.spec.ts index 0f42bcd4f..89503e99d 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.spec.ts @@ -5,11 +5,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { SharedModule } from '@shared/shared.module'; import { initialAppState } from '@store/index'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.ts b/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.ts index 8b3f95df3..831ed3567 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vin/tech-record-amend-vin.component.ts @@ -4,12 +4,12 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; import { V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { State } from '@store/index'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.spec.ts b/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.spec.ts index a61cf3b43..3f6803f9c 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.spec.ts @@ -5,10 +5,10 @@ import { ActivatedRoute, ActivatedRouteSnapshot, Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { SharedModule } from '@shared/shared.module'; import { State, initialAppState } from '@store/index'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.ts b/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.ts index 735eb344e..d7e9cea3f 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vrm-reason/tech-record-amend-vrm-reason.component.ts @@ -3,9 +3,14 @@ import { FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleTypes, VehiclesOtherThan } from '@models/vehicle-tech-record.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormControl, + FormNodeOption, + FormNodeTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { Subject, take, takeUntil } from 'rxjs'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.spec.ts b/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.spec.ts index be368062d..8b998b143 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.spec.ts @@ -4,12 +4,12 @@ import { ActivatedRoute, ActivatedRouteSnapshot, Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { mockVehicleTechnicalRecord } from '@mocks/mock-vehicle-technical-record.mock'; import { VehiclesOtherThan } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { SharedModule } from '@shared/shared.module'; import { State, initialAppState } from '@store/index'; diff --git a/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.ts b/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.ts index c29c111d0..894b47624 100644 --- a/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.ts +++ b/src/app/features/tech-record/components/tech-record-amend-vrm/tech-record-amend-vrm.component.ts @@ -5,12 +5,12 @@ import { GlobalError } from '@core/components/global-error/global-error.interfac import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; import { VehicleTypes, VehiclesOtherThan } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { amendVrm, amendVrmSuccess } from '@store/technical-records'; import { TechnicalRecordServiceState } from '@store/technical-records/reducers/technical-record-service.reducer'; diff --git a/src/app/features/tech-record/components/tech-record-change-status/tech-record-change-status.component.ts b/src/app/features/tech-record/components/tech-record-change-status/tech-record-change-status.component.ts index 24fa5c5a8..e2d81d7bc 100644 --- a/src/app/features/tech-record/components/tech-record-change-status/tech-record-change-status.component.ts +++ b/src/app/features/tech-record/components/tech-record-change-status/tech-record-change-status.component.ts @@ -3,9 +3,9 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { State } from '@store/index'; import { diff --git a/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts b/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts index eb403f47d..861aba67c 100644 --- a/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.spec.ts @@ -4,12 +4,12 @@ import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { getOptionsFromEnumAcronym } from '@forms/utils/enum-map'; import { V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { FixNavigationTriggeredOutsideAngularZoneNgModule } from '@shared/custom-module/fixNgZoneError'; import { SharedModule } from '@shared/shared.module'; diff --git a/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts b/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts index 21386d657..e78510016 100644 --- a/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts +++ b/src/app/features/tech-record/components/tech-record-change-type/tech-record-change-type.component.ts @@ -4,9 +4,9 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { TechRecordType as TechRecordTypeByVehicle } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; +import { getOptionsFromEnumAcronym } from '@forms/utils/enum-map'; import { MultiOptions } from '@models/options.model'; import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnumAcronym } from '@forms/utils/enum-map'; import { StatusCodes, V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; diff --git a/src/app/features/tech-record/components/tech-record-change-visibility/tech-record-change-visibility.component.ts b/src/app/features/tech-record/components/tech-record-change-visibility/tech-record-change-visibility.component.ts index 39b5cad20..1770579e4 100644 --- a/src/app/features/tech-record/components/tech-record-change-visibility/tech-record-change-visibility.component.ts +++ b/src/app/features/tech-record/components/tech-record-change-visibility/tech-record-change-visibility.component.ts @@ -3,10 +3,10 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { State } from '@store/index'; diff --git a/src/app/features/tech-record/components/tech-record-edit-additional-examiner-note/tech-record-edit-additional-examiner-note.component.ts b/src/app/features/tech-record/components/tech-record-edit-additional-examiner-note/tech-record-edit-additional-examiner-note.component.ts index 884cbc28d..561a4adf6 100644 --- a/src/app/features/tech-record/components/tech-record-edit-additional-examiner-note/tech-record-edit-additional-examiner-note.component.ts +++ b/src/app/features/tech-record/components/tech-record-edit-additional-examiner-note/tech-record-edit-additional-examiner-note.component.ts @@ -4,8 +4,13 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { AdditionalExaminerNotes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { CustomFormControl, FormNodeEditTypes, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { Store } from '@ngrx/store'; +import { + CustomFormControl, + FormNodeEditTypes, + FormNodeTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { State } from '@store/index'; import { updateExistingADRAdditionalExaminerNote } from '@store/technical-records'; diff --git a/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.spec.ts b/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.spec.ts index 83c8c66ea..31ca85ec2 100644 --- a/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.spec.ts @@ -6,11 +6,11 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { mockVehicleTechnicalRecord } from '@mocks/mock-vehicle-technical-record.mock'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { UserService } from '@services/user-service/user-service'; import { FixNavigationTriggeredOutsideAngularZoneNgModule } from '@shared/custom-module/fixNgZoneError'; diff --git a/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.ts b/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.ts index 2a6f7a8f4..74e22cf1f 100644 --- a/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.ts +++ b/src/app/features/tech-record/components/tech-record-generate-letter/tech-record-generate-letter.component.ts @@ -4,12 +4,17 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { LETTER_TYPES } from '@forms/templates/general/letter-types'; import { StatusCodes, V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormControl, + FormNodeOption, + FormNodeTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { UserService } from '@services/user-service/user-service'; import { generateLetter, generateLetterSuccess } from '@store/technical-records'; diff --git a/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.spec.ts b/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.spec.ts index 9949b39e6..68de10ba6 100644 --- a/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.spec.ts @@ -5,11 +5,11 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { UserService } from '@services/user-service/user-service'; import { SharedModule } from '@shared/shared.module'; diff --git a/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.ts b/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.ts index cdb6c0bec..4d81e3bd6 100644 --- a/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.ts +++ b/src/app/features/tech-record/components/tech-record-generate-plate/tech-record-generate-plate.component.ts @@ -3,9 +3,14 @@ import { FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { PlatesInner } from '@api/vehicle'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { CustomFormControl, FormNodeOption, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { Actions, ofType } from '@ngrx/effects'; import { Store, select } from '@ngrx/store'; +import { + CustomFormControl, + FormNodeOption, + FormNodeTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { UserService } from '@services/user-service/user-service'; import { State } from '@store/index'; diff --git a/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.spec.ts b/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.spec.ts index 9160b3d55..c51fddec6 100644 --- a/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.spec.ts @@ -5,13 +5,13 @@ import { RouterTestingModule } from '@angular/router/testing'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ReferenceDataResourceType, ReferenceDataTyre } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { FixNavigationTriggeredOutsideAngularZoneNgModule } from '@shared/custom-module/fixNgZoneError'; diff --git a/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.ts b/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.ts index ae135ecfe..d4c2a6d06 100644 --- a/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.ts +++ b/src/app/features/tech-record/components/tech-record-search-tyres/tech-record-search-tyres.component.ts @@ -5,13 +5,13 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType as TechRecordTypeByVerb } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { MultiOptions } from '@models/options.model'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeTypes, SearchParams } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType, ReferenceDataTyre, ReferenceDataTyreLoadIndex } from '@models/reference-data.model'; import { Roles } from '@models/roles.enum'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNode, FormNodeTypes, SearchParams } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { fetchReferenceDataByKeySearchSuccess, fetchTyreReferenceDataByKeySearchSuccess } from '@store/reference-data'; diff --git a/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.spec.ts b/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.spec.ts index 692fc01b3..f43d2a8d7 100644 --- a/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.spec.ts +++ b/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.spec.ts @@ -4,12 +4,12 @@ import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { FormNode, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TechRecordReasonForCreationSection } from '@forms/templates/general/reason-for-creation.template'; import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { FormNode, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; import { UserService } from '@services/user-service/user-service'; import { SharedModule } from '@shared/shared.module'; diff --git a/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.ts b/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.ts index 2ffd1127e..127829148 100644 --- a/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.ts +++ b/src/app/features/tech-record/components/tech-record-summary-changes/tech-record-summary-changes.component.ts @@ -9,12 +9,12 @@ import { TechRecordGETPSV, TechRecordGETTRL, } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { FormNode, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleSummary } from '@forms/templates/tech-records/vehicle-summary.template'; import { vehicleTemplateMap } from '@forms/utils/tech-record-constants'; import { Axles, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { FormNode, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { UserService } from '@services/user-service/user-service'; diff --git a/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.ts b/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.ts index 5ede06821..f3f79069b 100644 --- a/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.ts +++ b/src/app/features/tech-record/components/tech-record-summary/tech-record-summary.component.ts @@ -26,12 +26,12 @@ import { PsvBrakesComponent } from '@forms/custom-sections/psv-brakes/psv-brakes import { TrlBrakesComponent } from '@forms/custom-sections/trl-brakes/trl-brakes.component'; import { TyresComponent } from '@forms/custom-sections/tyres/tyres.component'; import { WeightsComponent } from '@forms/custom-sections/weights/weights.component'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { vehicleTemplateMap } from '@forms/utils/tech-record-constants'; import { ReasonForEditing, StatusCodes, V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; import { AxlesService } from '@services/axles/axles.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { FeatureToggleService } from '@services/feature-toggle-service/feature-toggle-service'; import { LoadingService } from '@services/loading/loading.service'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; diff --git a/src/app/features/tech-record/components/tech-record-unarchive/tech-record-unarchive-component.ts b/src/app/features/tech-record/components/tech-record-unarchive/tech-record-unarchive-component.ts index c32a7fdeb..c770c6078 100644 --- a/src/app/features/tech-record/components/tech-record-unarchive/tech-record-unarchive-component.ts +++ b/src/app/features/tech-record/components/tech-record-unarchive/tech-record-unarchive-component.ts @@ -3,10 +3,15 @@ import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { StatusCodes } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; +import { + CustomFormControl, + CustomFormGroup, + FormNodeOption, + FormNodeTypes, +} from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { State } from '@store/index'; import { unarchiveTechRecord, unarchiveTechRecordSuccess } from '@store/technical-records'; diff --git a/src/app/features/tech-record/components/vehicle-technical-record/vehicle-technical-record.component.spec.ts b/src/app/features/tech-record/components/vehicle-technical-record/vehicle-technical-record.component.spec.ts index 261aac102..a31347c04 100644 --- a/src/app/features/tech-record/components/vehicle-technical-record/vehicle-technical-record.component.spec.ts +++ b/src/app/features/tech-record/components/vehicle-technical-record/vehicle-technical-record.component.spec.ts @@ -6,11 +6,11 @@ import { RouterModule } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { ApiModule } from '@api/test-results'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { StatusCodes, TechRecordModel, V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { EffectsModule } from '@ngrx/effects'; import { StoreModule } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { UserService } from '@services/user-service/user-service'; import { SharedModule } from '@shared/shared.module'; diff --git a/src/app/features/tech-record/create-batch/components/batch-vehicle-details/batch-vehicle-details.component.ts b/src/app/features/tech-record/create-batch/components/batch-vehicle-details/batch-vehicle-details.component.ts index 218108b18..f818076c5 100644 --- a/src/app/features/tech-record/create-batch/components/batch-vehicle-details/batch-vehicle-details.component.ts +++ b/src/app/features/tech-record/create-batch/components/batch-vehicle-details/batch-vehicle-details.component.ts @@ -3,6 +3,9 @@ import { AbstractControl, FormArray, FormBuilder, FormControlStatus, FormGroup, import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; +import { CustomValidators } from '@forms/validators/custom-validators'; +import { VehicleTypes } from '@models/vehicle-tech-record.model'; +import { BatchTechnicalRecordService } from '@services/batch-technical-record/batch-technical-record.service'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormControl, @@ -11,9 +14,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { CustomValidators } from '@forms/validators/custom-validators'; -import { VehicleTypes } from '@models/vehicle-tech-record.model'; -import { BatchTechnicalRecordService } from '@services/batch-technical-record/batch-technical-record.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { Observable, Subject, combineLatest, filter, firstValueFrom, take } from 'rxjs'; diff --git a/src/app/features/tech-record/create-batch/components/batch-vehicle-template/batch-vehicle-template.component.ts b/src/app/features/tech-record/create-batch/components/batch-vehicle-template/batch-vehicle-template.component.ts index 0408155a4..ab14a39a5 100644 --- a/src/app/features/tech-record/create-batch/components/batch-vehicle-template/batch-vehicle-template.component.ts +++ b/src/app/features/tech-record/create-batch/components/batch-vehicle-template/batch-vehicle-template.component.ts @@ -5,8 +5,6 @@ import { GlobalError } from '@core/components/global-error/global-error.interfac import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { MultiOptions } from '@models/options.model'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BatchUpdateVehicleModel, StatusCodes, @@ -15,6 +13,8 @@ import { } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; import { BatchTechnicalRecordService } from '@services/batch-technical-record/batch-technical-record.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { createVehicleRecord, selectTechRecord, updateTechRecord } from '@store/technical-records'; import { TechnicalRecordServiceState } from '@store/technical-records/reducers/technical-record-service.reducer'; diff --git a/src/app/features/tech-record/create-batch/components/select-vehicle-type/select-vehicle-type.component.ts b/src/app/features/tech-record/create-batch/components/select-vehicle-type/select-vehicle-type.component.ts index 85d8f729a..41b2d6faa 100644 --- a/src/app/features/tech-record/create-batch/components/select-vehicle-type/select-vehicle-type.component.ts +++ b/src/app/features/tech-record/create-batch/components/select-vehicle-type/select-vehicle-type.component.ts @@ -4,12 +4,17 @@ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; import { StatusCodes, TrailerFormType, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; import { BatchTechnicalRecordService } from '@services/batch-technical-record/batch-technical-record.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormControl, + CustomFormGroup, + FormNodeOption, + FormNodeTypes, +} from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { selectTechRecord } from '@store/technical-records'; import { take } from 'rxjs'; diff --git a/src/app/features/tech-record/create-batch/create-batch-routing.module.ts b/src/app/features/tech-record/create-batch/create-batch-routing.module.ts index 614daf2bf..d45823b30 100644 --- a/src/app/features/tech-record/create-batch/create-batch-routing.module.ts +++ b/src/app/features/tech-record/create-batch/create-batch-routing.module.ts @@ -5,12 +5,12 @@ import { RoleGuard } from '@guards/role-guard/roles.guard'; import { Roles } from '@models/roles.enum'; import { TechRecordCreateBatchRoutes } from '@models/routes.enum'; import { techRecordDataResolver } from 'src/app/resolvers/tech-record-data/tech-record-data.resolver'; +import { RouterOutletComponent } from '../../../components/router-outlet/router-outlet.component'; import { TechRecordSearchTyresComponent } from '../components/tech-record-search-tyres/tech-record-search-tyres.component'; import { BatchVehicleDetailsComponent } from './components/batch-vehicle-details/batch-vehicle-details.component'; import { BatchVehicleResultsComponent } from './components/batch-vehicle-results/batch-vehicle-results.component'; import { BatchVehicleTemplateComponent } from './components/batch-vehicle-template/batch-vehicle-template.component'; import { SelectVehicleTypeComponent } from './components/select-vehicle-type/select-vehicle-type.component'; -import { RouterOutletComponent } from '../../../components/router-outlet/router-outlet.component'; const routes: Routes = [ { diff --git a/src/app/features/tech-record/create/create-tech-record.component.spec.ts b/src/app/features/tech-record/create/create-tech-record.component.spec.ts index f6f44bab5..549ec9510 100644 --- a/src/app/features/tech-record/create/create-tech-record.component.spec.ts +++ b/src/app/features/tech-record/create/create-tech-record.component.spec.ts @@ -5,9 +5,9 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { SEARCH_TYPES } from '@models/search-types-enum'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { SharedModule } from '@shared/shared.module'; import { initialAppState } from '@store/index'; diff --git a/src/app/features/tech-record/create/create-tech-record.component.ts b/src/app/features/tech-record/create/create-tech-record.component.ts index 6c9912087..5bff8f929 100644 --- a/src/app/features/tech-record/create/create-tech-record.component.ts +++ b/src/app/features/tech-record/create/create-tech-record.component.ts @@ -5,14 +5,14 @@ import { GlobalError } from '@core/components/global-error/global-error.interfac import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; import { CheckboxGroupComponent } from '@forms/components/checkbox-group/checkbox-group.component'; -import { MultiOptions } from '@models/options.model'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from '@forms/validators/custom-validators'; +import { MultiOptions } from '@models/options.model'; import { SEARCH_TYPES } from '@models/search-types-enum'; import { StatusCodes, V3TechRecordModel, VehicleTypes, VehiclesOtherThan } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; import { BatchTechnicalRecordService } from '@services/batch-technical-record/batch-technical-record.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { setSpinnerState } from '@store/spinner/actions/spinner.actions'; import { firstValueFrom } from 'rxjs'; diff --git a/src/app/features/test-records/amend/views/amended-test-record/amended-test-record.component.ts b/src/app/features/test-records/amend/views/amended-test-record/amended-test-record.component.ts index 0dd69a32b..9601ae975 100644 --- a/src/app/features/test-records/amend/views/amended-test-record/amended-test-record.component.ts +++ b/src/app/features/test-records/amend/views/amended-test-record/amended-test-record.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultDefects } from '@models/test-results/test-result-defects.model'; import { TestResultModel } from '@models/test-results/test-result.model'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestRecordsService } from '@services/test-records/test-records.service'; import { Observable, firstValueFrom, of } from 'rxjs'; diff --git a/src/app/features/test-records/amend/views/confirm-cancellation/confirm-cancellation.component.ts b/src/app/features/test-records/amend/views/confirm-cancellation/confirm-cancellation.component.ts index 65b09098a..23a59f394 100644 --- a/src/app/features/test-records/amend/views/confirm-cancellation/confirm-cancellation.component.ts +++ b/src/app/features/test-records/amend/views/confirm-cancellation/confirm-cancellation.component.ts @@ -3,10 +3,10 @@ import { Component, OnDestroy } from '@angular/core'; import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultModel } from '@models/test-results/test-result.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store, select } from '@ngrx/store'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TestRecordsService } from '@services/test-records/test-records.service'; import { selectRouteNestedParams } from '@store/router/selectors/router.selectors'; import { selectedTestResultState, updateTestResultSuccess } from '@store/test-records'; diff --git a/src/app/features/test-records/amend/views/test-amend-reason/test-amend-reason.component.ts b/src/app/features/test-records/amend/views/test-amend-reason/test-amend-reason.component.ts index 75dd93798..bce33beb6 100644 --- a/src/app/features/test-records/amend/views/test-amend-reason/test-amend-reason.component.ts +++ b/src/app/features/test-records/amend/views/test-amend-reason/test-amend-reason.component.ts @@ -1,7 +1,12 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { CustomFormControl, CustomFormGroup, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + CustomFormControl, + CustomFormGroup, + FormNodeOption, + FormNodeTypes, +} from '@services/dynamic-forms/dynamic-form.types'; @Component({ selector: 'app-test-amend-reason', diff --git a/src/app/features/test-records/amend/views/test-record/test-record.component.ts b/src/app/features/test-records/amend/views/test-record/test-record.component.ts index 72003f8b9..4f039759b 100644 --- a/src/app/features/test-records/amend/views/test-record/test-record.component.ts +++ b/src/app/features/test-records/amend/views/test-record/test-record.component.ts @@ -3,12 +3,12 @@ import { FormGroup } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { Roles } from '@models/roles.enum'; import { TestModeEnum } from '@models/test-results/test-result-view.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; import { Actions, ofType } from '@ngrx/effects'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; import { TestRecordsService } from '@services/test-records/test-records.service'; import { updateTestResultSuccess } from '@store/test-records'; diff --git a/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.ts b/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.ts index d76958523..010fa4488 100644 --- a/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.ts +++ b/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultModel } from '@models/test-results/test-result.model'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestRecordsService } from '@services/test-records/test-records.service'; import { Observable, of, skipWhile, switchMap, take } from 'rxjs'; diff --git a/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts b/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts index 6e6c7eed7..0effce40d 100644 --- a/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts +++ b/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts @@ -10,12 +10,12 @@ import { import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/dynamic-form-group.component'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { Roles } from '@models/roles.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { TestTypesService } from '@services/test-types/test-types.service'; diff --git a/src/app/features/test-records/components/base-test-record/base-test-record.component.ts b/src/app/features/test-records/components/base-test-record/base-test-record.component.ts index 43c5c1eb1..b60fe5c04 100644 --- a/src/app/features/test-records/components/base-test-record/base-test-record.component.ts +++ b/src/app/features/test-records/components/base-test-record/base-test-record.component.ts @@ -15,8 +15,6 @@ import { DynamicFormGroupComponent } from '@forms/components/dynamic-form-group/ import { CustomDefectsComponent } from '@forms/custom-sections/custom-defects/custom-defects.component'; import { DefectsComponent } from '@forms/custom-sections/defects/defects.component'; import { RequiredStandardsComponent } from '@forms/custom-sections/required-standards/required-standards.component'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormControl, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { Defect } from '@models/defects/defect.model'; import { Roles } from '@models/roles.enum'; import { TestResultStatus } from '@models/test-results/test-result-status.enum'; @@ -24,6 +22,8 @@ import { TestResultModel } from '@models/test-results/test-result.model'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormControl, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; import { TestRecordsService } from '@services/test-records/test-records.service'; import { DefectsState, filteredDefects } from '@store/defects'; diff --git a/src/app/features/test-records/components/test-type-select/test-type-select.component.spec.ts b/src/app/features/test-records/components/test-type-select/test-type-select.component.spec.ts index 9e8c2a206..0c2baad53 100644 --- a/src/app/features/test-records/components/test-type-select/test-type-select.component.spec.ts +++ b/src/app/features/test-records/components/test-type-select/test-type-select.component.spec.ts @@ -1,9 +1,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { createMockTestTypeCategory } from '@mocks/test-type-category.mock'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TestTypesService } from '@services/test-types/test-types.service'; import { initialAppState } from '@store/.'; import { of } from 'rxjs'; diff --git a/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts b/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts index 1f57b6fc4..f657ec186 100644 --- a/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts +++ b/src/app/features/test-records/components/vehicle-header/vehicle-header.component.ts @@ -2,11 +2,11 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { TestTypesTaxonomy } from '@api/test-types'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { TEST_TYPES_GROUP7 } from '@models/testTypeId.enum'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { TestResultStatus } from '@models/test-results/test-result-status.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TestType, resultOfTestEnum } from '@models/test-types/test-type.model'; +import { TEST_TYPES_GROUP7 } from '@models/testTypeId.enum'; import { V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; import { TestTypesService } from '@services/test-types/test-types.service'; diff --git a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts index fa312fc2d..d11e227cf 100644 --- a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts +++ b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts @@ -11,7 +11,6 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { AbandonDialogComponent } from '@forms/custom-sections/abandon-dialog/abandon-dialog.component'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { contingencyTestTemplates } from '@forms/templates/test-records/create-master.template'; import { mockTestResult } from '@mocks/mock-test-result'; import { Roles } from '@models/roles.enum'; @@ -21,6 +20,7 @@ import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { TestRecordsService } from '@services/test-records/test-records.service'; diff --git a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.ts b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.ts index 56cfac017..f02d25138 100644 --- a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.ts +++ b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.ts @@ -5,7 +5,6 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { GlobalWarning } from '@core/components/global-warning/global-warning.interface'; import { GlobalWarningService } from '@core/components/global-warning/global-warning.service'; import { AbandonDialogComponent } from '@forms/custom-sections/abandon-dialog/abandon-dialog.component'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TestModeEnum } from '@models/test-results/test-result-view.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TypeOfTest } from '@models/test-results/typeOfTest.enum'; @@ -13,6 +12,7 @@ import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { StatusCodes, V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { Actions, ofType } from '@ngrx/effects'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ResultOfTestService } from '@services/result-of-test/result-of-test.service'; import { RouterService } from '@services/router/router.service'; import { TestRecordsService } from '@services/test-records/test-records.service'; diff --git a/src/app/forms/components/approval-type/approval-type.component.spec.ts b/src/app/forms/components/approval-type/approval-type.component.spec.ts index 05e793111..f1107fb95 100644 --- a/src/app/forms/components/approval-type/approval-type.component.spec.ts +++ b/src/app/forms/components/approval-type/approval-type.component.spec.ts @@ -3,8 +3,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; +import { + CustomFormControl, + CustomFormGroup, + FormNodeTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; import { initialAppState } from '@store/index'; import { BaseControlComponent } from '../base-control/base-control.component'; import { FocusNextDirective } from '../date/focus-next.directive'; diff --git a/src/app/forms/components/date/date.component.spec.ts b/src/app/forms/components/date/date.component.spec.ts index b08dcee68..9f802692e 100644 --- a/src/app/forms/components/date/date.component.spec.ts +++ b/src/app/forms/components/date/date.component.spec.ts @@ -3,8 +3,8 @@ import { Component, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { initialAppState } from '@store/.'; import { BaseControlComponent } from '../base-control/base-control.component'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; diff --git a/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.spec.ts b/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.spec.ts index 7e76cd5d7..263c50552 100644 --- a/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.spec.ts +++ b/src/app/forms/components/dynamic-form-field/dynamic-form-field.component.spec.ts @@ -1,9 +1,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { TestStationsService } from '@services/test-stations/test-stations.service'; import { UserService } from '@services/user-service/user-service'; diff --git a/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.spec.ts b/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.spec.ts index fe7be6a3f..24626bbce 100644 --- a/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.spec.ts +++ b/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.spec.ts @@ -4,13 +4,13 @@ import { FormGroup } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { TestStationsService } from '@services/test-stations/test-stations.service'; import { UserService } from '@services/user-service/user-service'; import { initialAppState } from '@store/.'; import { DynamicFormsModule } from '../../dynamic-forms.module'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { FormNode, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; import { DynamicFormGroupComponent } from './dynamic-form-group.component'; describe('DynamicFormGroupComponent', () => { diff --git a/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.ts b/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.ts index d2d076d9b..f834bcb85 100644 --- a/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.ts +++ b/src/app/forms/components/dynamic-form-group/dynamic-form-group.component.ts @@ -10,7 +10,6 @@ import { SimpleChanges, } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { Subject, debounceTime, takeUntil } from 'rxjs'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormArray, @@ -19,6 +18,7 @@ import { FormNodeTypes, FormNodeViewTypes, } from '@services/dynamic-forms/dynamic-form.types'; +import { Subject, debounceTime, takeUntil } from 'rxjs'; @Component({ selector: 'app-dynamic-form-group', diff --git a/src/app/forms/components/radio-group/radio-group.component.spec.ts b/src/app/forms/components/radio-group/radio-group.component.spec.ts index 30be982cc..1a23dc7b0 100644 --- a/src/app/forms/components/radio-group/radio-group.component.spec.ts +++ b/src/app/forms/components/radio-group/radio-group.component.spec.ts @@ -3,9 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { initialAppState } from '@store/.'; -import { CustomFormControl, FormNodeOption, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { BaseControlComponent } from '../base-control/base-control.component'; import { FieldErrorMessageComponent } from '../field-error-message/field-error-message.component'; import { RadioGroupComponent } from './radio-group.component'; diff --git a/src/app/forms/components/suggestive-input/suggestive-input.component.ts b/src/app/forms/components/suggestive-input/suggestive-input.component.ts index 98d91b36d..ef58239a5 100644 --- a/src/app/forms/components/suggestive-input/suggestive-input.component.ts +++ b/src/app/forms/components/suggestive-input/suggestive-input.component.ts @@ -1,7 +1,7 @@ import { AfterContentInit, ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { MultiOption } from '@models/options.model'; import { CustomValidators } from '@forms/validators/custom-validators'; +import { MultiOption } from '@models/options.model'; import { Observable, firstValueFrom, skipWhile, take } from 'rxjs'; import { BaseControlComponent } from '../base-control/base-control.component'; diff --git a/src/app/forms/components/view-combination/view-combination.component.spec.ts b/src/app/forms/components/view-combination/view-combination.component.spec.ts index b130e5184..e39ab5e51 100644 --- a/src/app/forms/components/view-combination/view-combination.component.spec.ts +++ b/src/app/forms/components/view-combination/view-combination.component.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { SharedModule } from '@shared/shared.module'; import { CustomFormControl, FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { SharedModule } from '@shared/shared.module'; import { ViewCombinationComponent } from './view-combination.component'; describe('ViewCombinationComponent', () => { diff --git a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.spec.ts b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.spec.ts index 773549fae..21a97621e 100644 --- a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.spec.ts +++ b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.spec.ts @@ -2,12 +2,12 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { SPECIALIST_TEST_TYPE_IDS, TEST_TYPES_GROUP5_13 } from '@models/testTypeId.enum'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { TestResultModel } from '@models/test-results/test-result.model'; +import { SPECIALIST_TEST_TYPE_IDS, TEST_TYPES_GROUP5_13 } from '@models/testTypeId.enum'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { SharedModule } from '@shared/shared.module'; import { initialAppState } from '@store/index'; diff --git a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts index 9266ae99c..6793b20d3 100644 --- a/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts +++ b/src/app/forms/custom-sections/abandon-dialog/abandon-dialog.component.ts @@ -1,14 +1,14 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; +import { TestResultModel } from '@models/test-results/test-result.model'; import { TEST_TYPES_GROUP5_13 } from '@models/testTypeId.enum'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { SpecialRefData } from '@services/multi-options/multi-options.service'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; -import { TestResultModel } from '@models/test-results/test-result.model'; import { TestRecordsService } from '@services/test-records/test-records.service'; import merge from 'lodash.merge'; -import { DynamicFormGroupComponent } from '../../components/dynamic-form-group/dynamic-form-group.component'; import { BaseDialogComponent } from '../../../components/base-dialog/base-dialog.component'; +import { DynamicFormGroupComponent } from '../../components/dynamic-form-group/dynamic-form-group.component'; const ABANDON_FORM = (ReasonsForAbandoning: ReferenceDataResourceType | SpecialRefData): FormNode => ({ name: 'abandonSection', diff --git a/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts b/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts index 07f28b943..a5aca90e2 100644 --- a/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts +++ b/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts @@ -5,9 +5,9 @@ import { ActivatedRoute, Router } from '@angular/router'; import { AdditionalExaminerNotes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { BaseControlComponent } from '@forms/components/base-control/base-control.component'; -import { CustomControl, CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { ReasonForEditing } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; +import { CustomControl, CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { updateScrollPosition } from '@store/technical-records'; import { TechnicalRecordServiceState } from '@store/technical-records/reducers/technical-record-service.reducer'; diff --git a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts index 4930b2099..570c2c485 100644 --- a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { mockVehicleTechnicalRecord } from '@mocks/mock-vehicle-technical-record.mock'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { State, initialAppState } from '@store/index'; diff --git a/src/app/forms/custom-sections/adr-new-certificate-required-view/adr-new-certificate-required-view.component.spec.ts b/src/app/forms/custom-sections/adr-new-certificate-required-view/adr-new-certificate-required-view.component.spec.ts index 2a2921275..70e71b06a 100644 --- a/src/app/forms/custom-sections/adr-new-certificate-required-view/adr-new-certificate-required-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-new-certificate-required-view/adr-new-certificate-required-view.component.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { SharedModule } from '@shared/shared.module'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsM145ViewComponent } from '../adr-tank-details-m145-view/adr-tank-details-m145-view.component'; diff --git a/src/app/forms/custom-sections/adr-tank-details-initial-inspection-view/adr-tank-details-initial-inspection-view.component.spec.ts b/src/app/forms/custom-sections/adr-tank-details-initial-inspection-view/adr-tank-details-initial-inspection-view.component.spec.ts index 81c6d8e57..477213206 100644 --- a/src/app/forms/custom-sections/adr-tank-details-initial-inspection-view/adr-tank-details-initial-inspection-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-details-initial-inspection-view/adr-tank-details-initial-inspection-view.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsInitialInspectionViewComponent } from './adr-tank-details-initial-inspection-view.component'; diff --git a/src/app/forms/custom-sections/adr-tank-details-m145-view/adr-tank-details-m145-view.component.spec.ts b/src/app/forms/custom-sections/adr-tank-details-m145-view/adr-tank-details-m145-view.component.spec.ts index b5efa1812..ee4fe58b6 100644 --- a/src/app/forms/custom-sections/adr-tank-details-m145-view/adr-tank-details-m145-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-details-m145-view/adr-tank-details-m145-view.component.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, NG_VALUE_ACCESSOR, NgControl, ReactiveFormsModule } from '@angular/forms'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsM145ViewComponent } from './adr-tank-details-m145-view.component'; diff --git a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.spec.ts b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.spec.ts index a6cc92931..8d46aa267 100644 --- a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.spec.ts @@ -7,13 +7,13 @@ import { FieldErrorMessageComponent } from '@forms/components/field-error-messag import { SelectComponent } from '@forms/components/select/select.component'; import { TextInputComponent } from '@forms/components/text-input/text-input.component'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; +import { provideMockStore } from '@ngrx/store/testing'; import { CustomFormControl, CustomFormGroup, FormNodeTypes, FormNodeViewTypes, } from '@services/dynamic-forms/dynamic-form.types'; -import { provideMockStore } from '@ngrx/store/testing'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsSubsequentInspectionsEditComponent } from './adr-tank-details-subsequent-inspections-edit.component'; diff --git a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.ts b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.ts index a48d3018d..251eae609 100644 --- a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.ts +++ b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-edit/adr-tank-details-subsequent-inspections-edit.component.ts @@ -1,6 +1,8 @@ import { AfterContentInit, Component, OnDestroy, OnInit } from '@angular/core'; import { FormArray, NG_VALUE_ACCESSOR, Validators } from '@angular/forms'; import { TC3Types } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tc3Types.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { CustomValidators } from '@forms/validators/custom-validators'; import { ValidatorNames } from '@models/validators.enum'; import { CustomFormControl, @@ -9,8 +11,6 @@ import { FormNodeTypes, FormNodeViewTypes, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { CustomValidators } from '@forms/validators/custom-validators'; import { ReplaySubject, takeUntil } from 'rxjs'; import { CustomFormControlComponent } from '../custom-form-control/custom-form-control.component'; diff --git a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component.spec.ts b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component.spec.ts index 915addffc..02ab58dac 100644 --- a/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, NG_VALUE_ACCESSOR, NgControl, ReactiveFormsModule } from '@angular/forms'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { State, initialAppState } from '@store/index'; import { AdrTankDetailsSubsequentInspectionsViewComponent } from './adr-tank-details-subsequent-inspections-view.component'; diff --git a/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.spec.ts b/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.spec.ts index 59182e03e..41b87d81b 100644 --- a/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component.spec.ts @@ -4,8 +4,8 @@ import { FormBuilder, FormControl, FormGroup, NG_VALUE_ACCESSOR, NgControl } fro import { GlobalWarningService } from '@core/components/global-warning/global-warning.service'; import { FORM_INJECTION_TOKEN } from '@forms/components/dynamic-form-field/dynamic-form-field.component'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { SharedModule } from '@shared/shared.module'; import { initialAppState } from '@store/index'; import { AdrTankStatementUnNumberEditComponent } from './adr-tank-statement-un-number-edit.component'; diff --git a/src/app/forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component.spec.ts b/src/app/forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component.spec.ts index 5487086c1..8b3763a20 100644 --- a/src/app/forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component.spec.ts +++ b/src/app/forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, NG_VALUE_ACCESSOR, NgControl } from '@angular/forms'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { SharedModule } from '@shared/shared.module'; import { State, initialAppState } from '@store/index'; import { AdrTankStatementUnNumberViewComponent } from './adr-tank-statement-un-number-view.component'; diff --git a/src/app/forms/custom-sections/adr/adr.component.ts b/src/app/forms/custom-sections/adr/adr.component.ts index 8bac7b0f0..965220576 100644 --- a/src/app/forms/custom-sections/adr/adr.component.ts +++ b/src/app/forms/custom-sections/adr/adr.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType as TechRecordTypeVerb } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; +import { AdrTemplate } from '@forms/templates/general/adr.template'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; -import { AdrTemplate } from '@forms/templates/general/adr.template'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; diff --git a/src/app/forms/custom-sections/approval-type/approval-type.component.ts b/src/app/forms/custom-sections/approval-type/approval-type.component.ts index f1df3ec25..78239fe9f 100644 --- a/src/app/forms/custom-sections/approval-type/approval-type.component.ts +++ b/src/app/forms/custom-sections/approval-type/approval-type.component.ts @@ -4,6 +4,10 @@ import { TechRecord } from '@api/vehicle'; import { ApprovalType as approvalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { ApprovalType as approvalTypeHgvOrPsv } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalTypeHgvOrPsv.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; +import { HgvAndTrlTypeApprovalTemplate } from '@forms/templates/general/approval-type.template'; +import { PsvTypeApprovalTemplate } from '@forms/templates/psv/psv-approval-type.template'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormGroup, @@ -12,10 +16,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { HgvAndTrlTypeApprovalTemplate } from '@forms/templates/general/approval-type.template'; -import { PsvTypeApprovalTemplate } from '@forms/templates/psv/psv-approval-type.template'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Subject, debounceTime, takeUntil } from 'rxjs'; @Component({ diff --git a/src/app/forms/custom-sections/body/body.component.spec.ts b/src/app/forms/custom-sections/body/body.component.spec.ts index 16ffd4da1..ead2354dd 100644 --- a/src/app/forms/custom-sections/body/body.component.spec.ts +++ b/src/app/forms/custom-sections/body/body.component.spec.ts @@ -3,14 +3,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { initialAppState } from '@store/index'; import { SimpleChanges } from '@angular/core'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { FormNodeEditTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { HgvAndTrlBodyTemplate } from '@forms/templates/general/hgv-trl-body.template'; import { PsvBodyTemplate } from '@forms/templates/psv/psv-body.template'; import { createMockHgv } from '@mocks/hgv-record.mock'; @@ -18,6 +16,8 @@ import { createMockPsv } from '@mocks/psv-record.mock'; import { createMockTrl } from '@mocks/trl-record.mock'; import { ReferenceDataResourceType } from '@models/reference-data.model'; import { V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { FormNodeEditTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; import { lastValueFrom, of } from 'rxjs'; diff --git a/src/app/forms/custom-sections/body/body.component.ts b/src/app/forms/custom-sections/body/body.component.ts index 64f302d2e..e90c65d90 100644 --- a/src/app/forms/custom-sections/body/body.component.ts +++ b/src/app/forms/custom-sections/body/body.component.ts @@ -1,10 +1,6 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { TechRecordType as TechRecordVehicleType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb'; -import { MultiOptions } from '@models/options.model'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; -import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { HgvAndTrlBodyTemplate } from '@forms/templates/general/hgv-trl-body.template'; import { PsvBodyTemplate } from '@forms/templates/psv/psv-body.template'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; @@ -14,9 +10,18 @@ import { vehicleBodyTypeCodeMap, vehicleBodyTypeDescriptionMap, } from '@models/body-type-enum'; +import { MultiOptions } from '@models/options.model'; import { PsvMake, ReferenceDataResourceType } from '@models/reference-data.model'; import { V3TechRecordModel, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormGroup, + FormNode, + FormNodeEditTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { State } from '@store/index'; import { selectReferenceDataByResourceKey } from '@store/reference-data'; diff --git a/src/app/forms/custom-sections/custom-defects/custom-defects.component.spec.ts b/src/app/forms/custom-sections/custom-defects/custom-defects.component.spec.ts index 45fb2b4f5..337e5a959 100644 --- a/src/app/forms/custom-sections/custom-defects/custom-defects.component.spec.ts +++ b/src/app/forms/custom-sections/custom-defects/custom-defects.component.spec.ts @@ -4,9 +4,9 @@ import { ComponentFixture, TestBed, inject } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { provideMockStore } from '@ngrx/store/testing'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormGroup, FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; -import { provideMockStore } from '@ngrx/store/testing'; import { CustomDefectComponent } from '../custom-defect/custom-defect.component'; import { CustomDefectsComponent } from './custom-defects.component'; diff --git a/src/app/forms/custom-sections/defect/defect.component.ts b/src/app/forms/custom-sections/defect/defect.component.ts index fde032eb8..fa103c823 100644 --- a/src/app/forms/custom-sections/defect/defect.component.ts +++ b/src/app/forms/custom-sections/defect/defect.component.ts @@ -3,8 +3,6 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; import { DefectsTpl } from '@forms/templates/general/defect.template'; import { AdditionalInfoSection } from '@models/defects/additional-information.model'; import { Defect } from '@models/defects/defect.model'; @@ -14,8 +12,10 @@ import { DeficiencyCategoryEnum, TestResultDefect } from '@models/test-results/t import { TestResultDefects } from '@models/test-results/test-result-defects.model'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store, select } from '@ngrx/store'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNodeOption } from '@services/dynamic-forms/dynamic-form.types'; import { ResultOfTestService } from '@services/result-of-test/result-of-test.service'; -import { DefaultNullOrEmpty } from '@shared/pipes/default-null-or-empty/default-null-or-empty.pipe'; import { selectByDeficiencyRef, selectByImNumber } from '@store/defects'; import { State } from '@store/index'; import { selectRouteParam } from '@store/router/selectors/router.selectors'; diff --git a/src/app/forms/custom-sections/defects/defects.component.spec.ts b/src/app/forms/custom-sections/defects/defects.component.spec.ts index abfe5adbd..3e211ef2c 100644 --- a/src/app/forms/custom-sections/defects/defects.component.spec.ts +++ b/src/app/forms/custom-sections/defects/defects.component.spec.ts @@ -4,8 +4,8 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ButtonComponent } from '@shared/components/button/button.component'; import { TagComponent } from '@shared/components/tag/tag.component'; import { TruncatePipe } from '@shared/pipes/truncate/truncate.pipe'; diff --git a/src/app/forms/custom-sections/defects/defects.component.ts b/src/app/forms/custom-sections/defects/defects.component.ts index b88f3090d..32e461b94 100644 --- a/src/app/forms/custom-sections/defects/defects.component.ts +++ b/src/app/forms/custom-sections/defects/defects.component.ts @@ -1,9 +1,9 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { Defect } from '@models/defects/defect.model'; import { TestResultDefect } from '@models/test-results/test-result-defect.model'; import { TestResultModel } from '@models/test-results/test-result.model'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { Subscription, debounceTime } from 'rxjs'; @Component({ diff --git a/src/app/forms/custom-sections/dimensions/dimensions.component.ts b/src/app/forms/custom-sections/dimensions/dimensions.component.ts index 1156dde57..ae09d0b03 100644 --- a/src/app/forms/custom-sections/dimensions/dimensions.component.ts +++ b/src/app/forms/custom-sections/dimensions/dimensions.component.ts @@ -1,5 +1,9 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; +import { HgvDimensionsTemplate } from '@forms/templates/hgv/hgv-dimensions.template'; +import { PsvDimensionsTemplate } from '@forms/templates/psv/psv-dimensions.template'; +import { TrlDimensionsTemplate } from '@forms/templates/trl/trl-dimensions.template'; +import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormArray, @@ -8,10 +12,6 @@ import { FormNodeEditTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { HgvDimensionsTemplate } from '@forms/templates/hgv/hgv-dimensions.template'; -import { PsvDimensionsTemplate } from '@forms/templates/psv/psv-dimensions.template'; -import { TrlDimensionsTemplate } from '@forms/templates/trl/trl-dimensions.template'; -import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Subject, debounceTime, takeUntil } from 'rxjs'; @Component({ diff --git a/src/app/forms/custom-sections/letters/letters.component.ts b/src/app/forms/custom-sections/letters/letters.component.ts index 28e2be392..ac265c2f3 100644 --- a/src/app/forms/custom-sections/letters/letters.component.ts +++ b/src/app/forms/custom-sections/letters/letters.component.ts @@ -6,12 +6,12 @@ import { TechRecordSearchSchema } from '@dvsa/cvs-type-definitions/types/v3/tech import { ParagraphIds } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/trl/complete'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { TechRecordType as TechRecordTypeVehicleVerb } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { LettersTemplate } from '@forms/templates/general/letters.template'; import { Roles } from '@models/roles.enum'; import { LettersIntoAuthApprovalType, LettersOfAuth, StatusCodes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { updateScrollPosition } from '@store/technical-records'; import { ReplaySubject, Subscription, debounceTime, takeUntil } from 'rxjs'; diff --git a/src/app/forms/custom-sections/modified-weights/modified-weights.component.ts b/src/app/forms/custom-sections/modified-weights/modified-weights.component.ts index f24c08179..81768af20 100644 --- a/src/app/forms/custom-sections/modified-weights/modified-weights.component.ts +++ b/src/app/forms/custom-sections/modified-weights/modified-weights.component.ts @@ -4,9 +4,9 @@ import { TechRecordGETPSV, TechRecordGETTRL, } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { vehicleTemplateMap } from '@forms/utils/tech-record-constants'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; @Component({ diff --git a/src/app/forms/custom-sections/plates/plates.component.ts b/src/app/forms/custom-sections/plates/plates.component.ts index 29bb00a95..e195cc017 100644 --- a/src/app/forms/custom-sections/plates/plates.component.ts +++ b/src/app/forms/custom-sections/plates/plates.component.ts @@ -5,13 +5,13 @@ import { GlobalErrorService } from '@core/components/global-error/global-error.s import { HGVPlates } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete'; import { TRLPlates } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/trl/complete'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { hgvRequiredFields, trlRequiredFields, tyreRequiredFields } from '@models/plateRequiredFields.model'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { PlatesTemplate } from '@forms/templates/general/plates.template'; +import { hgvRequiredFields, trlRequiredFields, tyreRequiredFields } from '@models/plateRequiredFields.model'; import { Roles } from '@models/roles.enum'; import { Axle, StatusCodes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { canGeneratePlate, updateScrollPosition } from '@store/technical-records'; import { TechnicalRecordServiceState } from '@store/technical-records/reducers/technical-record-service.reducer'; import { cloneDeep } from 'lodash'; diff --git a/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.spec.ts b/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.spec.ts index 52280e193..6db3af53d 100644 --- a/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.spec.ts +++ b/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.spec.ts @@ -7,9 +7,9 @@ import { TechRecordType, } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; import { DynamicFormsModule } from '@forms/dynamic-forms.module'; -import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { mockVehicleTechnicalRecord } from '@mocks/mock-vehicle-technical-record.mock'; import { provideMockStore } from '@ngrx/store/testing'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; import { initialAppState } from '@store/index'; diff --git a/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.ts b/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.ts index 6bd882c4f..07b3ea493 100644 --- a/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.ts +++ b/src/app/forms/custom-sections/psv-brakes/psv-brakes.component.ts @@ -1,15 +1,20 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { FormArray, FormGroup } from '@angular/forms'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { MultiOptions } from '@models/options.model'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNode, FormNodeEditTypes, FormNodeWidth } from '@services/dynamic-forms/dynamic-form.types'; -import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { PsvBrakesTemplate } from '@forms/templates/psv/psv-brakes.template'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { MultiOptions } from '@models/options.model'; import { Brake, ReferenceDataResourceType } from '@models/reference-data.model'; import { Retarders } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormGroup, + FormNode, + FormNodeEditTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; +import { MultiOptionsService } from '@services/multi-options/multi-options.service'; import { ReferenceDataState, selectBrakeByCode } from '@store/reference-data'; import { updateBrakeForces } from '@store/technical-records'; import { TechnicalRecordServiceState } from '@store/technical-records/reducers/technical-record-service.reducer'; diff --git a/src/app/forms/custom-sections/required-standard/required-standard.component.spec.ts b/src/app/forms/custom-sections/required-standard/required-standard.component.spec.ts index 238bd4d63..caa0ecabd 100644 --- a/src/app/forms/custom-sections/required-standard/required-standard.component.spec.ts +++ b/src/app/forms/custom-sections/required-standard/required-standard.component.spec.ts @@ -3,11 +3,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { mockTestResult } from '@mocks/mock-test-result'; import { INSPECTION_TYPE, TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { ResultOfTestService } from '@services/result-of-test/result-of-test.service'; import { State, initialAppState } from '@store/index'; import { getRequiredStandardFromTypeAndRef } from '@store/required-standards/selectors/required-standards.selector'; diff --git a/src/app/forms/custom-sections/required-standard/required-standard.component.ts b/src/app/forms/custom-sections/required-standard/required-standard.component.ts index 10fcc9180..cab426287 100644 --- a/src/app/forms/custom-sections/required-standard/required-standard.component.ts +++ b/src/app/forms/custom-sections/required-standard/required-standard.component.ts @@ -2,13 +2,13 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/ import { ActivatedRoute, Router } from '@angular/router'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; import { RequiredStandardsTpl } from '@forms/templates/general/required-standards.template'; import { INSPECTION_TYPE, TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { Store, select } from '@ngrx/store'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; import { ResultOfTestService } from '@services/result-of-test/result-of-test.service'; -import { DefaultNullOrEmpty } from '@shared/pipes/default-null-or-empty/default-null-or-empty.pipe'; import { getRequiredStandardFromTypeAndRef } from '@store/required-standards/selectors/required-standards.selector'; import { selectRouteParam } from '@store/router/selectors/router.selectors'; import { diff --git a/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts b/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts index 1bc6313a7..3877f0ab9 100644 --- a/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts +++ b/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts @@ -6,8 +6,8 @@ import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ButtonComponent } from '@shared/components/button/button.component'; import { TagComponent } from '@shared/components/tag/tag.component'; import { TruncatePipe } from '@shared/pipes/truncate/truncate.pipe'; diff --git a/src/app/forms/custom-sections/required-standards/required-standards.component.ts b/src/app/forms/custom-sections/required-standards/required-standards.component.ts index 91c210a8a..f8b607c76 100644 --- a/src/app/forms/custom-sections/required-standards/required-standards.component.ts +++ b/src/app/forms/custom-sections/required-standards/required-standards.component.ts @@ -2,11 +2,11 @@ import { ViewportScroller } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { CustomFormArray, CustomFormGroup, FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { ResultOfTestService } from '@services/result-of-test/result-of-test.service'; import { testResultInEdit } from '@store/test-records'; import { isEqual } from 'lodash'; diff --git a/src/app/forms/custom-sections/trl-brakes/trl-brakes.component.ts b/src/app/forms/custom-sections/trl-brakes/trl-brakes.component.ts index 3a3c0f58c..c5624fb41 100644 --- a/src/app/forms/custom-sections/trl-brakes/trl-brakes.component.ts +++ b/src/app/forms/custom-sections/trl-brakes/trl-brakes.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { FormArray, FormGroup } from '@angular/forms'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; +import { TrlBrakesTemplate } from '@forms/templates/trl/trl-brakes.template'; import { MultiOptions } from '@models/options.model'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormGroup, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; -import { TrlBrakesTemplate } from '@forms/templates/trl/trl-brakes.template'; import { Subject, debounceTime, takeUntil } from 'rxjs'; @Component({ diff --git a/src/app/forms/custom-sections/tyres/tyres.component.ts b/src/app/forms/custom-sections/tyres/tyres.component.ts index 8dbffdb7c..5b0ce518e 100644 --- a/src/app/forms/custom-sections/tyres/tyres.component.ts +++ b/src/app/forms/custom-sections/tyres/tyres.component.ts @@ -4,19 +4,11 @@ import { ActivatedRoute, Router } from '@angular/router'; import { TyreUseCode as HgvTyreUseCode } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tyreUseCodeHgv.enum.js'; import { TyreUseCode as TrlTyreUseCode } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tyreUseCodeTrl.enum.js'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { MultiOptions } from '@models/options.model'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { - CustomFormArray, - CustomFormGroup, - FormNode, - FormNodeEditTypes, - FormNodeWidth, -} from '@services/dynamic-forms/dynamic-form.types'; import { tyresTemplateHgv } from '@forms/templates/hgv/hgv-tyres.template'; import { PsvTyresTemplate } from '@forms/templates/psv/psv-tyres.template'; import { tyresTemplateTrl } from '@forms/templates/trl/trl-tyres.template'; import { getOptionsFromEnum, getOptionsFromEnumOneChar } from '@forms/utils/enum-map'; +import { MultiOptions } from '@models/options.model'; import { ReferenceDataResourceType, ReferenceDataTyre, ReferenceDataTyreLoadIndex } from '@models/reference-data.model'; import { Axle, @@ -28,6 +20,14 @@ import { VehicleTypes, } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormArray, + CustomFormGroup, + FormNode, + FormNodeEditTypes, + FormNodeWidth, +} from '@services/dynamic-forms/dynamic-form.types'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { selectAllReferenceDataByResourceType } from '@store/reference-data'; diff --git a/src/app/forms/custom-sections/weights/weights.component.ts b/src/app/forms/custom-sections/weights/weights.component.ts index b8431d321..e044d3c24 100644 --- a/src/app/forms/custom-sections/weights/weights.component.ts +++ b/src/app/forms/custom-sections/weights/weights.component.ts @@ -1,13 +1,18 @@ /* eslint-disable no-underscore-dangle */ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { CustomFormArray, CustomFormGroup, FormNode, FormNodeEditTypes } from '@services/dynamic-forms/dynamic-form.types'; import { HgvWeight } from '@forms/templates/hgv/hgv-weight.template'; import { PsvWeightsTemplate } from '@forms/templates/psv/psv-weight.template'; import { TrlWeight } from '@forms/templates/trl/trl-weight.template'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { + CustomFormArray, + CustomFormGroup, + FormNode, + FormNodeEditTypes, +} from '@services/dynamic-forms/dynamic-form.types'; import { addAxle, removeAxle, updateBrakeForces } from '@store/technical-records'; import { TechnicalRecordServiceState } from '@store/technical-records/reducers/technical-record-service.reducer'; import { Subscription } from 'rxjs'; diff --git a/src/app/forms/dynamic-forms.module.ts b/src/app/forms/dynamic-forms.module.ts index 069d3fed4..81109a62c 100644 --- a/src/app/forms/dynamic-forms.module.ts +++ b/src/app/forms/dynamic-forms.module.ts @@ -2,13 +2,19 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; +import { NoSpaceDirective } from '@directives/app-no-space/app-no-space.directive'; +import { NumberOnlyDirective } from '@directives/app-number-only/app-number-only.directive'; +import { ToUppercaseDirective } from '@directives/app-to-uppercase/app-to-uppercase.directive'; +import { TrimWhitespaceDirective } from '@directives/app-trim-whitespace/app-trim-whitespace.directive'; +import { PrefixDirective } from '@directives/prefix/prefix.directive'; +import { SuffixDirective } from '@directives/suffix/suffix.directive'; import { ApprovalTypeFocusNextDirective } from '@forms/components/approval-type/approval-type-focus-next.directive'; import { ApprovalTypeInputComponent } from '@forms/components/approval-type/approval-type.component'; import { AdrCertificateHistoryComponent } from '@forms/custom-sections/adr-certificate-history/adr-certificate-history.component'; import { AdrExaminerNotesHistoryEditComponent } from '@forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit'; import { ApprovalTypeComponent } from '@forms/custom-sections/approval-type/approval-type.component'; -import { TruncatePipe } from '@shared/pipes/truncate/truncate.pipe'; import { SharedModule } from '@shared/shared.module'; +import { TruncatePipe } from '../pipes/truncate/truncate.pipe'; import { AutocompleteComponent } from './components/autocomplete/autocomplete.component'; import { BaseControlComponent } from './components/base-control/base-control.component'; import { CheckboxGroupComponent } from './components/checkbox-group/checkbox-group.component'; @@ -58,12 +64,6 @@ import { RequiredStandardsComponent } from './custom-sections/required-standards import { TrlBrakesComponent } from './custom-sections/trl-brakes/trl-brakes.component'; import { TyresComponent } from './custom-sections/tyres/tyres.component'; import { WeightsComponent } from './custom-sections/weights/weights.component'; -import { NoSpaceDirective } from '@directives/app-no-space/app-no-space.directive'; -import { NumberOnlyDirective } from '@directives/app-number-only/app-number-only.directive'; -import { ToUppercaseDirective } from '@directives/app-to-uppercase/app-to-uppercase.directive'; -import { TrimWhitespaceDirective } from '@directives/app-trim-whitespace/app-trim-whitespace.directive'; -import { PrefixDirective } from '@directives/prefix/prefix.directive'; -import { SuffixDirective } from '@directives/suffix/suffix.directive'; @NgModule({ declarations: [ diff --git a/src/app/forms/templates/car/car-tech-record.template.ts b/src/app/forms/templates/car/car-tech-record.template.ts index f96aa1e78..9e3897b0c 100644 --- a/src/app/forms/templates/car/car-tech-record.template.ts +++ b/src/app/forms/templates/car/car-tech-record.template.ts @@ -1,6 +1,8 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ValidatorNames } from '@models/validators.enum'; +import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { FormNode, FormNodeEditTypes, @@ -9,8 +11,6 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { TagType } from '../../../components/tag/tag.component'; export const CarTechRecord: FormNode = { diff --git a/src/app/forms/templates/general/adr-summary.template.ts b/src/app/forms/templates/general/adr-summary.template.ts index 28da9a2a9..5adad3830 100644 --- a/src/app/forms/templates/general/adr-summary.template.ts +++ b/src/app/forms/templates/general/adr-summary.template.ts @@ -13,9 +13,9 @@ import { AdrTankDetailsSubsequentInspectionsEditComponent } from '@forms/custom- import { AdrTankDetailsSubsequentInspectionsViewComponent } from '@forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component'; import { AdrTankStatementUnNumberEditComponent } from '@forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component'; import { AdrTankStatementUnNumberViewComponent } from '@forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component'; -import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TC2Types } from '@models/adr.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, diff --git a/src/app/forms/templates/general/adr.template.ts b/src/app/forms/templates/general/adr.template.ts index 8cb8e749a..b798655a5 100644 --- a/src/app/forms/templates/general/adr.template.ts +++ b/src/app/forms/templates/general/adr.template.ts @@ -13,10 +13,10 @@ import { AdrTankDetailsSubsequentInspectionsEditComponent } from '@forms/custom- import { AdrTankDetailsSubsequentInspectionsViewComponent } from '@forms/custom-sections/adr-tank-details-subsequent-inspections-view/adr-tank-details-subsequent-inspections-view.component'; import { AdrTankStatementUnNumberEditComponent } from '@forms/custom-sections/adr-tank-statement-un-number-edit/adr-tank-statement-un-number-edit.component'; import { AdrTankStatementUnNumberViewComponent } from '@forms/custom-sections/adr-tank-statement-un-number-view/adr-tank-statement-un-number-view.component'; -import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { AdrValidators } from '@forms/validators/adr/adr.validators'; import { TC2Types } from '@models/adr.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, diff --git a/src/app/forms/templates/general/approval-type.template.ts b/src/app/forms/templates/general/approval-type.template.ts index 576a38f51..37743c980 100644 --- a/src/app/forms/templates/general/approval-type.template.ts +++ b/src/app/forms/templates/general/approval-type.template.ts @@ -1,6 +1,6 @@ import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; -import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, diff --git a/src/app/forms/templates/general/documents.template.ts b/src/app/forms/templates/general/documents.template.ts index 206e9be51..6602793d6 100644 --- a/src/app/forms/templates/general/documents.template.ts +++ b/src/app/forms/templates/general/documents.template.ts @@ -1,5 +1,5 @@ -import { ValidatorNames } from '@models/validators.enum'; import { DOCUMENT_TYPES } from '@forms/templates/general/document-types'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; export const DocumentsTemplate: FormNode = { diff --git a/src/app/forms/templates/general/notes.template.ts b/src/app/forms/templates/general/notes.template.ts index b3791067e..046cd043f 100644 --- a/src/app/forms/templates/general/notes.template.ts +++ b/src/app/forms/templates/general/notes.template.ts @@ -1,5 +1,10 @@ import { ValidatorNames } from '@models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const NotesTemplate: FormNode = { name: 'notesSection', diff --git a/src/app/forms/templates/hgv/hgv-tech-record.template.ts b/src/app/forms/templates/hgv/hgv-tech-record.template.ts index c9ee77b0a..bbc4e4d45 100644 --- a/src/app/forms/templates/hgv/hgv-tech-record.template.ts +++ b/src/app/forms/templates/hgv/hgv-tech-record.template.ts @@ -1,8 +1,8 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategoryHgv.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.js'; -import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { EmissionStandard } from '@models/test-types/emissions.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FuelTypes } from '@models/vehicle-tech-record.model'; import { FormNode, diff --git a/src/app/forms/templates/hgv/hgv-tyres.template.ts b/src/app/forms/templates/hgv/hgv-tyres.template.ts index 105590f69..0a378596d 100644 --- a/src/app/forms/templates/hgv/hgv-tyres.template.ts +++ b/src/app/forms/templates/hgv/hgv-tyres.template.ts @@ -1,4 +1,5 @@ import { TyreUseCode } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tyreUseCodeHgv.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,7 +8,6 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TagType } from '../../../components/tag/tag.component'; export const tyresTemplateHgv: FormNode = { diff --git a/src/app/forms/templates/lgv/lgv-tech-record.template.ts b/src/app/forms/templates/lgv/lgv-tech-record.template.ts index b21c717d4..00865c6a1 100644 --- a/src/app/forms/templates/lgv/lgv-tech-record.template.ts +++ b/src/app/forms/templates/lgv/lgv-tech-record.template.ts @@ -1,6 +1,8 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ValidatorNames } from '@models/validators.enum'; +import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { FormNode, FormNodeEditTypes, @@ -9,8 +11,6 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { TagType } from '../../../components/tag/tag.component'; export const LgvTechRecord: FormNode = { diff --git a/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts b/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts index 50c3d193f..bc3aa5a75 100644 --- a/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts +++ b/src/app/forms/templates/motorcycle/motorcycle-tech-record.template.ts @@ -1,5 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -9,7 +10,6 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TagType } from '../../../components/tag/tag.component'; export const MotorcycleTechRecord: FormNode = { diff --git a/src/app/forms/templates/psv/psv-approval-type.template.ts b/src/app/forms/templates/psv/psv-approval-type.template.ts index b367e984d..fd056a1cd 100644 --- a/src/app/forms/templates/psv/psv-approval-type.template.ts +++ b/src/app/forms/templates/psv/psv-approval-type.template.ts @@ -1,6 +1,6 @@ import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; -import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, diff --git a/src/app/forms/templates/psv/psv-notes.template.ts b/src/app/forms/templates/psv/psv-notes.template.ts index 52b318d53..97822960b 100644 --- a/src/app/forms/templates/psv/psv-notes.template.ts +++ b/src/app/forms/templates/psv/psv-notes.template.ts @@ -1,5 +1,10 @@ import { ValidatorNames } from '@models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const PsvNotes: FormNode = { name: 'notesSection', diff --git a/src/app/forms/templates/psv/psv-tech-record.template.ts b/src/app/forms/templates/psv/psv-tech-record.template.ts index 33b3bd0c1..b6c6ebb80 100644 --- a/src/app/forms/templates/psv/psv-tech-record.template.ts +++ b/src/app/forms/templates/psv/psv-tech-record.template.ts @@ -1,8 +1,8 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategoryPsv.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.js'; -import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { EmissionStandard } from '@models/test-types/emissions.enum'; +import { ValidatorNames } from '@models/validators.enum'; import { VehicleSize } from '@models/vehicle-size.enum'; import { FuelTypes } from '@models/vehicle-tech-record.model'; import { diff --git a/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts b/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts index 110c249c5..cbc0d52ab 100644 --- a/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts +++ b/src/app/forms/templates/small-trailer/small-trailer-tech-record.template.ts @@ -1,6 +1,8 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ValidatorNames } from '@models/validators.enum'; +import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { FormNode, FormNodeEditTypes, @@ -9,8 +11,6 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { VehicleSubclass } from '@models/vehicle-tech-record.model'; import { TagType } from '../../../components/tag/tag.component'; export const SmallTrailerTechRecord: FormNode = { diff --git a/src/app/forms/templates/tech-records/vehicle-summary.template.ts b/src/app/forms/templates/tech-records/vehicle-summary.template.ts index 3993b4f38..4b5521fa4 100644 --- a/src/app/forms/templates/tech-records/vehicle-summary.template.ts +++ b/src/app/forms/templates/tech-records/vehicle-summary.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const VehicleSummary: FormNode = { name: 'vehicleSummary', diff --git a/src/app/forms/templates/test-records/create-master.template.ts b/src/app/forms/templates/test-records/create-master.template.ts index e3b08852a..bf3957ef3 100644 --- a/src/app/forms/templates/test-records/create-master.template.ts +++ b/src/app/forms/templates/test-records/create-master.template.ts @@ -1,6 +1,6 @@ import { TEST_TYPES } from '@models/testTypeId.enum'; -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { DefectsTpl } from '../general/defect.template'; import { RequiredStandardsTpl } from '../general/required-standards.template'; import { AdditionalDefectsSection } from './section-templates/additionalDefects/additional-defects-section.template'; diff --git a/src/app/forms/templates/test-records/master.template.ts b/src/app/forms/templates/test-records/master.template.ts index f3d45270e..b67ff96c6 100644 --- a/src/app/forms/templates/test-records/master.template.ts +++ b/src/app/forms/templates/test-records/master.template.ts @@ -1,6 +1,6 @@ import { TEST_TYPES } from '@models/testTypeId.enum'; -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { DefectsTpl } from '../general/defect.template'; import { RequiredStandardsTpl } from '../general/required-standards.template'; import { AdditionalDefectsSection } from './section-templates/additionalDefects/additional-defects-section.template'; diff --git a/src/app/forms/templates/test-records/section-templates/emissions/desk-based-emissions-section.template.ts b/src/app/forms/templates/test-records/section-templates/emissions/desk-based-emissions-section.template.ts index d4dda6a06..965c32b44 100644 --- a/src/app/forms/templates/test-records/section-templates/emissions/desk-based-emissions-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/emissions/desk-based-emissions-section.template.ts @@ -1,8 +1,8 @@ +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { EmissionStandard } from '@models/test-types/emissions.enum'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { EmissionStandard } from '@models/test-types/emissions.enum'; export const DeskBasedEmissionsSection: FormNode = { name: 'deskBasedEmissionsSection', diff --git a/src/app/forms/templates/test-records/section-templates/emissions/emissions-section.template.ts b/src/app/forms/templates/test-records/section-templates/emissions/emissions-section.template.ts index 327e9e205..ea30921d4 100644 --- a/src/app/forms/templates/test-records/section-templates/emissions/emissions-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/emissions/emissions-section.template.ts @@ -1,8 +1,8 @@ +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { EmissionStandard } from '@models/test-types/emissions.enum'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { EmissionStandard } from '@models/test-types/emissions.enum'; export const EmissionsSection: FormNode = { name: 'emissionsSection', diff --git a/src/app/forms/templates/test-records/section-templates/notes/adr-notes-section.template.ts b/src/app/forms/templates/test-records/section-templates/notes/adr-notes-section.template.ts index 032502b54..39178006b 100644 --- a/src/app/forms/templates/test-records/section-templates/notes/adr-notes-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/notes/adr-notes-section.template.ts @@ -1,8 +1,13 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; -import { ValidatorNames } from '@models/validators.enum'; -import { CustomFormControl, FormNode, FormNodeEditTypes, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; +import { ValidatorNames } from '@models/validators.enum'; import { Store, select } from '@ngrx/store'; +import { + CustomFormControl, + FormNode, + FormNodeEditTypes, + FormNodeTypes, +} from '@services/dynamic-forms/dynamic-form.types'; import { State } from '@store/index'; import { testResultInEdit } from '@store/test-records'; import { map, take, tap } from 'rxjs'; diff --git a/src/app/forms/templates/test-records/section-templates/reasonForCreation/reasonForCreation.template.ts b/src/app/forms/templates/test-records/section-templates/reasonForCreation/reasonForCreation.template.ts index fb70e35c7..2c1adb64a 100644 --- a/src/app/forms/templates/test-records/section-templates/reasonForCreation/reasonForCreation.template.ts +++ b/src/app/forms/templates/test-records/section-templates/reasonForCreation/reasonForCreation.template.ts @@ -1,5 +1,10 @@ import { ValidatorNames } from '@models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const reasonForCreationSection: FormNode = { name: 'reasonForCreationSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-hgv-trl.template.ts b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-hgv-trl.template.ts index 36ccbda82..8099b2ef9 100644 --- a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-hgv-trl.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-hgv-trl.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const CreateRequiredSectionHgvTrl: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-lgv-car.template.ts b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-lgv-car.template.ts index 3fe4473fe..3e5a1bb76 100644 --- a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-lgv-car.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-lgv-car.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const CreateRequiredSectionLgvCar: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-motorcycle.template.ts b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-motorcycle.template.ts index e07d0a033..23d6a4339 100644 --- a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-motorcycle.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section-motorcycle.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const CreateRequiredSectionMotorcycle: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section.template.ts index 057e9ec29..8a9f00d03 100644 --- a/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/contingency-required-hidden-section.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const CreateRequiredSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/custom-defects-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/custom-defects-hidden-section.template.ts index ca119f8ce..da80c3493 100644 --- a/src/app/forms/templates/test-records/section-templates/required/custom-defects-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/custom-defects-hidden-section.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const CustomDefectsHiddenSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/defect-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/defect-hidden-section.template.ts index 1ec695f32..73b7a142a 100644 --- a/src/app/forms/templates/test-records/section-templates/required/defect-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/defect-hidden-section.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const defectsHiddenSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-lgv.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-lgv.template.ts index 8d60f325b..f88cc36ae 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-lgv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-lgv.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredHiddenSectionGroup4And5Lgv: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle-amend.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle-amend.template.ts index d3d68ad40..1a89e2665 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle-amend.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle-amend.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const AmendDeskBasedRequiredHiddenSectionGroup4Motorcyle: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle.template.ts index cb2022ec5..20bbbaf38 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group4-motorcycle.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredHiddenSectionGroup4Motorcyle: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group5-lgv.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group5-lgv.template.ts index 948086e17..3cfa67b8d 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group5-lgv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-group5-lgv.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredHiddenSectionGroup5Lgv: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-hgv-trl.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-hgv-trl.template.ts index 3eec2c87c..547de7abb 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-hgv-trl.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-hgv-trl.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredSectionHgvTrl: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-psv.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-psv.template.ts index 866cccb89..3e5ff6cf0 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-psv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-hidden-section-psv.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const DeskBasedRequiredSectionPsv: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-section-group4-amend.template.ts b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-section-group4-amend.template.ts index 961695f2c..ccbe24869 100644 --- a/src/app/forms/templates/test-records/section-templates/required/desk-based-required-section-group4-amend.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/desk-based-required-section-group4-amend.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const AmendDeskBasedRequiredHiddenSectionGroup4: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/required-hidden-section-hgv-trl.template.ts b/src/app/forms/templates/test-records/section-templates/required/required-hidden-section-hgv-trl.template.ts index 12007d7cd..1ec2e2e70 100644 --- a/src/app/forms/templates/test-records/section-templates/required/required-hidden-section-hgv-trl.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/required-hidden-section-hgv-trl.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const RequiredSectionHGVTRL: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/required-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/required-hidden-section.template.ts index 21da93095..f27686462 100644 --- a/src/app/forms/templates/test-records/section-templates/required/required-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/required-hidden-section.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const RequiredSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/seatbelt-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/seatbelt-hidden-section.template.ts index 62d20ae70..2bc60e591 100644 --- a/src/app/forms/templates/test-records/section-templates/required/seatbelt-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/seatbelt-hidden-section.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const SeatbeltHiddenSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-hgv-trl.template.ts b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-hgv-trl.template.ts index 6fb46763e..4d8160e9d 100644 --- a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-hgv-trl.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-hgv-trl.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const SpecialistRequiredSectionHGVTRL: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-lgv-car.template.ts b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-lgv-car.template.ts index c34191bf8..c63103d7a 100644 --- a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-lgv-car.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-lgv-car.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const SpecialistRequiredSectionLgvCarSmallTrl: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-motorcycle.template.ts b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-motorcycle.template.ts index 643556e47..72c8d7bf5 100644 --- a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-motorcycle.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section-motorcycle.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const RequiredSpecialistSectionMotorcycle: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section.template.ts b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section.template.ts index 4a437d0e8..acc116aff 100644 --- a/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/required/specialist-required-hidden-section.template.ts @@ -1,4 +1,9 @@ -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const RequiredSpecialistSection: FormNode = { name: 'requiredSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group1.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group1.template.ts index 8dc3a7da7..515b9ccf0 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group1.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group1.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,7 +8,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const OldIVASpecialistTestSectionGroup1: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group5.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group5.template.ts index 757832d11..d3b0ab79e 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group5.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/old-specialist-test-section-group5.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,7 +8,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const OldIVASpecialistTestSectionGroup5: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group1.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group1.template.ts index af33f598b..db7cee5c9 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group1.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group1.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { TEST_TYPES_GROUP1_SPEC_TEST } from '@models/testTypeId.enum'; import { ValidatorNames } from '@models/validators.enum'; import { @@ -8,7 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const SpecialistTestSectionGroup1: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group2.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group2.template.ts index 7f37b902a..f413aa45b 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group2.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group2.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,7 +8,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const SpecialistTestSectionGroup2: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3And4.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3And4.template.ts index aac7ceb49..ae85a5abe 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3And4.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group3And4.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,7 +8,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const SpecialistTestSectionGroup3And4: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group5.template.ts b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group5.template.ts index 68e7b59ab..4e8c1597b 100644 --- a/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group5.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/specialist/specialist-test-section-group5.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; import { ValidatorNames } from '@models/validators.enum'; import { @@ -8,7 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const SpecialistTestSectionGroup5: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/test/test-section-group5And13.template.ts b/src/app/forms/templates/test-records/section-templates/test/test-section-group5And13.template.ts index f384d27ec..6a91783ae 100644 --- a/src/app/forms/templates/test-records/section-templates/test/test-section-group5And13.template.ts +++ b/src/app/forms/templates/test-records/section-templates/test/test-section-group5And13.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,7 +8,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const TestSectionGroup5And13: FormNode = { name: 'testSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/amend-iva-msva-psv-hgv-light.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/amend-iva-msva-psv-hgv-light.template.ts index 3ad675c18..076acb44f 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/amend-iva-msva-psv-hgv-light.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/amend-iva-msva-psv-hgv-light.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,8 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const IvaMsvaVehicleSection: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-psv-hgv-light-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-psv-hgv-light-vehicle-section.template.ts index 790c231af..d9e16a067 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-psv-hgv-light-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-psv-hgv-light-vehicle-section.template.ts @@ -1,5 +1,7 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -8,8 +10,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const ContingencyVehicleSectionDefaultPsvHgvLight: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-trl-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-trl-vehicle-section.template.ts index ac67b26bc..28af6414e 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-trl-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-default-trl-vehicle-section.template.ts @@ -1,5 +1,7 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -8,8 +10,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const ContingencyVehicleSectionDefaultTrl: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-iva-msva-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-iva-msva-vehicle-section.template.ts index b9f15bcbc..38e74ba2a 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/contingency-iva-msva-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/contingency-iva-msva-vehicle-section.template.ts @@ -1,5 +1,7 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -8,8 +10,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const ContingencyIvaMsvaVehicleSection: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/default-psv-hgv-light-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/default-psv-hgv-light-vehicle-section.template.ts index 2c0c6927e..63ef5b1dd 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/default-psv-hgv-light-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/default-psv-hgv-light-vehicle-section.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,8 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const VehicleSectionDefaultPsvHgvLight: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/default-trl-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/default-trl-vehicle-section.template.ts index 1e42922b7..2eba20238 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/default-trl-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/default-trl-vehicle-section.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,8 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const VehicleSectionDefaultTrl: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-psv-hgv-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-psv-hgv-vehicle-section.template.ts index 8798691f3..6856f03e0 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-psv-hgv-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-psv-hgv-vehicle-section.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,8 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const DeskBasedVehicleSectionDefaultPsvHgv: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-trl-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-trl-vehicle-section.template.ts index c024b46a7..ebb32988f 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-trl-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-default-trl-vehicle-section.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,8 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const DeskBasedVehicleSectionDefaultTrl: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-test-hgv-vehicle-section-group1And2And4.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-test-hgv-vehicle-section-group1And2And4.template.ts index c8a06e760..dfa623ddb 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-test-hgv-vehicle-section-group1And2And4.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-test-hgv-vehicle-section-group1And2And4.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,8 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const DeskBasedVehicleSectionHgvGroup1And2And4: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group4-lgv.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group4-lgv.template.ts index 774043ab6..d274f10b1 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group4-lgv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group4-lgv.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,8 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const DeskBasedVehicleSectionGroup4LGV: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group5-lgv.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group5-lgv.template.ts index c9804b04e..950ff17f3 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group5-lgv.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/desk-based-vehicle-section-group5-lgv.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { FormNode, FormNodeEditTypes, @@ -6,8 +8,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const DeskBasedVehicleSectionGroup5Lgv: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/vehicle/group-3-light-vehicle-section.template.ts b/src/app/forms/templates/test-records/section-templates/vehicle/group-3-light-vehicle-section.template.ts index 79d6f36be..79339c41c 100644 --- a/src/app/forms/templates/test-records/section-templates/vehicle/group-3-light-vehicle-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/vehicle/group-3-light-vehicle-section.template.ts @@ -1,4 +1,6 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,8 +9,6 @@ import { FormNodeViewTypes, FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const VehicleSectionGroup3: FormNode = { name: 'vehicleSection', diff --git a/src/app/forms/templates/test-records/section-templates/visit/contingency-visit-section.template.ts b/src/app/forms/templates/test-records/section-templates/visit/contingency-visit-section.template.ts index 495e94813..475895e35 100644 --- a/src/app/forms/templates/test-records/section-templates/visit/contingency-visit-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/visit/contingency-visit-section.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -8,7 +9,6 @@ import { FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; import { SpecialRefData } from '@services/multi-options/multi-options.service'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const ContingencyVisitSection: FormNode = { name: 'visitSection', diff --git a/src/app/forms/templates/test-records/section-templates/visit/visit-section.template.ts b/src/app/forms/templates/test-records/section-templates/visit/visit-section.template.ts index 2a095976b..f344fac38 100644 --- a/src/app/forms/templates/test-records/section-templates/visit/visit-section.template.ts +++ b/src/app/forms/templates/test-records/section-templates/visit/visit-section.template.ts @@ -1,4 +1,5 @@ import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { ReferenceDataResourceType } from '@models/reference-data.model'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -8,7 +9,6 @@ import { FormNodeWidth, } from '@services/dynamic-forms/dynamic-form.types'; import { SpecialRefData } from '@services/multi-options/multi-options.service'; -import { ReferenceDataResourceType } from '@models/reference-data.model'; export const VisitSection: FormNode = { name: 'visitSection', diff --git a/src/app/forms/templates/trl/trl-auth-into-service.template.ts b/src/app/forms/templates/trl/trl-auth-into-service.template.ts index 3264ae402..6c970bc48 100644 --- a/src/app/forms/templates/trl/trl-auth-into-service.template.ts +++ b/src/app/forms/templates/trl/trl-auth-into-service.template.ts @@ -1,5 +1,10 @@ import { ValidatorNames } from '@models/validators.enum'; -import { FormNode, FormNodeEditTypes, FormNodeTypes, FormNodeViewTypes } from '@services/dynamic-forms/dynamic-form.types'; +import { + FormNode, + FormNodeEditTypes, + FormNodeTypes, + FormNodeViewTypes, +} from '@services/dynamic-forms/dynamic-form.types'; export const TrlAuthIntoServiceTemplate: FormNode = { name: 'authorizationIntoServiceSection', diff --git a/src/app/forms/templates/trl/trl-tech-record.template.ts b/src/app/forms/templates/trl/trl-tech-record.template.ts index d3c86509b..24acef632 100644 --- a/src/app/forms/templates/trl/trl-tech-record.template.ts +++ b/src/app/forms/templates/trl/trl-tech-record.template.ts @@ -1,8 +1,8 @@ import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { VehicleConfiguration } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleConfigurationTrl.enum.js'; -import { ValidatorNames } from '@models/validators.enum'; import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { CouplingTypeOptions } from '@models/coupling-type-enum'; +import { ValidatorNames } from '@models/validators.enum'; import { FrameDescriptions } from '@models/vehicle-tech-record.model'; import { FormNode, diff --git a/src/app/forms/templates/trl/trl-tyres.template.ts b/src/app/forms/templates/trl/trl-tyres.template.ts index 5d66c8a59..27b62c488 100644 --- a/src/app/forms/templates/trl/trl-tyres.template.ts +++ b/src/app/forms/templates/trl/trl-tyres.template.ts @@ -1,4 +1,5 @@ import { TyreUseCode } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/tyreUseCodeTrl.enum.js'; +import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { ValidatorNames } from '@models/validators.enum'; import { FormNode, @@ -7,7 +8,6 @@ import { FormNodeWidth, TagTypeLabels, } from '@services/dynamic-forms/dynamic-form.types'; -import { getOptionsFromEnum } from '@forms/utils/enum-map'; import { TagType } from '../../../components/tag/tag.component'; export const tyresTemplateTrl: FormNode = { diff --git a/src/app/forms/utils/tech-record-constants.ts b/src/app/forms/utils/tech-record-constants.ts index dd05b3046..d644f4e69 100644 --- a/src/app/forms/utils/tech-record-constants.ts +++ b/src/app/forms/utils/tech-record-constants.ts @@ -1,4 +1,3 @@ -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { CarTechRecord } from '@forms/templates/car/car-tech-record.template'; import { ApplicantDetails } from '@forms/templates/general/applicant-details.template'; import { HgvAndTrlTypeApprovalTemplate } from '@forms/templates/general/approval-type.template'; @@ -25,6 +24,7 @@ import { PsvTechRecord } from '@forms/templates/psv/psv-tech-record.template'; import { PsvTyresTemplate } from '@forms/templates/psv/psv-tyres.template'; import { PsvWeightsTemplate } from '@forms/templates/psv/psv-weight.template'; import { SmallTrailerTechRecord } from '@forms/templates/small-trailer/small-trailer-tech-record.template'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { AdrCertificateTemplate } from '@forms/templates/general/adr-certificate.template'; import { AdrTemplate } from '@forms/templates/general/adr.template'; diff --git a/src/app/forms/validators/custom-async-validators.spec.ts b/src/app/forms/validators/custom-async-validators.spec.ts index a25806f85..06bc5bf4a 100644 --- a/src/app/forms/validators/custom-async-validators.spec.ts +++ b/src/app/forms/validators/custom-async-validators.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; import { AbstractControl, FormGroup, ValidationErrors } from '@angular/forms'; import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { operatorEnum } from '@models/condition.model'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { createMockCustomDefect } from '@mocks/custom-defect.mock'; import { mockTestResult } from '@mocks/mock-test-result'; +import { operatorEnum } from '@models/condition.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { State, initialAppState } from '@store/.'; import { editingTechRecord } from '@store/technical-records'; import { testResultInEdit } from '@store/test-records'; diff --git a/src/app/forms/validators/custom-async-validators.ts b/src/app/forms/validators/custom-async-validators.ts index 00ddf5c33..1cd283881 100644 --- a/src/app/forms/validators/custom-async-validators.ts +++ b/src/app/forms/validators/custom-async-validators.ts @@ -1,12 +1,12 @@ import { AbstractControl, AsyncValidatorFn, ValidationErrors, Validators } from '@angular/forms'; import { Condition, operatorEnum } from '@models/condition.model'; -// eslint-disable-next-line import/no-cycle -import { CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { User } from '@models/reference-data.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TestStation } from '@models/test-stations/test-station.model'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { Store, select } from '@ngrx/store'; +// eslint-disable-next-line import/no-cycle +import { CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { State } from '@store/.'; import { selectUserByResourceKey } from '@store/reference-data'; import { editingTechRecord } from '@store/technical-records'; diff --git a/src/app/forms/validators/custom-validators.spec.ts b/src/app/forms/validators/custom-validators.spec.ts index 2491f4690..0a6b5517d 100644 --- a/src/app/forms/validators/custom-validators.spec.ts +++ b/src/app/forms/validators/custom-validators.spec.ts @@ -3,8 +3,8 @@ import { ADRDangerousGood } from '@dvsa/cvs-type-definitions/types/v3/tech-recor import { ApprovalType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/approvalType.enum.js'; import { VehicleClassDescription } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleClassDescription.enum.js'; import { ValidatorNames } from '@models/validators.enum'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { VehicleSizes, VehicleTypes } from '@models/vehicle-tech-record.model'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { CustomValidators } from './custom-validators'; interface CustomPatternMessage { diff --git a/src/app/forms/validators/custom-validators.ts b/src/app/forms/validators/custom-validators.ts index afc1db3b2..ccfce87d4 100644 --- a/src/app/forms/validators/custom-validators.ts +++ b/src/app/forms/validators/custom-validators.ts @@ -1,8 +1,8 @@ import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms'; import { VehicleClassDescription } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/vehicleClassDescription.enum.js'; +import { VehicleSizes, VehicleTypes } from '@models/vehicle-tech-record.model'; // eslint-disable-next-line import/no-cycle import { CustomFormControl, CustomFormGroup } from '@services/dynamic-forms/dynamic-form.types'; -import { VehicleSizes, VehicleTypes } from '@models/vehicle-tech-record.model'; import validateDate from 'validate-govuk-date'; export class CustomValidators { diff --git a/src/app/forms/validators/defects/defect.validators.spec.ts b/src/app/forms/validators/defects/defect.validators.spec.ts index 2e03bef69..697f67091 100644 --- a/src/app/forms/validators/defects/defect.validators.spec.ts +++ b/src/app/forms/validators/defects/defect.validators.spec.ts @@ -1,6 +1,6 @@ import { AbstractControl, FormGroup } from '@angular/forms'; -import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { deficiencyCategory } from '@models/defects/deficiency-category.enum'; +import { CustomFormControl, CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { DefectValidators } from './defect.validators'; describe('parent sibling validators', () => { diff --git a/src/app/shared/pipes/default-null-or-empty/default-null-or-empty.pipe.spec.ts b/src/app/pipes/default-null-or-empty/default-null-or-empty.pipe.spec.ts similarity index 100% rename from src/app/shared/pipes/default-null-or-empty/default-null-or-empty.pipe.spec.ts rename to src/app/pipes/default-null-or-empty/default-null-or-empty.pipe.spec.ts diff --git a/src/app/shared/pipes/default-null-or-empty/default-null-or-empty.pipe.ts b/src/app/pipes/default-null-or-empty/default-null-or-empty.pipe.ts similarity index 100% rename from src/app/shared/pipes/default-null-or-empty/default-null-or-empty.pipe.ts rename to src/app/pipes/default-null-or-empty/default-null-or-empty.pipe.ts diff --git a/src/app/shared/pipes/digit-group-separator/digit-group-separator.pipe.spec.ts b/src/app/pipes/digit-group-separator/digit-group-separator.pipe.spec.ts similarity index 100% rename from src/app/shared/pipes/digit-group-separator/digit-group-separator.pipe.spec.ts rename to src/app/pipes/digit-group-separator/digit-group-separator.pipe.spec.ts diff --git a/src/app/shared/pipes/digit-group-separator/digit-group-separator.pipe.ts b/src/app/pipes/digit-group-separator/digit-group-separator.pipe.ts similarity index 100% rename from src/app/shared/pipes/digit-group-separator/digit-group-separator.pipe.ts rename to src/app/pipes/digit-group-separator/digit-group-separator.pipe.ts diff --git a/src/app/shared/pipes/format-vehicle-type/format-vehicle-type.pipe.spec.ts b/src/app/pipes/format-vehicle-type/format-vehicle-type.pipe.spec.ts similarity index 100% rename from src/app/shared/pipes/format-vehicle-type/format-vehicle-type.pipe.spec.ts rename to src/app/pipes/format-vehicle-type/format-vehicle-type.pipe.spec.ts diff --git a/src/app/shared/pipes/format-vehicle-type/format-vehicle-type.pipe.ts b/src/app/pipes/format-vehicle-type/format-vehicle-type.pipe.ts similarity index 100% rename from src/app/shared/pipes/format-vehicle-type/format-vehicle-type.pipe.ts rename to src/app/pipes/format-vehicle-type/format-vehicle-type.pipe.ts diff --git a/src/app/shared/pipes/get-control-label/get-control-label.pipe.spec.ts b/src/app/pipes/get-control-label/get-control-label.pipe.spec.ts similarity index 100% rename from src/app/shared/pipes/get-control-label/get-control-label.pipe.spec.ts rename to src/app/pipes/get-control-label/get-control-label.pipe.spec.ts diff --git a/src/app/shared/pipes/get-control-label/get-control-label.pipe.ts b/src/app/pipes/get-control-label/get-control-label.pipe.ts similarity index 100% rename from src/app/shared/pipes/get-control-label/get-control-label.pipe.ts rename to src/app/pipes/get-control-label/get-control-label.pipe.ts diff --git a/src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.spec.ts b/src/app/pipes/ref-data-decode/ref-data-decode.pipe.spec.ts similarity index 100% rename from src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.spec.ts rename to src/app/pipes/ref-data-decode/ref-data-decode.pipe.spec.ts diff --git a/src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.ts b/src/app/pipes/ref-data-decode/ref-data-decode.pipe.ts similarity index 100% rename from src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.ts rename to src/app/pipes/ref-data-decode/ref-data-decode.pipe.ts index 8cf38f647..c21625175 100644 --- a/src/app/shared/pipes/ref-data-decode/ref-data-decode.pipe.ts +++ b/src/app/pipes/ref-data-decode/ref-data-decode.pipe.ts @@ -1,5 +1,4 @@ import { OnDestroy, Pipe, PipeTransform } from '@angular/core'; -import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { ReferenceDataModelBase, ReferenceDataResourceType, @@ -7,6 +6,7 @@ import { } from '@models/reference-data.model'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store } from '@ngrx/store'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; import { State } from '@store/index'; import { fetchReferenceData, diff --git a/src/app/shared/pipes/test-type-name/test-type-name.pipe.spec.ts b/src/app/pipes/test-type-name/test-type-name.pipe.spec.ts similarity index 100% rename from src/app/shared/pipes/test-type-name/test-type-name.pipe.spec.ts rename to src/app/pipes/test-type-name/test-type-name.pipe.spec.ts diff --git a/src/app/shared/pipes/test-type-name/test-type-name.pipe.ts b/src/app/pipes/test-type-name/test-type-name.pipe.ts similarity index 100% rename from src/app/shared/pipes/test-type-name/test-type-name.pipe.ts rename to src/app/pipes/test-type-name/test-type-name.pipe.ts diff --git a/src/app/shared/pipes/truncate/truncate.pipe.spec.ts b/src/app/pipes/truncate/truncate.pipe.spec.ts similarity index 100% rename from src/app/shared/pipes/truncate/truncate.pipe.spec.ts rename to src/app/pipes/truncate/truncate.pipe.spec.ts diff --git a/src/app/shared/pipes/truncate/truncate.pipe.ts b/src/app/pipes/truncate/truncate.pipe.ts similarity index 100% rename from src/app/shared/pipes/truncate/truncate.pipe.ts rename to src/app/pipes/truncate/truncate.pipe.ts diff --git a/src/app/shared/pipes/tyre-axle-load/tyre-axle-load.pipe.spec.ts b/src/app/pipes/tyre-axle-load/tyre-axle-load.pipe.spec.ts similarity index 100% rename from src/app/shared/pipes/tyre-axle-load/tyre-axle-load.pipe.spec.ts rename to src/app/pipes/tyre-axle-load/tyre-axle-load.pipe.spec.ts diff --git a/src/app/shared/pipes/tyre-axle-load/tyre-axle-load.pipe.ts b/src/app/pipes/tyre-axle-load/tyre-axle-load.pipe.ts similarity index 100% rename from src/app/shared/pipes/tyre-axle-load/tyre-axle-load.pipe.ts rename to src/app/pipes/tyre-axle-load/tyre-axle-load.pipe.ts diff --git a/src/app/services/batch-technical-record/batch-technical-record.service.spec.ts b/src/app/services/batch-technical-record/batch-technical-record.service.spec.ts index 1e94efc16..92739c27d 100644 --- a/src/app/services/batch-technical-record/batch-technical-record.service.spec.ts +++ b/src/app/services/batch-technical-record/batch-technical-record.service.spec.ts @@ -3,9 +3,9 @@ import { TestBed } from '@angular/core/testing'; import { AbstractControl, FormControl, FormGroup, ValidationErrors } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { TechRecordSearchSchema } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/search'; -import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { StatusCodes, VehicleTypes } from '@models/vehicle-tech-record.model'; import { provideMockStore } from '@ngrx/store/testing'; +import { CustomFormControl, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordHttpService } from '@services/technical-record-http/technical-record-http.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { initialAppState } from '@store/index'; diff --git a/src/app/services/batch-technical-record/batch-technical-record.service.ts b/src/app/services/batch-technical-record/batch-technical-record.service.ts index 9c4826f49..aa5327378 100644 --- a/src/app/services/batch-technical-record/batch-technical-record.service.ts +++ b/src/app/services/batch-technical-record/batch-technical-record.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { AbstractControl, AsyncValidatorFn, ValidationErrors } from '@angular/forms'; -import { CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { SEARCH_TYPES } from '@models/search-types-enum'; import { StatusCodes, VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store, select } from '@ngrx/store'; +import { CustomFormControl } from '@services/dynamic-forms/dynamic-form.types'; import { TechnicalRecordHttpService } from '@services/technical-record-http/technical-record-http.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { updateEditingTechRecordCancel } from '@store/technical-records'; diff --git a/src/app/services/dynamic-forms/dynamic-form.service.ts b/src/app/services/dynamic-forms/dynamic-form.service.ts index b3d6418c6..31d2a2400 100644 --- a/src/app/services/dynamic-forms/dynamic-form.service.ts +++ b/src/app/services/dynamic-forms/dynamic-form.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; import { AsyncValidatorFn, FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { GlobalError } from '@core/components/global-error/global-error.interface'; -import { AsyncValidatorNames } from '@models/async-validators.enum'; -import { Condition } from '@models/condition.model'; -import { ValidatorNames } from '@models/validators.enum'; import { ErrorMessageMap } from '@forms/utils/error-message-map'; // eslint-disable-next-line import/no-cycle import { CustomAsyncValidators } from '@forms/validators/custom-async-validators'; import { CustomValidators, EnumValidatorOptions, IsArrayValidatorOptions } from '@forms/validators/custom-validators'; import { DefectValidators } from '@forms/validators/defects/defect.validators'; +import { AsyncValidatorNames } from '@models/async-validators.enum'; +import { Condition } from '@models/condition.model'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; +import { ValidatorNames } from '@models/validators.enum'; import { Store } from '@ngrx/store'; import { State } from '@store/index'; import { CustomFormArray, CustomFormControl, CustomFormGroup, FormNode, FormNodeTypes } from './dynamic-form.types'; diff --git a/src/app/services/dynamic-forms/dynamic-form.types.ts b/src/app/services/dynamic-forms/dynamic-form.types.ts index 6cd1aafb9..8dd530e08 100644 --- a/src/app/services/dynamic-forms/dynamic-form.types.ts +++ b/src/app/services/dynamic-forms/dynamic-form.types.ts @@ -14,16 +14,16 @@ import { Params } from '@angular/router'; // eslint-disable-next-line import/no-cycle import { BaseControlComponent } from '@forms/components/base-control/base-control.component'; import { AsyncValidatorNames } from '@models/async-validators.enum'; -import { ValidatorNames } from '@models/validators.enum'; import { ReferenceDataResourceType } from '@models/reference-data.model'; +import { ValidatorNames } from '@models/validators.enum'; import { Store } from '@ngrx/store'; +import { SpecialRefData } from '@services/multi-options/multi-options.service'; // eslint-disable-next-line import/no-cycle import { State } from '@store/index'; import { Observable, map } from 'rxjs'; +import { TagTypes } from '../../components/tag/tag.component'; // eslint-disable-next-line import/no-cycle import { DynamicFormService } from './dynamic-form.service'; -import { SpecialRefData } from '@services/multi-options/multi-options.service'; -import { TagTypes } from '../../components/tag/tag.component'; export enum FormNodeViewTypes { DATE = 'date', diff --git a/src/app/services/test-records/test-records.service.ts b/src/app/services/test-records/test-records.service.ts index e47c6bb3a..ccf960895 100644 --- a/src/app/services/test-records/test-records.service.ts +++ b/src/app/services/test-records/test-records.service.ts @@ -5,14 +5,14 @@ import { GetTestResultsService, UpdateTestResultsService, } from '@api/test-results'; -import { TEST_TYPES, TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { contingencyTestTemplates } from '@forms/templates/test-records/create-master.template'; import { masterTpl } from '@forms/templates/test-records/master.template'; import { TestResultStatus } from '@models/test-results/test-result-status.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; +import { TEST_TYPES, TEST_TYPES_GROUP1_SPEC_TEST, TEST_TYPES_GROUP5_SPEC_TEST } from '@models/testTypeId.enum'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Store, select } from '@ngrx/store'; +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultsState, cancelEditingTestResult, diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 5be70b320..a80a42939 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -4,29 +4,29 @@ import { RouterModule } from '@angular/router'; import { DocumentRetrievalService } from '@api/document-retrieval'; import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { FeatureToggleDirective } from '@directives/feature-toggle/feature-toggle.directive'; -import { PreventDoubleClickDirective } from './directives/prevent-double-click/prevent-double-click.directive'; -import { RetrieveDocumentDirective } from './directives/retrieve-document/retrieve-document.directive'; -import { DefaultNullOrEmpty } from './pipes/default-null-or-empty/default-null-or-empty.pipe'; -import { DigitGroupSeparatorPipe } from './pipes/digit-group-separator/digit-group-separator.pipe'; -import { FormatVehicleTypePipe } from './pipes/format-vehicle-type/format-vehicle-type.pipe'; -import { GetControlLabelPipe } from './pipes/get-control-label/get-control-label.pipe'; -import { RefDataDecodePipe } from './pipes/ref-data-decode/ref-data-decode.pipe'; -import { TestTypeNamePipe } from './pipes/test-type-name/test-type-name.pipe'; -import { TyreAxleLoadPipe } from './pipes/tyre-axle-load/tyre-axle-load.pipe'; -import { TestCertificateComponent } from '../components/test-certificate/test-certificate.component'; +import { AccordionControlComponent } from '../components/accordion-control/accordion-control.component'; +import { AccordionComponent } from '../components/accordion/accordion.component'; +import { BannerComponent } from '../components/banner/banner.component'; +import { BaseDialogComponent } from '../components/base-dialog/base-dialog.component'; import { ButtonGroupComponent } from '../components/button-group/button-group.component'; import { ButtonComponent } from '../components/button/button.component'; -import { BannerComponent } from '../components/banner/banner.component'; -import { TagComponent } from '../components/tag/tag.component'; -import { NumberPlateComponent } from '../components/number-plate/number-plate.component'; +import { CollapsibleTextComponent } from '../components/collapsible-text/collapsible-text.component'; import { IconComponent } from '../components/icon/icon.component'; -import { AccordionComponent } from '../components/accordion/accordion.component'; -import { AccordionControlComponent } from '../components/accordion-control/accordion-control.component'; -import { PaginationComponent } from '../components/pagination/pagination.component'; -import { BaseDialogComponent } from '../components/base-dialog/base-dialog.component'; import { InputSpinnerComponent } from '../components/input-spinner/input-spinner.component'; +import { NumberPlateComponent } from '../components/number-plate/number-plate.component'; +import { PaginationComponent } from '../components/pagination/pagination.component'; import { RouterOutletComponent } from '../components/router-outlet/router-outlet.component'; -import { CollapsibleTextComponent } from '../components/collapsible-text/collapsible-text.component'; +import { TagComponent } from '../components/tag/tag.component'; +import { TestCertificateComponent } from '../components/test-certificate/test-certificate.component'; +import { DefaultNullOrEmpty } from '../pipes/default-null-or-empty/default-null-or-empty.pipe'; +import { DigitGroupSeparatorPipe } from '../pipes/digit-group-separator/digit-group-separator.pipe'; +import { FormatVehicleTypePipe } from '../pipes/format-vehicle-type/format-vehicle-type.pipe'; +import { GetControlLabelPipe } from '../pipes/get-control-label/get-control-label.pipe'; +import { RefDataDecodePipe } from '../pipes/ref-data-decode/ref-data-decode.pipe'; +import { TestTypeNamePipe } from '../pipes/test-type-name/test-type-name.pipe'; +import { TyreAxleLoadPipe } from '../pipes/tyre-axle-load/tyre-axle-load.pipe'; +import { PreventDoubleClickDirective } from './directives/prevent-double-click/prevent-double-click.directive'; +import { RetrieveDocumentDirective } from './directives/retrieve-document/retrieve-document.directive'; @NgModule({ declarations: [ diff --git a/src/app/store/technical-records/effects/technical-record-service.effects.ts b/src/app/store/technical-records/effects/technical-record-service.effects.ts index 360116c0f..a67cd0b26 100644 --- a/src/app/store/technical-records/effects/technical-record-service.effects.ts +++ b/src/app/store/technical-records/effects/technical-record-service.effects.ts @@ -7,12 +7,12 @@ import { TechRecordGETPSV, TechRecordGETTRL, } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-verb-vehicle-type'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { vehicleTemplateMap } from '@forms/utils/tech-record-constants'; import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { Actions, createEffect, ofType } from '@ngrx/effects'; import { Store, select } from '@ngrx/store'; import { BatchTechnicalRecordService } from '@services/batch-technical-record/batch-technical-record.service'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { TechnicalRecordHttpService } from '@services/technical-record-http/technical-record-http.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { UserService } from '@services/user-service/user-service'; diff --git a/src/app/store/test-records/actions/test-records.actions.ts b/src/app/store/test-records/actions/test-records.actions.ts index 2d50b29b8..efe2e25d4 100644 --- a/src/app/store/test-records/actions/test-records.actions.ts +++ b/src/app/store/test-records/actions/test-records.actions.ts @@ -1,12 +1,12 @@ import { GlobalError } from '@core/components/global-error/global-error.interface'; -// eslint-disable-next-line import/no-cycle -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { TestResultDefect } from '@models/test-results/test-result-defect.model'; import { TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { Update } from '@ngrx/entity'; import { createAction, props } from '@ngrx/store'; +// eslint-disable-next-line import/no-cycle +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; export const fetchTestResults = createAction('[API/test-results] Fetch All'); export const fetchTestResultsSuccess = createAction( diff --git a/src/app/store/test-records/effects/test-records.effects.spec.ts b/src/app/store/test-records/effects/test-records.effects.spec.ts index 23f11df9f..68c072724 100644 --- a/src/app/store/test-records/effects/test-records.effects.spec.ts +++ b/src/app/store/test-records/effects/test-records.effects.spec.ts @@ -6,8 +6,6 @@ import { ApiModule as TestResultsApiModule } from '@api/test-results'; import { TestTypesService } from '@api/test-types'; import { GlobalError } from '@core/components/global-error/global-error.interface'; import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategoryPsv.enum.js'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { contingencyTestTemplates } from '@forms/templates/test-records/create-master.template'; import { createMockTestResult } from '@mocks/test-result.mock'; import { createMockTestType } from '@mocks/test-type.mock'; @@ -19,6 +17,8 @@ import { VehicleTypes } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; +import { FormNode, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { FeatureToggleService } from '@services/feature-toggle-service/feature-toggle-service'; import { RouterService } from '@services/router/router.service'; import { TestRecordsService } from '@services/test-records/test-records.service'; diff --git a/src/app/store/test-records/effects/test-records.effects.ts b/src/app/store/test-records/effects/test-records.effects.ts index 82c88adc1..8e1aa8de6 100644 --- a/src/app/store/test-records/effects/test-records.effects.ts +++ b/src/app/store/test-records/effects/test-records.effects.ts @@ -2,16 +2,16 @@ import { Injectable, inject } from '@angular/core'; import { Router } from '@angular/router'; import { TestTypesService } from '@api/test-types'; import { GlobalError } from '@core/components/global-error/global-error.interface'; -import { TEST_TYPES } from '@models/testTypeId.enum'; -import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { contingencyTestTemplates } from '@forms/templates/test-records/create-master.template'; import { masterTpl } from '@forms/templates/test-records/master.template'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TypeOfTest } from '@models/test-results/typeOfTest.enum'; import { TestStationType } from '@models/test-stations/test-station-type.enum'; +import { TEST_TYPES } from '@models/testTypeId.enum'; import { StatusCodes } from '@models/vehicle-tech-record.model'; import { Actions, createEffect, ofType } from '@ngrx/effects'; import { Store, select } from '@ngrx/store'; +import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { FeatureToggleService } from '@services/feature-toggle-service/feature-toggle-service'; import { TechnicalRecordHttpService } from '@services/technical-record-http/technical-record-http.service'; import { TestRecordsService } from '@services/test-records/test-records.service'; diff --git a/src/app/store/test-records/reducers/test-records.reducer.ts b/src/app/store/test-records/reducers/test-records.reducer.ts index 870fd5171..8c406acb4 100644 --- a/src/app/store/test-records/reducers/test-records.reducer.ts +++ b/src/app/store/test-records/reducers/test-records.reducer.ts @@ -1,17 +1,17 @@ -import { - TEST_TYPES_GROUP1_SPEC_TEST, - TEST_TYPES_GROUP5_SPEC_TEST, - TEST_TYPES_GROUP9_10_CENTRAL_DOCS, -} from '@models/testTypeId.enum'; -// eslint-disable-next-line import/no-cycle -import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import { DeficiencyCategoryEnum, TestResultDefect } from '@models/test-results/test-result-defect.model'; import { TestResultRequiredStandard } from '@models/test-results/test-result-required-standard.model'; import { TestResultModel } from '@models/test-results/test-result.model'; import { TypeOfTest } from '@models/test-results/typeOfTest.enum'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; +import { + TEST_TYPES_GROUP1_SPEC_TEST, + TEST_TYPES_GROUP5_SPEC_TEST, + TEST_TYPES_GROUP9_10_CENTRAL_DOCS, +} from '@models/testTypeId.enum'; import { EntityAdapter, EntityState, createEntityAdapter } from '@ngrx/entity'; import { createFeatureSelector, createReducer, on } from '@ngrx/store'; +// eslint-disable-next-line import/no-cycle +import { FormNode } from '@services/dynamic-forms/dynamic-form.types'; import cloneDeep from 'lodash.clonedeep'; import merge from 'lodash.merge'; import { diff --git a/tsconfig.json b/tsconfig.json index baea4adc9..300755fb0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -25,10 +25,12 @@ "paths": { "@api/*": ["src/app/api/*"], "@core/*": ["src/app/core/*"], + "@components/*": ["src/app/components/*"], "@forms/*": ["src/app/forms/*"], "@guards/*": ["src/app/guards/*"], "@mocks/*": ["src/mocks/*"], "@models/*": ["src/app/models/*"], + "@pipes/*": ["src/app/pipes/*"], "@services/*": ["src/app/services/*"], "@store/*": ["src/app/store/*"], "@shared/*": ["src/app/shared/*"], From 923022a36f38111ccc851c26913b0aa91bdee54b Mon Sep 17 00:00:00 2001 From: Thomas Crawley Date: Thu, 5 Sep 2024 13:03:56 +0100 Subject: [PATCH 4/8] feat(cb2-13727): add additional shortened url paths --- tsconfig.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 300755fb0..d6c79a628 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,17 +24,20 @@ ], "paths": { "@api/*": ["src/app/api/*"], - "@core/*": ["src/app/core/*"], "@components/*": ["src/app/components/*"], + "@core/*": ["src/app/core/*"], + "@directives/*": ["src/app/directives/*"], + "@features/*": ["src/app/features/*"], "@forms/*": ["src/app/forms/*"], "@guards/*": ["src/app/guards/*"], - "@mocks/*": ["src/mocks/*"], + "@interceptors/*": ["src/app/interceptors/*"], "@models/*": ["src/app/models/*"], "@pipes/*": ["src/app/pipes/*"], + "@resolvers/*": ["src/app/resolvers/*"], "@services/*": ["src/app/services/*"], - "@store/*": ["src/app/store/*"], "@shared/*": ["src/app/shared/*"], - "@directives/*": ["src/app/directives/*"], + "@store/*": ["src/app/store/*"], + "@mocks/*": ["src/mocks/*"], "govuk-frontend/*": ["node_modules/govuk-frontend/*"] } }, From 3b23f3423e1be1f9fd8569439de1a61fa10bca88 Mon Sep 17 00:00:00 2001 From: Thomas Crawley Date: Thu, 5 Sep 2024 13:08:25 +0100 Subject: [PATCH 5/8] feat(cb2-13727): add test folders for top level components --- .../accordion-control.component.spec.ts | 4 ++-- .../accordion.component.spec.ts | 4 ++-- .../{ => __tests__}/banner.component.spec.ts | 2 +- .../base-dialog.component.spec.ts | 2 +- .../button-group.component.spec.ts | 2 +- .../{ => __tests__}/button.component.spec.ts | 2 +- .../collapsible-text.component.spec.ts | 2 +- .../{ => __tests__}/icon.component.spec.ts | 2 +- .../input-spinner.component.spec.ts | 2 +- .../number-plate.component.spec.ts | 2 +- .../pagination.component.spec.ts | 2 +- .../router-outlet.component.spec.ts | 2 +- .../tag/{ => __tests__}/tag.component.spec.ts | 2 +- .../test-certificate.component.spec.ts | 2 +- .../core/components/header/header.stories.ts | 19 ------------------- 15 files changed, 16 insertions(+), 35 deletions(-) rename src/app/components/accordion-control/{ => __tests__}/accordion-control.component.spec.ts (91%) rename src/app/components/accordion/{ => __tests__}/accordion.component.spec.ts (95%) rename src/app/components/banner/{ => __tests__}/banner.component.spec.ts (90%) rename src/app/components/base-dialog/{ => __tests__}/base-dialog.component.spec.ts (89%) rename src/app/components/button-group/{ => __tests__}/button-group.component.spec.ts (89%) rename src/app/components/button/{ => __tests__}/button.component.spec.ts (92%) rename src/app/components/collapsible-text/{ => __tests__}/collapsible-text.component.spec.ts (92%) rename src/app/components/icon/{ => __tests__}/icon.component.spec.ts (91%) rename src/app/components/input-spinner/{ => __tests__}/input-spinner.component.spec.ts (89%) rename src/app/components/number-plate/{ => __tests__}/number-plate.component.spec.ts (96%) rename src/app/components/pagination/{ => __tests__}/pagination.component.spec.ts (98%) rename src/app/components/router-outlet/{ => __tests__}/router-outlet.component.spec.ts (90%) rename src/app/components/tag/{ => __tests__}/tag.component.spec.ts (91%) rename src/app/components/test-certificate/{ => __tests__}/test-certificate.component.spec.ts (98%) delete mode 100644 src/app/core/components/header/header.stories.ts diff --git a/src/app/components/accordion-control/accordion-control.component.spec.ts b/src/app/components/accordion-control/__tests__/accordion-control.component.spec.ts similarity index 91% rename from src/app/components/accordion-control/accordion-control.component.spec.ts rename to src/app/components/accordion-control/__tests__/accordion-control.component.spec.ts index 981a1f2c2..6dc1609e5 100644 --- a/src/app/components/accordion-control/accordion-control.component.spec.ts +++ b/src/app/components/accordion-control/__tests__/accordion-control.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { provideMockStore } from '@ngrx/store/testing'; import { initialAppState } from '@store/index'; -import { AccordionComponent } from '../accordion/accordion.component'; -import { AccordionControlComponent } from './accordion-control.component'; +import { AccordionComponent } from '../../accordion/accordion.component'; +import { AccordionControlComponent } from '../accordion-control.component'; @Component({ selector: 'app-host', diff --git a/src/app/components/accordion/accordion.component.spec.ts b/src/app/components/accordion/__tests__/accordion.component.spec.ts similarity index 95% rename from src/app/components/accordion/accordion.component.spec.ts rename to src/app/components/accordion/__tests__/accordion.component.spec.ts index 2acf7335c..5738a5651 100644 --- a/src/app/components/accordion/accordion.component.spec.ts +++ b/src/app/components/accordion/__tests__/accordion.component.spec.ts @@ -2,9 +2,9 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; -import { State, initialAppState } from '@store/.'; +import { State, initialAppState } from '@store/index'; import { addSectionState, removeSectionState } from '@store/technical-records'; -import { AccordionComponent } from './accordion.component'; +import { AccordionComponent } from '../accordion.component'; @Component({ selector: 'app-host', diff --git a/src/app/components/banner/banner.component.spec.ts b/src/app/components/banner/__tests__/banner.component.spec.ts similarity index 90% rename from src/app/components/banner/banner.component.spec.ts rename to src/app/components/banner/__tests__/banner.component.spec.ts index 865c11ae0..acb7b283f 100644 --- a/src/app/components/banner/banner.component.spec.ts +++ b/src/app/components/banner/__tests__/banner.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { BannerComponent } from './banner.component'; +import { BannerComponent } from '../banner.component'; describe('BannerComponent', () => { let component: BannerComponent; diff --git a/src/app/components/base-dialog/base-dialog.component.spec.ts b/src/app/components/base-dialog/__tests__/base-dialog.component.spec.ts similarity index 89% rename from src/app/components/base-dialog/base-dialog.component.spec.ts rename to src/app/components/base-dialog/__tests__/base-dialog.component.spec.ts index ac5a25b31..ad969b0c1 100644 --- a/src/app/components/base-dialog/base-dialog.component.spec.ts +++ b/src/app/components/base-dialog/__tests__/base-dialog.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { BaseDialogComponent } from './base-dialog.component'; +import { BaseDialogComponent } from '../base-dialog.component'; describe('BaseDialogComponent', () => { let component: BaseDialogComponent; diff --git a/src/app/components/button-group/button-group.component.spec.ts b/src/app/components/button-group/__tests__/button-group.component.spec.ts similarity index 89% rename from src/app/components/button-group/button-group.component.spec.ts rename to src/app/components/button-group/__tests__/button-group.component.spec.ts index 81fe8fd84..db7882a1e 100644 --- a/src/app/components/button-group/button-group.component.spec.ts +++ b/src/app/components/button-group/__tests__/button-group.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ButtonGroupComponent } from './button-group.component'; +import { ButtonGroupComponent } from '../button-group.component'; describe('ButtonGroupComponent', () => { let component: ButtonGroupComponent; diff --git a/src/app/components/button/button.component.spec.ts b/src/app/components/button/__tests__/button.component.spec.ts similarity index 92% rename from src/app/components/button/button.component.spec.ts rename to src/app/components/button/__tests__/button.component.spec.ts index 413d98602..749a8a37d 100644 --- a/src/app/components/button/button.component.spec.ts +++ b/src/app/components/button/__tests__/button.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { ButtonComponent } from './button.component'; +import { ButtonComponent } from '../button.component'; describe('ButtonComponent', () => { let component: ButtonComponent; diff --git a/src/app/components/collapsible-text/collapsible-text.component.spec.ts b/src/app/components/collapsible-text/__tests__/collapsible-text.component.spec.ts similarity index 92% rename from src/app/components/collapsible-text/collapsible-text.component.spec.ts rename to src/app/components/collapsible-text/__tests__/collapsible-text.component.spec.ts index 5a5854079..d5b9869cb 100644 --- a/src/app/components/collapsible-text/collapsible-text.component.spec.ts +++ b/src/app/components/collapsible-text/__tests__/collapsible-text.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CollapsibleTextComponent } from './collapsible-text.component'; +import { CollapsibleTextComponent } from '../collapsible-text.component'; describe('CollapsibleTextComponent', () => { let component: CollapsibleTextComponent; diff --git a/src/app/components/icon/icon.component.spec.ts b/src/app/components/icon/__tests__/icon.component.spec.ts similarity index 91% rename from src/app/components/icon/icon.component.spec.ts rename to src/app/components/icon/__tests__/icon.component.spec.ts index 2a0824d9d..6189e9d37 100644 --- a/src/app/components/icon/icon.component.spec.ts +++ b/src/app/components/icon/__tests__/icon.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { IconComponent } from './icon.component'; +import { IconComponent } from '../icon.component'; describe('IconComponent', () => { let component: IconComponent; diff --git a/src/app/components/input-spinner/input-spinner.component.spec.ts b/src/app/components/input-spinner/__tests__/input-spinner.component.spec.ts similarity index 89% rename from src/app/components/input-spinner/input-spinner.component.spec.ts rename to src/app/components/input-spinner/__tests__/input-spinner.component.spec.ts index ae3c9efa9..6633467a8 100644 --- a/src/app/components/input-spinner/input-spinner.component.spec.ts +++ b/src/app/components/input-spinner/__tests__/input-spinner.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { InputSpinnerComponent } from './input-spinner.component'; +import { InputSpinnerComponent } from '../input-spinner.component'; describe('InputSpinnerComponent', () => { let component: InputSpinnerComponent; diff --git a/src/app/components/number-plate/number-plate.component.spec.ts b/src/app/components/number-plate/__tests__/number-plate.component.spec.ts similarity index 96% rename from src/app/components/number-plate/number-plate.component.spec.ts rename to src/app/components/number-plate/__tests__/number-plate.component.spec.ts index 4d63f1694..7089039bf 100644 --- a/src/app/components/number-plate/number-plate.component.spec.ts +++ b/src/app/components/number-plate/__tests__/number-plate.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DefaultNullOrEmpty } from '@shared/pipes/default-null-or-empty/default-null-or-empty.pipe'; -import { NumberPlateComponent } from './number-plate.component'; +import { NumberPlateComponent } from '../number-plate.component'; describe('NumberPlateComponent', () => { let component: NumberPlateComponent; diff --git a/src/app/components/pagination/pagination.component.spec.ts b/src/app/components/pagination/__tests__/pagination.component.spec.ts similarity index 98% rename from src/app/components/pagination/pagination.component.spec.ts rename to src/app/components/pagination/__tests__/pagination.component.spec.ts index 111c9fd0f..d60b2ac9f 100644 --- a/src/app/components/pagination/pagination.component.spec.ts +++ b/src/app/components/pagination/__tests__/pagination.component.spec.ts @@ -4,7 +4,7 @@ import { By } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { Observable, map } from 'rxjs'; -import { PaginationComponent } from './pagination.component'; +import { PaginationComponent } from '../pagination.component'; @Component({ selector: 'app-host', diff --git a/src/app/components/router-outlet/router-outlet.component.spec.ts b/src/app/components/router-outlet/__tests__/router-outlet.component.spec.ts similarity index 90% rename from src/app/components/router-outlet/router-outlet.component.spec.ts rename to src/app/components/router-outlet/__tests__/router-outlet.component.spec.ts index 807d44da2..ea60417b7 100644 --- a/src/app/components/router-outlet/router-outlet.component.spec.ts +++ b/src/app/components/router-outlet/__tests__/router-outlet.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { RouterOutletComponent } from './router-outlet.component'; +import { RouterOutletComponent } from '../router-outlet.component'; describe('RouterOutletComponent', () => { let component: RouterOutletComponent; diff --git a/src/app/components/tag/tag.component.spec.ts b/src/app/components/tag/__tests__/tag.component.spec.ts similarity index 91% rename from src/app/components/tag/tag.component.spec.ts rename to src/app/components/tag/__tests__/tag.component.spec.ts index 5536e0183..d96bbf400 100644 --- a/src/app/components/tag/tag.component.spec.ts +++ b/src/app/components/tag/__tests__/tag.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TagComponent } from './tag.component'; +import { TagComponent } from '../tag.component'; describe('TagComponent', () => { let component: TagComponent; diff --git a/src/app/components/test-certificate/test-certificate.component.spec.ts b/src/app/components/test-certificate/__tests__/test-certificate.component.spec.ts similarity index 98% rename from src/app/components/test-certificate/test-certificate.component.spec.ts rename to src/app/components/test-certificate/__tests__/test-certificate.component.spec.ts index 941469173..1d372743a 100644 --- a/src/app/components/test-certificate/test-certificate.component.spec.ts +++ b/src/app/components/test-certificate/__tests__/test-certificate.component.spec.ts @@ -8,7 +8,7 @@ import { FeatureToggleService } from '@services/feature-toggle-service/feature-t import { RetrieveDocumentDirective } from '@shared/directives/retrieve-document/retrieve-document.directive'; import { State, initialAppState } from '@store/index'; import { isTestTypeOldIvaOrMsva, toEditOrNotToEdit } from '@store/test-records'; -import { TestCertificateComponent } from './test-certificate.component'; +import { TestCertificateComponent } from '../test-certificate.component'; describe('TestCertificateComponent', () => { let component: TestCertificateComponent; diff --git a/src/app/core/components/header/header.stories.ts b/src/app/core/components/header/header.stories.ts deleted file mode 100644 index 41e063e96..000000000 --- a/src/app/core/components/header/header.stories.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Meta, Story } from '@storybook/angular'; - -import { HeaderComponent } from './header.component'; - -export default { - title: 'Header', - component: HeaderComponent, - argTypes: { logOut: { action: 'clicked' } }, -} as Meta; - -const Template: Story = () => ({ - props: {}, -}); - -export const Primary: Story = () => ({ - props: { - username: 'username', - }, -}); From 4d5ef7b83e83bbb37b0111cbb66a190623b1206d Mon Sep 17 00:00:00 2001 From: Thomas Crawley Date: Thu, 5 Sep 2024 13:12:15 +0100 Subject: [PATCH 6/8] feat(cb2-13727): add test folders to core components --- .../{ => __tests__}/breadcrumbs.component.spec.ts | 4 ++-- .../{ => __tests__}/footer.component.spec.ts | 2 +- src/app/core/components/footer/footer.stories.ts | 12 ------------ .../global-error.component.spec.ts | 6 +++--- .../{ => __tests__}/global-error.service.spec.ts | 6 +++--- .../global-error/global-error.stories.ts | 15 --------------- .../global-warning.component.spec.ts | 6 +++--- .../global-warning.service.spec.ts | 6 +++--- .../{ => __tests__}/header.component.spec.ts | 2 +- .../page-not-found.component.spec.ts | 2 +- .../phase-banner.component.spec.ts | 2 +- .../server-error.component.spec.ts | 2 +- .../{ => __tests__}/spinner.component.spec.ts | 2 +- 13 files changed, 20 insertions(+), 47 deletions(-) rename src/app/core/components/breadcrumbs/{ => __tests__}/breadcrumbs.component.spec.ts (96%) rename src/app/core/components/footer/{ => __tests__}/footer.component.spec.ts (90%) delete mode 100644 src/app/core/components/footer/footer.stories.ts rename src/app/core/components/global-error/{ => __tests__}/global-error.component.spec.ts (88%) rename src/app/core/components/global-error/{ => __tests__}/global-error.service.spec.ts (92%) delete mode 100644 src/app/core/components/global-error/global-error.stories.ts rename src/app/core/components/global-warning/{ => __tests__}/global-warning.component.spec.ts (89%) rename src/app/core/components/global-warning/{ => __tests__}/global-warning.service.spec.ts (87%) rename src/app/core/components/header/{ => __tests__}/header.component.spec.ts (95%) rename src/app/core/components/page-not-found/{ => __tests__}/page-not-found.component.spec.ts (89%) rename src/app/core/components/phase-banner/{ => __tests__}/phase-banner.component.spec.ts (89%) rename src/app/core/components/server-error/{ => __tests__}/server-error.component.spec.ts (89%) rename src/app/core/components/spinner/{ => __tests__}/spinner.component.spec.ts (94%) diff --git a/src/app/core/components/breadcrumbs/breadcrumbs.component.spec.ts b/src/app/core/components/breadcrumbs/__tests__/breadcrumbs.component.spec.ts similarity index 96% rename from src/app/core/components/breadcrumbs/breadcrumbs.component.spec.ts rename to src/app/core/components/breadcrumbs/__tests__/breadcrumbs.component.spec.ts index 9e23418c0..948ab416b 100644 --- a/src/app/core/components/breadcrumbs/breadcrumbs.component.spec.ts +++ b/src/app/core/components/breadcrumbs/__tests__/breadcrumbs.component.spec.ts @@ -3,10 +3,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { RouterReducerState } from '@ngrx/router-store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { RouterService } from '@services/router/router.service'; -import { State, initialAppState } from '@store/.'; +import { State, initialAppState } from '@store/index'; import { routerState } from '@store/router/selectors/router.selectors'; import { firstValueFrom } from 'rxjs'; -import { BreadcrumbsComponent } from './breadcrumbs.component'; +import { BreadcrumbsComponent } from '../breadcrumbs.component'; describe('BreadcrumbsComponent', () => { let component: BreadcrumbsComponent; diff --git a/src/app/core/components/footer/footer.component.spec.ts b/src/app/core/components/footer/__tests__/footer.component.spec.ts similarity index 90% rename from src/app/core/components/footer/footer.component.spec.ts rename to src/app/core/components/footer/__tests__/footer.component.spec.ts index 6c48f38b1..22b906110 100644 --- a/src/app/core/components/footer/footer.component.spec.ts +++ b/src/app/core/components/footer/__tests__/footer.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FooterComponent } from './footer.component'; +import { FooterComponent } from '../footer.component'; describe('FooterComponent', () => { let component: FooterComponent; diff --git a/src/app/core/components/footer/footer.stories.ts b/src/app/core/components/footer/footer.stories.ts deleted file mode 100644 index 0361eabdc..000000000 --- a/src/app/core/components/footer/footer.stories.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Meta, Story } from '@storybook/angular'; - -import { FooterComponent } from './footer.component'; - -export default { - title: 'Footer', - component: FooterComponent, -} as Meta; - -export const Primary: Story = () => ({ - props: {}, -}); diff --git a/src/app/core/components/global-error/global-error.component.spec.ts b/src/app/core/components/global-error/__tests__/global-error.component.spec.ts similarity index 88% rename from src/app/core/components/global-error/global-error.component.spec.ts rename to src/app/core/components/global-error/__tests__/global-error.component.spec.ts index fb2ebddc0..e6ede279b 100644 --- a/src/app/core/components/global-error/global-error.component.spec.ts +++ b/src/app/core/components/global-error/__tests__/global-error.component.spec.ts @@ -2,9 +2,9 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { provideMockStore } from '@ngrx/store/testing'; -import { initialAppState } from '@store/.'; -import { GlobalErrorComponent } from './global-error.component'; -import { GlobalErrorService } from './global-error.service'; +import { initialAppState } from '@store/index'; +import { GlobalErrorComponent } from '../global-error.component'; +import { GlobalErrorService } from '../global-error.service'; @Component({ selector: 'app-mock-component', diff --git a/src/app/core/components/global-error/global-error.service.spec.ts b/src/app/core/components/global-error/__tests__/global-error.service.spec.ts similarity index 92% rename from src/app/core/components/global-error/global-error.service.spec.ts rename to src/app/core/components/global-error/__tests__/global-error.service.spec.ts index 8f0250c73..fe445af36 100644 --- a/src/app/core/components/global-error/global-error.service.spec.ts +++ b/src/app/core/components/global-error/__tests__/global-error.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed } from '@angular/core/testing'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; -import { State, initialAppState } from '@store/.'; +import { State, initialAppState } from '@store/index'; import { addError, clearError, patchErrors, setErrors } from '@store/global-error/actions/global-error.actions'; -import { GlobalError } from './global-error.interface'; -import { GlobalErrorService } from './global-error.service'; +import { GlobalError } from '../global-error.interface'; +import { GlobalErrorService } from '../global-error.service'; describe('GlobalErrorService', () => { let service: GlobalErrorService; diff --git a/src/app/core/components/global-error/global-error.stories.ts b/src/app/core/components/global-error/global-error.stories.ts deleted file mode 100644 index 6430a0a5e..000000000 --- a/src/app/core/components/global-error/global-error.stories.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Meta, Story } from '@storybook/angular'; -import { GlobalErrorComponent } from './global-error.component'; - -export default { - title: 'Global Error Component', - component: GlobalErrorComponent, -} as Meta; - -export const NoErrors: Story = () => ({ - props: {}, -}); - -export const Error: Story = () => ({ - props: { errorMessage$: 'error' }, -}); diff --git a/src/app/core/components/global-warning/global-warning.component.spec.ts b/src/app/core/components/global-warning/__tests__/global-warning.component.spec.ts similarity index 89% rename from src/app/core/components/global-warning/global-warning.component.spec.ts rename to src/app/core/components/global-warning/__tests__/global-warning.component.spec.ts index 65bc2ae2d..47e815b95 100644 --- a/src/app/core/components/global-warning/global-warning.component.spec.ts +++ b/src/app/core/components/global-warning/__tests__/global-warning.component.spec.ts @@ -2,9 +2,9 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { provideMockStore } from '@ngrx/store/testing'; -import { initialAppState } from '@store/.'; -import { GlobalWarningComponent } from './global-warning.component'; -import { GlobalWarningService } from './global-warning.service'; +import { initialAppState } from '@store/index'; +import { GlobalWarningComponent } from '../global-warning.component'; +import { GlobalWarningService } from '../global-warning.service'; @Component({ selector: 'app-mock-component', diff --git a/src/app/core/components/global-warning/global-warning.service.spec.ts b/src/app/core/components/global-warning/__tests__/global-warning.service.spec.ts similarity index 87% rename from src/app/core/components/global-warning/global-warning.service.spec.ts rename to src/app/core/components/global-warning/__tests__/global-warning.service.spec.ts index 1dc9ed2f0..f0e79db92 100644 --- a/src/app/core/components/global-warning/global-warning.service.spec.ts +++ b/src/app/core/components/global-warning/__tests__/global-warning.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed } from '@angular/core/testing'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; -import { State, initialAppState } from '@store/.'; +import { State, initialAppState } from '@store/index'; import { clearWarning, setWarnings } from '@store/global-warning/actions/global-warning.actions'; -import { GlobalWarning } from './global-warning.interface'; -import { GlobalWarningService } from './global-warning.service'; +import { GlobalWarning } from '../global-warning.interface'; +import { GlobalWarningService } from '../global-warning.service'; describe('GlobalWarningService', () => { let service: GlobalWarningService; diff --git a/src/app/core/components/header/header.component.spec.ts b/src/app/core/components/header/__tests__/header.component.spec.ts similarity index 95% rename from src/app/core/components/header/header.component.spec.ts rename to src/app/core/components/header/__tests__/header.component.spec.ts index 36543cc33..6fc688115 100644 --- a/src/app/core/components/header/header.component.spec.ts +++ b/src/app/core/components/header/__tests__/header.component.spec.ts @@ -1,7 +1,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { HeaderComponent } from './header.component'; +import { HeaderComponent } from '../header.component'; describe('HeaderComponent', () => { let component: HeaderComponent; diff --git a/src/app/core/components/page-not-found/page-not-found.component.spec.ts b/src/app/core/components/page-not-found/__tests__/page-not-found.component.spec.ts similarity index 89% rename from src/app/core/components/page-not-found/page-not-found.component.spec.ts rename to src/app/core/components/page-not-found/__tests__/page-not-found.component.spec.ts index c1d2ff83e..232f6209c 100644 --- a/src/app/core/components/page-not-found/page-not-found.component.spec.ts +++ b/src/app/core/components/page-not-found/__tests__/page-not-found.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { PageNotFoundComponent } from './page-not-found.component'; +import { PageNotFoundComponent } from '../page-not-found.component'; describe('PageNotFoundComponent', () => { let component: PageNotFoundComponent; diff --git a/src/app/core/components/phase-banner/phase-banner.component.spec.ts b/src/app/core/components/phase-banner/__tests__/phase-banner.component.spec.ts similarity index 89% rename from src/app/core/components/phase-banner/phase-banner.component.spec.ts rename to src/app/core/components/phase-banner/__tests__/phase-banner.component.spec.ts index 779d4b39f..4e9b711b9 100644 --- a/src/app/core/components/phase-banner/phase-banner.component.spec.ts +++ b/src/app/core/components/phase-banner/__tests__/phase-banner.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { PhaseBannerComponent } from './phase-banner.component'; +import { PhaseBannerComponent } from '../phase-banner.component'; describe('PhaseBannerComponent', () => { let component: PhaseBannerComponent; diff --git a/src/app/core/components/server-error/server-error.component.spec.ts b/src/app/core/components/server-error/__tests__/server-error.component.spec.ts similarity index 89% rename from src/app/core/components/server-error/server-error.component.spec.ts rename to src/app/core/components/server-error/__tests__/server-error.component.spec.ts index 10a157660..174c8b742 100644 --- a/src/app/core/components/server-error/server-error.component.spec.ts +++ b/src/app/core/components/server-error/__tests__/server-error.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ServerErrorComponent } from './server-error.component'; +import { ServerErrorComponent } from '../server-error.component'; describe('ServerErrorComponent', () => { let component: ServerErrorComponent; diff --git a/src/app/core/components/spinner/spinner.component.spec.ts b/src/app/core/components/spinner/__tests__/spinner.component.spec.ts similarity index 94% rename from src/app/core/components/spinner/spinner.component.spec.ts rename to src/app/core/components/spinner/__tests__/spinner.component.spec.ts index e006a0847..a0d6c149b 100644 --- a/src/app/core/components/spinner/spinner.component.spec.ts +++ b/src/app/core/components/spinner/__tests__/spinner.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { SpinnerComponent } from './spinner.component'; +import { SpinnerComponent } from '../spinner.component'; describe('SpinnerComponent', () => { let component: SpinnerComponent; From f41e82b96fd82a7531c7bef0cc6076b1865d90e3 Mon Sep 17 00:00:00 2001 From: Thomas Crawley Date: Fri, 6 Sep 2024 11:21:01 +0100 Subject: [PATCH 7/8] feat(cb2-13727): unit testing --- .../__tests__/number-plate.component.spec.ts | 2 +- .../reference-data-deleted-list.component.spec.ts | 2 +- .../reference-data-select-type.component.spec.ts | 2 +- .../test-amendment-history.component.spec.ts | 2 +- .../test-result-summary.component.spec.ts | 4 ++-- .../base-test-record.component.spec.ts | 2 +- .../create-test-record.component.spec.ts | 12 ++++++------ .../defects/defects.component.spec.ts | 6 +++--- .../required-standards.component.spec.ts | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/app/components/number-plate/__tests__/number-plate.component.spec.ts b/src/app/components/number-plate/__tests__/number-plate.component.spec.ts index 7089039bf..8392f837b 100644 --- a/src/app/components/number-plate/__tests__/number-plate.component.spec.ts +++ b/src/app/components/number-plate/__tests__/number-plate.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DefaultNullOrEmpty } from '@shared/pipes/default-null-or-empty/default-null-or-empty.pipe'; import { NumberPlateComponent } from '../number-plate.component'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; describe('NumberPlateComponent', () => { let component: NumberPlateComponent; diff --git a/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts b/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts index 6f7aacf0d..21428e28d 100644 --- a/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts +++ b/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts @@ -7,10 +7,10 @@ import { Roles } from '@models/roles.enum'; import { provideMockStore } from '@ngrx/store/testing'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; -import { PaginationComponent } from '@shared/components/pagination/pagination.component'; import { initialAppState } from '@store/index'; import { of } from 'rxjs'; import { ReferenceDataDeletedListComponent } from '../reference-data-deleted-list.component'; +import { PaginationComponent } from '@components/pagination/pagination.component'; describe('DataTypeListComponent', () => { let component: ReferenceDataDeletedListComponent; diff --git a/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts b/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts index b0d7156b2..601766fb7 100644 --- a/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts +++ b/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts @@ -11,10 +11,10 @@ import { provideMockStore } from '@ngrx/store/testing'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { ReferenceDataService } from '@services/reference-data/reference-data.service'; import { UserService } from '@services/user-service/user-service'; -import { ButtonComponent } from '@shared/components/button/button.component'; import { initialAppState } from '@store/index'; import { of } from 'rxjs'; import { ReferenceDataSelectTypeComponent } from '../reference-data-select-type.component'; +import { ButtonComponent } from '@components/button/button.component'; describe('ReferenceDataComponent', () => { let component: ReferenceDataSelectTypeComponent; diff --git a/src/app/features/test-records/amend/components/test-amendment-history/test-amendment-history.component.spec.ts b/src/app/features/test-records/amend/components/test-amendment-history/test-amendment-history.component.spec.ts index 860d10702..bd84bad47 100644 --- a/src/app/features/test-records/amend/components/test-amendment-history/test-amendment-history.component.spec.ts +++ b/src/app/features/test-records/amend/components/test-amendment-history/test-amendment-history.component.spec.ts @@ -6,10 +6,10 @@ import { mockTestResult, mockTestResultArchived } from '@mocks/mock-test-result' import { createMockTestResult } from '@mocks/test-result.mock'; import { TestResultModel } from '@models/test-results/test-result.model'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; -import { DefaultNullOrEmpty } from '@shared/pipes/default-null-or-empty/default-null-or-empty.pipe'; import { State, initialAppState } from '@store/.'; import { selectedTestSortedAmendmentHistory } from '@store/test-records'; import { TestAmendmentHistoryComponent } from './test-amendment-history.component'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; describe('TestAmendmentHistoryComponent', () => { let component: TestAmendmentHistoryComponent; diff --git a/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.spec.ts b/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.spec.ts index bc78d8f21..4cf6c6b51 100644 --- a/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.spec.ts +++ b/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.spec.ts @@ -6,11 +6,11 @@ import { provideMockStore } from '@ngrx/store/testing'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { TestRecordsService } from '@services/test-records/test-records.service'; -import { NumberPlateComponent } from '@shared/components/number-plate/number-plate.component'; -import { TagComponent } from '@shared/components/tag/tag.component'; import { initialAppState } from '@store/.'; import { VehicleHeaderComponent } from '../../../components/vehicle-header/vehicle-header.component'; import { TestResultSummaryComponent } from './test-result-summary.component'; +import { NumberPlateComponent } from '@components/number-plate/number-plate.component'; +import { TagComponent } from '@components/tag/tag.component'; describe('TestResultSummaryComponent', () => { let component: TestResultSummaryComponent; diff --git a/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts b/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts index 0effce40d..eb972244f 100644 --- a/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts +++ b/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts @@ -20,12 +20,12 @@ import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { TestTypesService } from '@services/test-types/test-types.service'; import { UserService } from '@services/user-service/user-service'; -import { DefaultNullOrEmpty } from '@shared/pipes/default-null-or-empty/default-null-or-empty.pipe'; import { SharedModule } from '@shared/shared.module'; import { initialAppState } from '@store/.'; import { of } from 'rxjs'; import { VehicleHeaderComponent } from '../vehicle-header/vehicle-header.component'; import { BaseTestRecordComponent } from './base-test-record.component'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; describe('BaseTestRecordComponent', () => { let component: BaseTestRecordComponent; diff --git a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts index d11e227cf..acab6761d 100644 --- a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts +++ b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts @@ -25,12 +25,6 @@ import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; import { TestRecordsService } from '@services/test-records/test-records.service'; import { UserService } from '@services/user-service/user-service'; -import { ButtonGroupComponent } from '@shared/components/button-group/button-group.component'; -import { ButtonComponent } from '@shared/components/button/button.component'; -import { IconComponent } from '@shared/components/icon/icon.component'; -import { NumberPlateComponent } from '@shared/components/number-plate/number-plate.component'; -import { DefaultNullOrEmpty } from '@shared/pipes/default-null-or-empty/default-null-or-empty.pipe'; -import { TestTypeNamePipe } from '@shared/pipes/test-type-name/test-type-name.pipe'; import { SharedModule } from '@shared/shared.module'; import { State, initialAppState } from '@store/.'; import { sectionTemplates, testResultInEdit, toEditOrNotToEdit } from '@store/test-records'; @@ -38,6 +32,12 @@ import { Observable, ReplaySubject, of } from 'rxjs'; import { BaseTestRecordComponent } from '../../../components/base-test-record/base-test-record.component'; import { VehicleHeaderComponent } from '../../../components/vehicle-header/vehicle-header.component'; import { CreateTestRecordComponent } from './create-test-record.component'; +import { TestTypeNamePipe } from '@pipes/test-type-name/test-type-name.pipe'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; +import { ButtonComponent } from '@components/button/button.component'; +import { ButtonGroupComponent } from '@components/button-group/button-group.component'; +import { IconComponent } from '@components/icon/icon.component'; +import { NumberPlateComponent } from '@components/number-plate/number-plate.component'; describe('CreateTestRecordComponent', () => { let component: CreateTestRecordComponent; diff --git a/src/app/forms/custom-sections/defects/defects.component.spec.ts b/src/app/forms/custom-sections/defects/defects.component.spec.ts index 3e211ef2c..3e18712af 100644 --- a/src/app/forms/custom-sections/defects/defects.component.spec.ts +++ b/src/app/forms/custom-sections/defects/defects.component.spec.ts @@ -6,13 +6,13 @@ import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { provideMockStore } from '@ngrx/store/testing'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { ButtonComponent } from '@shared/components/button/button.component'; -import { TagComponent } from '@shared/components/tag/tag.component'; -import { TruncatePipe } from '@shared/pipes/truncate/truncate.pipe'; import { initialAppState } from '@store/.'; import { DefectSelectComponent } from '../../components/defect-select/defect-select.component'; import { DefectComponent } from '../defect/defect.component'; import { DefectsComponent } from './defects.component'; +import { ButtonComponent } from '@components/button/button.component'; +import { TruncatePipe } from '@pipes/truncate/truncate.pipe'; +import { TagComponent } from '@components/tag/tag.component'; describe('DefectsComponent', () => { let component: DefectsComponent; diff --git a/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts b/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts index 3877f0ab9..f6dbf8bc0 100644 --- a/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts +++ b/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts @@ -8,11 +8,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { provideMockStore } from '@ngrx/store/testing'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; -import { ButtonComponent } from '@shared/components/button/button.component'; -import { TagComponent } from '@shared/components/tag/tag.component'; -import { TruncatePipe } from '@shared/pipes/truncate/truncate.pipe'; import { initialAppState } from '@store/index'; import { RequiredStandardsComponent } from './required-standards.component'; +import { ButtonComponent } from '@components/button/button.component'; +import { TruncatePipe } from '@pipes/truncate/truncate.pipe'; +import { TagComponent } from '@components/tag/tag.component'; describe('RequiredStandardsComponent', () => { let component: RequiredStandardsComponent; From 3982181b105f219416613cac5c5f3a68ff29b88f Mon Sep 17 00:00:00 2001 From: Thomas Crawley Date: Fri, 6 Sep 2024 11:26:28 +0100 Subject: [PATCH 8/8] feat(cb2-13727): fix lint --- .../__tests__/number-plate.component.spec.ts | 2 +- .../__tests__/global-error.service.spec.ts | 2 +- .../__tests__/global-warning.service.spec.ts | 2 +- .../reference-data-deleted-list.component.spec.ts | 2 +- .../reference-data-select-type.component.spec.ts | 2 +- .../test-amendment-history.component.spec.ts | 2 +- .../test-result-summary.component.spec.ts | 4 ++-- .../base-test-record.component.spec.ts | 2 +- .../create-test-record.component.spec.ts | 12 ++++++------ .../defects/defects.component.spec.ts | 6 +++--- .../required-standards.component.spec.ts | 6 +++--- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/app/components/number-plate/__tests__/number-plate.component.spec.ts b/src/app/components/number-plate/__tests__/number-plate.component.spec.ts index 8392f837b..c4ae4f3f9 100644 --- a/src/app/components/number-plate/__tests__/number-plate.component.spec.ts +++ b/src/app/components/number-plate/__tests__/number-plate.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { NumberPlateComponent } from '../number-plate.component'; import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; +import { NumberPlateComponent } from '../number-plate.component'; describe('NumberPlateComponent', () => { let component: NumberPlateComponent; diff --git a/src/app/core/components/global-error/__tests__/global-error.service.spec.ts b/src/app/core/components/global-error/__tests__/global-error.service.spec.ts index fe445af36..47f0c6264 100644 --- a/src/app/core/components/global-error/__tests__/global-error.service.spec.ts +++ b/src/app/core/components/global-error/__tests__/global-error.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; -import { State, initialAppState } from '@store/index'; import { addError, clearError, patchErrors, setErrors } from '@store/global-error/actions/global-error.actions'; +import { State, initialAppState } from '@store/index'; import { GlobalError } from '../global-error.interface'; import { GlobalErrorService } from '../global-error.service'; diff --git a/src/app/core/components/global-warning/__tests__/global-warning.service.spec.ts b/src/app/core/components/global-warning/__tests__/global-warning.service.spec.ts index f0e79db92..14c68437d 100644 --- a/src/app/core/components/global-warning/__tests__/global-warning.service.spec.ts +++ b/src/app/core/components/global-warning/__tests__/global-warning.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; -import { State, initialAppState } from '@store/index'; import { clearWarning, setWarnings } from '@store/global-warning/actions/global-warning.actions'; +import { State, initialAppState } from '@store/index'; import { GlobalWarning } from '../global-warning.interface'; import { GlobalWarningService } from '../global-warning.service'; diff --git a/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts b/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts index 21428e28d..2f8d3f356 100644 --- a/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts +++ b/src/app/features/reference-data/reference-data-deleted-list/__tests__/reference-data-deleted-list.component.spec.ts @@ -2,6 +2,7 @@ import { HttpClientModule } from '@angular/common/http'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { PaginationComponent } from '@components/pagination/pagination.component'; import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { Roles } from '@models/roles.enum'; import { provideMockStore } from '@ngrx/store/testing'; @@ -10,7 +11,6 @@ import { UserService } from '@services/user-service/user-service'; import { initialAppState } from '@store/index'; import { of } from 'rxjs'; import { ReferenceDataDeletedListComponent } from '../reference-data-deleted-list.component'; -import { PaginationComponent } from '@components/pagination/pagination.component'; describe('DataTypeListComponent', () => { let component: ReferenceDataDeletedListComponent; diff --git a/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts b/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts index 601766fb7..2a0a3bc60 100644 --- a/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts +++ b/src/app/features/reference-data/reference-data-select-type/__tests__/reference-data-select-type.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ButtonComponent } from '@components/button/button.component'; import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { RadioGroupComponent } from '@forms/components/radio-group/radio-group.component'; import { ReferenceDataResourceType } from '@models/reference-data.model'; @@ -14,7 +15,6 @@ import { UserService } from '@services/user-service/user-service'; import { initialAppState } from '@store/index'; import { of } from 'rxjs'; import { ReferenceDataSelectTypeComponent } from '../reference-data-select-type.component'; -import { ButtonComponent } from '@components/button/button.component'; describe('ReferenceDataComponent', () => { let component: ReferenceDataSelectTypeComponent; diff --git a/src/app/features/test-records/amend/components/test-amendment-history/test-amendment-history.component.spec.ts b/src/app/features/test-records/amend/components/test-amendment-history/test-amendment-history.component.spec.ts index bd84bad47..f155e179b 100644 --- a/src/app/features/test-records/amend/components/test-amendment-history/test-amendment-history.component.spec.ts +++ b/src/app/features/test-records/amend/components/test-amendment-history/test-amendment-history.component.spec.ts @@ -6,10 +6,10 @@ import { mockTestResult, mockTestResultArchived } from '@mocks/mock-test-result' import { createMockTestResult } from '@mocks/test-result.mock'; import { TestResultModel } from '@models/test-results/test-result.model'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; import { State, initialAppState } from '@store/.'; import { selectedTestSortedAmendmentHistory } from '@store/test-records'; import { TestAmendmentHistoryComponent } from './test-amendment-history.component'; -import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; describe('TestAmendmentHistoryComponent', () => { let component: TestAmendmentHistoryComponent; diff --git a/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.spec.ts b/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.spec.ts index 4cf6c6b51..90940f083 100644 --- a/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.spec.ts +++ b/src/app/features/test-records/amend/views/test-result-summary/test-result-summary.component.spec.ts @@ -2,6 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { ApiModule as TestResultsApiModule } from '@api/test-results'; +import { NumberPlateComponent } from '@components/number-plate/number-plate.component'; +import { TagComponent } from '@components/tag/tag.component'; import { provideMockStore } from '@ngrx/store/testing'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; @@ -9,8 +11,6 @@ import { TestRecordsService } from '@services/test-records/test-records.service' import { initialAppState } from '@store/.'; import { VehicleHeaderComponent } from '../../../components/vehicle-header/vehicle-header.component'; import { TestResultSummaryComponent } from './test-result-summary.component'; -import { NumberPlateComponent } from '@components/number-plate/number-plate.component'; -import { TagComponent } from '@components/tag/tag.component'; describe('TestResultSummaryComponent', () => { let component: TestResultSummaryComponent; diff --git a/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts b/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts index eb972244f..09d955a62 100644 --- a/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts +++ b/src/app/features/test-records/components/base-test-record/base-test-record.component.spec.ts @@ -14,6 +14,7 @@ import { Roles } from '@models/roles.enum'; import { TestResultModel } from '@models/test-results/test-result.model'; import { resultOfTestEnum } from '@models/test-types/test-type.model'; import { provideMockStore } from '@ngrx/store/testing'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { CustomFormGroup, FormNodeTypes } from '@services/dynamic-forms/dynamic-form.types'; import { RouterService } from '@services/router/router.service'; @@ -25,7 +26,6 @@ import { initialAppState } from '@store/.'; import { of } from 'rxjs'; import { VehicleHeaderComponent } from '../vehicle-header/vehicle-header.component'; import { BaseTestRecordComponent } from './base-test-record.component'; -import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; describe('BaseTestRecordComponent', () => { let component: BaseTestRecordComponent; diff --git a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts index acab6761d..33ab87c36 100644 --- a/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts +++ b/src/app/features/test-records/create/views/create-test-record/create-test-record.component.spec.ts @@ -7,6 +7,10 @@ import { GetTestResultsService, UpdateTestResultsService, } from '@api/test-results'; +import { ButtonGroupComponent } from '@components/button-group/button-group.component'; +import { ButtonComponent } from '@components/button/button.component'; +import { IconComponent } from '@components/icon/icon.component'; +import { NumberPlateComponent } from '@components/number-plate/number-plate.component'; import { GlobalErrorService } from '@core/components/global-error/global-error.service'; import { RoleRequiredDirective } from '@directives/app-role-required/app-role-required.directive'; import { AbandonDialogComponent } from '@forms/custom-sections/abandon-dialog/abandon-dialog.component'; @@ -20,6 +24,8 @@ import { V3TechRecordModel } from '@models/vehicle-tech-record.model'; import { provideMockActions } from '@ngrx/effects/testing'; import { Action } from '@ngrx/store'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; +import { TestTypeNamePipe } from '@pipes/test-type-name/test-type-name.pipe'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { RouterService } from '@services/router/router.service'; import { TechnicalRecordService } from '@services/technical-record/technical-record.service'; @@ -32,12 +38,6 @@ import { Observable, ReplaySubject, of } from 'rxjs'; import { BaseTestRecordComponent } from '../../../components/base-test-record/base-test-record.component'; import { VehicleHeaderComponent } from '../../../components/vehicle-header/vehicle-header.component'; import { CreateTestRecordComponent } from './create-test-record.component'; -import { TestTypeNamePipe } from '@pipes/test-type-name/test-type-name.pipe'; -import { DefaultNullOrEmpty } from '@pipes/default-null-or-empty/default-null-or-empty.pipe'; -import { ButtonComponent } from '@components/button/button.component'; -import { ButtonGroupComponent } from '@components/button-group/button-group.component'; -import { IconComponent } from '@components/icon/icon.component'; -import { NumberPlateComponent } from '@components/number-plate/number-plate.component'; describe('CreateTestRecordComponent', () => { let component: CreateTestRecordComponent; diff --git a/src/app/forms/custom-sections/defects/defects.component.spec.ts b/src/app/forms/custom-sections/defects/defects.component.spec.ts index 3e18712af..a0a98ef80 100644 --- a/src/app/forms/custom-sections/defects/defects.component.spec.ts +++ b/src/app/forms/custom-sections/defects/defects.component.spec.ts @@ -4,15 +4,15 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { ButtonComponent } from '@components/button/button.component'; +import { TagComponent } from '@components/tag/tag.component'; import { provideMockStore } from '@ngrx/store/testing'; +import { TruncatePipe } from '@pipes/truncate/truncate.pipe'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { initialAppState } from '@store/.'; import { DefectSelectComponent } from '../../components/defect-select/defect-select.component'; import { DefectComponent } from '../defect/defect.component'; import { DefectsComponent } from './defects.component'; -import { ButtonComponent } from '@components/button/button.component'; -import { TruncatePipe } from '@pipes/truncate/truncate.pipe'; -import { TagComponent } from '@components/tag/tag.component'; describe('DefectsComponent', () => { let component: DefectsComponent; diff --git a/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts b/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts index f6dbf8bc0..fb2385efd 100644 --- a/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts +++ b/src/app/forms/custom-sections/required-standards/required-standards.component.spec.ts @@ -5,14 +5,14 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ButtonComponent } from '@components/button/button.component'; +import { TagComponent } from '@components/tag/tag.component'; import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js'; import { provideMockStore } from '@ngrx/store/testing'; +import { TruncatePipe } from '@pipes/truncate/truncate.pipe'; import { DynamicFormService } from '@services/dynamic-forms/dynamic-form.service'; import { initialAppState } from '@store/index'; import { RequiredStandardsComponent } from './required-standards.component'; -import { ButtonComponent } from '@components/button/button.component'; -import { TruncatePipe } from '@pipes/truncate/truncate.pipe'; -import { TagComponent } from '@components/tag/tag.component'; describe('RequiredStandardsComponent', () => { let component: RequiredStandardsComponent;