ui-soxo-bootstrap-core 2.6.37 → 2.6.40-dev.0

package/core/lib/elements/basic/dragabble-wrapper/draggable-wrapper.js

@@ -1,26 +1,27 @@
-import React, { useRef } from 'react';
+import React, { useRef, useEffect } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 
-export default function DraggableWrapper({ id, index, movePanel, item, dragEnabled, level, parentId, onCrossLevelMove, canAcceptChildren }) {
-  const autoScrollWindow = (monitor) => {
-    const offset = monitor.getClientOffset();
-    if (!offset) return;
-
-    const EDGE = 80;
-    const SPEED = 20;
-
-    const viewportHeight = window.innerHeight;
-
-    // 🔼 scroll UP
-    if (offset.y < EDGE) {
-      window.scrollBy(0, -SPEED);
-    }
+// Walk up the DOM to find the nearest vertically-scrollable ancestor.
+// Returns null when the page (window) is the scroller.
+function getScrollableAncestor(node) {
+  let el = node?.parentElement;
+  while (el) {
+    const { overflowY } = window.getComputedStyle(el);
+    const scrollable = overflowY === 'auto' || overflowY === 'scroll' || overflowY === 'overlay';
+    if (scrollable && el.scrollHeight > el.clientHeight) return el;
+    el = el.parentElement;
+  }
+  return null;
+}
 
-    // 🔽 scroll DOWN
-    if (offset.y > viewportHeight - EDGE) {
-      window.scrollBy(0, SPEED);
-    }
-  };
+export default function DraggableWrapper({ id, index, movePanel, item, dragEnabled, level, parentId, onCrossLevelMove, canAcceptChildren }) {
+  // Root DOM node, used to locate the scrollable ancestor at drag time
+  const rootRef = useRef(null);
+  // Latest pointer Y, fed by a document-level `dragover` listener (see effect below)
+  const pointerY = useRef(0);
+  const rafRef = useRef(null);
+  // The scrollable container to auto-scroll (resolved when a drag starts)
+  const scrollContainerRef = useRef(null);
 
   const [{ isDragging }, drag] = useDrag({
     type: 'PANEL',
@@ -31,12 +32,78 @@ export default function DraggableWrapper({ id, index, movePanel, item, dragEnabl
     }),
   });
 
+  /**
+   * Continuous edge auto-scroll while THIS item is being dragged.
+   *
+   * Driven by a document-level `dragover` listener + requestAnimationFrame loop
+   * rather than the drop target's `hover` handler. `hover` only fires while the
+   * pointer is over a droppable panel and only on movement, so scrolling UP
+   * failed: the top of the viewport is the (non-droppable) header, and holding
+   * the pointer still at an edge produced no events. The rAF loop keeps
+   * scrolling from the last known pointer position regardless of what's beneath.
+   *
+   * The list may scroll inside an overflow container rather than the window, so
+   * we resolve the nearest scrollable ancestor and scroll that (falling back to
+   * the window), computing the edges from the container's own bounds.
+   */
+  useEffect(() => {
+    if (!isDragging) return;
+
+    const EDGE = 80;
+    const SPEED = 20;
+
+    scrollContainerRef.current = getScrollableAncestor(rootRef.current);
+
+    const onDragOver = (e) => {
+      pointerY.current = e.clientY;
+    };
+
+    const tick = () => {
+      const y = pointerY.current;
+
+      if (y > 0) {
+        const container = scrollContainerRef.current;
+
+        if (container) {
+          const rect = container.getBoundingClientRect();
+          // near container top
+          if (y < rect.top + EDGE) {
+            container.scrollTop -= SPEED;
+          }
+          // near container bottom
+          else if (y > rect.bottom - EDGE) {
+            container.scrollTop += SPEED;
+          }
+        } else {
+          const viewportHeight = window.innerHeight;
+          // near viewport top
+          if (y < EDGE) {
+            window.scrollBy(0, -SPEED);
+          }
+          // near viewport bottom
+          else if (y > viewportHeight - EDGE) {
+            window.scrollBy(0, SPEED);
+          }
+        }
+      }
+
+      rafRef.current = requestAnimationFrame(tick);
+    };
+
+    window.addEventListener('dragover', onDragOver);
+    rafRef.current = requestAnimationFrame(tick);
+
+    return () => {
+      window.removeEventListener('dragover', onDragOver);
+      if (rafRef.current) cancelAnimationFrame(rafRef.current);
+      pointerY.current = 0;
+      scrollContainerRef.current = null;
+    };
+  }, [isDragging]);
+
   const [{ isOver, canDrop }, drop] = useDrop({
     accept: 'PANEL',
     hover: (dragItem, monitor) => {
-      //  THIS FIXES BOTTOM → TOP
-      autoScrollWindow(monitor);
-
       if (dragItem.index === index) return;
 
       if (dragItem.level === level && dragItem.parentId === parentId) {
@@ -85,7 +152,7 @@ export default function DraggableWrapper({ id, index, movePanel, item, dragEnabl
   const childZoneBackgroundColor = isOverChild && canDropChild ? '#d4f4dd' : 'transparent';
 
   return (
-    <div style={{ width: '100%', display: 'flex' }}>
+    <div ref={rootRef} style={{ width: '100%', display: 'flex' }}>
       {/* HEADER DROP — reorder only */}
       <div ref={drop}>
         <div

package/core/lib/elements/basic/table/table.js

@@ -58,12 +58,7 @@ const TableComponent = ({ columns, dataSource, loading, fixed, scroll, summary,
 
   return (
     <Table
-      title={() =>
-        // <div style={{ fontWeight: 'bold', fontSize: 16, padding: '8px 16px' }}>
-        title ? title : ''
-        // </div>
-      }
-      //   columns={updatedColumns}
+      title={title ? () => title : undefined}
       scroll={scroll}
       dataSource={dataSource}
       loading={loading}

package/core/lib/elements/complex/qrscanner/qrscanner.js

@@ -8,7 +8,7 @@
  */
 
 import React, { useEffect, useRef } from 'react';
-import { Html5Qrcode } from 'html5-qrcode';
+import { Html5Qrcode } from 'html5-qrcode/cjs/index.js';
 
 /**
  * QrScanner Component

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

@@ -0,0 +1,14 @@
+// ------------------------
+// Menu caption + path label
+// ------------------------
+const MenuLabel = ({ menu }) => {
+  const path = menu.path || menu.route;
+  return (
+    <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', gap: 8, lineHeight: 1.3 }}>
+      <span>{menu.caption}</span>
+      {path ? <span style={{ color: '#999', fontSize: 12 }}>{path}</span> : null}
+    </div>
+  );
+};
+
+export default MenuLabel;

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

@@ -0,0 +1,127 @@
+import { Collapse, Checkbox, Tag } from 'antd';
+
+import MenuLabel from './menu-label';
+
+const { Panel } = Collapse;
+
+// ------------------------
+// Recursive Nested Menu Component
+// ------------------------
+const MenuTree = ({ menus, selectedMenus, toggleMenu, parentId = null, searchActive = false }) => {
+  // 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);
+                    }
+                  }}
+                />
+                <MenuLabel menu={menu} />
+              </div>
+              <Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
+            </div>
+          );
+        }
+
+        return (
+          <Collapse
+            // remount when search toggles so panels open while searching and collapse when cleared
+            key={`${menu.id}-${searchActive}`}
+            style={{ marginBottom: 6 }}
+            defaultActiveKey={searchActive ? [menu.id] : undefined}
+          >
+            <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)} />
+                    <MenuLabel menu={menu} />
+                  </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} searchActive={searchActive} />
+              </div>
+            </Panel>
+          </Collapse>
+        );
+      })}
+    </>
+  );
+};
+
+export default MenuTree;

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

@@ -1,15 +1,14 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
-import { Skeleton, Typography, message, Form, Input, Collapse, Checkbox, Tag } from 'antd';
+import { Skeleton, Typography, message, Form, Input } 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 = [] }) => {
+const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_queries = [], onSubmittingChange, formRef }) => {
   let mode = 'Add';
   if (formContent.id) mode = 'Edit';
   else if (formContent.copy) mode = 'copy';
@@ -31,8 +30,10 @@ 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([]);
@@ -43,6 +44,9 @@ 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;
@@ -97,40 +101,28 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
     setSelectedMenus((prev) => (checked ? [...prev, id] : prev.filter((m) => m !== id)));
   };
 
-  // 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));
-  //     }
-  //   };
+  // 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);
+
   const onSubmit = async (values) => {
-    setLoading(true);
+    onSubmittingChange?.(true);
 
     // Find menus that were originally selected but now deselected
     const deselectedMenus = originalMenus.filter((id) => !selectedMenus.includes(id));
@@ -159,7 +151,7 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
     } catch (err) {
       // message.error('Something went wrong');
     } finally {
-      setLoading(false);
+      onSubmittingChange?.(false);
     }
   };
 
@@ -194,6 +186,7 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
                   display: 'flex',
                   justifyContent: 'space-between',
                   alignItems: 'center',
+                  gap: 16,
                   marginBottom: 16,
                 }}
               >
@@ -204,14 +197,20 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
                   <p style={{ color: '#999', marginBottom: 0 }}>Choose menus and set permissions</p>
                 </div>
 
-                <Form.Item style={{ marginBottom: 0 }}>
-                  <Button loading={loading} htmlType="submit" type="primary">
-                    Save
-                  </Button>
-                </Form.Item>
+                <Input.Search
+                  allowClear
+                  placeholder="Search menus"
+                  value={menuSearch}
+                  onChange={(e) => setMenuSearch(e.target.value)}
+                  style={{ maxWidth: 260 }}
+                />
               </div>
 
-              <MenuTree menus={menuList} selectedMenus={selectedMenus} toggleMenu={toggleMenu} />
+              {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>
+              )}
             </div>
           )}
         </Form>
@@ -221,125 +220,3 @@ 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,6 +40,12 @@ 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;
@@ -360,12 +366,26 @@ 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();