ui-soxo-bootstrap-core 2.6.1-dev.2 → 2.6.1-dev.21

package/core/lib/pages/login/login.js

@@ -30,7 +30,7 @@ import { getAccessToken, getRefreshToken } from '../../utils/http/auth.helper';
 
 import { Location } from '../../utils';
 
-import { checkLicenseStatus, formatMobile, safeJSON ,checkExpiryStatus} from '../../utils/common/common.utils';
+import { checkLicenseStatus, formatMobile, safeJSON } from '../../utils/common/common.utils';
 
 import { MailOutlined, MessageOutlined, WhatsAppOutlined } from '@ant-design/icons';
 
@@ -50,11 +50,10 @@ const tailLayout = {
 
 const LICENSE_EXPIRY = '2026-12-12';
 
+
 const headers = {
   db_ptr: 'nuraho',
 };
-//password valdity expire
-const PASSWORD_VALIDITY_DAYS = 90;
 
 /**
  *
@@ -114,46 +113,32 @@ function LoginPhone({ history, appSettings }) {
    *
    * - Parses `last_password_change` from user.other_details.
    * - Calculates expiry using PASSWORD_VALIDITY_DAYS.
-   * - Uses `checkExpiryStatus()` to determine status.
    * - Shows Ant Design warning message if expired or within warning period.
    * - Warning message includes navigation to `/change-password`.
    *
    * Requires:
    * - PASSWORD_VALIDITY_DAYS constant
-   * - checkExpiryStatus utility
    * - React Router history
    * - antd message component
    */
-  const handlePasswordExpiryCheck = (user) => {
-    const otherDetails = user?.other_details ? JSON.parse(user.other_details) : null;
-
-    const lastPasswordChange = otherDetails?.last_password_change;
-
-    if (lastPasswordChange) {
-      const passwordExpiryDate = new Date(lastPasswordChange);
-      passwordExpiryDate.setDate(passwordExpiryDate.getDate() + PASSWORD_VALIDITY_DAYS);
-
-      const passwordStatus = checkExpiryStatus({
-        expiryDate: passwordExpiryDate,
-        warningDays: 2,
-        expiredMessage: 'Your password has expired. Please reset it.',
-        warningMessage: (d) => (
-          <span>
-            Your password will expire in {d} day(s).{' '}
-            <a
-              onClick={() => {
-                history.push('/change-password');
-              }}
-            >
-              Click here to update.
-            </a>
-          </span>
-        ),
-      });
+  const handlePasswordExpiryCheck = (expiryDays) => {
+    if (expiryDays == null) return;
 
-      if (passwordStatus.message) {
-        message.warning(passwordStatus.message);
-      }
+    if (expiryDays <= 0) {
+      message.error('Your password has expired. Please reset it.');
+
+      setExpiredPassword(true);
+      setShowResetpassword(true);
+
+      return;
+    }
+
+    if (expiryDays <= 2) {
+      message.warning(
+        <span>
+          Your password will expire in {expiryDays} day(s). <a onClick={() => history.push('/change-password')}>Click here to update.</a>
+        </span>
+      );
     }
   };
 
@@ -194,7 +179,7 @@ function LoginPhone({ history, appSettings }) {
           if (insider_token) localStorage.insider_token = insider_token;
 
           if (result.success) {
-            handlePasswordExpiryCheck(user);
+            handlePasswordExpiryCheck(result.expiry_in_days);
 
             //two_factor_authentication variable is present then proceed Two factor authentication
             if (result.data && result.data.two_factor_authentication) {
@@ -321,6 +306,8 @@ function LoginPhone({ history, appSettings }) {
    *
    */
   const sendAuthenticationOtp = () => {
+    if (loading) return;
+
     //  Reset previous error
     setModeError(false);
 
@@ -349,10 +336,10 @@ function LoginPhone({ history, appSettings }) {
       if (result.success) {
         //  for expiry_time
         startFromExpiry(result?.expiry_time);
-        // if the api is sucess then go for otpverification step
-        setotpVerification(true);
         // set  button loading false
         setLoading(false);
+        // if the api is sucess then go for otpverification step
+        setotpVerification(true);
       } else {
         setLoading(false);
         message.error(result.message);
@@ -409,7 +396,7 @@ function LoginPhone({ history, appSettings }) {
           if (result?.user?.organization_details) {
             const data = safeJSON(result?.user?.organization_details);
 
-            const defaultBranch = data.branch.find((b) => b.defaultBranch === 'true');
+            const defaultBranch = data.branch.find((b) => b.defaultBranch === true);
             const defaultDbptr = defaultBranch?.dbPtr;
 
             localStorage.setItem('db_ptr', defaultDbptr);
@@ -419,7 +406,7 @@ function LoginPhone({ history, appSettings }) {
           // set user info into local storage
           localStorage.setItem('userInfo', JSON.stringify(userInfo));
 
-          handlePasswordExpiryCheck(result.user);
+          handlePasswordExpiryCheck(result.expiry_in_days);
 
           setTimeout(() => history.push('/'), 500);
         } else {
@@ -460,6 +447,8 @@ function LoginPhone({ history, appSettings }) {
    * Otp resend Logic
    */
   const handleResendOTP = () => {
+    if (loading) return;
+
     setOtpValue('');
     setModeError(false);
     setOtpError(false);
@@ -622,28 +611,28 @@ function LoginPhone({ history, appSettings }) {
     return user.username;
   };
 
-  const { globalCustomerHeader = () => {} } = appSettings;
+  const { globalCustomerHeader = () => { } } = appSettings;
 
   const themeName = process.env.REACT_APP_THEME; // e.g., 'purple'
   const isPurple = themeName === 'purple';
 
   const sectionStyle = isPurple
     ? {
-        width: '100%',
-        height: '100vh',
-        backgroundImage: `${state.theme.colors.loginPageBackground}`,
-        backgroundPosition: 'center bottom, center',
-        backgroundRepeat: 'no-repeat, no-repeat',
-        backgroundSize: 'cover, cover',
-      }
+      width: '100%',
+      height: '100vh',
+      backgroundImage: `${state.theme.colors.loginPageBackground}`,
+      backgroundPosition: 'center bottom, center',
+      backgroundRepeat: 'no-repeat, no-repeat',
+      backgroundSize: 'cover, cover',
+    }
     : {
-        width: '100%',
-        height: '100vh',
-        background: 'linear-gradient(to bottom, #F7F6E3 0%, #EEF1DE 20%, #D5E4DA 45%, #9DBFC8 75%, #4F89A6 100%)',
-        backgroundPosition: 'center bottom, center',
-        backgroundRepeat: 'no-repeat, no-repeat',
-        backgroundSize: 'cover, cover',
-      };
+      width: '100%',
+      height: '100vh',
+      background: 'linear-gradient(to bottom, #F7F6E3 0%, #EEF1DE 20%, #D5E4DA 45%, #9DBFC8 75%, #4F89A6 100%)',
+      backgroundPosition: 'center bottom, center',
+      backgroundRepeat: 'no-repeat, no-repeat',
+      backgroundSize: 'cover, cover',
+    };
 
   return (
     <section className="full-page" style={sectionStyle}>
@@ -729,7 +718,7 @@ function LoginPhone({ history, appSettings }) {
 
                   {!otpVerification ? (
                     <div className="otp-container">
-                      <Button type="primary" onClick={sendAuthenticationOtp} style={{ marginTop: '6px' }}>
+                      <Button loading={loading} type="primary" onClick={sendAuthenticationOtp} style={{ marginTop: '6px' }}>
                         Send OTP
                       </Button>
                     </div>
@@ -775,7 +764,7 @@ function LoginPhone({ history, appSettings }) {
                         </div>
                       </div>
                       {!otpSuccess && (
-                        <Button type="primary" disabled={otpExpired} onClick={verifyOtp} style={{ marginTop: 16 }}>
+                        <Button loading={loading} type="primary" disabled={otpExpired} onClick={verifyOtp} style={{ marginTop: 16 }}>
                           Verify OTP
                         </Button>
                       )}
@@ -811,7 +800,7 @@ function LoginPhone({ history, appSettings }) {
                     <Button loading={loading} type="primary" htmlType="submit" className="SubmitBtn">
                       &nbsp;&nbsp; Submit
                     </Button>
-                    <div className="forgot-password" style={{ marginTop: '8px', textAlign: 'center' }}>
+                    <div className="forgot-password">
                       <Link onClick={() => setShowResetpassword(true)}>Forgot Password?</Link>
                     </div>
                   </Form.Item>
@@ -827,13 +816,13 @@ function LoginPhone({ history, appSettings }) {
                     setShowResetpassword(false);
                     setExpiredPassword(false);
                   }}
-                  title={expiredPassword ? 'Password Expired' : 'Forgot Password'}
-                  subtitle={
-                    expiredPassword
-                      ? 'Enter your username and choose your preferred OTP method to receive a reset link.'
-                      : 'Enter your username to reset your password and select your preferred OTP method.'
-                  }
-                  buttonText={expiredPassword ? 'Send Reset Link' : 'Reset Password'}
+                  title={expiredPassword ? 'Password Expired!' : 'Forgot Password?'}
+                  // subtitle={
+                  //   expiredPassword
+                  //     ? 'Your password has expired. Select a preferred communication method to receive the One-Time Password (OTP) to continue.'
+                  //     : 'Enter your username and Select a preferred communication method to receive the One-Time Password (OTP) to continue..'
+                  // }
+                  buttonText={expiredPassword ? 'Send Reset Link' : 'Send Reset Link'}
                 />
               )}
             </div>

package/core/lib/pages/login/login.scss

@@ -228,6 +228,15 @@ body {
             text-transform: capitalize;
           }
         }
+
+        .forgot-password {
+          margin-top: 8px;
+          text-align: center;
+
+          a {
+            color: #204b7e;
+          }
+        }
       }
     }
 

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

@@ -17,7 +17,7 @@
  * @param {boolean} disabledUserName - Disable username field
  */
 
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Divider, Form, Input, message } from 'antd';
 import { Button } from '../../elements';
 import CommunicationModeSelection from './commnication-mode-selection';
@@ -36,6 +36,9 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
 
   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) {
@@ -43,6 +46,10 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
     }
   }, [disabledUserName, defaultUsername]);
 
+  useEffect(() => {
+    inputRef.current?.focus();
+  }, []);
+
   /**
    * Sends forgot password request to backend.
    * Payload: { mode, username, user_type: 'staff' }
@@ -83,26 +90,20 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
   return (
     <motion.div
       className="forgot-password-container"
-      initial={{ opacity: 0, y: 70 }}
+      initial={{ opacity: 0, y: 30 }}
       animate={{ opacity: 1, y: 0 }}
-      exit={{ opacity: 0, y: -50 }}
+      exit={{ opacity: 0, y: -20 }}
       transition={{
-        y: {
-          duration: 1,
-          ease: [0.22, 0.08, 0.26, 1],
-        },
-        opacity: {
-          duration: 0.45,
-          ease: 'easeOut',
-        },
+        duration: 0.30,
+        ease: 'easeOut',
       }}
     >
       <h3 className="password-title">{title}</h3>
-      <p className="password-subtitle">{subtitle}</p>
-      <Divider />
+      {/* <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} />
+          <Input placeholder="Enter your username" disabled={disabledUserName} ref={inputRef}/>
         </Form.Item>
 
         <CommunicationModeSelection communicationMode={communicationMode} setCommunicationMode={setCommunicationMode} modeError={modeError} />
@@ -110,9 +111,8 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
         <Button type="primary" htmlType="submit" loading={loading}>
           {buttonText}
         </Button>
-
-        <div style={{ marginTop: '10px', textAlign: 'center' }}>
-          <a style={{ cursor: 'pointer' }} onClick={handleBackToLogin}>
+        <div className="back-to-login">
+          <a onClick={handleBackToLogin}>
             Back to Login
           </a>
         </div>

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

@@ -18,5 +18,14 @@
     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,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/http/http.utils.js

@@ -82,7 +82,7 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
       ...settings.headers,
       ...headers,
       ...(props.headers || {}),
-      Authorization: `Bearer ${token}`,
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
       'Content-Type': 'application/json',
     },
     body: formBody ? JSON.stringify(formBody) : null,
@@ -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) {