Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Fix/rebase vtmdev1 #1563

Merged
merged 47 commits into from
Aug 27, 2024
Merged

Fix/rebase vtmdev1 #1563

merged 47 commits into from
Aug 27, 2024

Conversation

pbardy2000
Copy link
Contributor

Ticket title

One line description
CB2-XXXX

Checklist

  • Branch is rebased against the latest develop/common
  • Code and UI has been tested manually after the additional changes
  • PR title includes the JIRA ticket number
  • Squashed commits contain the JIRA ticket number
  • Delete branch after merge

tomevs88 and others added 30 commits April 11, 2024 09:56
…1464)

Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>
…xists on MVSA IVA tests (#1481)

* feat(cb2-11930): ensure certificate number is sent to backend if its exists on MVSA IVA tests

* feat(cb2-11930): fix linting issue
Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>
* feat(cb2-10241): update adr notes to use custom component (#1446)

* feat/CB2-11250 - Edit button on additional examiner notes takes you to blank page (#1447)

* feat(cb2-10241): update adr notes to use custom component

* feat(cb2-11250): format table

* feat(cb2-11250): set up router link

* feat(cb2-11250): blank page link working

* feat(cb2-11250): revert unnecessary changes

* feat(cb2-11250): amend routing function

* feat(cb2-11250): fix linting and add unit test

* feat(cb2-11250): fix linting and add unit test

* feat(cb2-11250): update link design

* feat(cb2-11250): fix button link styling

---------

Co-authored-by: Brandon Thomas-Davies <87308252+BrandonT95@users.noreply.github.com>

* feat(CB2-9916): Add warning to cherished transfer (#1451)

* feat(cb2-9916): added cherised transfer warning message for psv and hgv

* feat(cb2-9916): fix linting

* feat(cb2-10032): add pagination to adr examiner notes (#1450)

* feat(cb2-10032): add pagination to adr examiner notes

* feat(cb2-10032): add pagination to notes amend view

* feat(cb2-11103): createdAtDate for adr examiner notes now save as full iso date string (#1452)

* feat(cb2-11103): ability to submit and show date and time for adr notes creation

* feat(cb2-11103): fix unit test

* feat(cb2-11103): fix other unit test

* feat/CB2-10033 - Additional Examiner Note (#1448)

* feat(cb2-10241): update adr notes to use custom component

* feat(cb2-11250): format table

* feat(cb2-11250): set up router link

* feat(cb2-11250): blank page link working

* feat(cb2-11250): revert unnecessary changes

* feat(cb2-11250): amend routing function

* feat(cb2-11250): fix linting and add unit test

* feat(cb2-11250): fix linting and add unit test

* feat(cb2-11250): update link design

* feat(cb2-11250): fix button link styling

* feat(cb2-10033): basic setup and grabbed selected note from record

* feat(cb2-10033): stash for mobbing

* feat(cb2-10033): hook form up to display note which is to be edited

* feat(cb2-10033): set up model binding to component

* feat(cb2-10033): use correct directive and basic form validation

* feat(cb2-10033): amend routing title for notifiable alteration

* feat(cb2-10033): remove validation as requirements confirmed not needed

* feat(cb2-10033): implement state management solution

* feat(cb2-10033): fix display for summary screen

* feat(cb2-10033): refactor state and data handling approach

* feat(cb2-10033): reducer tests

* feat(cb2-10033): basic unit testing draft

* feat(cb2-10033): unit testing

* feat(cb2-10033): linting fix

* feat(cb2-10033): fix review screen

* feat(cb2-10033): git stash for mobbing

* feat(cb2-10033): add logic to hide collapse function and fix missing acs

* feat(cb2-10033): move title from component to templates

* feat(cb2-10033): acordion issues solved

---------

Co-authored-by: Brandon Thomas-Davies <87308252+BrandonT95@users.noreply.github.com>
Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>
Co-authored-by: Thomas Evans <36958694+tomevs88@users.noreply.github.com>

* feat(cb2-10033): upped char count to 151 (#1453)

Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>

* feat(cb2-10033): upped char count to 150

* feat(cb2-10033): upped char count to 150

* feat(cb2-10033): upped char count to 15 again

* feat(cb2-10033): css removed

* fix(cb2-11103): re-add missing timestamp from adr notes view (#1460)

* feat(cb2-10286): add hint text to 3 month extension (#1462)

* feat(cb2-10973): feature flags changed to show IVA flow in all envs (#1465)

Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>

* feat(cb2-10125): make adr guidance notes a checkbox group (#1466)

* feat(cb2-11546): make 'make' required for HGVs and TRLs which carry dangerous goods (#1461)

* fix(cb2-11546): make vehicle make required when carrying dangerous goods

* feat(cb2-11546): only make applicable for HGVs and LGVs

* feat(cb2-10286): add new certificate required field (#1463)

* feat(cb2-10286): add new certificate required field

* feat(cb2-9747): default checkbox to false so it will correctly display no text in read mode

* feat/CB2-10740 - Mark if a vehicle is used for international journeys on VTM (#1467)

* feat(cb2-10740): hook up template and values correctly to type definition

* feat(cb2-10740): lint fix

---------

Co-authored-by: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>

* fix(cb2-9747): fix failing unit test (#1468)

* fix(cb2-9747): create mocked date to fix failing unit test (#1469)

* feat(cb2-11185): ensure correct text-wrapping. (#1473)

* fix(cb2-11185): break text to avoid long strings causing the page to overflow horizontally

* fix(cb2-11185): break long strings to overflow, but not mid-word unless necessary

* fix(cb2-11185): fix linting

* fix(cb2-10419): change casing in select defect (#1474)

* fix(cb2-11302): correct spelling of accessor to assessor (#1475)

* fix(cb2-10562): prevent submitting a psv with one axle (#1480)

* fix(cb2-11069): reset error message when new data is provided (#1479)

* fix(cb2-11068): allow unset as form node width so it never hides option text (#1478)

* fix(CB2-11243): prevent SR field in tyres component being cut-off on large screens (#1477)

* fix(cb2-11068): allow unset as form node width so it never hides option text

* fix(cb2-11243): set width to unset to select autoscales to text

* fix(CB2-11453): prevent download .zip file in seperate window (as this may be blocked) (#1476)

* fix(cb2-11453): do not download link via external tab

* fix(cb2-11453): fix unit test

* feat(cb2-11930): ensure certificate number is sent to backend if it exists on MVSA IVA tests (#1482)

* feat(cb2-11930): ensure certificate number is sent to backend if its exists on MVSA IVA tests

* feat(cb2-11930): fix linting issue

* fix(cb2-11908): remove duplicate label from additional examiner notes history (#1483)

* feat(cb2-12056): test codes moved (#1487)

Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>

---------

Co-authored-by: Thomas Crawley <thomas.crawley@dvsa.gov.uk>
Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>
Co-authored-by: Thomas Evans <36958694+tomevs88@users.noreply.github.com>
Co-authored-by: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>
* feat(cb2-10241): update adr notes to use custom component (#1446)

* feat/CB2-11250 - Edit button on additional examiner notes takes you to blank page (#1447)

* feat(cb2-10241): update adr notes to use custom component

* feat(cb2-11250): format table

* feat(cb2-11250): set up router link

* feat(cb2-11250): blank page link working

* feat(cb2-11250): revert unnecessary changes

* feat(cb2-11250): amend routing function

* feat(cb2-11250): fix linting and add unit test

* feat(cb2-11250): fix linting and add unit test

* feat(cb2-11250): update link design

* feat(cb2-11250): fix button link styling

---------

Co-authored-by: Brandon Thomas-Davies <87308252+BrandonT95@users.noreply.github.com>

* feat(CB2-9916): Add warning to cherished transfer (#1451)

* feat(cb2-9916): added cherised transfer warning message for psv and hgv

* feat(cb2-9916): fix linting

* feat(cb2-10032): add pagination to adr examiner notes (#1450)

* feat(cb2-10032): add pagination to adr examiner notes

* feat(cb2-10032): add pagination to notes amend view

* feat(cb2-11103): createdAtDate for adr examiner notes now save as full iso date string (#1452)

* feat(cb2-11103): ability to submit and show date and time for adr notes creation

* feat(cb2-11103): fix unit test

* feat(cb2-11103): fix other unit test

* feat/CB2-10033 - Additional Examiner Note (#1448)

* feat(cb2-10241): update adr notes to use custom component

* feat(cb2-11250): format table

* feat(cb2-11250): set up router link

* feat(cb2-11250): blank page link working

* feat(cb2-11250): revert unnecessary changes

* feat(cb2-11250): amend routing function

* feat(cb2-11250): fix linting and add unit test

* feat(cb2-11250): fix linting and add unit test

* feat(cb2-11250): update link design

* feat(cb2-11250): fix button link styling

* feat(cb2-10033): basic setup and grabbed selected note from record

* feat(cb2-10033): stash for mobbing

* feat(cb2-10033): hook form up to display note which is to be edited

* feat(cb2-10033): set up model binding to component

* feat(cb2-10033): use correct directive and basic form validation

* feat(cb2-10033): amend routing title for notifiable alteration

* feat(cb2-10033): remove validation as requirements confirmed not needed

* feat(cb2-10033): implement state management solution

* feat(cb2-10033): fix display for summary screen

* feat(cb2-10033): refactor state and data handling approach

* feat(cb2-10033): reducer tests

* feat(cb2-10033): basic unit testing draft

* feat(cb2-10033): unit testing

* feat(cb2-10033): linting fix

* feat(cb2-10033): fix review screen

* feat(cb2-10033): git stash for mobbing

* feat(cb2-10033): add logic to hide collapse function and fix missing acs

* feat(cb2-10033): move title from component to templates

* feat(cb2-10033): acordion issues solved

---------

Co-authored-by: Brandon Thomas-Davies <87308252+BrandonT95@users.noreply.github.com>
Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>
Co-authored-by: Thomas Evans <36958694+tomevs88@users.noreply.github.com>

* feat(cb2-10033): upped char count to 151 (#1453)

Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>

* feat(cb2-10033): upped char count to 150

* feat(cb2-10033): upped char count to 150

* feat(cb2-10033): upped char count to 15 again

* feat(cb2-10033): css removed

* fix(cb2-11103): re-add missing timestamp from adr notes view (#1460)

* feat(cb2-10286): add hint text to 3 month extension (#1462)

* feat(cb2-10973): feature flags changed to show IVA flow in all envs (#1465)

Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>

* feat(cb2-10125): make adr guidance notes a checkbox group (#1466)

* feat(cb2-11546): make 'make' required for HGVs and TRLs which carry dangerous goods (#1461)

* fix(cb2-11546): make vehicle make required when carrying dangerous goods

* feat(cb2-11546): only make applicable for HGVs and LGVs

* feat(cb2-10286): add new certificate required field (#1463)

* feat(cb2-10286): add new certificate required field

* feat(cb2-9747): default checkbox to false so it will correctly display no text in read mode

* feat/CB2-10740 - Mark if a vehicle is used for international journeys on VTM (#1467)

* feat(cb2-10740): hook up template and values correctly to type definition

* feat(cb2-10740): lint fix

---------

Co-authored-by: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>

* fix(cb2-9747): fix failing unit test (#1468)

* fix(cb2-9747): create mocked date to fix failing unit test (#1469)

* feat(cb2-11185): ensure correct text-wrapping. (#1473)

* fix(cb2-11185): break text to avoid long strings causing the page to overflow horizontally

* fix(cb2-11185): break long strings to overflow, but not mid-word unless necessary

* fix(cb2-11185): fix linting

* fix(cb2-10419): change casing in select defect (#1474)

* fix(cb2-11302): correct spelling of accessor to assessor (#1475)

* fix(cb2-10562): prevent submitting a psv with one axle (#1480)

* fix(cb2-11069): reset error message when new data is provided (#1479)

* fix(cb2-11068): allow unset as form node width so it never hides option text (#1478)

* fix(CB2-11243): prevent SR field in tyres component being cut-off on large screens (#1477)

* fix(cb2-11068): allow unset as form node width so it never hides option text

* fix(cb2-11243): set width to unset to select autoscales to text

* fix(CB2-11453): prevent download .zip file in seperate window (as this may be blocked) (#1476)

* fix(cb2-11453): do not download link via external tab

* fix(cb2-11453): fix unit test

* fix(cb2-11908): remove duplicate label from additional examiner notes history

* fix(cb2-11908): Change labels of examiner notes

* fix(cb2-11908): fix unit tests

---------

Co-authored-by: Brandon Thomas-Davies <87308252+BrandonT95@users.noreply.github.com>
Co-authored-by: Thomas Crawley <thomas.crawley@dvsa.gov.uk>
Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>
Co-authored-by: Thomas Evans <36958694+tomevs88@users.noreply.github.com>
…#1493)

* fix(cb2-12009): default psv body model to null if its an empty string

* fix(cb2-12009): add snyk ignore

* fix(cb2-12009): correct snyk ignore indentation

* fix(cb2-12009): add package number to snyk ignore
#1497)

* fix(cb2-12599): ensure additional examiner notes appear in the correct order

* feat(cb2-12599) adding temp fixup for the gha action

* Update pr-checks.yml

* fix(cb2-12599): updated references in pr checks gha job

* fix(cb2-12599) removed node16 version from scanner

---------

Co-authored-by: Josh Carter <35105612+JoshCarter-ops@users.noreply.github.com>
* feat(dev-no-analytics): remove analytics implementation

* feat(cb2-12722): add gtm plugin

* feat(cb2-12722): add new gtm plugin and fix tests
* feat(cb2-12600): add form control to specialist contingency test group 1 and 5

* feat(cb2-12600): add hint text

* feat(cb2-12600): adjust error messages so they match ACs

* feat(cb2-12600): fix linting

* feat(cb2-12600): enable viewing reapplication date on view history and amend

* feat(cb2-12600): fix linting
* feat(cb2-12600): add form control to specialist contingency test group 1 and 5

* feat(cb2-12600): add hint text

* feat(cb2-12600): adjust error messages so they match ACs

* feat(cb2-12600): fix linting

* feat(cb2-12600): enable viewing reapplication date on view history and amend

* feat(cb2-12600): fix linting

* feat(cb2-12600): remove reapplication date from group 5 templates

* feat(cb2-12600): remove reapplication date from group 5

* feat(cb2-12600): fix the linting
* feat(cb2-12600): add form control to specialist contingency test group 1 and 5

* feat(cb2-12600): add hint text

* feat(cb2-12600): adjust error messages so they match ACs

* feat(cb2-12600): fix linting

* feat(cb2-12600): enable viewing reapplication date on view history and amend

* feat(cb2-12600): fix linting

* feat(cb2-12600): remove reapplication date from group 5 templates

* feat(cb2-12600): remove reapplication date from group 5

* feat(cb2-12600): fix the linting

* feat(cb2-12600): hide reapplication date when amending passed specialist test

* feat(cb2-12600): fix linting
* fix(cb2-12006): prevent error message duplication

* fix(cb2-12006): fix unit test
…trally (#1519)

* feat(cb2-13164): add issue documents centrally

* feat(cb2-13164): issue documents centrally for all relevant templates

* feat(cb2-13164): fix linting

* feat(cb2-13164): change name from issueDocumentsCentrally to issueRequired to match BE

* feat(cb2-13164): fix linting again

* feat(cb2-13164): hide for group 1

* feat(cb2-13164): fix linting again again

* feat(cb2-13164): set issueRequired to false for fail/abandon

* feat(cb2-13176): conditionally show hint text on ADR tests only

* feat(cb2-13176): fix linting

* feat(cb2-13176): remove issue docs centrally from groups 2 3 4 and add to 15 and 16

* feat(cb2-13176): remove issue required from  group 3

* feat(cb2-13176): remove validation for certificate number on groups 3 and 4

* feat(cb2-13176): fix linting

* feat(cb2-13176): use nested shape

* feat(cb2-13176): fix linting

* feat(cb2-13176): ensure reasons for issue is always an array of strings
…iable Alteration test (#1521)

* feat(cb2-13164): add issue documents centrally

* feat(cb2-13164): issue documents centrally for all relevant templates

* feat(cb2-13164): fix linting

* feat(cb2-13164): change name from issueDocumentsCentrally to issueRequired to match BE

* feat(cb2-13164): fix linting again

* feat(cb2-13164): hide for group 1

* feat(cb2-13164): fix linting again again

* feat(cb2-13164): set issueRequired to false for fail/abandon

* feat(cb2-13176): conditionally show hint text on ADR tests only

* feat(cb2-13176): fix linting

* feat(cb2-13176): remove issue docs centrally from groups 2 3 4 and add to 15 and 16

* feat(cb2-13176): remove issue required from  group 3

* feat(cb2-13176): remove validation for certificate number on groups 3 and 4

* feat(cb2-13176): fix linting

* feat(cb2-13176): use nested shape

* feat(cb2-13176): fix linting

* feat(cb2-13176): ensure reasons for issue is always an array of strings

* feat(cb2-13299): enable issue documents centrally for free or paid notifiable alteration test types

---------

Co-authored-by: Thomas Evans <36958694+tomevs88@users.noreply.github.com>
* chore(version-bump): bump version

* chore(version-bump): bump version
…ments is…" (#1525)

This reverts commit 6bfbc2d.

Co-authored-by: Thomas Evans <36958694+tomevs88@users.noreply.github.com>
Co-authored-by: Tom Evans <thomas.evans@dvsa.gov.uk>
* fix(cb2-13506): use correct notes section on amending ADR tests

* fix(cb2-13506): fix linting
pbardy2000 and others added 17 commits August 8, 2024 13:59
… test type ids) (#1530)

* feat(cb2-13455): add issue docs centrally for first test and first test prohibition clearance

* feat(cb2-13455): linting

* feat(cb2-13455): fix linting

* feat(cb2-13455): fix template

* feat(cb2-13455): show issue docs for prs

---------

Co-authored-by: Brandon Thomas-Davies <87308252+BrandonT95@users.noreply.github.com>
Snyk has created this PR to upgrade @sentry/angular-ivy from 7.103.0 to 7.118.0.

See this package in npm:
@sentry/angular-ivy

See this project in Snyk:
https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>
Snyk has created this PR to upgrade @sentry/types from 7.103.0 to 7.118.0.

See this package in npm:
@sentry/types

See this project in Snyk:
https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>
Co-authored-by: Thomas Crawley <thomas.crawley@dvsa.gov.uk>
Snyk has created this PR to upgrade @sentry/cli from 2.28.6 to 2.32.1.

See this package in npm:
@sentry/cli

See this project in Snyk:
https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>
Co-authored-by: Thomas Crawley <thomas.crawley@dvsa.gov.uk>
Snyk has created this PR to upgrade @azure/msal-angular from 3.0.13 to 3.0.20.

See this package in npm:
@azure/msal-angular

See this project in Snyk:
https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>
Co-authored-by: Thomas Crawley <thomas.crawley@dvsa.gov.uk>
* fix(cb2-13164): add issue docs centrally to TIR test types

* fix(cb2-13164): fix linting
* refactor(gha-1): decouple sonar from pr checks

* fix(gha-1): conflict

* fix(gha-1): remove sonar from pr check
* feat(linting-1): biome intro

* fix(linting-1): disable rules

* chore(linting-1): enable useTemplate

* fix(linting-1): ignore api files
#1546)

* chore(testing-1): remove files from test and coverage paths that hold no functionality

* chore(linting-1): point test step to arm runner
* chore(nodeupgrade-1): node upgrade

* chore(nodeupgrade-1): node downgrade

* chore(nodeupgrade-1): nvmrc bump

* chore(nodeupgrade-1): attempt 3

* Delete cypress.env.json
* fix: upgrade @sentry/cli from 2.28.6 to 2.32.2

Snyk has created this PR to upgrade @sentry/cli from 2.28.6 to 2.32.2.

See this package in npm:
@sentry/cli

See this project in Snyk:
https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr

* feat(snykupgrade-2): move to dev dependencies

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Thomas Crawley <thomas.crawley@dvsa.gov.uk>
Co-authored-by: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>
* chore(dep-1): bump jest preset angular

* chore(dep-1): update angular core and cli

* fix(build-1): provider hoisting

* chore(dep-1): update ngrx packages

* chore(dep-1): migrate to sentry angular package

* refactor(gha-1): remove matrix and reference nvmrc

* chore(dep-1): fix linting and update build command

* chore(dep-1): update lib to 2023 option

* fix(linting-1): revert api folder changes

* fix(tidyup-1): remove commented out opts

* chore(linting-1): fix lint
…t types (#1557)

* fix(cb2-13684): prevent lost of tech record status when filtering test types

* fix(cb2-13684): use statusCode form tech record instead of off test result

* fix(cb2-13684): fix unit tests
…en (#1554)

* fix(cb2-13615): ensure we're not showing child if parent is also hidden

* fix(cb2-13615): fix unit tests

---------

Co-authored-by: Thomas Evans <36958694+tomevs88@users.noreply.github.com>
@pbardy2000 pbardy2000 merged commit b717ddd into feature/VTMDEV-1 Aug 27, 2024
7 checks passed
@pbardy2000 pbardy2000 deleted the fix/rebase-vtmdev1 branch August 27, 2024 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants