fix(RBACProvider): Move to components package

Hyperkid123 · Jul 27, 2022 · 6e7176b · 6e7176b
1 parent 0de30e4
commit 6e7176b
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 28 deletions.
diff --git a/packages/utils/src/RBACHook/RBACProvider.tsx → ...ponents/src/RBACProvider/RBACProvider.tsx b/packages/utils/src/RBACHook/RBACProvider.tsx → ...ponents/src/RBACProvider/RBACProvider.tsx
@@ -1,7 +1,14 @@
 import React, { useEffect, useState } from 'react';
 import { Access } from '@redhat-cloud-services/rbac-client';
-import { doesHavePermissions, getRBAC, hasAllPermissions } from '../RBAC';
-import { RBACContext, initialPermissions } from './constants';
+import { Bullseye, Spinner } from '@patternfly/react-core';
+
+import {
+  RBACContext,
+  doesHavePermissions,
+  getRBAC,
+  hasAllPermissions,
+  initialPermissions,
+} from '@redhat-cloud-services/frontend-components-utilities/RBAC';
 
 const hasAccessWithUserPermissions = (userPermissions: Access[]) => {
   return (requiredPermissions: any, checkAll = true) => {
@@ -13,7 +20,7 @@ export interface RBACProviderProps {
   appName: string;
 }
 
-const RBACProvider: React.FunctionComponent<RBACProviderProps> = ({ appName, children }) => {
+export const RBACProvider: React.FunctionComponent<RBACProviderProps> = ({ appName, children }) => {
   const [permissionState, setPermissionState] = useState(initialPermissions);
   let loading = false;
 
@@ -31,7 +38,6 @@ const RBACProvider: React.FunctionComponent<RBACProviderProps> = ({ appName, chi
   };
 
   useEffect(() => {
-    console.log('SADASD', appName, permissionState, loading);
     if (!loading && permissionState.permissions.length == 0) {
       fetchPermissions();
     }
@@ -41,10 +47,16 @@ const RBACProvider: React.FunctionComponent<RBACProviderProps> = ({ appName, chi
     <RBACContext.Provider
       value={{
         ...permissionState,
-        hasAccess: hasAccessWithUserPermissions(permissionState?.permissions),
+        hasAccess: hasAccessWithUserPermissions(permissionState?.permissions || []),
       }}
     >
-      {!permissionState.isLoading && children}
+      {!permissionState.isLoading ? (
+        children
+      ) : (
+        <Bullseye>
+          <Spinner size="xl" />
+        </Bullseye>
+      )}
     </RBACContext.Provider>
   );
 };

diff --git a/packages/components/src/RBACProvider/index.ts b/packages/components/src/RBACProvider/index.ts
@@ -0,0 +1 @@
+export { default as RBACProvider } from './RBACProvider';
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
@@ -39,3 +39,4 @@ export * from './FilterHooks';
 export * from './AsyncComponent';
 export * from './Ouia';
 export * from './ErrorBoundary';
+export * from './RBACProvider';
diff --git a/packages/utils/src/RBAC/RBAC.ts b/packages/utils/src/RBAC/RBAC.ts
@@ -1,3 +1,4 @@
+import { createContext } from 'react';
 import { Access } from '@redhat-cloud-services/rbac-client';
 import type { ChromeAPI } from '@redhat-cloud-services/types';
 
@@ -60,4 +61,20 @@ export function hasAllPermissions(userPermissions: (Access | string)[], permissi
   });
 }
 
+export const initialPermissions = {
+  isLoading: true,
+  isOrgAdmin: false,
+  permissions: [],
+  hasAccess: (_?: any) => {
+    return;
+  },
+};
+
+export const RBACContext = createContext(initialPermissions);
+
+export interface UsePermissionsState extends RBAC {
+  isLoading: boolean;
+  hasAccess?: boolean;
+}
+
 export default getRBAC;
diff --git a/packages/utils/src/RBACHook/RBACHook.ts b/packages/utils/src/RBACHook/RBACHook.ts
@@ -1,6 +1,5 @@
 import { useContext, useEffect, useState } from 'react';
-import { RBACContext, UsePermissionsState } from './constants';
-import { doesHavePermissions, getRBAC, hasAllPermissions } from '../RBAC';
+import { RBACContext, UsePermissionsState, doesHavePermissions, getRBAC, hasAllPermissions } from '../RBAC';
 
 export function usePermissions(appName: string, permissionsList: string[], disableCache?: boolean, checkAll?: boolean): UsePermissionsState {
   const [permissions, setPermissions] = useState<UsePermissionsState>({

diff --git a/packages/utils/src/RBACHook/constants.ts b/packages/utils/src/RBACHook/constants.ts
@@ -1,19 +0,0 @@
-import { createContext } from 'react';
-import { RBAC } from '../RBAC';
-
-export const initialPermissions = {
-  isLoading: true,
-  loaded: false,
-  isOrgAdmin: false,
-  permissions: [],
-  hasAccess: (_?: any) => {
-    return;
-  },
-};
-
-export const RBACContext = createContext(initialPermissions);
-
-export interface UsePermissionsState extends RBAC {
-  isLoading: boolean;
-  hasAccess?: boolean;
-}

diff --git a/packages/utils/src/RBACHook/index.ts b/packages/utils/src/RBACHook/index.ts
@@ -1,3 +1,2 @@
-export { default as RBACProvider } from './RBACProvider';
 export { default } from './RBACHook';
 export * from './RBACHook';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default as RBACProvider } from './RBACProvider';