Mhr Correction/Amend Button States

ppr-ui/package.json

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

ppr-ui/src/App.vue

@@ -33,7 +33,10 @@
           icon=" "
         />
         <Breadcrumb v-if="haveData" />
-        <Tombstone v-if="haveData" />
+        <Tombstone
+          v-if="haveData"
+          :actionInProgress="actionInProgress"
+        />
         <v-container class="py-0">
           <v-row noGutters>
             <v-col cols="12">
@@ -45,6 +48,7 @@
                 @profileReady="profileReady = true"
                 @error="handleError($event)"
                 @haveData="haveData = $event"
+                @actionInProgress="actionInProgress = $event"
               />
             </v-col>
           </v-row>
@@ -156,6 +160,7 @@ export default defineComponent({
       haveData: false,
       loggedOut: false,
       tokenService: false,
+      actionInProgress: false,
       registryUrl: computed((): string => {
         // if REGISTRY_URL does not exist this will return 'undefined'. Needs to be null or str
         const configRegistryUrl = sessionStorage.getItem('REGISTRY_URL')

ppr-ui/src/components/tombstone/Tombstone.vue

@@ -4,6 +4,7 @@
       <TombstoneDynamic
         v-if="displayTombstoneDynamic"
         :isMhrInformation="displayMhrInformation"
+        :actionInProgress="actionInProgress"
       />
       <TombstoneDefault v-else />
     </v-container>
@@ -23,6 +24,12 @@ export default defineComponent({
     TombstoneDefault,
     TombstoneDynamic
   },
+  props: {
+    actionInProgress: {
+      type: Boolean,
+      default: false
+    }
+  },
   setup () {
     const route = useRoute()
     const { isMhrCorrection } = useMhrCorrections()

ppr-ui/src/components/tombstone/TombstoneDynamic.vue

@@ -91,7 +91,7 @@
 
     <!-- Mhr Amend/Correct Btns -->
     <v-row
-      v-if="isMhrInformation && isMhrChangesEnabled && !isNonResExemption"
+      v-if="isMhrChangesEnabled && isRouteName(RouteNames.MHR_INFORMATION)"
       noGutters
       class="mt-2 mb-n4"
     >
@@ -102,6 +102,7 @@
         color="primary"
         variant="plain"
         :ripple="false"
+        :disabled="actionInProgress"
         @click="initMhrCorrection(MhrPublicAmendment)"
       >
         <v-icon
@@ -125,6 +126,7 @@
             variant="plain"
             v-bind="props"
             :ripple="false"
+            :disabled="actionInProgress"
           >
             <v-icon
               color="primary"
@@ -141,6 +143,7 @@
             class="ml-n3 px-0"
             v-bind="props"
             :ripple="false"
+            :disabled="actionInProgress"
           >
             <v-icon v-if="isActive">
               mdi-menu-up
@@ -178,8 +181,8 @@ import { computed, defineComponent, reactive, toRefs } from 'vue'
 import { useStore } from '@/store/store'
 import { formatExpiryDate, pacificDate } from '@/utils'
 import { RegistrationTypeIF } from '@/interfaces'
-import { MhApiStatusTypes, MhUIStatusTypes } from '@/enums'
-import { useExemptions, useMhrCorrections, useMhrInformation, useTransportPermits } from '@/composables'
+import { MhApiStatusTypes, MhUIStatusTypes, RouteNames } from '@/enums'
+import { useMhrCorrections, useMhrInformation, useNavigation, useTransportPermits } from '@/composables'
 import { storeToRefs } from 'pinia'
 import { MhrCorrectionClient, MhrCorrectionStaff, MhrPublicAmendment } from '@/resources'
 import MhrStatusCorrection from '@/components/mhrRegistration/MhrStatusCorrection.vue'
@@ -192,6 +195,10 @@ export default defineComponent({
     isMhrInformation: {
       type: Boolean,
       default: false
+    },
+    actionInProgress: {
+      type: Boolean,
+      default: false
     }
   },
   setup () {
@@ -203,8 +210,8 @@ export default defineComponent({
       getMhrInformation,
       getMhrOriginalTransportPermitRegStatus
     } = storeToRefs(useStore())
+    const { isRouteName } = useNavigation()
     const { isFrozenMhr } = useMhrInformation()
-    const { isNonResExemption } = useExemptions()
     const { initMhrCorrection, isMhrChangesEnabled, isMhrCorrection } = useMhrCorrections()
 
     const { isAmendLocationActive } = useTransportPermits()
@@ -255,8 +262,9 @@ export default defineComponent({
     })
 
     return {
+      RouteNames,
+      isRouteName,
       isMhrCorrection,
-      isNonResExemption,
       initMhrCorrection,
       isMhrChangesEnabled,
       MhrCorrectionStaff,

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

@@ -702,7 +702,8 @@ export default defineComponent({
   },
   emits: [
     'error',
-    'emitHaveData'
+    'emitHaveData',
+    'actionInProgress'
   ],
   setup (props, context) {
     const router = useRouter()
@@ -1454,10 +1455,9 @@ export default defineComponent({
       onSave()
     })
 
-    watch(() => getMhrInformation.value.frozenDocumentType,
-      val => {
-        localState.hasAlertMsg = QSLockedStateUnitNoteTypes.includes(val)
-      })
+    watch(() => getMhrInformation.value.frozenDocumentType, val => {
+      localState.hasAlertMsg = QSLockedStateUnitNoteTypes.includes(val)
+    })
 
     watch(() => localState.transportPermitLocationType, val => {
       if (val === LocationChangeTypes.TRANSPORT_PERMIT_SAME_PARK) {
@@ -1466,6 +1466,11 @@ export default defineComponent({
       }
     })
 
+    /** Inform root level components when there is an MHR action in Progress **/
+    watch(() => [localState.showTransferType, isChangeLocationActive.value], (watchedConditions) => {
+      context.emit('actionInProgress', watchedConditions.includes(true))
+    }, { immediate: true })
+
     return {
       isRoleStaffSbc,
       isRoleStaffReg,