@applica-software-guru/react-admin 1.3.177 → 1.3.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applica-software-guru/react-admin",
-  "version": "1.3.177",
+  "version": "1.3.179",
   "private": false,
   "repository": {
     "type": "git",

package/src/components/Layout/Navigation/Navigation.tsx

@@ -33,7 +33,6 @@ function Navigation(props: INavigationProps) {
       icon: item.icon
     }));
   }
-
   return (
     <NavList {...props}>
       {!isLoading &&

package/src/components/ra-lists/List.tsx

@@ -173,7 +173,7 @@ const ApplicaStyledList = styled(RaList, {
         [theme.breakpoints.down('sm')]: {
           '&>.MuiStack-root': {
             width: '100%',
-            '&>div': {
+            '&>div:not(.MuiStack-root)': {
               width: '100%'
             }
           }

package/src/contexts/MenuConfigContext.tsx

@@ -1,5 +1,5 @@
 import { MenuProps } from '../types';
-import { createContext } from 'react';
+import { createContext, useEffect } from 'react';
 import { useLocalStorage } from '../hooks';
 
 export type MenuConfigContextProps = {
@@ -7,17 +7,13 @@ export type MenuConfigContextProps = {
   openComponent: string;
   selectedID: string | null;
   drawerOpen: boolean;
-  componentDrawerOpen: boolean;
-  menuDashboard: any;
   error: any;
-  groups: MenuProps;
+  menu: MenuProps;
   activeItem: (openItem: string[]) => void;
-  activeComponent: (openComponent: string) => void;
   openDrawer: (drawerOpen: boolean) => void;
-  openComponentDrawer: (componentDrawerOpen: boolean) => void;
   activeID: (selectedID: string | null) => void;
-  getMenuSuccess: (menuDashboard: any) => void;
   hasError: (error: any) => void;
+  setMenu: (menu: MenuProps) => void;
 };
 const notImplemented = () => {
   throw new Error('Not implemented');
@@ -27,17 +23,13 @@ const initialState: MenuConfigContextProps = {
   openComponent: 'buttons',
   selectedID: null,
   drawerOpen: false,
-  componentDrawerOpen: true,
-  menuDashboard: {},
   error: null,
-  groups: [],
+  menu: [],
   activeItem: notImplemented,
-  activeComponent: notImplemented,
   openDrawer: notImplemented,
-  openComponentDrawer: notImplemented,
   activeID: notImplemented,
-  getMenuSuccess: notImplemented,
-  hasError: notImplemented
+  hasError: notImplemented,
+  setMenu: notImplemented
 };
 
 const MenuConfigContext = createContext<MenuConfigContextProps>(initialState);
@@ -47,69 +39,27 @@ export type MenuConfigProviderProps = {
   children: React.ReactNode;
 };
 
-const MenuConfigProvider = ({ menu: groups, children }: MenuConfigProviderProps) => {
-  const [menu, setMenu] = useLocalStorage('menu-config', { ...initialState });
-
-  const activeItem = (openItem: string) => {
-    setMenu((menu: MenuConfigContextProps) => ({
-      ...menu,
-      openItem
-    }));
-  };
-
-  const activeID = (selectedID: string) => {
-    setMenu((menu: MenuConfigContextProps) => ({
-      ...menu,
-      selectedID
-    }));
-  };
-
-  const activeComponent = (openComponent: string) => {
-    setMenu((menu: MenuConfigContextProps) => ({
-      ...menu,
-      openComponent
-    }));
-  };
-
-  const openDrawer = (drawerOpen: boolean) => {
-    setMenu((menu: MenuConfigContextProps) => ({
-      ...menu,
-      drawerOpen
-    }));
-  };
-
-  const openComponentDrawer = (componentDrawerOpen: boolean) => {
-    setMenu((menu: MenuConfigContextProps) => ({
-      ...menu,
-      componentDrawerOpen
-    }));
-  };
+const MenuConfigProvider = ({ menu, children }: MenuConfigProviderProps) => {
+  const [menuConfig, setMenuConfig] = useLocalStorage('menu-config', { ...initialState, menu }) as any;
+  const setMenu = (menu: MenuProps) => setMenuConfig((menuConfig: MenuConfigContextProps) => ({ ...menuConfig, menu }));
+  const activeItem = (openItem: string) => setMenuConfig((menuConfig: MenuConfigContextProps) => ({ ...menuConfig, openItem }));
+  const activeID = (selectedID: string) => setMenuConfig((menuConfig: MenuConfigContextProps) => ({ ...menuConfig, selectedID }));
+  const openDrawer = (drawerOpen: boolean) => setMenuConfig((menuConfig: MenuConfigContextProps) => ({ ...menuConfig, drawerOpen }));
+  const hasError = (error: any) => setMenuConfig((menuConfig: MenuConfigContextProps) => ({ ...menuConfig, error }));
 
-  const getMenuSuccess = (menuDashboard: any) => {
-    setMenu((menu: MenuConfigContextProps) => ({
-      ...menu,
-      menuDashboard
-    }));
-  };
+  useEffect(() => {
+    setMenu(menu);
+  }, [menu]);
 
-  const hasError = (error: any) => {
-    setMenu((menu: MenuConfigContextProps) => ({
-      ...menu,
-      error
-    }));
-  };
   return (
     <MenuConfigContext.Provider
       value={{
         // @ts-ignore
-        ...menu,
-        groups,
+        ...menuConfig,
+        setMenu,
         activeItem,
-        activeComponent,
         openDrawer,
-        openComponentDrawer,
         activeID,
-        getMenuSuccess,
         hasError
       }}
     >

package/src/hooks/useMenu.jsx

@@ -96,7 +96,7 @@ const mapParent = (group) => {
   return group;
 };
 
-const createNodes = ({ userGroups, resources, permissions, translate, roles }) => {
+const createNodes = ({ userMenu, resources, permissions, translate, roles }) => {
   const translateRecursive = (group) => {
     group.title = translate(group.title, { _: group.title });
 
@@ -126,7 +126,7 @@ const createNodes = ({ userGroups, resources, permissions, translate, roles }) =
     return group;
   };
 
-  const groupsA = cloneDeep(userGroups)
+  const groupsA = cloneDeep(userMenu)
     .map((group) => ({
       type: 'group',
       icon: AntDesignOutlined,
@@ -142,7 +142,7 @@ const createNodes = ({ userGroups, resources, permissions, translate, roles }) =
     // Generate unique list of groups (because a resource can be configured with the same group of another resource)
     .filter((group, index, self) => self.indexOf(group) === index)
     // Remove from the list groups already defined by the user (Applica developer)
-    .filter((group) => group !== undefined && getGroupById(userGroups, group) === null)
+    .filter((group) => group !== undefined && getGroupById(userMenu, group) === null)
     .map((group) => ({
       id: group,
       title: translate(`ra.menu.group.${group}`),
@@ -187,7 +187,7 @@ const useMenu = () => {
   const isAuthenticated = identity && identity.id > 0;
 
   const { isLoading: loadingPermissions, permissions } = usePermissions(isAuthenticated);
-  const { groups: userGroups } = useMenuConfig();
+  const { menu: userMenu } = useMenuConfig();
   const translate = useTranslate();
   const menu = useMemo(() => {
     if (loadingIdentity || !identity || identity === null || identity?.id <= 0) {
@@ -198,11 +198,11 @@ const useMenu = () => {
       resources,
       permissions,
       translate,
-      userGroups,
+      userMenu,
       roles
     });
     return groups;
-  }, [loadingIdentity, loadingPermissions, identity, resources, permissions, translate, userGroups]);
+  }, [loadingIdentity, loadingPermissions, identity, resources, permissions, translate, userMenu]);
 
   const isLoading = useMemo(() => loadingIdentity, [loadingIdentity]);