From 424b2f3345bf94375800972e82fc4b40d96540ad Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Mon, 5 Feb 2024 14:46:45 -0800
Subject: [PATCH] Fix Location Type payload and PidNumber refactor

---
 ppr-ui/package-lock.json                               |  4 ++--
 ppr-ui/package.json                                    |  2 +-
 ppr-ui/src/components/common/PidNumber.vue             | 10 ++++------
 .../mhrRegistration/HomeLocation/HomeLocationType.vue  |  1 +
 .../composables/mhrInformation/useTransportPermits.ts  |  6 ++++++
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index 094e80f42..ab1c1fb45 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ppr-ui",
-  "version": "3.0.34",
+  "version": "3.0.35",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "3.0.34",
+      "version": "3.0.35",
       "dependencies": {
         "@bcrs-shared-components/input-field-date-picker": "^1.0.0",
         "@lemoncode/fonk": "^1.5.1",
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
index 9e7797dac..3a3651d2e 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.0.34",
+  "version": "3.0.35",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",
diff --git a/ppr-ui/src/components/common/PidNumber.vue b/ppr-ui/src/components/common/PidNumber.vue
index a07adffe5..41140d976 100644
--- a/ppr-ui/src/components/common/PidNumber.vue
+++ b/ppr-ui/src/components/common/PidNumber.vue
@@ -104,14 +104,12 @@
 <script lang="ts">
 
 import { computed, defineComponent, nextTick, reactive, ref, toRefs, watch } from 'vue'
-import { useStore } from '@/store/store'
 import { useInputRules } from '@/composables'
 import { ltsaDetails } from '@/utils/ltsa-api-helper'
 import { BaseDialog } from '@/components/dialogs'
 import { pidNotFoundDialog } from '@/resources/dialogOptions'
 import { LtsaDetailsIF, PidInfoIF } from '@/interfaces/ltsa-api-interfaces'
 import { FormIF } from '@/interfaces'
-import { storeToRefs } from 'pinia'
 
 
 export default defineComponent({
@@ -120,21 +118,21 @@ export default defineComponent({
     BaseDialog
   },
   props: {
+    pidNumber: { type: String, default: '' },
     disable: { type: Boolean, default: false },
     required: { type: Boolean, default: false }
   },
   emits: ['setPid', 'verifyingPid'],
   setup (props, context) {
-    const { getMhrRegistrationLocation } = storeToRefs(useStore())
     const { isNumber } = useInputRules()
     const pidOneRef = ref(null) as FormIF
     const pidTwoRef = ref(null) as FormIF
     const pidThreeRef = ref(null) as FormIF
 
     const localState = reactive({
-      pidOne: getMhrRegistrationLocation.value?.pidNumber.slice(0, 3) || '',
-      pidTwo: getMhrRegistrationLocation.value?.pidNumber.slice(3, 6) || '',
-      pidThree: getMhrRegistrationLocation.value?.pidNumber.slice(6, 9) || '',
+      pidOne: props.pidNumber?.slice(0, 3) || '',
+      pidTwo: props.pidNumber?.slice(3, 6) || '',
+      pidThree: props.pidNumber?.slice(6, 9) || '',
       enablePidLoader: false,
       dialogOptions: pidNotFoundDialog,
       showNotFoundDialog: false,
diff --git a/ppr-ui/src/components/mhrRegistration/HomeLocation/HomeLocationType.vue b/ppr-ui/src/components/mhrRegistration/HomeLocation/HomeLocationType.vue
index be6601d0a..5cfbb9ca4 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeLocation/HomeLocationType.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeLocation/HomeLocationType.vue
@@ -152,6 +152,7 @@
                     >
                       <PidNumber
                         class="mb-4"
+                        :pidNumber="locationTypeInfo.pidNumber"
                         :disable="showLocationInfo"
                         :required="otherTypeOption === HomeLocationTypes.OTHER_STRATA && validate"
                         @set-pid="handlePidInfo($event)"
diff --git a/ppr-ui/src/composables/mhrInformation/useTransportPermits.ts b/ppr-ui/src/composables/mhrInformation/useTransportPermits.ts
index 1dc277065..c0a74ecf2 100644
--- a/ppr-ui/src/composables/mhrInformation/useTransportPermits.ts
+++ b/ppr-ui/src/composables/mhrInformation/useTransportPermits.ts
@@ -103,6 +103,12 @@ export const useTransportPermits = () => {
       payloadData.newLocation.address.postalCode = ' '
     }
 
+    // api does not support otherType, and it should be set to the locationType
+    if (payloadData.newLocation.otherType) {
+      payloadData.newLocation.locationType = payloadData.newLocation.otherType
+      delete payloadData.newLocation.otherType
+    }
+
     return payloadData
   }