ui-soxo-bootstrap-core 2.4.25-dev.40 → 2.4.25-dev.41

package/core/lib/models/forms/components/form-creator/form-creator.js

@@ -465,6 +465,7 @@ function UserInput({ field, onUpload, selectedInformation, onChange, onFieldUpda
             {...field}
             onChange={(value) => onChange(field, value)}
             defaultValue={field.default}
+            allowClear={true}
             // defaultValue={'1'}
           />
         );

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

@@ -423,13 +423,15 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
 
       // add new model
       UsersAPI.create(values).then((result) => {
-        // callback();
-        if (result.success) message.success(result.message);
-        else message.error(result.message);
-
         setLoading(false);
 
-        callback();
+        if (result.success) {
+          message.success(result.message);
+          // close modal
+          callback();
+        } else {
+          message.error(result.message);
+        }
       });
     }
   };
@@ -605,8 +607,26 @@ 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" maxLength={10} />
+              <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',
+                  },
+                ]}
+              >
+                <Input
+                  placeholder="Enter Mobile"
+                  maxLength={10}
+                  onKeyPress={(e) => {
+                    if (!/[0-9]/.test(e.key)) {
+                      e.preventDefault();
+                    }
+                  }}
+                />
               </Form.Item>
             </Col>
             <Col span={8}>
@@ -651,7 +671,7 @@ 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(Number(opt.value))) 
+                    .filter((opt) => selectedBranches.includes(Number(opt.value)))
                     .map((opt) => (
                       <Option key={opt.value} value={Number(opt.value)}>
                         {opt.label}

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

@@ -365,7 +365,7 @@ const UserList = ({ model, match, relativeAdd = false, additional_queries = [],
             )}
 
             {/* Add Modal */}
-            <Modal destroyOnClose confirmLoading={loading} visible={visible} onCancel={closeModal} footer={null}>
+            <Modal destroyOnClose={false} confirmLoading={loading} visible={visible} onCancel={closeModal} footer={null}>
                 <model.ModalAddComponent
                     match={match}
                     model={model}

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

@@ -261,7 +261,7 @@ export default function ReportingDashboard({
     getPatientDetails();
   }
 
-  const fetchReportData = async (id, values, dbPtr, pagination) => {
+  const fetchReportData = async (id, values, dbPtr, pagination, paramsString) => {
     const { current, pageSize } = pagination || {};
     // If card script id is exist load that id otherwise load id
     const coreScriptId = scriptId.current ? scriptId.current : id;
@@ -270,22 +270,23 @@ export default function ReportingDashboard({
     try {
       // Prepare payload for backend: format only here
       const formattedValues = {};
-      const inputParams = JSON.parse(config.input_parameters);
-      // Extract only allowed field names from input parameters
-
-      const allowedFields = inputParams.map((p) => p.field);
+      let inputParams = [];
+      inputParams = JSON.parse(paramsString);
       // Iterate through all keys in the values object
 
-      Object.keys(values).forEach((key) => {
-        // Skip keys that are not in the allowed fields list
+      inputParams.forEach(({ field }) => {
+        const val = values[field];
 
-        if (!allowedFields.includes(key)) {
-          return;
+        // field exists in values → format & assign
+        if (val !== undefined) {
+          formattedValues[field] = moment.isMoment(val) ? val.format('YYYY-MM-DD') : val;
+        }
+        // field missing in values → set null
+        else {
+          formattedValues[field] = null;
         }
-
-        const val = values[key];
-        formattedValues[key] = moment.isMoment(val) ? val.format('YYYY-MM-DD') : val;
       });
+      // });
       // Pagination Data
       const paginationData = {
         page: pagination.current || 1,
@@ -436,7 +437,7 @@ export default function ReportingDashboard({
 
     // Call API
     try {
-      await fetchReportData(id, values, dbPtr, paginationData);
+      await fetchReportData(id, values, dbPtr, paginationData, paramsString);
     } finally {
       setLoading(false);
       setCardLoading(false);

package/package.json

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