Merge pull request #1885 from gkarat/override-rd-check-rbac

fix: Override resourceDefinitions within RBACContext

Author: Hyperkid123

packages/components/src/RBACProvider/RBACProvider.tsx

@@ -11,10 +11,10 @@ import {
 } from '@redhat-cloud-services/frontend-components-utilities/RBAC';
 
 const hasAccessWithUserPermissions = (userPermissions: (Access | string)[], checkResourceDefinitions: boolean) => {
-  return (requiredPermissions: (Access | string)[], checkAll?: boolean): boolean => {
+  return (requiredPermissions: (Access | string)[], checkAll?: boolean, checkResourceDefinitionsOverride?: boolean): boolean => {
     return checkAll
-      ? hasAllPermissions(userPermissions, requiredPermissions, checkResourceDefinitions)
-      : doesHavePermissions(userPermissions, requiredPermissions, checkResourceDefinitions);
+      ? hasAllPermissions(userPermissions, requiredPermissions, checkResourceDefinitionsOverride ?? checkResourceDefinitions)
+      : doesHavePermissions(userPermissions, requiredPermissions, checkResourceDefinitionsOverride ?? checkResourceDefinitions);
   };
 };
 

packages/utils/src/RBAC/RBAC.ts

@@ -135,7 +135,7 @@ export interface UsePermissionsContextState {
   isLoading?: boolean;
   isOrgAdmin: boolean;
   permissions: (string | Access)[];
-  hasAccess?: (requiredPermissions: (Access | string)[], checkAll?: boolean) => boolean;
+  hasAccess?: (requiredPermissions: (Access | string)[], checkAll?: boolean, checkResourceDefinitionsOverride?: boolean) => boolean;
 }
 
 export const initialPermissions: UsePermissionsContextState = {

packages/utils/src/RBACHook/RBACHook.ts

@@ -39,12 +39,16 @@ export function usePermissions(
   return permissions;
 }
 
-export const usePermissionsWithContext = (requiredPermissions: (Access | string)[], checkAll?: boolean) => {
+export const usePermissionsWithContext = (
+  requiredPermissions: (Access | string)[],
+  checkAll?: boolean,
+  checkResourceDefinitionsOverride?: boolean
+) => {
   const { hasAccess, ...permissionState } = useContext(RBACContext);
 
   return {
     ...permissionState,
-    hasAccess: hasAccess?.(requiredPermissions, checkAll) || false,
+    hasAccess: hasAccess?.(requiredPermissions, checkAll, checkResourceDefinitionsOverride) || false,
   };
 };