13746 Fix issue with staff (#1032)

* 13746 Fix issue with staff * 13746 Code refactor based on pr * 13746 Code refactor based on pr * 13746 Refactor
bcgov · Nov 8, 2022 · e08a05e · e08a05e
1 parent 4d0f6db
commit e08a05e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/ppr-ui/src/components/tables/common/TableRow.vue b/ppr-ui/src/components/tables/common/TableRow.vue
@@ -38,7 +38,7 @@
             </p>
           </div>
           <p v-else class="ma-0">
-            <b>{{ item.baseRegistrationNumber }}</b>
+            <b>{{ item.baseRegistrationNumber || item.mhrNumber }}</b>
           </p>
         </v-col>
       </v-row>
@@ -340,7 +340,7 @@
       </v-row>
 
       <!-- MHR DRAFT ACTIONS -->
-      <v-row v-else-if="!isPpr && (!isChild || isDraft(item))" class="actions" no-gutters>
+      <v-row v-else-if="!isPpr && isDraft(item)" class="actions" no-gutters>
         <v-col class="edit-action pa-0" cols="auto">
           <v-btn
             color="primary"

diff --git a/ppr-ui/src/composables/mhrRegistration/useNewMhrRegistration.ts b/ppr-ui/src/composables/mhrRegistration/useNewMhrRegistration.ts
@@ -20,7 +20,8 @@ export const useNewMhrRegistration = () => {
     getMhrAttentionReferenceNum,
     getMhrRegistrationLocation,
     getMhrRegistrationHomeOwnerGroups,
-    getStaffPayment
+    getStaffPayment,
+    isRoleQualifiedSupplier
   } = useGetters<any>([
     'getMhrRegistrationHomeDescription',
     'getMhrRegistrationSubmittingParty',
@@ -29,7 +30,8 @@ export const useNewMhrRegistration = () => {
     'getMhrRegistrationLocation',
     'getMhrRegistrationHomeOwnerGroups',
     'getCertifyInformation',
-    'getStaffPayment'
+    'getStaffPayment',
+    'isRoleQualifiedSupplier'
   ])
   const { setMhrTableHistory } = useActions<any>(['setMhrTableHistory'])
 
@@ -199,9 +201,11 @@ export const useNewMhrRegistration = () => {
 
   const fetchMhRegistrations = async (): Promise<void> => {
     const draftFilings = await getMhrDrafts()
-    const myMhrHistory = await mhrRegistrationHistory(true)
-    const filteredMhrHistory = addHistoryDraftsToMhr(myMhrHistory, draftFilings)
-    setMhrTableHistory([...filteredMhrHistory])
+    const myMhrHistory = await mhrRegistrationHistory(isRoleQualifiedSupplier.value)
+    if (isRoleQualifiedSupplier.value) {
+      const filteredMhrHistory = addHistoryDraftsToMhr(myMhrHistory, draftFilings)
+      setMhrTableHistory(filteredMhrHistory)
+    } else setMhrTableHistory([...draftFilings, ...myMhrHistory])
   }
 
   function addHistoryDraftsToMhr (mhrHistory: MhRegistrationSummaryIF[], mhrDrafts: MhrDraftTransferApiIF[]):

diff --git a/ppr-ui/src/views/mhrInformation/MhrInformation.vue b/ppr-ui/src/views/mhrInformation/MhrInformation.vue
@@ -279,7 +279,10 @@ export default defineComponent({
         return !isGlobalEditingMode.value && isTransferDetailsValid.value && true
       }),
       isValidTransferReview: computed((): boolean => { // is valid on review step
-        return localState.isReviewMode && isRefNumValid.value && localState.isCompletionConfirmed && !localState.validateAuthorizationError
+        return localState.isReviewMode &&
+        isRefNumValid.value &&
+        localState.isCompletionConfirmed &&
+        !localState.validateAuthorizationError
       }),
       transferErrorMsg: computed((): string => {
         const isValidReview = localState.isReviewMode ? !localState.isValidTransferReview : !localState.isValidTransfer