ui-soxo-bootstrap-core 2.4.25-dev.13 → 2.4.25-dev.15

package/core/models/doctor/components/doctor-add/doctor-add.js

@@ -10,7 +10,7 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
   const [form] = Form.useForm();
   const { t } = useTranslation();
 
-  // Signature states
+  // Signature states..
   const [fileUrl, setFileUrl] = useState(null);
   const [editingSignature, setEditingSignature] = useState(false);
   const [previousSignature, setPreviousSignature] = useState(null);

package/core/models/staff/components/staff-add/staff-add.js

@@ -57,6 +57,18 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
     }
   }, [visible]);
 
+  const phoneValidator = (_, value) => {
+    if (!value) {
+      return Promise.resolve(); // not required
+    }
+
+    if (!/^\d{10}$/.test(value)) {
+      return Promise.reject('Phone number must be 10 digits');
+    }
+
+    return Promise.resolve();
+  };
+
   /** -------------------------------
    *  API CALL – Designations
    * ------------------------------- */
@@ -92,11 +104,31 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
       return Promise.resolve();
     }
 
+    // Starting space not allowed
+    if (value.startsWith(' ')) {
+      setCodeStatus({
+        status: 'error',
+        message: 'Code cannot start with a space',
+      });
+      return Promise.reject(new Error('Code cannot start with a space'));
+    }
+
+    //  Any space not allowed
+    if (/\s/.test(value)) {
+      setCodeStatus({
+        status: 'error',
+        message: 'Spaces are not allowed in the code',
+      });
+      return Promise.reject(new Error('Spaces are not allowed in the code'));
+    }
+
     try {
       const res = await UsersAPI.getStaffCode(value);
+      console.log(res.message, ' inside validateDoctorCode');
 
       if (res?.status === 409 || res?.success === false) {
         setCodeStatus({ status: 'error', message: res.message || 'Code already exists' });
+        console.log('here');
         return Promise.reject(new Error(res.message || 'Code already exists'));
       }
 
@@ -108,8 +140,8 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
         return Promise.resolve();
       }
 
-      setCodeStatus({ status: 'error', message: 'Unexpected response' });
-      return Promise.reject(new Error('Unexpected response'));
+      setCodeStatus({ status: 'error', message: 'Please enter a valid code' });
+      return Promise.reject(new Error('Please enter a valid code'));
     } catch {
       setCodeStatus({ status: 'error', message: 'Validation failed' });
       return Promise.reject(new Error('Validation failed'));
@@ -163,19 +195,19 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
       id: values.id,
       shortName: values.shortName,
       description: values.description,
-      designationPtr: values.designation,
-      phone: values.phone1,
-      mobile: values.phone2,
-      alternateMobile: values.phone2,
-      email: values.email1,
-      alternateEmail: values.email2,
-      remarks: values.remarks,
+      designationPtr: values.designation || null,
+      phone: values.phone1 || null,
+      mobile: values.phone1 || null,
+      alternateMobile: values.phone2 || null,
+      email: values.email1 || null,
+      alternateEmail: values.email2 || null,
+      remarks: values.remarks || null,
       slNo: values.slno ? Number(values.slno) : null,
       active: values.active === 'Y' ? 'Y' : 'N',
-      address1: values.address1,
-      address2: values.address2,
-      place: values.place,
-      zip: values.zip,
+      address1: values.address1 || null,
+      address2: values.address2 || null,
+      place: values.place || null,
+      zip: values.zip || null,
     };
 
     try {
@@ -217,21 +249,20 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
               name="id"
               validateTrigger="onChange"
               hasFeedback={!editMode}
-              rules={[{ required: true }, { validator: validateDoctorCode }]}
+              rules={[{ required: true, message: 'Code is required' }, { validator: validateDoctorCode }]}
             >
-              <Input placeholder="Enter Code" ref={nameInputRef} onKeyDown={handleEnterKey} disabled={editMode} />
+              <Input placeholder="Enter Code" autoComplete="off" maxLength={10} ref={nameInputRef} onKeyDown={handleEnterKey} disabled={editMode} />
             </Form.Item>
           </Col>
 
-          <Col span={6}>
-            <Form.Item label="Name" name="shortName" rules={[{ required: true }]}>
-              <Input placeholder="Enter Name" onKeyDown={handleEnterKey} />
+          <Col span={12}>
+            <Form.Item label="Name" name="description" rules={[{ required: true }]}>
+              <Input placeholder="Enter Description" autoComplete="off" onKeyDown={handleEnterKey} />
             </Form.Item>
           </Col>
-
-          <Col span={12}>
-            <Form.Item label="Description" name="description" rules={[{ required: true }]}>
-              <Input placeholder="Enter Description" onKeyDown={handleEnterKey} />
+          <Col span={6}>
+            <Form.Item label="Short Name" name="shortName" rules={[{ required: true }]}>
+              <Input placeholder="Enter Short Name" autoComplete="off" onKeyDown={handleEnterKey} maxLength={10} />
             </Form.Item>
           </Col>
         </Row>
@@ -240,7 +271,7 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
           {/* GENERAL TAB */}
           <Tabs.TabPane tab="GENERAL" key="1">
             <Row gutter={16}>
-              <Col span={6}>
+              {/* <Col span={6}>
                 <Form.Item label="Phone Number 1" name="phone1">
                   <Input maxLength={10} placeholder="Enter Phone Number" onKeyDown={handleEnterKey} />
                 </Form.Item>
@@ -250,17 +281,42 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
                 <Form.Item label="Phone Number 2" name="phone2">
                   <Input maxLength={10} placeholder="Enter Phone Number" onKeyDown={handleEnterKey} />
                 </Form.Item>
+              </Col> */}
+              <Col span={6}>
+                <Form.Item label="Phone Number" name="phone1" rules={[{ validator: phoneValidator }]}>
+                  <Input
+                    maxLength={10}
+                    autoComplete="off"
+                    placeholder="Enter Phone Number"
+                    inputMode="numeric"
+                    onChange={(e) => (e.target.value = e.target.value.replace(/\D/g, ''))}
+                    onKeyDown={handleEnterKey}
+                  />
+                </Form.Item>
+              </Col>
+
+              <Col span={6}>
+                <Form.Item label="Alternate Phone Number" name="phone2" rules={[{ validator: phoneValidator }]}>
+                  <Input
+                    maxLength={10}
+                    placeholder="Enter Phone Number"
+                    autoComplete="off"
+                    inputMode="numeric"
+                    onChange={(e) => (e.target.value = e.target.value.replace(/\D/g, ''))}
+                    onKeyDown={handleEnterKey}
+                  />
+                </Form.Item>
               </Col>
 
               <Col span={6}>
-                <Form.Item label="Email ID 1" name="email1">
-                  <Input placeholder="Enter Email" onKeyDown={handleEnterKey} />
+                <Form.Item label="Email ID" name="email1">
+                  <Input autoComplete="off" placeholder="Enter Email" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
 
               <Col span={6}>
-                <Form.Item label="Email ID 2" name="email2">
-                  <Input placeholder="Enter Email" onKeyDown={handleEnterKey} />
+                <Form.Item label="Alternate Email" name="email2">
+                  <Input autoComplete="off" placeholder="Enter Email" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
             </Row>
@@ -273,8 +329,8 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
               </Col>
 
               <Col span={8}>
-                <Form.Item label="Serial Number" name="slno">
-                  <Input placeholder="Enter Serial Number" onKeyDown={handleEnterKey} />
+                <Form.Item label="Serial Number" name="slno" rules={[{ message: 'only numbers are allowed', pattern: /^\d*$/ }]}>
+                  <Input autoComplete="off" maxLength={5} placeholder="Enter Serial Number" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
 
@@ -297,7 +353,7 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
             <Row>
               <Col span={24}>
                 <Form.Item label="Remarks" name="remarks">
-                  <Input placeholder="Enter Remarks" onKeyDown={handleEnterKey} />
+                  <Input autoComplete="off" placeholder="Enter Remarks" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
             </Row>
@@ -308,13 +364,13 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
             <Row gutter={16}>
               <Col span={12}>
                 <Form.Item label="Address Line 1" name="address1">
-                  <Input placeholder="Enter Address" onKeyDown={handleEnterKey} />
+                  <Input autoComplete="off" placeholder="Enter Address" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
 
               <Col span={12}>
                 <Form.Item label="Address Line 2" name="address2">
-                  <Input placeholder="Enter Address" onKeyDown={handleEnterKey} />
+                  <Input autoComplete="off" placeholder="Enter Address" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
             </Row>
@@ -322,13 +378,13 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
             <Row gutter={16}>
               <Col span={12}>
                 <Form.Item label="Place" name="place">
-                  <Input placeholder="Enter Place" onKeyDown={handleEnterKey} />
+                  <Input autoComplete="off" placeholder="Enter Place" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
 
               <Col span={12}>
                 <Form.Item label="Zip Code" name="zip">
-                  <Input placeholder="Enter Zip Code" maxLength={7} onKeyDown={handleEnterKey} />
+                  <Input autoComplete="off" placeholder="Enter Zip Code" maxLength={7} onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
             </Row>

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

@@ -160,6 +160,17 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
       }
     }
   }, []);
+
+  useEffect(() => {
+    if (!loading && formContent?.role_id && roles.length > 0) {
+      const roleId = Number(formContent.role_id);
+
+      if (!Number.isNaN(roleId)) {
+        form.setFieldsValue({ role_id: roleId });
+      }
+    }
+  }, [loading, formContent, roles]);
+
   /**
    *Define the options dynamically
    */
@@ -203,7 +214,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
         }
       })
       .catch((error) => {
-        console.error('Error fetching designations:', error);
         setDesignations([]);
       })
       .finally(() => setLoading(false));
@@ -215,16 +225,10 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   function getRoles() {
     RolesAPI.getRole()
       .then((res) => {
-        // if API returns { statusCode: 200, result: [...] }
-        if (Array.isArray(res.result)) {
-          setRoles(res.result.filter((r) => r.active === 'Y')); // optional: only active roles
-        } else {
-          setRoles([]);
-        }
+        const activeRoles = Array.isArray(res.result) ? res.result.filter((r) => r.active === 'Y') : [];
+        setRoles(activeRoles);
       })
-      .catch((err) => {
-        setRoles([]);
-      });
+      .catch(() => setRoles([]));
   }
 
   /** Get Department List */
@@ -243,7 +247,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
         }
       })
       .catch((error) => {
-        console.error('Error fetching departments:', error);
         setDepartments([]);
       })
       .finally(() => setLoading(false));
@@ -320,25 +323,24 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
         form.setFieldsValue({ staff_code: formContent.staff_code });
       }
     }
-    if (formContent?.id && formContent?.organization_details) {
-      try {
-        const org = JSON.parse(formContent.organization_details);
-        const branchIds = org.branch_ids?.map((b) => b.id) || [];
-        const defaultBranchObj = org.branch_ids?.find((b) => b.DefaultBranch === 'true');
-        const defaultBr = defaultBranchObj?.id || null;
-
-        setSelectedBranches(branchIds);
-        setDefaultBranch(defaultBr);
-
-        form.setFieldsValue({
-          selectedBranches: branchIds,
-          defaultBranch: defaultBr,
-        });
-      } catch (err) {
-        console.error('Invalid organization_details JSON', err);
-      }
-    }
-  }, [formContent]);
+    if (!formContent) return;
+
+    // normalize branch ids to NUMBER
+    const org =
+      typeof formContent.organization_details === 'string' ? JSON.parse(formContent.organization_details) : formContent.organization_details;
+
+    const branchIds = (org?.branch_ids || []).map(Number);
+    const defaultBr = formContent.defaultBranch ? Number(formContent.defaultBranch) : null;
+
+    // state (for filtering)
+    setSelectedBranches(branchIds);
+
+    // form (source of truth)
+    form.setFieldsValue({
+      selectedBranches: branchIds,
+      defaultBranch: defaultBr,
+    });
+  }, [formContent, form]);
   // Generate branch options for Select component
   const branchOptions = branches.map((branch) => ({
     label: branch.br_desc,
@@ -349,6 +351,8 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
    * Submit values
    */
   const onSubmit = (values) => {
+    values.defaultBranch = String(values.defaultBranch);
+
     /**If PanelOpen is open and edit mode then password will be existing password else new password*/
     if (!isPasswordVisible && mode === 'Edit') {
       values.password = body.password;
@@ -377,6 +381,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     if (props?.ldap && selectedOption && selectedOption.value) {
       values = {
         ...values,
+
         addAllBranches: props.ldap.addAllBranches,
         auth_user: selectedOption.value,
         auth_type: 'LDAP',
@@ -387,6 +392,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     if (values.attributes && typeof values === 'object') {
       values = {
         ...values,
+
         auth_type: 'LDAP',
 
         attributes: JSON.stringify(values.attributes),
@@ -506,12 +512,20 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
               {' '}
               {/* Show extra dropdown only if user type is Doctor */}
               {userType === 'RAD' && (
-                <Form.Item name="default_code" label="Default Code" rules={[{ required: true, message: 'Please select a default code' }]}>
+                <Form.Item
+                  name="default_code"
+                  preserve={false}
+                  label="Default Code"
+                  rules={[{ required: true, message: 'Please select a default code' }]}
+                >
                   <Select
                     placeholder="Select Code"
                     options={doctorList}
                     showSearch
                     optionFilterProp="label"
+                    onChange={(value) => {
+                      form.setFieldsValue({ default_code: value });
+                    }}
                     dropdownRender={(menu) => (
                       <>
                         {menu}
@@ -541,12 +555,20 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                 </Form.Item>
               )}
               {userType === 'STAFF' && (
-                <Form.Item name="staff_code" label="Staff Code" rules={[{ required: true, message: 'Please select a staff code' }]}>
+                <Form.Item
+                  name="staff_code"
+                  preserve={false} //  THIS FIXES IT
+                  label="Staff Code"
+                  rules={[{ required: true, message: 'Please select a staff code' }]}
+                >
                   <Select
                     placeholder="Select Code"
                     options={staffList}
                     showSearch
                     optionFilterProp="label"
+                    onChange={(value) => {
+                      form.setFieldsValue({ staff_code: value });
+                    }}
                     dropdownRender={(menu) => (
                       <>
                         {menu}
@@ -584,7 +606,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
             <Col span={8}>
               {/* Mobile */}
               <Form.Item name="mobile" label="Mobile" rules={[{ required: true, message: 'Please enter your mobile number' }]}>
-                <Input placeholder="Enter Mobile" />
+                <Input placeholder="Enter Mobile" maxLength={10} />
               </Form.Item>
             </Col>
             <Col span={8}>
@@ -608,22 +630,19 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                 <Select
                   mode="multiple"
                   placeholder="Select Branches"
-                  value={selectedBranches}
+                  options={branchOptions}
+                  allowClear
+                  showSearch
+                  optionFilterProp="label"
                   onChange={(value) => {
-                    setSelectedBranches(value);
+                    const normalized = value.map(Number);
+                    setSelectedBranches(normalized);
 
-                    // ⬅NEW: remove defaultBranch if it’s not in selectedBranches
-                    if (!value.includes(defaultBranch)) {
-                      setDefaultBranch(undefined);
+                    const currentDefault = form.getFieldValue('defaultBranch');
+                    if (currentDefault && !normalized.includes(currentDefault)) {
                       form.setFieldsValue({ defaultBranch: undefined });
                     }
                   }}
-                  options={branchOptions}
-                  allowClear
-                  showSearch
-                  optionFilterProp="label"
-                  maxTagCount={5} // Show only 5 tags
-                  maxTagPlaceholder={(omittedValues) => `+${omittedValues.length}`} // Show "+n"
                 />
               </Form.Item>
             </Col>
@@ -632,9 +651,9 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
               <Form.Item label="Default Branch" name="defaultBranch" rules={[{ required: true, message: 'Please select default branch' }]}>
                 <Select placeholder="Select Default Branch" onChange={setDefaultBranch}>
                   {branchOptions
-                    .filter((opt) => selectedBranches.includes(opt.value))
+                    .filter((opt) => selectedBranches.includes(Number(opt.value))) 
                     .map((opt) => (
-                      <Option key={opt.value} value={opt.value}>
+                      <Option key={opt.value} value={Number(opt.value)}>
                         {opt.label}
                       </Option>
                     ))}
@@ -710,8 +729,8 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
               </Form.Item>
             </Col>
             <Col span={8}>
-              <Form.Item name="role_id" label="Role" rules={[{ required: true, message: 'Please Input Role' }]}>
-                <Select placeholder="Select Role" style={{ width: '100%' }}>
+              <Form.Item name="role_id" label="Role" rules={[{ required: true, message: 'Please select a Role' }]}>
+                <Select placeholder="Select Role">
                   {roles.map((role) => (
                     <Option key={role.id} value={role.id}>
                       {role.name}

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

@@ -11,7 +11,6 @@ export default function UserEdit(record) {
   // Handle edit button click
   const handleEditClick = () => {
     if (!record.id) {
-      console.warn('Invalid record: Missing ID');
       return;
     }
 
@@ -29,9 +28,7 @@ export default function UserEdit(record) {
             // Try parsing other_details, handle error if invalid JSON
             try {
               otherDetails = JSON.parse(apiData.other_details);
-            } catch (err) {
-              console.warn('Failed to parse other_details:', apiData.other_details);
-            }
+            } catch (err) {}
           }
           let orgDetails = {};
           try {
@@ -50,8 +47,10 @@ export default function UserEdit(record) {
             designation: apiData.designation_code,
             department: apiData.department_id,
             // Handle selected branches and default branch
+            organization_details: orgDetails,
             selectedBranches: orgDetails.branch_ids || [],
-            defaultBranch: apiData.firm_id || null,
+            defaultBranch: apiData.branch_id || null,
+            role_id: apiData.role_id,
             password: apiData.password,
             user_group: apiData.user_group,
             // Handle doctor codes

package/package.json

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