ORV2-2624 - FE: Permission Matrix in Active and Expired Permits tab

frontend/src/common/authentication/PermissionMatrix.ts

@@ -122,7 +122,7 @@ const MANAGE_PERMITS = {
   /**
    * Active Permits tab
    */
-  VIEW_ACTIVE_PERMITS: {
+  VIEW_LIST_OF_ACTIVE_PERMITS: {
     allowedBCeIDRoles: ALL_BCeID_ROLES,
     allowedIDIRRoles: ALL_IDIR_ROLES,
   },
@@ -410,7 +410,7 @@ const GLOBAL_SEARCH = {
   AMEND_PERMIT: { allowedIDIRRoles: [PC, SA, CTPO] },
   VOID_PERMIT: { allowedIDIRRoles: [SA] },
   REVOKE_PERMIT: { allowedIDIRRoles: [SA] },
-  RESEND: { allowedIDIRRoles: [PC, SA, FIN, CTPO, HQA] },
+  RESEND_PERMIT: { allowedIDIRRoles: [PC, SA, FIN, CTPO, HQA] },
 
   /** Search for Inactive Permit */
   SEARCH_FOR_INACTIVE_PERMIT: { allowedIDIRRoles: [PC, SA, CTPO, EO] },

frontend/src/features/idir/search/components/IDIRPermitSearchResults.tsx

@@ -18,7 +18,6 @@ import { PermitListItem } from "../../../permits/types/permit";
 import { getPermitDataBySearch } from "../api/idirSearch";
 import { PermitSearchResultColumnDef } from "../table/PermitSearchResultColumnDef";
 import { PERMIT_ACTION_ORIGINS, SearchFields } from "../types/types";
-import { IDIRPermitSearchRowActions } from "./IDIRPermitSearchRowActions";
 import {
   defaultTableInitialStateOptions,
   defaultTableOptions,
@@ -29,6 +28,7 @@ import { ERROR_ROUTES } from "../../../../routes/constants";
 import { VEHICLES_URL } from "../../../../common/apiManager/endpoints/endpoints";
 import { httpGETRequest } from "../../../../common/apiManager/httpRequestHandler";
 import { useSetCompanyHandler } from "../helpers/useSetCompanyHandler";
+import { PermitRowOptions } from "../../../permits/components/permit-list/PermitRowOptions";
 
 /**
  * Function to decide whether to show row actions icon or not.
@@ -205,11 +205,10 @@ export const IDIRPermitSearchResults = memo(
           if (shouldShowRowActions(idirUserDetails?.userRole)) {
             return (
               <Box className="idir-search-results__row-actions">
-                <IDIRPermitSearchRowActions
+                <PermitRowOptions
                   isPermitInactive={isInactive}
                   permitNumber={row.original.permitNumber}
                   permitId={row.original.permitId}
-                  userRole={idirUserDetails?.userRole}
                   companyId={row.original.companyId}
                   permitActionOrigin={PERMIT_ACTION_ORIGINS.GLOBAL_SEARCH}
                 />

frontend/src/features/permits/components/dashboard/PermitLists.tsx

@@ -53,18 +53,35 @@ export const PermitLists = React.memo(() => {
     });
   }
 
-  tabs.push(
-    {
+  const canViewListOfActivePermits = usePermissionMatrix({
+    permissionMatrixKeys: {
+      permissionMatrixFeatureKey: "MANAGE_PERMITS",
+      permissionMatrixFunctionKey: "VIEW_LIST_OF_ACTIVE_PERMITS",
+    },
+  });
+
+  if (canViewListOfActivePermits) {
+    tabs.push({
       label: "Active Permits",
       component: <ActivePermitList />,
       componentKey: PERMIT_TABS.ACTIVE_PERMITS,
+    });
+  }
+
+  const canViewListOfExpiredPermits = usePermissionMatrix({
+    permissionMatrixKeys: {
+      permissionMatrixFeatureKey: "MANAGE_PERMITS",
+      permissionMatrixFunctionKey: "VIEW_LIST_OF_EXPIRED_PERMITS",
     },
-    {
+  });
+
+  if (canViewListOfExpiredPermits) {
+    tabs.push({
       label: "Expired Permits",
       component: <ExpiredPermitList />,
       componentKey: PERMIT_TABS.EXPIRED_PERMITS,
-    },
-  );
+    });
+  }
 
   const { state: stateFromNavigation } = useLocation();
 

frontend/src/features/permits/components/permit-list/BasePermitList.tsx

@@ -16,22 +16,19 @@ import { NoRecordsFound } from "../../../../common/components/table/NoRecordsFou
 import { getPermits } from "../../apiManager/permitsAPI";
 import { PermitListItem } from "../../types/permit";
 import { PermitsColumnDefinition } from "./Columns";
-import { PermitRowOptions } from "./PermitRowOptions";
 import { useNavigate } from "react-router-dom";
 import { ERROR_ROUTES } from "../../../../routes/constants";
 import {
   defaultTableInitialStateOptions,
   defaultTableOptions,
   defaultTableStateOptions,
 } from "../../../../common/helpers/tableHelper";
-import { IDIRPermitSearchRowActions } from "../../../idir/search/components/IDIRPermitSearchRowActions";
 import { hasPermitExpired } from "../../helpers/permitState";
 import { isPermitInactive } from "../../types/PermitStatus";
 import OnRouteBCContext from "../../../../common/authentication/OnRouteBCContext";
-import { DoesUserHaveRole } from "../../../../common/authentication/util";
-import { IDIR_USER_ROLE } from "../../../../common/authentication/types";
 import { applyWhenNotNullable } from "../../../../common/helpers/util";
 import { PERMIT_ACTION_ORIGINS } from "../../../idir/search/types/types";
+import { PermitRowOptions } from "./PermitRowOptions";
 
 /**
  * A permit list component with common functionalities that can be shared by
@@ -42,8 +39,7 @@ export const BasePermitList = ({
 }: {
   isExpired?: boolean;
 }) => {
-  const { idirUserDetails, companyId: companyIdFromContext } =
-    useContext(OnRouteBCContext);
+  const { companyId: companyIdFromContext } = useContext(OnRouteBCContext);
 
   const companyId: number = applyWhenNotNullable(
     (id) => Number(id),
@@ -157,31 +153,13 @@ export const BasePermitList = ({
           isPermitInactive(row.original.permitStatus);
         return (
           <Box sx={{ display: "flex", justifyContent: "flex-end" }}>
-            {DoesUserHaveRole({
-              userRole: idirUserDetails?.userRole,
-              allowedRoles: [
-                IDIR_USER_ROLE.PPC_CLERK,
-                IDIR_USER_ROLE.ENFORCEMENT_OFFICER,
-              ],
-            }) ? (
-              <IDIRPermitSearchRowActions
-                isPermitInactive={isInactive}
-                permitNumber={row.original.permitNumber}
-                permitId={row.original.permitId}
-                userRole={idirUserDetails?.userRole}
-                companyId={row.original.companyId}
-                permitActionOrigin={PERMIT_ACTION_ORIGINS.ACTIVE_PERMITS}
-              />
-            ) : (
-              <PermitRowOptions
-                isExpired={isExpired}
-                companyId={row.original.companyId}
-                permitId={row.original.permitId}
-                onDocumentUnavailable={() => {
-                  navigate(ERROR_ROUTES.DOCUMENT_UNAVAILABLE);
-                }}
-              />
-            )}
+            <PermitRowOptions
+              isPermitInactive={isInactive}
+              permitNumber={row.original.permitNumber}
+              permitId={row.original.permitId}
+              companyId={row.original.companyId}
+              permitActionOrigin={PERMIT_ACTION_ORIGINS.ACTIVE_PERMITS}
+            />
           </Box>
         );
       },