Merge branch 'master' into fix-checkbox-filter

Author: victoria-dos

packages/components/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components",
-    "version": "3.11.2",
+    "version": "3.11.3",
     "description": "Common components for RedHat Cloud Services project.",
     "main": "index.js",
     "module": "esm/index.js",

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/demo/src/index.html

@@ -5,8 +5,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
-    <link rel="stylesheet" type="text/css" href="https://unpkg.com/@patternfly/patternfly@latest/patternfly-base.css"/>
-    <link rel="stylesheet" type="text/css" href="https://unpkg.com/@patternfly/patternfly@latest/patternfly-addons.css"/>
+    <link rel="stylesheet" type="text/css" href="https://unpkg.com/@patternfly/patternfly@4.224.5/patternfly-base.css"/>
+    <link rel="stylesheet" type="text/css" href="https://unpkg.com/@patternfly/patternfly@4.224.5/patternfly-addons.css"/>
     <!--
         manifest.json provides metadata used when your web app is added to the
         homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-utilities",
-    "version": "3.7.4",
+    "version": "3.7.6",
     "description": "Util functions for RedHat Cloud Services project.",
     "main": "index.js",
     "module": "esm/index.js",

packages/utils/src/RBAC/RBAC.ts

@@ -36,8 +36,7 @@ function extractResourceDefinitionValues(rds: ResourceDefinition[]) {
     if (operation === ResourceDefinitionFilterOperationEnum.In) {
       return [
         ...acc,
-        ...value
-          .toString()
+        ...(Array.isArray(value) ? value.map((value) => (value === null ? 'null' : value)).toString() : value)
           .split(',')
           .map((value) => `${key}:${value}`),
       ];
@@ -135,7 +134,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,
   };
 };