ORV2-3453 - BVT bug: Enforcement Officer has no access to Bridge Calc Tool (#1818)

Co-authored-by: GlenAOT <[email protected]>

Author: glen-aot

frontend/src/common/authentication/PermissionMatrix.ts

@@ -347,6 +347,9 @@ const STICKY_SIDE_BAR = {
   MANAGE_PPC_USERS_BUTTON: {
     allowedIDIRRoles: [SA],
   },
+  BRIDGE_FORMULA_CALCULATION_TOOL_BUTTON: {
+    allowedIDIRRoles: [HQA, SA, PC, CTPO, EO],
+  },
 } as const;
 
 const MANAGE_PPC_USERS = {

frontend/src/common/components/naviconsidebar/NavIconBFCTButton.tsx

@@ -12,7 +12,7 @@ import { NAV_BUTTON_TYPES } from "./types/NavButtonType";
 export const NavIconBFCTButton = () => {
   const navigate = useNavigate();
   const { pathname } = useLocation();
-  const isActive = pathname === IDIR_ROUTES.WELCOME;
+  const isActive = pathname === IDIR_ROUTES.BRIDGE_FORMULA_CALCULATION_TOOL;
   const { clearCompanyContext } = useContext(OnRouteBCContext);
 
   return (

frontend/src/common/components/naviconsidebar/NavIconSideBar.tsx

@@ -1,14 +1,14 @@
 import { useAuth } from "react-oidc-context";
-import React, { useContext } from "react";
+import { useContext } from "react";
 
 import { IDPS } from "../../types/idp";
 import "./NavIconSideBar.scss";
 import OnRouteBCContext from "../../../common/authentication/OnRouteBCContext";
-import { USER_ROLE } from "../../../common/authentication/types";
 import { NavIconHomeButton } from "./NavIconHomeButton";
 import { NavIconReportButton } from "./NavIconReportButton";
 import { NavIconBFCTButton } from "./NavIconBFCTButton";
 import { useFeatureFlagsQuery } from "../../hooks/hooks";
+import { usePermissionMatrix } from "../../authentication/PermissionMatrix";
 
 /**
  * Displays a sidebar with NavIcon buttons as children
@@ -17,22 +17,35 @@ export const NavIconSideBar = () => {
   const { isAuthenticated, user } = useAuth();
   const { idirUserDetails } = useContext(OnRouteBCContext);
   const isIdir = user?.profile?.identity_provider === IDPS.IDIR;
-  const isEofficer =
-    idirUserDetails?.userRole === USER_ROLE.ENFORCEMENT_OFFICER;
 
   const shouldShowSideBar =
-    isAuthenticated && isIdir && idirUserDetails?.userName && !isEofficer;
+    isAuthenticated && isIdir && idirUserDetails?.userName;
 
   // Determine when to hide the BridgeFormulaCalculationTool button based on its corresponding feature flag
   const { data: featureFlags } = useFeatureFlagsQuery();
-  const enableBFCT =
+
+  const BFCTFeatureFlagEnabled =
     featureFlags?.["BRIDGE-FORMULA-CALCULATION-TOOL"] === "ENABLED";
 
+  const shouldShowBFCTButton = usePermissionMatrix({
+    permissionMatrixKeys: {
+      permissionMatrixFeatureKey: "STICKY_SIDE_BAR",
+      permissionMatrixFunctionKey: "BRIDGE_FORMULA_CALCULATION_TOOL_BUTTON",
+    },
+  });
+
+  const shouldShowReportsButton = usePermissionMatrix({
+    permissionMatrixKeys: {
+      permissionMatrixFeatureKey: "STICKY_SIDE_BAR",
+      permissionMatrixFunctionKey: "REPORTS_BUTTON",
+    },
+  });
+
   return shouldShowSideBar ? (
     <div className="nav-icon-side-bar">
       <NavIconHomeButton />
-      <NavIconReportButton />
-      {enableBFCT && <NavIconBFCTButton />}
+      {shouldShowReportsButton && <NavIconReportButton />}
+      {BFCTFeatureFlagEnabled && shouldShowBFCTButton && <NavIconBFCTButton />}
     </div>
   ) : null;
 };