ui-soxo-bootstrap-core 2.6.1-dev.3 → 2.6.1-dev.31

package/core/lib/utils/common/common.utils.js

@@ -4,6 +4,7 @@ Implements utility functions to be used across project
 
 /*eslint no-useless-escape:"off",eqeqeq: "off"*/
 import moment from 'moment';
+import { parsePhoneNumberFromString, isValidPhoneNumber } from 'libphonenumber-js';
 
 export function IsObjectHaveKeys(obj) {
   return obj && typeof obj == 'object' && Object.keys(obj).length;
@@ -122,41 +123,6 @@ export const checkLicenseStatus = (expiryDate) => {
   return { valid: true, daysLeft, message: null, level: null };
 };
 
-/**
- * Checks password expiry status.
- *
- * @param {string|Date} expiryDate
- * @param {number} warningDays
- * @param {string} expiredMessage
- * @param {(daysLeft: number) => string} warningMessage
- *
- * @returns {{ valid: boolean, daysLeft: number, message: string|null, level: "error"|"warning"|null }}
- */
-
-export const checkExpiryStatus = ({ expiryDate, warningDays, expiredMessage, warningMessage }) => {
-  const expiry = new Date(expiryDate);
-
-  if (isNaN(expiry)) {
-    return { valid: false, daysLeft: 0, message: 'Invalid date', level: 'error' };
-  }
-
-  expiry.setHours(0, 0, 0, 0);
-  const today = new Date();
-  today.setHours(0, 0, 0, 0);
-
-  const msDiff = expiry.getTime() - today.getTime();
-  const daysLeft = Math.ceil(msDiff / (1000 * 60 * 60 * 24));
-
-  if (daysLeft < 0) {
-    return { valid: false, daysLeft, message: expiredMessage, level: 'error' };
-  }
-
-  if (daysLeft <= warningDays) {
-    return { valid: true, daysLeft, message: warningMessage(daysLeft), level: 'warning' };
-  }
-
-  return { valid: true, daysLeft, message: null, level: null };
-};
 
 /**
  * Masks a mobile number by hiding all but the last `visibleDigits`.
@@ -221,3 +187,51 @@ export function safeJSON(value) {
     return null;
   }
 }
+
+/**
+ * Convert +countrycode phone into form compatible structure
+ * @param {string} phone
+ * @returns {object|null}
+ */
+export const formatPhoneForForm = (phone) => {
+  if (!phone) return null;
+
+  const parsed = parsePhoneNumberFromString(phone);
+
+  if (!parsed) return null;
+
+  return {
+    value: parsed.nationalNumber,
+    code: {
+      dialCode: parsed.countryCallingCode,
+      countryCode: parsed.country?.toLowerCase(),
+    },
+    valid: true,
+  };
+};
+
+/**
+ * Validates a phone number from CountryPhoneInput.
+ * Builds full number using country dial code and checks validity.
+ *
+ * @param {Object} _ - Ant Design rule parameter (unused)
+ * @param {Object} val - Phone value object from form
+ * @returns {Promise<void>}
+ */
+export const phoneValidator = (_, val) => {
+  if (!val || !val.value || !val?.code?.dialCode) {
+    return Promise.resolve();
+  }
+
+  const fullPhone = `+${val.code.dialCode}${val.value}`;
+
+  return isValidPhoneNumber(fullPhone) ? Promise.resolve() : Promise.reject('Invalid mobile number');
+};
+
+// Returns phone number with country code (e.g., +919876543210)
+export const formatPhoneWithCountryCode = (phone) => {
+  if (phone && typeof phone === 'object' && phone.code) {
+    return `+${phone.code.dialCode}${phone.value}`;
+  }
+  return phone;
+};

package/core/lib/utils/generic/generic.utils.js

@@ -31,7 +31,8 @@ export function getExportData(records, exportDataColumns) {
     const response = records.map((row, columnIndex) => {
 
         let entry = {
-            'Sl No': columnIndex + 1
+            'Sl No': row.isSummaryRow ? '' : columnIndex + 1,
+            isSummaryRow: row.isSummaryRow
         };
 
         filteredColumns.forEach((column, indexValue) => {

package/core/lib/utils/http/http.utils.js

@@ -70,24 +70,37 @@ export async function DeleteData({ url, ...props }) {
  *
  * @param {*} param
  */
-
 export async function ApiCall({ url, formBody, method, settings, ...props }) {
   const token = props.token || (await settings.getToken());
   const path = window.location.pathname;
   const baseUrl = props.baseUrl || process.env.REACT_APP_endpoint;
 
+  const isFormData = formBody instanceof FormData;
+
   const payload = {
     method,
     headers: {
       ...settings.headers,
-      ...headers,
       ...(props.headers || {}),
       Authorization: `Bearer ${token}`,
-      'Content-Type': 'application/json',
     },
-    body: formBody ? JSON.stringify(formBody) : null,
   };
 
+  // ✅ Upload + normal handling
+  if (method !== 'GET' && formBody) {
+    payload.body = formBody;
+
+    if (!isFormData && !(props.isUpload)) {
+      payload.body = JSON.stringify(formBody);
+      payload.headers['Content-Type'] = 'application/json';
+    }
+
+    // ❗ VERY IMPORTANT
+    if (isFormData || (props.isUpload)) {
+      delete payload.headers['Content-Type'];
+    }
+  }
+
   // 🟡 Handles both normal and retried responses
   const handleResponse = async (res) => {
     if (props.responseType === 'blob') {
@@ -153,5 +166,21 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
     return result;
   } catch (err) {
     console.error('Login error -->', err?.message);
+    throw err;
   }
 }
+
+/**
+ * Method for uploading documents
+ * @public
+ */
+export async function UploadData({ url, formBody, ...props }) {
+  return ApiCall({
+    url,
+    formBody,
+    isUpload: true,
+    method: 'POST',
+    returnResponse: true,
+    ...props,
+  });
+}

package/core/lib/utils/index.js

@@ -14,7 +14,7 @@ import { GetData, PostData, PutData, DeleteData } from './http/http.utils';
 
 import { getExportData } from './generic/generic.utils';
 
-import { ConvertBytesToArray, safeJSON } from './common/common.utils';
+import { ConvertBytesToArray, safeJSON, formatPhoneForForm, phoneValidator, formatPhoneWithCountryCode } from './common/common.utils';
 
 import SettingsUtil from './setting.utils';
 
@@ -37,4 +37,7 @@ export {
   SettingsUtil,
   FormUtils,
   safeJSON,
+  formatPhoneForForm,
+  phoneValidator,
+  formatPhoneWithCountryCode,
 };

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/core-scripts/core-scripts.js

@@ -9,142 +9,163 @@ import React from 'react';
 
 import Base from '../base/base';
 
-import { ApiUtils } from './../../lib/'
-
+import { ApiUtils } from './../../lib/';
 
 class CoreScript extends Base {
+  constructor() {
+    super();
 
-    constructor() {
-        super();
-
-        this.fields = [
-            {
-                field: 'name',
-                caption: 'Name'
-            },
-            {
-                field: 'amount',
-                caption: 'Amount'
-            }
-        ];
-
-        // this.columns = ;
-    }
-
-    get id() {
-        return 'id';
-    }
-
-    get getEndpoint() {
-        return 'core-scripts';
-    }
-
-
-    get modelName() {
-        return `core-scripts`;
-    }
-
-    get columns() {
-        return [
-            {
-                caption: 'Staff',
-                field: 'staff.name',
-                key: 'staff'
-            },
-            {
-                caption: 'Weight',
-                field: 'weight',
-                key: 'weight'
-            },
-            {
-                caption: 'Date',
-                field: 'created_at',
-                key: 'created_at'
-            }
-        ];
-    }
-
-
-    /**
-     *Getting core_script data
-     * @returns
-     */
-    getReportingLisitng = (id, formBody, dbPtr = null) => {
-        
-        // Settings db pointer
-        if (!dbPtr) dbPtr = localStorage.db_ptr;
-        return ApiUtils.post({
-            url: `core-scripts/dashboardquery/${id}`,
-            formBody,
-            headers: {
-        'Content-Type': 'application/json',
-        Authorization: 'Bearer ' + localStorage.access_token,
-        db_ptr: dbPtr
+    this.fields = [
+      {
+        field: 'name',
+        caption: 'Name',
       },
-        });
-    };
-
-
-    /**
-     *Updating user details
-     * @returns
-     */
-    getUserDetailsLisitng = (id, formBody) => {
+      {
+        field: 'amount',
+        caption: 'Amount',
+      },
+    ];
 
-        return ApiUtils.post({
-            url: `core-scripts/update-user-deatils/${id}`,
-            formBody,
-        });
-    };
+    // this.columns = ;
+  }
 
+  get id() {
+    return 'id';
+  }
 
-    /**
-     * 
-     */
-    getReportMenu = async ({ id }) => {
-
-        const result = await this.getRecord({ id });
-
-        const report = result.result
-
-        return {
-            ...report,
-            caption: report.caption,
-            path: '/reports/' + report.id,
-            is_visible: true
-        }
-    }
-
-    /**
-      * To get extra script data corresponding to mode
-      *
-      * @param {*} mode
-      * @returns
-      */
-    getExtraInfo = (mode) => {
-        return ApiUtils.get({
-            url: `core-scripts/get-script-data?mode=${mode}`,
-        });
-    };
+  get getEndpoint() {
+    return 'core-scripts';
+  }
 
+  get modelName() {
+    return `core-scripts`;
+  }
 
-    /**
-      * To get executed data
-      *
-      * @param {*} mode
-      * @returns
-      */
-
-    getSelectedExtraInfo = (formBody) => {
-        return ApiUtils.post({
-            url: `core-scripts/get-selected-script-data`,
-            formBody,
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: 'Bearer ' + localStorage.access_token,
-            },
-        });
+  get columns() {
+    return [
+      {
+        caption: 'Staff',
+        field: 'staff.name',
+        key: 'staff',
+      },
+      {
+        caption: 'Weight',
+        field: 'weight',
+        key: 'weight',
+      },
+      {
+        caption: 'Date',
+        field: 'created_at',
+        key: 'created_at',
+      },
+    ];
+  }
+
+  /**
+   *Getting core_script data
+   * @returns
+   */
+  getReportingLisitng = (id, formBody, dbPtr = null) => {
+    // Settings db pointer
+    if (!dbPtr) dbPtr = localStorage.db_ptr;
+    return ApiUtils.post({
+      url: `core-scripts/dashboardquery/${id}`,
+      formBody,
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: 'Bearer ' + localStorage.access_token,
+        db_ptr: dbPtr,
+      },
+    });
+  };
+
+  /**
+   *Updating user details
+   * @returns
+   */
+  getUserDetailsLisitng = (id, formBody) => {
+    return ApiUtils.post({
+      url: `core-scripts/update-user-deatils/${id}`,
+      formBody,
+    });
+  };
+
+  getQuery = (formBody) => {
+    return ApiUtils.post({
+      url: `core-scripts/execute-script-api`,
+      formBody,
+    });
+  };
+/**
+ * 
+ */
+  getQuerySeacch = (formBody) => {
+    return ApiUtils.post({
+    //   baseUrl: 'http://localhost:8002/dev/',
+      url: `core-scripts/execute-script-by-search`,
+      formBody,
+    });
+  };
+
+  getCorescript = (formBody,dbPtr) => {
+   
+    if (!dbPtr) dbPtr = localStorage.db_ptr;
+    return ApiUtils.post({
+    //   baseUrl: 'http://localhost:8002/dev/',
+      url: `core-scripts/get-core-script`,
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: 'Bearer ' + localStorage.access_token,
+        db_ptr: dbPtr,
+      },
+      formBody,
+    });
+  };
+  /**
+   *
+   */
+  getReportMenu = async ({ id }) => {
+    const result = await this.getRecord({ id });
+
+    const report = result.result;
+
+    return {
+      ...report,
+      caption: report.caption,
+      path: '/reports/' + report.id,
+      is_visible: true,
     };
+  };
+
+  /**
+   * To get extra script data corresponding to mode
+   *
+   * @param {*} mode
+   * @returns
+   */
+  getExtraInfo = (mode) => {
+    return ApiUtils.get({
+      url: `core-scripts/get-script-data?mode=${mode}`,
+    });
+  };
+
+  /**
+   * To get executed data
+   *
+   * @param {*} mode
+   * @returns
+   */
+
+  getSelectedExtraInfo = (formBody) => {
+    return ApiUtils.post({
+      url: `core-scripts/get-selected-script-data`,
+      formBody,
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: 'Bearer ' + localStorage.access_token,
+      },
+    });
+  };
 }
 
 export default CoreScript;

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

@@ -6,7 +6,8 @@ import { useTranslation, Button } from './../../../../lib/';
 import { UsersAPI } from '../../..';
 import SignatureCanvasComponent from '../../../../lib/components/consent/signature-pad';
 
-const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSuccess }) => {
+const DoctorAdd = ({ visible, onCancel, doctorId, doctorData, onSuccess }) => {
+  // console.log('attributes', attributes);
   const [form] = Form.useForm();
   const { t } = useTranslation();
 
@@ -21,8 +22,8 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
   const [doctorID, setDoctorID] = useState(false);
   const [selectedDoctor, setSelectedDoctor] = useState(null);
 
-  const propValues = attributes || {};
-  const doctorType = propValues?.type;
+  // const propValues = attributes || {};
+  // const doctorType = propValues?.type;
 
   const editMode = Boolean(doctorId);
 
@@ -37,6 +38,10 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
     message: '',
   });
 
+  const getDoctorTypeOptions = () => [
+    { label: 'In House', value: 'DRINH' },
+    { label: 'Out Side', value: 'DROTR' },
+  ];
   /** Autofocus on modal open */
   useEffect(() => {
     if (visible) {
@@ -266,7 +271,7 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
               <Row gutter={16}>
                 <Col span={8}>
                   <Form.Item label="Type" name="type">
-                    <Select placeholder="Select Type" options={doctorType || []} showSearch />
+                    <Select placeholder="Select Type" options={getDoctorTypeOptions() || []} showSearch />
                   </Form.Item>
                 </Col>
 

package/core/models/menus/components/menu-add/menu-add.js

@@ -164,7 +164,7 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
             <div className="left-container">
               {/* Caption */}
               <Form.Item name={'caption'} label="Caption" rules={[{ required: true, message: 'Caption is required' }]}>
-                <Input placeholder="Enter caption" />
+                <Input placeholder="Enter caption" autoFocus />
               </Form.Item>
               {/* Caption Ends */}