ui-soxo-bootstrap-core 2.6.3 → 2.6.4

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

@@ -6,7 +6,7 @@ import { Skeleton, Typography, message, Switch, Form, Input, Select, Checkbox, R
 
 import AsyncSelect from 'react-select/async';
 
-import { Table, Card, Button, JSONInput, GlobalContext } from './../../../../lib/';
+import { Table, Card, Button, JSONInput, GlobalContext, safeJSON } from './../../../../lib/';
 
 import { ModelsAPI, PagesAPI, RolesAPI } from '../../..';
 
@@ -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);
 
@@ -42,7 +42,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   const [selectedStaff, setSelectedStaff] = useState(null);
   const [staffList, setStaffList] = useState([]);
   /**Converting to JSON */
-  let firmDetails = JSON.parse(user.firm.f_otherdetails1);
+  const firmDetails = safeJSON(user?.firm?.f_otherdetails1) ?? {};
 
   /**Variable for cheaking mandatory condition of mobile*/
   let mobileRequired;
@@ -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,
@@ -81,7 +88,17 @@ export default function UserEdit(record) {
             <Skeleton active />
           </div>
         ) : (
-          <UserAdd mode="Edit" formContent={userData} callback={() => setVisible(false)} edit={true} />
+          <UserAdd
+            mode="Edit"
+            formContent={userData}
+            callback={() => {
+              setVisible(false);
+              if (record.callback) {
+                record.callback();
+              }
+            }}
+            edit={true}
+          />
         )}
       </Modal>
     </div>

package/core/models/users/users.js

@@ -149,7 +149,13 @@ class Users extends Base {
    * @returns
    */
   create = (formBody) => {
-    return ApiUtils.post({ url: `users/create-user`, formBody });
+    return ApiUtils.post({
+      url: `users/create-user`,
+      formBody,
+      headers: {
+        db_ptr: 'nuraho',
+      },
+    });
   };
 
   /**
@@ -161,7 +167,7 @@ class Users extends Base {
     return ApiUtils.get({
       url: `branch-master/get-records`,
       headers: {
-        db_ptr: process.env.REACT_APP_HO_DB_PTR,
+        db_ptr: 'nuraho',
       },
     });
   };
@@ -271,25 +277,35 @@ class Users extends Base {
    * @returns
    */
   updateUser = ({ id, formBody }) => {
-    return ApiUtils.put({ url: `users/update-user/${id}`, formBody });
+    return ApiUtils.put({
+      url: `users/update-user/${id}`,
+      formBody,
+      headers: {
+        db_ptr: 'nuraho',
+      },
+    });
   };
-  
+
   /* The `getUser` 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 `users/` to fetch
   user data based on the provided `id`. This method is used to retrieve a specific user's
   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.
+  /* 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`
   with the `user_id` parameter set to the provided `id`. This method is used to fetch the role or
   roles associated with a specific user from the API. */
-  
+
   getUserRole = ({ id }) => {
     return ApiUtils.get({ url: `core-user-roles?user_id=${id}&active=Y` });
-
   };
 
   /**

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

@@ -292,8 +292,11 @@ 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];
       }
@@ -324,7 +327,6 @@ export default function ReportingDashboard({
       }
     } catch (error) {
       console.error('Error fetching report data:', error);
-      message.warn('Please try again');
     } finally {
       // Always runs, success or error
       setLoading(false);

package/package.json

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