ui-soxo-bootstrap-core 2.6.40-dev.17 → 2.6.40

package/core/models/menus/components/menu-lists/menu-lists.js

@@ -30,9 +30,6 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
   const [query, setQuery] = useState('');
   const [dragMode, setDragMode] = useState(false);
   const [orderChanged, setOrderChanged] = useState(false);
-  // keys of currently-expanded top-level panels. Seeded from the search results
-  // when the query changes, but the user can freely toggle panels afterwards.
-  const [openKeys, setOpenKeys] = useState([]);
 
   const [nextId, setNextId] = useState(10000);
 
@@ -184,16 +181,6 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
         return;
       }
 
-      // Prevent moving a menu into one of its own descendants
-      // (e.g. A > B, C — A cannot be dropped under B or C).
-      if (targetParentId) {
-        const draggedNode = findMenuById(records, draggedItem.id);
-        if (draggedNode && findMenuById(draggedNode.sub_menus || [], targetParentId)) {
-          message.warning('Cannot move a menu into its own sub menu');
-          return;
-        }
-      }
-
       // Remove item from original location
       const { newItems: itemsAfterRemove, foundItem } = findAndRemoveItem(records, draggedItem.id);
 
@@ -207,7 +194,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
 
       setRecords(finalItems);
       setOrderChanged(true);
-      message.success(`Moved "${foundItem.caption}" to level ${targetLevel}`);
+      message.success(`Moved "${foundItem.name}" to level ${targetLevel}`);
     },
     [records]
   );
@@ -216,42 +203,9 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
     model.delete(rec).then(loadMenus);
   };
 
-  // Recursively filter the menu tree by caption. A menu is kept if its own
-  // caption matches OR any descendant matches. When the menu itself matches we
-  // keep its full subtree; when only a descendant matches we keep just the
-  // pruned path so the matching item stays reachable.
-  const filterMenus = (menus, q) => {
-    if (!q) return menus || [];
-    const lower = q.toLowerCase();
-
-    return (menus || []).reduce((acc, menu) => {
-      const selfMatch = (menu.caption || '').toLowerCase().includes(lower);
-      if (selfMatch) {
-        acc.push({ ...menu });
-        return acc;
-      }
-      const subFiltered = filterMenus(menu.sub_menus || [], q);
-      if (subFiltered.length) {
-        acc.push({ ...menu, sub_menus: subFiltered });
-      }
-      return acc;
-    }, []);
-  };
-
-  // Ids of items (at one level) that have sub_menus — used to auto-expand
-  // every branch leading to a search match.
-  const expandableKeys = (items) => (items || []).filter((m) => m.sub_menus && m.sub_menus.length > 0).map((m) => String(m.id));
+  const filtered = records.filter((r) => r.caption?.toUpperCase().includes(query.toUpperCase()));
 
-  const searchActive = !!query;
-  const visibleItems = filterMenus(records, query);
-
-  // When the query changes, seed the open panels from the search results (every
-  // branch on the path to a match) so the matched sub-menu is revealed. After
-  // that the user can collapse/expand freely via the Collapse onChange below.
-  useEffect(() => {
-    setOpenKeys(query ? expandableKeys(filterMenus(records, query)) : []);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [query]);
+  const visibleItems = filtered;
 
   const onSearch = (event) => {
     setQuery(event.target.value);
@@ -351,12 +305,12 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
     <Card className="generic-list">
       <div style={{ marginBottom: 16 }}>
         <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
-          <Search placeholder="Search menus & sub-menus…" allowClear style={{ width: 300, marginBottom: '0px' }} onChange={onSearch} />
+          <Search placeholder="Enter Search Value" allowClear style={{ width: 300, marginBottom: '0px' }} onChange={onSearch} />
 
           <Space size="small">
-            {/* <Button onClick={getRecords} size={'small'} type="default">
+            <Button onClick={getRecords} size={'small'} type="default">
               <ReloadOutlined />
-            </Button> */}
+            </Button>
 
             <Switch checked={dragMode} onChange={toggleDragMode} checkedChildren="Order On" unCheckedChildren="Order Off" />
 
@@ -407,11 +361,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
             {/* {!view ? ( */}
             <Card>
               <DndProvider backend={HTML5Backend}>
-                <Collapse
-                  accordion={!searchActive}
-                  activeKey={openKeys}
-                  onChange={(keys) => setOpenKeys(Array.isArray(keys) ? keys : keys ? [keys] : [])}
-                >
+                <Collapse accordion>
                   {visibleItems && visibleItems.length > 0 ? (
                     visibleItems.map((item, index) => (
                       <Panel
@@ -439,8 +389,6 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
                             items={item.sub_menus || []}
                             model={model}
                             dragMode={dragMode}
-                            searchActive={searchActive}
-                            query={query}
                             setSelectedRecord={setSelectedRecord}
                             setDrawerTitle={setDrawerTitle}
                             setDrawerVisible={setDrawerVisible}
@@ -489,7 +437,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
   );
 };
 /* -----------------------------------------------------------------------
-   PANEL ACTIONS
+   PANEL ACTIONS 
 ------------------------------------------------------------------------ */
 function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerVisible, deleteRecord) {
   return (
@@ -552,8 +500,6 @@ function NestedMenu({
   items,
   model,
   dragMode,
-  searchActive,
-  query,
   setSelectedRecord,
   setDrawerTitle,
   setDrawerVisible,
@@ -562,22 +508,15 @@ function NestedMenu({
   onCrossLevelMove,
   onChange,
 }) {
+  // do not render Collapse
+  if (!items || items.length === 0) return null;
+
   const [localItems, setLocalItems] = useState(items);
-  // keys of currently-expanded sub-panels. Seeded from the search results when
-  // the query changes, but the user can freely toggle panels afterwards.
-  const [openKeys, setOpenKeys] = useState([]);
 
   useEffect(() => {
     setLocalItems(items);
   }, [items]);
 
-  // Seed the open sub-panels from the search path when the query changes; keep
-  // the user's toggles otherwise so a search-opened panel can be closed.
-  useEffect(() => {
-    setOpenKeys(searchActive ? (items || []).filter((c) => c.sub_menus && c.sub_menus.length > 0).map((c) => String(c.id)) : []);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [query, searchActive]);
-
   const moveSubMenu = useCallback(
     (from, to) => {
       if (!dragMode || from === to) return;
@@ -597,7 +536,7 @@ function NestedMenu({
   }
 
   return (
-    <Collapse accordion={!searchActive} activeKey={openKeys} onChange={(keys) => setOpenKeys(Array.isArray(keys) ? keys : keys ? [keys] : [])}>
+    <Collapse accordion>
       {localItems.map((child, index) => (
         <Panel
           key={child.id}
@@ -624,8 +563,6 @@ function NestedMenu({
             step={step + 1}
             items={child.sub_menus || []}
             dragMode={dragMode}
-            searchActive={searchActive}
-            query={query}
             setSelectedRecord={setSelectedRecord}
             setDrawerTitle={setDrawerTitle}
             setDrawerVisible={setDrawerVisible}

package/core/models/menus/menus.js

@@ -160,29 +160,6 @@ class MenusAPI extends Base {
     });
   };
 
-  getBranches = () => {
-    return ApiUtils.get({
-      url: 'branches',
-    });
-  };
-
-  switchBranch = (formBody, dbPtr) => {
-    return ApiUtils.post({
-      url: `auth/switch-branch`,
-      headers: { db_ptr: dbPtr },
-      formBody,
-    });
-  };
-
-  getProfile = (token) => {
-    return ApiUtils.get({
-      url: 'auth/profile',
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
-    });
-  };
-
   /**
    * create menu
    */
@@ -208,6 +185,7 @@ class MenusAPI extends Base {
         : 'menus/get-menus'; // NURA
 
     if (!dbPtr) dbPtr = localStorage.db_ptr;
+
     return this.get({
       url,
       config,
@@ -327,12 +305,6 @@ class MenusAPI extends Base {
       // }
     ];
   };
-  // license summary api call
-  getSummary = () => {
-    return ApiUtils.get({
-      url: 'license/summary',
-    });
-  };
 }
 
 export default MenusAPI;

package/core/models/roles/components/role-add/role-add.js

@@ -1,14 +1,15 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
-import { Skeleton, Typography, message, Form, Input } from 'antd';
+import { Skeleton, Typography, message, Form, Input, Collapse, Checkbox, Tag } from 'antd';
 import { GlobalContext } from './../../../../lib';
+import { Button } from './../../../../lib';
 import { ModelsAPI, PagesAPI, RolesAPI, MenusAPI } from '../../..';
-import MenuTree from './menu-tree';
 import './role-add.scss';
 
 const { Title } = Typography;
+const { Panel } = Collapse;
 
-const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_queries = [], onSubmittingChange, formRef }) => {
+const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_queries = [] }) => {
   let mode = 'Add';
   if (formContent.id) mode = 'Edit';
   else if (formContent.copy) mode = 'copy';
@@ -30,10 +31,8 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
 
   const isEdit = !!(formContent.id || formContent.copy);
   const [initialLoading, setInitialLoading] = useState(isEdit);
+  const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
-
-  // expose the form instance so the Drawer footer Save button can submit it
-  if (formRef) formRef.current = form;
   const [pages, setPages] = useState([]);
   const [models, setModels] = useState([]);
   const [menuList, setMenuList] = useState([]);
@@ -44,9 +43,6 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
   // Selected menus (array of IDs)
   const [selectedMenus, setSelectedMenus] = useState([]);
 
-  // Search term for filtering the menu list
-  const [menuSearch, setMenuSearch] = useState('');
-
   const location = useLocation();
   const query = new URLSearchParams(location.search);
   let step = parseInt(query.get('step')) || 1;
@@ -101,28 +97,40 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
     setSelectedMenus((prev) => (checked ? [...prev, id] : prev.filter((m) => m !== id)));
   };
 
-  // Recursively filter menus by caption. A menu is kept if its caption matches
-  // the search term, or if any of its descendants match (ancestors are kept so
-  // the matching child stays reachable).
-  const filterMenus = (menus, term) => {
-    if (!term) return menus;
-    const lower = term.toLowerCase();
-
-    return menus.reduce((acc, menu) => {
-      const children = filterMenus(menu.sub_menus || [], term);
-      const selfMatch = (menu.caption || '').toLowerCase().includes(lower);
-
-      if (selfMatch || children.length > 0) {
-        acc.push({ ...menu, sub_menus: children });
-      }
-      return acc;
-    }, []);
-  };
-
-  const filteredMenuList = filterMenus(menuList, menuSearch);
-
+  // Submit handler
+  //   const onSubmit = (values) => {
+  //     setLoading(true);
+
+  //     const payload = {
+  //       ...values,
+  //       menu_ids
+  // : selectedMenus,
+  //       attributes: JSON.stringify(values.attributes || {}),
+  //     };
+
+  //     if (formContent.id) {
+  //       RolesAPI.updateRole({ id: formContent.id, formBody: payload })
+  //         .then(() => {
+  //           message.success('Role Updated');
+  //           setLoading(false);
+  //           callback();
+  //         })
+  //         .catch(() => setLoading(false));
+  //     } else {
+  //       additional_queries.forEach(({ field, value }) => {
+  //         payload[field] = value;
+  //       });
+  //       RolesAPI.createRole(payload)
+  //         .then(() => {
+  //           message.success('Role Added');
+  //           setLoading(false);
+  //           callback();
+  //         })
+  //         .catch(() => setLoading(false));
+  //     }
+  //   };
   const onSubmit = async (values) => {
-    onSubmittingChange?.(true);
+    setLoading(true);
 
     // Find menus that were originally selected but now deselected
     const deselectedMenus = originalMenus.filter((id) => !selectedMenus.includes(id));
@@ -145,21 +153,13 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
     });
 
     try {
-      const res = await RolesAPI.createRole(payload); //  single API
-
-      // it via success: false — show that message as a warning.
-      if (res?.success === false) {
-        message.warning(res.message || 'Failed to save role');
-        return;
-      }
-
+      await RolesAPI.createRole(payload); //  single API
       message.success(formContent?.id ? 'Role Updated' : 'Role Added');
       callback();
     } catch (err) {
-      // Surface any unexpected backend error message as a warning.
-      message.warning(err?.message || err?.result?.message || 'Failed to save role');
+      // message.error('Something went wrong');
     } finally {
-      onSubmittingChange?.(false);
+      setLoading(false);
     }
   };
 
@@ -194,7 +194,6 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
                   display: 'flex',
                   justifyContent: 'space-between',
                   alignItems: 'center',
-                  gap: 16,
                   marginBottom: 16,
                 }}
               >
@@ -205,20 +204,14 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
                   <p style={{ color: '#999', marginBottom: 0 }}>Choose menus and set permissions</p>
                 </div>
 
-                <Input.Search
-                  allowClear
-                  placeholder="Search menus"
-                  value={menuSearch}
-                  onChange={(e) => setMenuSearch(e.target.value)}
-                  style={{ maxWidth: 260 }}
-                />
+                <Form.Item style={{ marginBottom: 0 }}>
+                  <Button loading={loading} htmlType="submit" type="primary">
+                    Save
+                  </Button>
+                </Form.Item>
               </div>
 
-              {filteredMenuList.length > 0 ? (
-                <MenuTree menus={filteredMenuList} selectedMenus={selectedMenus} toggleMenu={toggleMenu} searchActive={!!menuSearch} />
-              ) : (
-                <p style={{ color: '#999', textAlign: 'center', padding: '16px 0' }}>No menus found</p>
-              )}
+              <MenuTree menus={menuList} selectedMenus={selectedMenus} toggleMenu={toggleMenu} />
             </div>
           )}
         </Form>
@@ -228,3 +221,125 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
 };
 
 export default RoleAdd;
+
+// ------------------------
+// Recursive Nested Menu Component
+// ------------------------
+// ------------------------
+// Recursive Nested Menu Component
+// ------------------------
+const MenuTree = ({ menus, selectedMenus, toggleMenu, parentId = null }) => {
+  // Helper: check if parent should be checked
+  const isParentChecked = (menu) => {
+    if (!menu.sub_menus || menu.sub_menus.length === 0) {
+      return selectedMenus.includes(menu.id);
+    }
+    const allChildIds = menu.sub_menus.map((c) => c.id);
+    return allChildIds.every((id) => selectedMenus.includes(id));
+  };
+
+  // Helper: check if parent is indeterminate
+  const isParentIndeterminate = (menu) => {
+    if (!menu.sub_menus || menu.sub_menus.length === 0) return false;
+    const allChildIds = menu.sub_menus.map((c) => c.id);
+    const checkedCount = allChildIds.filter((id) => selectedMenus.includes(id)).length;
+    return checkedCount > 0 && checkedCount < allChildIds.length;
+  };
+
+  return (
+    <>
+      {menus.map((menu) => {
+        const children = menu.sub_menus || [];
+        const parentChecked = isParentChecked(menu);
+        const parentIndeterminate = isParentIndeterminate(menu);
+
+        const onParentChange = (checked) => {
+          toggleMenu(menu.id, checked);
+          // toggle children recursively
+          children.forEach((c) => toggleMenuRecursive(c, checked));
+        };
+
+        const toggleMenuRecursive = (menu, checked) => {
+          toggleMenu(menu.id, checked);
+          if (menu.sub_menus && menu.sub_menus.length > 0) {
+            menu.sub_menus.forEach((c) => toggleMenuRecursive(c, checked));
+          }
+        };
+
+        if (children.length === 0) {
+          return (
+            <div
+              style={{
+                justifyContent: 'space-between',
+                display: 'flex',
+                alignItems: 'center',
+                border: '1px solid rgba(198, 195, 195, 0.85)',
+                // borderRadius: 6,
+                padding: '12px 16px',
+                marginBottom: 6,
+                background: '#fff',
+              }}
+            >
+              <div
+                key={menu.id}
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  gap: 8,
+                }}
+              >
+                <Checkbox
+                  checked={selectedMenus.includes(menu.id)}
+                  onChange={(e) => {
+                    const checked = e.target.checked;
+
+                    toggleMenu(menu.id, checked);
+
+                    //  FORCE parent selection
+                    if (checked && parentId) {
+                      toggleMenu(parentId, true);
+                    }
+                  }}
+                />
+                <span>{menu.caption}</span>
+              </div>
+              <Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
+            </div>
+          );
+        }
+
+        return (
+          <Collapse
+            key={menu.id}
+            style={{ marginBottom: 6 }}
+            // defaultActiveKey={[menu.id]}
+          >
+            <Panel
+              key={menu.id}
+              header={
+                <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+                  <div
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                      gap: 8,
+                    }}
+                    onClick={(e) => e.stopPropagation()}
+                  >
+                    <Checkbox checked={parentChecked} indeterminate={parentIndeterminate} onChange={(e) => onParentChange(e.target.checked)} />
+                    <span>{menu.caption}</span>
+                  </div>
+                  <Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
+                </div>
+              }
+            >
+              <div style={{ paddingLeft: 20 }}>
+                <MenuTree menus={children} selectedMenus={selectedMenus} toggleMenu={toggleMenu} parentId={menu.id} />
+              </div>
+            </Panel>
+          </Collapse>
+        );
+      })}
+    </>
+  );
+};

package/core/models/roles/components/role-list/role-list.js

@@ -40,12 +40,6 @@ const RoleList = ({ model, match, relativeAdd = false, additional_queries = [],
 
   const [single, setSingle] = useState({});
 
-  // tracks RoleAdd form submission so the Drawer footer button shows loading
-  const [submitting, setSubmitting] = useState(false);
-
-  // holds the RoleAdd form instance so the Drawer footer Save button can submit it
-  const formRef = useRef(null);
-
   var [queryValue, setQueryValue] = useState('');
 
   const { Search } = Input;
@@ -366,26 +360,12 @@ const RoleList = ({ model, match, relativeAdd = false, additional_queries = [],
         destroyOnClose
         onClose={closeModal}
         bodyStyle={{ paddingBottom: 80 }}
-        footer={
-          <div style={{ textAlign: 'right' }}>
-            <Space size="small">
-              <Button type="default" onClick={closeModal}>
-                Cancel
-              </Button>
-              <Button type="primary" loading={submitting} onClick={() => formRef.current?.submit()}>
-                Save
-              </Button>
-            </Space>
-          </div>
-        }
       >
         <model.ModalAddComponent
           match={match}
           model={model}
           additional_queries={additional_queries}
           formContent={single}
-          formRef={formRef}
-          onSubmittingChange={setSubmitting}
           callback={(event) => {
             closeModal();
             getRecords();

package/core/models/roles/roles.js

@@ -163,9 +163,6 @@ class RolesAPI extends BaseAPI {
     return ApiUtils.post({
       url: `core-roles/save-core-role`,
       formBody,
-      // Let the caller surface the backend message (as a warning) instead of
-      // the default red error toast from the http layer.
-      hideError: true,
     });
   };
 

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

@@ -160,7 +160,7 @@ export default function AssignRole() {
     const role_id = role.id;
     try {
       const res = await MenusAPI.getCoreMenuByRoleId(role_id);
-      const allMenus = Array.isArray(res?.result) ? res.result : [];
+      const allMenus = res.result || [];
 
       setModules(allMenus);
     } catch (e) {
@@ -264,12 +264,11 @@ export default function AssignRole() {
   const handleViewAll = async () => {
     setLoadingMenus(true);
     setModules([]);
-    setActiveRole({ name: 'All Roles', isViewAll: true });
+    setActiveRole({ name: 'All Roles' });
 
     try {
       const res = await MenusAPI.getMenubyUser(id);
-      const userMenus = Array.isArray(res?.result?.menus) ? res.result.menus : [];
-      setModules(userMenus);
+      setModules(res?.result?.menus ?? []);
       setLoadingMenus(false);
     } catch (err) {
       setLoadingMenus(false);
@@ -278,18 +277,6 @@ export default function AssignRole() {
     }
   };
 
-  /**
-   * Context-specific empty-state message for the right (menus) panel:
-   * - View Access for a user with no roles → no role assigned
-   * - A selected role with no menus → no menus assigned
-   * - Nothing selected yet → prompt to pick a role
-   */
-  const emptyMenusMessage = !activeRole
-    ? 'Select a role to view menus'
-    : activeRole.isViewAll
-    ? 'No role has been assigned to this user.'
-    : 'No menus have been assigned to this role.';
-
   return (
     <section className="assign-role">
       {/* LEFT PANEL */}
@@ -396,19 +383,17 @@ export default function AssignRole() {
           padding: 16,
         }}
       >
-        {modules.length > 0 && (
-          <div className="menus-header">
-            <div className="title">Menus {activeRole ? `– ${activeRole.name}` : ''}</div>
-            <div className="sub-text">You don’t have permission to edit this here. Update it in Role Settings.</div>
-          </div>
-        )}
+        <div className="menus-header">
+          <div className="title">Menus {activeRole ? `– ${activeRole.name}` : ''}</div>
+          <div className="sub-text">You don’t have permission to edit this here. Update it in Role Settings.</div>
+        </div>
 
         <div className="menus-content">
           {loadingMenus ? (
             <Skeleton active paragraph={{ rows: 6 }} />
           ) : modules.length === 0 ? (
             <div className="empty-state">
-              <Empty description={emptyMenusMessage} />
+              <Empty description="Select a role to view menus" />
             </div>
           ) : (
             <MenuTree menus={modules} selectedMenus={selectedMenus} toggleMenu={toggleMenu} showCheckbox={false} />