ui-soxo-bootstrap-core 2.6.1-dev.1 → 2.6.1-dev.11

package/core/lib/pages/login/reset-password.js

@@ -0,0 +1,124 @@
+/**
+ * ResetPassword Component
+ *
+ * Handles staff password reset flow:
+ * - Accepts username
+ * - Selects communication mode (email/SMS)
+ * - Calls API to send reset link
+ * - Displays success/error messages
+ * - Allows navigation back to login
+ *
+ * Props:
+ * @param {Function} onBack - Triggered when "Back to Login" is clicked
+ * @param {string} title - Page title
+ * @param {string} subtitle - Page subtitle
+ * @param {string} buttonText - Submit button text
+ * @param {string} defaultUsername - Pre-filled username
+ * @param {boolean} disabledUserName - Disable username field
+ */
+
+import React, { useState, useEffect, useRef } from 'react';
+import { Divider, Form, Input, message } from 'antd';
+import { Button } from '../../elements';
+import CommunicationModeSelection from './commnication-mode-selection';
+import { motion } from 'framer-motion';
+import './reset-password.scss';
+import { UsersAPI } from '../../../models';
+
+function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, disabledUserName }) {
+  //  Selected communication mode (default: email) */
+  const [communicationMode, setCommunicationMode] = useState('email');
+
+  const [modeError, setModeError] = useState(false);
+
+  // Loading state for submit button */
+  const [loading, setLoading] = useState(false);
+
+  const [form] = Form.useForm();
+
+  // Ref to username input auto focus
+  const inputRef = useRef(null);
+
+  // Pre-fills username if provided and disabled.
+  useEffect(() => {
+    if (disabledUserName && defaultUsername) {
+      form.setFieldsValue({ username: defaultUsername });
+    }
+  }, [disabledUserName, defaultUsername]);
+
+  useEffect(() => {
+    inputRef.current?.focus();
+  }, []);
+
+  /**
+   * Sends forgot password request to backend.
+   * Payload: { mode, username, user_type: 'staff' }
+   */
+  const handleSendForgetPassword = async (values) => {
+    const payload = {
+      mode: communicationMode,
+      username: values.username,
+      user_type: 'staff',
+    };
+    setLoading(true);
+
+    try {
+      const res = await UsersAPI.createForgotePassword(payload);
+
+      if (!res?.success) {
+        throw new Error(res?.message || 'Reset password failed');
+      }
+
+      message.success(res?.message || 'Reset password link sent');
+    } catch (err) {
+      message.warning(err?.message || 'Reset password failed');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  /**
+   * Clears auth storage and navigates back.
+   */
+  const handleBackToLogin = () => {
+    localStorage.removeItem('access_token');
+    localStorage.removeItem('refresh_token');
+    sessionStorage.clear();
+    onBack();
+  };
+
+  return (
+    <motion.div
+      className="forgot-password-container"
+      initial={{ opacity: 0, y: 30 }}
+      animate={{ opacity: 1, y: 0 }}
+      exit={{ opacity: 0, y: -20 }}
+      transition={{
+        duration: 0.30,
+        ease: 'easeOut',
+      }}
+    >
+      <h3 className="password-title">{title}</h3>
+      {/* <p className="password-subtitle">{subtitle}</p>
+      <Divider /> */}
+      <Form layout="vertical" form={form} onFinish={handleSendForgetPassword}>
+        <Form.Item label="Username" name="username" rules={[{ required: true, message: 'Please input your username' }]}>
+          <Input placeholder="Enter your username" disabled={disabledUserName} ref={inputRef}/>
+        </Form.Item>
+
+        <CommunicationModeSelection communicationMode={communicationMode} setCommunicationMode={setCommunicationMode} modeError={modeError} />
+
+        <Button type="primary" htmlType="submit" loading={loading}>
+          {buttonText}
+        </Button>
+        <div className="back-to-login">
+          <a onClick={handleBackToLogin}>
+            Back to Login
+          </a>
+        </div>
+      </Form>
+    </motion.div>
+  );
+}
+
+export default ResetPassword;

package/core/lib/pages/login/reset-password.scss

@@ -0,0 +1,31 @@
+.forgot-password-container {
+
+    padding: 4px;
+  .password-title{
+    color: #1f1f1f;
+    margin: 0 0 8px;
+  }
+
+  .password-subtitle {
+    font-size: 14px;
+    font-weight: 400;
+    color: #6b7280;
+    line-height: 1.5;
+    margin: 0 0 20px;
+  }
+
+  .ant-divider {
+    margin: 0;
+    border-top: 1px solid #e5e7eb;
+  }
+
+  .back-to-login {
+    margin-top: 10px;
+    text-align: center;
+
+    a {
+      cursor: pointer;
+      color: #204b7e;
+    }
+  }
+}

package/core/lib/pages/profile/themes.json

@@ -88,10 +88,10 @@
       "loginPageBackground": "linear-gradient(#D5F1FB, #24AEB8)",
       "bodyBackground": "#F0F6FF",
       "progressBar": "#24AEB8",
-      "primaryButtonBg": "#446AA9",
+      "primaryButtonBg": "#204b7e",
       "primaryButtonHoverBg": "#2E4873",
       "primaryButtonText": "#FFFFFF",
-      "primaryButtonActiveBg": "#446AA9",
+      "primaryButtonActiveBg": "#204b7e",
       "primaryButtonDisabledBg": "#C4C6CC",
       "primaryButtonDisabledText": "#6B7280",
 
@@ -104,14 +104,14 @@
 
       "dashedButtonBg": "#FFFFFF",
       "dashedButtonHoverBg": "#D1E3FF",
-      "dashedButtonText": "#446AA9",
+      "dashedButtonText": "#204b7e",
       "dashedButtonActiveBg": "#B8C7FF",
       "dashedButtonDisabledBg": "#F0F6FF",
       "dashedButtonDisabledText": "#A9BCC6",
 
       "linkButtonBg": "transparent",
       "linkButtonHoverBg": "#F5F5F5",
-      "linkButtonText": "#446AA9",
+      "linkButtonText": "#204b7e",
       "linkButtonActiveBg": "#D1E3FF",
       "linkButtonDisabledText": "#A9BCC6",
 

package/core/lib/utils/api/api.utils.js

@@ -24,15 +24,15 @@ export default class ApiUtils {
   };
 
   static get = async ({ url, config = { queries: [], order: {} }, headers: customHeaders = {}, ...props }) => {
-    const { headers: defaultHeaders } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     try {
       return await GetData({
         url: createUrlParams(url, config),
         settings,
         headers: {
-          ...defaultHeaders,
-          // override here
+          ...(settings.headers || {}),
+          ...(dbPtr ? { db_ptr: dbPtr } : {}),
           ...customHeaders,
         },
         ...props,
@@ -43,15 +43,15 @@ export default class ApiUtils {
   };
 
   static getRecordDetail = async ({ url, config = { queries: [] }, headers: customHeaders = {}, ...props }) => {
-    const { headers: defaultHeaders } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     try {
       return await GetData({
         url: createUrlParams(url, config),
         settings,
         headers: {
-          ...defaultHeaders,
-          // override here
+          ...(settings.headers || {}),
+          ...(dbPtr ? { db_ptr: dbPtr } : {}),
           ...customHeaders,
         },
         ...props,
@@ -62,52 +62,64 @@ export default class ApiUtils {
   };
 
   static post = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
-    const { headers: defaultHeaders } = settings;
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PostData({
       url,
       formBody,
       settings,
       headers: {
-        ...defaultHeaders,
-        // override here
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
         ...customHeaders,
       },
       ...props,
     });
   };
 
-  static put = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+  static put = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PutData({
       url,
       settings,
       formBody,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };
 
-  static patch = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+  static patch = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PatchData({
       url,
       settings,
       formBody,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };
 
-  static delete = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+  static delete = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return DeleteData({
       url,
       settings,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };

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,6 +123,42 @@ 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`.
  * Adds spacing only to the masked portion (groups of 3),
@@ -185,3 +222,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/http/http.utils.js

@@ -153,5 +153,6 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
     return result;
   } catch (err) {
     console.error('Login error -->', err?.message);
+    throw err;
   }
 }

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

@@ -97,6 +97,15 @@ class CoreScript extends Base {
         });
     };
 
+     getQuery = (formBody) => {
+
+        return ApiUtils.post({
+            url: `core-scripts/execute-script-api`,
+            formBody,
+        });
+    };
+
+
 
     /**
      * 

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 */}
 

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

@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useEffect } from 'react';
-import { Space, Popconfirm, Input, Drawer, Skeleton, Collapse, message } from 'antd';
+import { Space, Popconfirm, Input, Drawer, Skeleton, Collapse, message, Tag } from 'antd';
 import { ReloadOutlined, DeleteOutlined, EditOutlined, PlusCircleFilled, CopyOutlined } from '@ant-design/icons';
 import { Button, Card, Switch, DraggableWrapper } from '../../../../lib';
 //  for draggable menu list import { DndProvider } from "react-dnd";
@@ -55,7 +55,6 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
       .catch(() => setLoading(false));
   };
 
-  console.log('record', records);
   /**
    *
    */
@@ -206,7 +205,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
 
   const filtered = records.filter((r) => r.name?.toUpperCase().includes(query.toUpperCase()));
 
-  const visibleItems = dragMode ? records : filtered;
+  const visibleItems = filtered;
 
   const onSearch = (event) => {
     setQuery(event.target.value);
@@ -440,7 +439,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
 function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerVisible, deleteRecord) {
   return (
     <Space onClick={(e) => e.stopPropagation()}>
-      {/* ⭐ NEW BUTTON — Add Submenu */}
+      <Tag color={item.is_visible === true ? 'green' : 'blue'}>{item.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
       <Button
         size="small"
         type="dashed"
@@ -459,7 +458,6 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         <PlusCircleFilled />
         Add Sub Menu
       </Button>
-
       {model.ModalAddComponent && (
         <Button
           size="small"
@@ -473,8 +471,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
           <EditOutlined />
         </Button>
       )}
-
-      {/* <Button
+      <Button
         size="small"
         type="default"
         onClick={() => {
@@ -484,8 +481,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         }}
       >
         <CopyOutlined />
-      </Button> */}
-
+      </Button>
       <Popconfirm title="Are you sure?" onConfirm={() => deleteRecord(item)}>
         <Button danger size="small" type="default">
           <DeleteOutlined />

package/core/models/menus/menus.js

@@ -177,28 +177,47 @@ class MenusAPI extends Base {
    * @param {*} menu
    * @returns
    */
-  getMenus = (config) => {
+  getMenus = (config, dbPtr = null) => {
     // Use 'core-menus' endpoint if REACT_APP_USE_CORE_MENUS is true (used for Matria)
     const url =
       process.env.REACT_APP_USE_CORE_MENUS === 'true'
         ? 'core-menus/get-menus' // Matria
         : 'menus/get-menus'; // NURA
 
+    if (!dbPtr) dbPtr = localStorage.db_ptr;
+
     return this.get({
       url,
       config,
+      headers: {
+        db_ptr: dbPtr,
+      },
+    }).then((result) => result);
+  };
+
+  getMenubyUser = (user_id) => {
+    const url = `menus/get-menus?userId=${user_id}`;
+    return this.get({
+      url,
     }).then((result) => result);
   };
 
   // get core-menu list with submenu
   getCoreMenuLists = () => {
     const url = 'core-menus/core-menus?step=1&header_id=null';
-
     return this.get({
       url,
     }).then((result) => result);
   };
 
+  getCoreMenuByRoleId = async (role_id) => {
+    const url = `menus/get-menus-by-role/${role_id}`;
+    const result = await this.get({
+      url,
+    });
+    return result;
+  };
+
   getCoreMenus = () => {
     return [
       // {