ui-soxo-bootstrap-core 2.6.0 → 2.6.1-dev.10

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, CountryPhoneInput, phoneValidator } 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;
@@ -95,7 +95,10 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   const [body, setBody] = useState(formContent);
 
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
-  const [visible, setVisible] = useState(false);
+
+  // state for doctor and staff visibility
+  const [doctorVisible, setDoctorVisible] = useState(false);
+  const [staffVisible, setStaffVisible] = useState(false);
 
   const formData = {
     ...body,
@@ -270,8 +273,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 +326,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
@@ -351,6 +357,10 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
    * Submit values
    */
   const onSubmit = (values) => {
+    const mobileData = values.mobile;
+
+    const mobileWithCountryCode = `+${mobileData.code.dialCode}${mobileData.value}`;
+
     values.defaultBranch = String(values.defaultBranch);
 
     /**If PanelOpen is open and edit mode then password will be existing password else new password*/
@@ -372,6 +382,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     values = {
       ...values,
       auth_type: 'LDAP',
+      mobile: mobileWithCountryCode,
       FA: authentication,
     };
 
@@ -538,31 +549,17 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                             borderTop: '1px solid #f0f0f0',
                             color: '#1890ff',
                           }}
-                          onClick={() => setVisible(true)}
+                          onClick={() => setDoctorVisible(true)}
                         >
                           + Add New Doctor
                         </div>
                       </>
                     )}
                   />
-                  {/* Render DoctorAdd OUTSIDE the Select */}
-                  <DoctorAdd
-                    visible={visible}
-                    onCancel={() => setVisible(false)}
-                    attributes={attributes}
-                    doctorData={selectedDoctor}
-                    doctorId={doctorID}
-                    onSuccess={getDoctors}
-                  />
                 </Form.Item>
               )}
               {userType === 'STAFF' && (
-                <Form.Item
-                  name="staff_code"
-                  preserve={false} //  THIS FIXES IT
-                  label="Staff Code"
-                  rules={[{ required: true, message: 'Please select a staff code' }]}
-                >
+                <Form.Item name="staff_code" label="Staff Code" rules={[{ required: true, message: 'Please select a staff code' }]}>
                   <Select
                     placeholder="Select Code"
                     options={staffList}
@@ -581,18 +578,13 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                             borderTop: '1px solid #f0f0f0',
                             color: '#1890ff',
                           }}
-                          onClick={() => setVisible(true)}
+                          onClick={() => setStaffVisible(true)}
                         >
                           + Add New Staff
                         </div>
                       </>
                     )}
                   />
-                  {/* Render DoctorAdd OUTSIDE the Select */}
-
-                  <StaffAdd visible={visible} onCancel={() => setVisible(false)} staffData={selectedStaff} staffId={staffID} onSuccess={getStaff} />
-
-                  <></>
                 </Form.Item>
               )}
             </Col>
@@ -610,23 +602,10 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
               <Form.Item
                 name="mobile"
                 label="Mobile"
-                rules={[
-                  { required: true, message: 'Please enter your mobile number' },
-                  {
-                    pattern: /^[0-9]{10}$/,
-                    message: 'Mobile number must be exactly 10 digits',
-                  },
-                ]}
+                validateTrigger="onBlur"
+                rules={[{ required: true, message: 'Mobile number required' }, { validator: phoneValidator }]}
               >
-                <Input
-                  placeholder="Enter Mobile"
-                  maxLength={10}
-                  onKeyPress={(e) => {
-                    if (!/[0-9]/.test(e.key)) {
-                      e.preventDefault();
-                    }
-                  }}
-                />
+                <CountryPhoneInput defaultCountryCode={process.env.REACT_APP_COUNTRYCODE} enableSearch inputStyle={{ width: '100%' }} />
               </Form.Item>
             </Col>
             <Col span={8}>
@@ -669,7 +648,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) => (
@@ -682,15 +661,20 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
             </Col>
           </Row>
           <Row gutter={16}>
+            <Col span={8}>
+              <Form.Item name="user_group" label="User Group" rules={[{ required: true, message: 'Please enter your user group' }]}>
+                <Input placeholder="Enter User Group" />
+              </Form.Item>
+            </Col>
             <Col span={8}>
               {formContent?.id ? (
                 <>
-                  <Form.Item>
+                  {/* <Form.Item>
                     <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
                       <Checkbox onChange={handleCheackChange} />
                       <span>Select the option if you want to change the password</span>
                     </div>
-                  </Form.Item>
+                  </Form.Item> */}
 
                   {isPasswordVisible && (
                     <Form.Item
@@ -743,11 +727,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
             {/* Path Ends */}
 
             {/* Path */}
-            <Col span={8}>
-              <Form.Item name="user_group" label="User Group" rules={[{ required: true, message: 'Please enter your user group' }]}>
-                <Input placeholder="Enter User Group" />
-              </Form.Item>
-            </Col>
+
             {/* <Col span={8}>
               <Form.Item name="role_id" label="Role" rules={[{ required: true, message: 'Please select a Role' }]}>
                 <Select placeholder="Select Role">
@@ -846,6 +826,17 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
           </Form.Item>
         </Form>
       )}
+      {/* Render DoctorAdd OUTSIDE the Select */}
+      <DoctorAdd
+        visible={doctorVisible}
+        onCancel={() => setDoctorVisible(false)}
+        // attributes={attributes}
+        doctorData={selectedDoctor}
+        doctorId={doctorID}
+        onSuccess={getDoctors}
+      />
+
+      <StaffAdd visible={staffVisible} onCancel={() => setStaffVisible(false)} staffData={selectedStaff} staffId={staffID} onSuccess={getStaff} />
     </section>
   );
 };

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

@@ -3,6 +3,7 @@ import { Modal, Button, Skeleton } from 'antd';
 import { EditOutlined } from '@ant-design/icons';
 import UserAdd from '../../../../models/users/components/user-add/user-add';
 import { UsersAPI } from '../../..';
+import { formatPhoneForForm } from '../../../../lib';
 
 export default function UserEdit(record) {
   const [visible, setVisible] = useState(false);
@@ -37,25 +38,35 @@ 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;
+
+          const formattedMobile = formatPhoneForForm(apiData.mobile);
+
           // Construct mapped data object
           const mappedData = {
             id: apiData.id,
             user_type: otherDetails.user_type || apiData.user_type,
             name: apiData.name,
             email: apiData.email,
-            mobile: apiData.mobile,
+            mobile: formattedMobile,
             designation: apiData.designation_code,
-            department: apiData.department_id,
+            department: Number(apiData.department_id),
             // 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,
             // Handle doctor codes
             default_code: apiData.doctor_code,
             doctor_code: apiData.doctor_code,
+            staff_code: apiData.staff_id,
             auth_type: apiData.auth_type,
             FA: apiData.FA,
             active: apiData.active ? true : false,
@@ -81,7 +92,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` });
-
   };
 
   /**
@@ -348,6 +364,16 @@ class Users extends Base {
       url: 'staff/get-all-staff',
     });
   };
+
+  createForgotePassword = (formBody) => {
+    return ApiUtils.post({
+      url: `bookings/trigger-reset-password-link`,
+      formBody,
+      headers: {
+        db_ptr: 'nuraho',
+      },
+    });
+  };
 }
 
 export default Users;

package/core/modules/dashboard/components/dashboard-card/menu-dashboard-card.js

@@ -207,7 +207,7 @@ export default function MenuDashboardCard({ record, selectedCardId, scope, dbPtr
 
       '.statistic-card-container': {
         '.ant-statistic-title': {
-          color: 'rgba(0, 0, 0, 0.45)',
+          color: 'rgba(0, 0, 0, 0.85)',
           fontSize: '10px',
           marginBottom: '0px',
         },