ui-soxo-bootstrap-core 2.6.1-dev.4 → 2.6.1-dev.6

package/core/models/base/base.js

@@ -88,9 +88,13 @@ class BaseAPI {
      * Get the data from the table
      */
     get(config = {}) {
-        // Get the records from firebase
-
-        return ApiUtils.get({ url: config.url || this.endpoint, config });
+        const { url, headers, ...rest } = config;
+        return ApiUtils.get({
+            url: url || this.endpoint,
+            headers,
+            config: rest,
+            ...rest,
+        });
     }
 
     getRelations(id) {

package/core/models/menus/menus.js

@@ -177,16 +177,21 @@ class MenusAPI extends Base {
    * @param {*} menu
    * @returns
    */
-  getMenus = (config) => {
+  getMenus = (config, dbPtr = null) => {
     // Use 'core-menus' endpoint if REACT_APP_USE_CORE_MENUS is true (used for Matria)
     const url =
       process.env.REACT_APP_USE_CORE_MENUS === 'true'
         ? 'core-menus/get-menus' // Matria
         : 'menus/get-menus'; // NURA
 
+    if (!dbPtr) dbPtr = localStorage.db_ptr;
+
     return this.get({
       url,
       config,
+      headers: {
+        db_ptr: dbPtr,
+      },
     }).then((result) => result);
   };
 

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

@@ -93,10 +93,10 @@ export default function AssignRole() {
       const roleList = Array.isArray(roleRes?.result) ? roleRes.result : [];
 
       //  Extract VALID role IDs (ignore nulls & duplicates)
-      const roleIds = [...new Set(list.filter((item) => item.role_id && item.active === 'Y').map((item) => Number(item.role_id)))];
+      const roleIds = [...new Set(roleList.filter((item) => item.role_id && item.active === 'Y').map((item) => Number(item.role_id)))];
 
       setSelectedRoles(roleIds);
-      setInitialRoles(roleIds); 
+      setInitialRoles(roleIds);
     } catch (e) {
       console.error(e);
       message.error('Unable to load user details');
@@ -206,10 +206,10 @@ export default function AssignRole() {
    * @returns {Promise<void>}
    */
   const handleSaveUserRole = async () => {
-   if (!id) {
-    message.error('Invalid user');
-    return;
-  }
+    if (!id) {
+      message.error('Invalid user');
+      return;
+    }
     // start button spinner
     setSaving(true);
 
@@ -236,9 +236,8 @@ export default function AssignRole() {
       // Only show success AFTER all saves
 
       message.success('User roles updated successfully');
-      
-      await loadUser();
 
+      await loadUser();
     } catch (err) {
       console.error(err);
       message.error('Failed to save user roles');
@@ -248,6 +247,19 @@ export default function AssignRole() {
     }
   };
 
+  // Role Change
+  const rolesChanged = useMemo(() => {
+    // Length mismatch means roles were added or removed
+    if (initialRoles.length !== selectedRoles.length) return true;
+
+    // Sort both arrays before comparison (order should not matter)
+    const sortedInitial = [...initialRoles].sort();
+    const sortedSelected = [...selectedRoles].sort();
+
+    // Check for any value difference
+    return sortedInitial.some((value, index) => value !== sortedSelected[index]);
+  }, [initialRoles, selectedRoles]);
+
   return (
     <section className="assign-role">
       {/* LEFT PANEL */}
@@ -308,9 +320,11 @@ export default function AssignRole() {
         </div>
 
         <div className="footer-actions">
-          <Button type="primary" onClick={handleSaveUserRole} loading={saving} disabled={!selectedRoles.length}>
-            Save
-          </Button>
+          {rolesChanged && (
+            <Button type="primary" onClick={handleSaveUserRole} loading={saving}>
+              Save
+            </Button>
+          )}
         </div>
       </Card>
     </section>

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

@@ -27,12 +27,18 @@
     .role-list-header {
       display: flex;
       justify-content: space-between;
-      margin-bottom: 12px;
+      align-items: center;
       strong {
         font-weight: 600;
       }
     }
 
+    .view-all-btn {
+      cursor: pointer;
+      color: #1677ff;
+      font-weight: 500;
+    }
+
     .role-search {
       margin: 12px 0;
     }

package/core/models/users/components/user-add/user-add.js

@@ -30,7 +30,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   const [selectedBranches, setSelectedBranches] = useState([]);
 
   // for default branch
-  const [defaultBranch, setDefaultBranch] = useState(null);
+  // const [defaultBranch, setDefaultBranch] = useState(null);
   //Need to check this condition
   const [authentication, setAuthentication] = useState(false);
 
@@ -270,8 +270,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   const getStaff = () => {
     UsersAPI.getAllStaff()
       .then((res) => {
-        console.log('Staff List Response:', res);
-
         if (Array.isArray(res)) {
           const list = res.map((staff) => ({
             label: `${staff.shortName || 'No Name'} (${staff.id})`,
@@ -325,20 +323,25 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     }
     if (!formContent) return;
 
-    // normalize branch ids to NUMBER
     const org =
       typeof formContent.organization_details === 'string' ? JSON.parse(formContent.organization_details) : formContent.organization_details;
 
+    // normalize branch ids to NUMBER
     const branchIds = (org?.branch_ids || []).map(Number);
-    const defaultBr = formContent.defaultBranch ? Number(formContent.defaultBranch) : null;
+
+    // find default branch pointer
+    const defaultBranchObj = org?.branch?.find((br) => br.defaultBranch);
+
+    // extract dbPtr (branch code)
+    const defaultBranchCode = defaultBranchObj?.branch_id ? Number(defaultBranchObj.branch_id) : undefined;
 
     // state (for filtering)
     setSelectedBranches(branchIds);
 
-    // form (source of truth)
+    // form values
     form.setFieldsValue({
       selectedBranches: branchIds,
-      defaultBranch: defaultBr,
+      defaultBranch: defaultBranchCode,
     });
   }, [formContent, form]);
   // Generate branch options for Select component
@@ -669,7 +672,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
             <Col span={8}>
               {/* Default Branch */}
               <Form.Item label="Default Branch" name="defaultBranch" rules={[{ required: true, message: 'Please select default branch' }]}>
-                <Select placeholder="Select Default Branch" onChange={setDefaultBranch}>
+                <Select placeholder="Select Default Branch">
                   {branchOptions
                     .filter((opt) => selectedBranches.includes(Number(opt.value)))
                     .map((opt) => (

package/core/models/users/components/user-add/user-edit.js

@@ -37,6 +37,13 @@ export default function UserEdit(record) {
           } catch (e) {
             orgDetails = {};
           }
+
+          // find default branch pointer
+          const defaultBranchObj = orgDetails?.branch?.find((br) => br.defaultBranch);
+
+          // extract dbPtr (branch code)
+          const defaultBranchCode = defaultBranchObj?.branch_id ? Number(defaultBranchObj.branch_id) : undefined;
+
           // Construct mapped data object
           const mappedData = {
             id: apiData.id,
@@ -49,7 +56,7 @@ export default function UserEdit(record) {
             // Handle selected branches and default branch
             organization_details: orgDetails,
             selectedBranches: orgDetails.branch_ids || [],
-            defaultBranch: apiData.branch_id || null,
+            defaultBranch: defaultBranchCode || null,
             role_id: apiData.role_id,
             password: apiData.password,
             user_group: apiData.user_group,

package/core/models/users/users.js

@@ -292,7 +292,12 @@ class Users extends Base {
   information from the API. */
 
   getUser = ({ id }) => {
-    return ApiUtils.get({ url: `users/${id}` });
+    return ApiUtils.get({
+      url: `users/${id}`,
+      headers: {
+        db_ptr: 'nuraho',
+      },
+    });
   };
   /* The `getUserRole` method is a function that takes an object with an `id` property as a parameter.
   It then uses the `ApiUtils.get` function to make a GET request to the endpoint `core-user-roles`

package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.js

@@ -314,8 +314,12 @@ export default function ReportingDashboard({
 
       // Fetch result
       const result = await CoreScripts.getReportingLisitng(coreScriptId, formBody, dbPtr);
+
+      const apiData = Array.isArray(result) ? result : Array.isArray(result?.result) ? result.result : [];
+
       // Handle both result formats
-      let resultDetails = result[0];
+      let resultDetails = apiData[0] || [];
+      
       if (result?.result && result?.result[0]) {
         resultDetails = result.result[0];
       }

package/package.json

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