Fix Void Transport Permit Text and Badge (#1956)

* Fix Void Transport Permit with active Exemption
bcgov · Jun 28, 2024 · f981599 · f981599
1 parent 3f4ea99
commit f981599
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/ppr-ui/src/composables/exemption/useExemptions.ts b/ppr-ui/src/composables/exemption/useExemptions.ts
@@ -20,8 +20,10 @@ import {
   UnitNoteDocTypes,
   UnitNoteStatusTypes
 } from '@/enums'
+import { useRouter } from 'vue-router'
 
 export const useExemptions = () => {
+  const router = useRouter()
   const { goToRoute } = useNavigation()
   const { setMhrExemption, setMhrExemptionNote, setMhrExemptionValidation, setMhrExemptionValue } = useStore()
   const {
@@ -60,7 +62,8 @@ export const useExemptions = () => {
   const isExemptionWithActiveTransportPermit: ComputedRef<boolean> = computed((): boolean => {
     return (
       getMhrInformation.value.permitStatus === MhApiStatusTypes.ACTIVE &&
-      (isResExemption.value || isNonResExemption.value)
+      (isResExemption.value || isNonResExemption.value) &&
+      [RouteNames.EXEMPTION_DETAILS, RouteNames.EXEMPTION_REVIEW].includes(router.currentRoute.value.name as RouteNames)
     )
   })
 

diff --git a/ppr-ui/tests/unit/ExemptionDetails.spec.ts b/ppr-ui/tests/unit/ExemptionDetails.spec.ts
@@ -8,15 +8,15 @@ import { axe } from 'vitest-axe'
 import { TransportPermitDetails } from '@/components/mhrTransportPermit'
 import { useStore } from '@/store/store'
 import { mockedAddress } from './test-data'
-import { UnitNoteDocTypes } from '@/enums'
+import { RouteNames, UnitNoteDocTypes } from '@/enums'
 
 const store = useStore()
 
 describe('ExemptionDetails', () => {
   let wrapper
 
   beforeEach(async () => {
-    wrapper = await createComponent(ExemptionDetails as any, { showErrors: false })
+    wrapper = await createComponent(ExemptionDetails as any, { showErrors: false }, RouteNames.EXEMPTION_DETAILS)
     await nextTick()
   })
 

diff --git a/ppr-ui/tests/unit/ExemptionReview.spec.ts b/ppr-ui/tests/unit/ExemptionReview.spec.ts
@@ -22,7 +22,7 @@ import { ConfirmCompletion } from '@/components/mhrTransfers'
 import { StaffPayment } from '@/components/common'
 import { axe } from 'vitest-axe'
 import { useStore } from '@/store/store'
-import { UnitNoteDocTypes } from '@/enums'
+import { RouteNames, UnitNoteDocTypes } from '@/enums'
 import { mockedAddress } from './test-data'
 import { TransportPermitDetails } from '@/components/mhrTransportPermit'
 
@@ -32,7 +32,7 @@ describe('ExemptionReview', () => {
   let wrapper
 
   beforeEach(async () => {
-    wrapper = await createComponent(ExemptionReview, { showErrors: false }, null)
+    wrapper = await createComponent(ExemptionReview, { showErrors: false }, RouteNames.EXEMPTION_REVIEW)
     setupMockStaffUser()
     await nextTick()
   })