ui-soxo-bootstrap-core 2.6.40 → 2.6.42

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));
@@ -153,13 +145,21 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
     });
 
     try {
-      await RolesAPI.createRole(payload); //  single API
+      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;
+      }
+
       message.success(formContent?.id ? 'Role Updated' : 'Role Added');
       callback();
     } catch (err) {
-      // message.error('Something went wrong');
+      // Surface any unexpected backend error message as a warning.
+      message.warning(err?.message || err?.result?.message || 'Failed to save role');
     } finally {
-      setLoading(false);
+      onSubmittingChange?.(false);
     }
   };
 
@@ -194,6 +194,7 @@ const RoleAdd = ({ model, callback, edit, formContent = {}, match, additional_qu
                   display: 'flex',
                   justifyContent: 'space-between',
                   alignItems: 'center',
+                  gap: 16,
                   marginBottom: 16,
                 }}
               >
@@ -204,14 +205,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 +228,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();

package/core/models/roles/roles.js

@@ -163,6 +163,9 @@ 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 = res.result || [];
+      const allMenus = Array.isArray(res?.result) ? res.result : [];
 
       setModules(allMenus);
     } catch (e) {
@@ -264,11 +264,12 @@ export default function AssignRole() {
   const handleViewAll = async () => {
     setLoadingMenus(true);
     setModules([]);
-    setActiveRole({ name: 'All Roles' });
+    setActiveRole({ name: 'All Roles', isViewAll: true });
 
     try {
       const res = await MenusAPI.getMenubyUser(id);
-      setModules(res?.result?.menus ?? []);
+      const userMenus = Array.isArray(res?.result?.menus) ? res.result.menus : [];
+      setModules(userMenus);
       setLoadingMenus(false);
     } catch (err) {
       setLoadingMenus(false);
@@ -277,6 +278,18 @@ 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 */}
@@ -383,17 +396,19 @@ export default function AssignRole() {
           padding: 16,
         }}
       >
-        <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>
+        {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-content">
           {loadingMenus ? (
             <Skeleton active paragraph={{ rows: 6 }} />
           ) : modules.length === 0 ? (
             <div className="empty-state">
-              <Empty description="Select a role to view menus" />
+              <Empty description={emptyMenusMessage} />
             </div>
           ) : (
             <MenuTree menus={modules} selectedMenus={selectedMenus} toggleMenu={toggleMenu} showCheckbox={false} />

package/core/modules/steps/steps.js

@@ -1290,7 +1290,27 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
               </div>
             )} */}
 
-            <div className="steps-top-bar">
+            <div className={`steps-top-bar${isStepFullscreen ? ' is-fullscreen' : ''}`}>
+              {/*
+                Full-screen toggle is anchored to the far left of the bar so the
+                step tabs can stretch across the middle and the primary CTA sits
+                flush right (see design).
+              */}
+              <Button
+                className="steps-fullscreen-toggle"
+                type="dashed"
+                icon={isStepFullscreen ? <CompressOutlined /> : <ExpandOutlined />}
+                onClick={toggleStepFullscreen}
+                aria-label={isStepFullscreen ? 'Exit Full Screen' : 'Full Screen'}
+                title={isStepFullscreen ? 'Exit Full Screen' : 'Full Screen'}
+              >
+                {isStepFullscreen ? 'Exit Full Screen' : 'Full Screen'}
+              </Button>
+
+              {/*
+                Breadcrumb strip stays visible in fullscreen mode too so the
+                user keeps the step timeline / navigation while presenting.
+              */}
               <div className="steps-breadcrumb-strip">
                 {steps.length ? (
                   steps.map((stepItem, stepIndex) => {
@@ -1315,10 +1335,6 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
               </div>
 
               <div className="steps-nav-actions">
-                <Button type="dashed" icon={isStepFullscreen ? <CompressOutlined /> : <ExpandOutlined />} onClick={toggleStepFullscreen}>
-                  {isStepFullscreen ? 'Exit Full Screen' : 'Full Screen'}
-                </Button>
-
                 {/*
                   Previous-process button.
                   - Only relevant at the start of a process (`activeStep === 0`)
@@ -1333,7 +1349,13 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
                 )}
 
                 {activeStep > 0 && (
-                  <Button type="default" icon={<ArrowLeftOutlined />} onClick={handlePrevious}>
+                  <Button
+                    type="default"
+                    icon={<ArrowLeftOutlined />}
+                    onClick={handlePrevious}
+                    aria-label="Back"
+                    title="Back"
+                  >
                     Back
                   </Button>
                 )}
@@ -1366,7 +1388,13 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
                     )}
                   </>
                 ) : (
-                  <Button type="primary" disabled={!isStepCompleted} onClick={handleNext}>
+                  <Button
+                    type="primary"
+                    disabled={!isStepCompleted}
+                    onClick={handleNext}
+                    aria-label={activeStep === 0 ? (FIRST_STEP_LABELS[processName?.trim().toLowerCase()] ?? 'Next') : 'Next'}
+                    title={activeStep === 0 ? (FIRST_STEP_LABELS[processName?.trim().toLowerCase()] ?? 'Next') : 'Next'}
+                  >
                     {/*
                       First-step label is resolved via FIRST_STEP_LABELS using
                       the process name (lowercased + trimmed) as the key. Known
@@ -1464,10 +1492,10 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
                     </button>
                   </>
                 ) : null}
-                <div
+                {/* <div
                   key={`${currentProcessId}_${activeStep}`}
                   className={`steps-chat-step-card ${stepSlideDirection === 'backward' ? 'slide-backward' : 'slide-forward'}`}
-                >
+                > */}
                   {/* <div className="steps-chat-step-top">
                     <span className="steps-index-pill">
                       Step {Math.min(activeStep + 1, steps.length || 1)} of {steps.length || 1}
@@ -1476,15 +1504,15 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
                     {currentStep?.step_description ? <p className="steps-description">{currentStep.step_description}</p> : null}
                   </div> */}
 
-                  <div className="steps-chat-step-component">
+                  {/* <div className="steps-chat-step-component"> */}
                     {loading ? (
                       <div className="steps-chat-loading">
                         <Spin />
                       </div>
                     ) : null}
                     {!loading ? renderDynamicStep() : null}
-                  </div>
-                </div>
+                  {/* </div> */}
+                {/* </div> */}
               </div>
             </div>