ui-soxo-bootstrap-core 2.6.1-dev.7 → 2.6.1-dev.8

package/core/lib/components/sidemenu/sidemenu.js

@@ -39,18 +39,18 @@ function CollapsedIconMenu({ menu, collapsed, icon, caption }) {
   // Import t and i18n from useTranslation
   const { t, i18n } = useTranslation();
   const { state } = useContext(GlobalContext);
-    const [isMobile, setIsMobile] = useState(false);
+  const [isMobile, setIsMobile] = useState(false);
 
-    useEffect(() => {
-      const handleResize = () => {
-        setIsMobile(window.innerWidth < 768); // Common breakpoint for mobile
-      };
+  useEffect(() => {
+    const handleResize = () => {
+      setIsMobile(window.innerWidth < 768); // Common breakpoint for mobile
+    };
 
-      handleResize(); // Set initial value
-      window.addEventListener('resize', handleResize);
+    handleResize(); // Set initial value
+    window.addEventListener('resize', handleResize);
 
-      return () => window.removeEventListener('resize', handleResize);
-    }, []);
+    return () => window.removeEventListener('resize', handleResize);
+  }, []);
 
   const menuText = t(caption);
   const menuContent = (
@@ -85,8 +85,14 @@ function CollapsedIconMenu({ menu, collapsed, icon, caption }) {
     </>
   );
 
-    // On mobile, or when the menu is collapsed (based on original logic), don't show the popover tooltip.
-    return isMobile || collapsed ? menuContent : <Popover content={menuText} placement="right">{menuContent}</Popover>;
+  // On mobile, or when the menu is collapsed (based on original logic), don't show the popover tooltip.
+  return isMobile || collapsed ? (
+    menuContent
+  ) : (
+    <Popover content={menuText} placement="right">
+      {menuContent}
+    </Popover>
+  );
 }
 
 export default function SideMenu({ loading, modules = [], callback, appSettings, collapsed }) {
@@ -123,7 +129,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
    * Logout Function
    */
   async function handleLogout() {
-    let dbPtrValue = appSettings.headers.db_ptr;
+    // let dbPtrValue = appSettings.headers.db_ptr;
     const isEnvThemeTrue = process.env.REACT_APP_THEME === 'true';
 
     //  Only clear localStorage if theme is not 'true'
@@ -137,7 +143,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
       // const result = Users.logout()
       localStorage.clear();
 
-      localStorage.setItem('db_ptr', dbPtrValue);
+      // localStorage.setItem('db_ptr', dbPtrValue);
 
       let userInfo = {
         dms: {},

package/core/lib/utils/api/api.utils.js

@@ -24,15 +24,15 @@ export default class ApiUtils {
   };
 
   static get = async ({ url, config = { queries: [], order: {} }, headers: customHeaders = {}, ...props }) => {
-    const { headers: defaultHeaders } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     try {
       return await GetData({
         url: createUrlParams(url, config),
         settings,
         headers: {
-          ...defaultHeaders,
-          // override here
+          ...(settings.headers || {}),
+          ...(dbPtr ? { db_ptr: dbPtr } : {}),
           ...customHeaders,
         },
         ...props,
@@ -43,15 +43,15 @@ export default class ApiUtils {
   };
 
   static getRecordDetail = async ({ url, config = { queries: [] }, headers: customHeaders = {}, ...props }) => {
-    const { headers: defaultHeaders } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     try {
       return await GetData({
         url: createUrlParams(url, config),
         settings,
         headers: {
-          ...defaultHeaders,
-          // override here
+          ...(settings.headers || {}),
+          ...(dbPtr ? { db_ptr: dbPtr } : {}),
           ...customHeaders,
         },
         ...props,
@@ -62,15 +62,15 @@ export default class ApiUtils {
   };
 
   static post = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
-    const { headers: defaultHeaders } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PostData({
       url,
       formBody,
       settings,
       headers: {
-        ...defaultHeaders,
-        // override here
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
         ...customHeaders,
       },
       ...props,
@@ -78,36 +78,48 @@ export default class ApiUtils {
   };
 
   static put = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PutData({
       url,
       settings,
       formBody,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };
 
   static patch = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PatchData({
       url,
       settings,
       formBody,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };
 
   static delete = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return DeleteData({
       url,
       settings,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };

package/core/models/menus/menus.js

@@ -203,13 +203,21 @@ class MenusAPI extends Base {
   };
 
   // get core-menu list with submenu
-  getCoreMenuLists = (role_id) => {
-    const url = `menus/get-menus-by-role/${role_id}`;
+  getCoreMenuLists = () => {
+    const url = 'core-menus/core-menus?step=1&header_id=null';
     return this.get({
       url,
     }).then((result) => result);
   };
 
+  getCoreMenuByRoleId = async (role_id) => {
+    const url = `menus/get-menus-by-role/${role_id}`;
+    const result = await this.get({
+      url,
+    });
+    return result;
+  };
+
   getCoreMenus = () => {
     return [
       // {

package/core/models/users/components/assign-role/assign-role.js

@@ -159,7 +159,7 @@ export default function AssignRole() {
 
     const role_id = role.id;
     try {
-      const res = await MenusAPI.getCoreMenuLists(role_id);
+      const res = await MenusAPI.getCoreMenuByRoleId(role_id);
       const allMenus = res.result || [];
 
       setModules(allMenus);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.6.1-dev.7",
+  "version": "2.6.1-dev.8",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"