Show MHR table statuses as per UXA

bcgov · Oct 17, 2023 · 288a972 · 288a972
1 parent 2451127
commit 288a972
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/ppr-ui/src/composables/exemption/useExemptions.ts b/ppr-ui/src/composables/exemption/useExemptions.ts
@@ -100,7 +100,7 @@ export const useExemptions = () => {
     return mhrRegSummary.changes?.filter(
       reg =>
         reg.registrationDescription === APIMhrDescriptionTypes.RESIDENTIAL_EXEMPTION &&
-        reg.statusType === MhApiStatusTypes.EXEMPT
+        (reg.statusType === MhApiStatusTypes.EXEMPT || reg.statusType === MhApiStatusTypes.ACTIVE)
     ).length > 0
   }
 

diff --git a/ppr-ui/src/composables/useRegistration.ts b/ppr-ui/src/composables/useRegistration.ts
@@ -47,7 +47,6 @@ export const useRegistration = (setSort: RegistrationSortIF) => {
     if (!status) return UIStatusTypes.DRAFT
     if (status === MhApiStatusTypes.FROZEN) return MhUIStatusTypes.ACTIVE
     if (!isChild && status === MhApiStatusTypes.EXEMPT) return MhUIStatusTypes.EXEMPT
-    if (isChild && (status === MhApiStatusTypes.CANCELLED || status === MhApiStatusTypes.EXEMPT)) return ''
     return isPpr ? PprAPIToUIStatusTypesMap[status] : MhrAPIToUIStatusTypesMap[status]
   }