Create New Permit UXA

ppr-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.63",
+  "version": "3.2.64",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",

ppr-ui/src/components/mhrTransportPermit/LocationChange.vue

@@ -228,11 +228,13 @@ const props = defineProps<{
 
 const emit = defineEmits(['updateLocationType'])
 
-const { isRoleQualifiedSupplier, isRoleStaffSbc, setMhrTransportPermit, setMhrTransportPermitNewLocation,
+const { setMhrTransportPermit, setMhrTransportPermitNewLocation,
   setMhrTransportPermitNewCivicAddress, setUnsavedChanges, setMhrStatusType } = useStore()
 
 const {
   hasUnsavedChanges,
+  isRoleStaffSbc,
+  isRoleQualifiedSupplier,
   getMhrTransportPermit,
   getMhrTransportPermitHomeLocation,
   getMhrOriginalTransportPermit,
@@ -274,9 +276,9 @@ const state = reactive({
   prevLocationChangeType: null,
   locationChangeFromValid: false,
   roleBasedLocationChangeTypes: computed(() =>
-    (isRoleQualifiedSupplier || isRoleStaffSbc)
-      ? locationChangeTypes.slice(0, -2) // remove Registered Location Change and Cancel Permit from the list
-      : locationChangeTypes.slice(0, -1)), // remove Cancel Permit from the list
+    (isRoleQualifiedSupplier.value || isRoleStaffSbc.value)
+      ? locationChangeTypes.slice(0, -3) // remove Registered Location Change and Cancel Permit and Extend from the list
+      : locationChangeTypes.slice(0, -2)), // remove Cancel Permit and Extend from the list
   isTransportPermitType: computed(() =>
     getMhrTransportPermit.value.locationChangeType === LocationChangeTypes.TRANSPORT_PERMIT),
   isNotManufacturersLot: computed(() => getMhrRegistrationLocation.value.locationType !== HomeLocationTypes.LOT),
@@ -287,7 +289,8 @@ const state = reactive({
     (props.validate && !isValueAmended('newLocation.address') && !hasAmendmentChanges.value)),
   isLandOwnershipInvalid: computed(() => (props.validate && !getInfoValidation('isHomeLandOwnershipValid')) ||
     (props.validate && !isValueAmended('ownLand') && !hasAmendmentChanges.value)),
-  isRoleQSorSBCAmend: computed(() => (isRoleQualifiedSupplier || isRoleStaffSbc) && isAmendLocationActive.value),
+  isRoleQSorSBCAmend: computed(() => (isRoleQualifiedSupplier.value || isRoleStaffSbc.value) &&
+    isAmendLocationActive.value),
   showChangeTransportPermitLocationTypeDialog: false,
   amendedBadgeHomeLocationType: {
     action: 'AMENDED',

ppr-ui/src/views/mhrInformation/MhrTransportPermit.vue

@@ -7,8 +7,8 @@
       @proceed="handleConfirmNewPermit"
     >
       <template #content>
-        <p class="px-0">
-          By applying for a new transport permit you are confirming that the active Transport permit
+        <p class="px-0 mr-n11">
+          By applying for a new transport permit you are confirming that the active transport permit
           {{ getMhrInformation.permitRegistrationNumber }} issued on
           {{ pacificDate(getMhrInformation.permitDateTime, true) }} has been completed and will render as no longer
           active.
@@ -78,7 +78,7 @@
             <img
               alt="extend-icon"
               class="icon-small"
-              src="@/assets/svgs/NewPermit.svg"
+              src="@/assets/svgs/iconNewPermit.svg"
             >
             Create New Transport Permit
           </v-btn>
@@ -140,7 +140,7 @@
                         <img
                           alt="extend-icon"
                           class="icon-small"
-                          src="@/assets/svgs/IconExtend.svg"
+                          src="@/assets/svgs/iconExtend.svg"
                         >
                       </span>
                       <span class="extend-btn-text ml-1">Extend Transport Permit</span>
@@ -160,7 +160,7 @@
                         <img
                           alt="extend-icon"
                           class="icon-small"
-                          src="@/assets/svgs/NewPermit.svg"
+                          src="@/assets/svgs/iconNewPermit.svg"
                         >
                       </span>
                       <span class="extend-btn-text ml-1">Create New Transport Permit</span>

ppr-ui/tests/unit/MhrTransportPermit.spec.ts

@@ -117,7 +117,7 @@ describe('MhrTransportPermit', () => {
     await nextTick()
 
     const locationChangeDropdown = wrapper.findComponent(LocationChange).findComponent('.v-select')
-    expect(locationChangeDropdown.vm.items.length).toBe(3)
+    expect(locationChangeDropdown.vm.items.length).toBe(2)
   })
 
   it('should render different location change options', async () => {
@@ -127,7 +127,7 @@ describe('MhrTransportPermit', () => {
     const locationChangeDropdown = locationChange.findComponent('.v-select')
 
     expect(locationChangeDropdown.exists()).toBe(true)
-    expect(locationChangeDropdown.vm.items.length).toBe(4)
+    expect(locationChangeDropdown.vm.items.length).toBe(3)
 
     // select transport permit
     locationChange.vm.selectLocationType(LocationChangeTypes.TRANSPORT_PERMIT)
@@ -609,7 +609,7 @@ describe('Mhr Information Transport Permit', async () => {
     await nextTick()
 
     const locationChangeDropdown = locationChange.findComponent('.v-select')
-    expect(locationChangeDropdown.vm.items.length).toBe(3)
+    expect(locationChangeDropdown.vm.items.length).toBe(2)
 
     expect(wrapper.findComponent(DocumentId).exists()).toBe(false)
     expect(locationChange.findComponent(HomeLocationType).exists()).toBe(true)