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

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 } 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();
+
+  // Pre-fills username if provided and disabled.
+  useEffect(() => {
+    if (disabledUserName && defaultUsername) {
+      form.setFieldsValue({ username: defaultUsername });
+    }
+  }, [disabledUserName, defaultUsername]);
+
+  /**
+   * 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: 70 }}
+      animate={{ opacity: 1, y: 0 }}
+      exit={{ opacity: 0, y: -50 }}
+      transition={{
+        y: {
+          duration: 1,
+          ease: [0.22, 0.08, 0.26, 1],
+        },
+        opacity: {
+          duration: 0.45,
+          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} />
+        </Form.Item>
+
+        <CommunicationModeSelection communicationMode={communicationMode} setCommunicationMode={setCommunicationMode} modeError={modeError} />
+
+        <Button type="primary" htmlType="submit" loading={loading}>
+          {buttonText}
+        </Button>
+
+        <div style={{ marginTop: '10px', textAlign: 'center' }}>
+          <a style={{ cursor: 'pointer' }} onClick={handleBackToLogin}>
+            Back to Login
+          </a>
+        </div>
+      </Form>
+    </motion.div>
+  );
+}
+
+export default ResetPassword;

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

@@ -0,0 +1,22 @@
+.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;
+  }
+}
+

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

@@ -1,10 +1,4 @@
-import {
-  PostData,
-  GetData,
-  PutData,
-  PatchData,
-  DeleteData,
-} from "./../http/http.utils";
+import { PostData, GetData, PutData, PatchData, DeleteData } from './../http/http.utils';
 
 let headers = {};
 
@@ -29,40 +23,56 @@ export default class ApiUtils {
     return this.user;
   };
 
-  static get = ({ url, config = { queries: [], order: {} }, ...props }) => {
-    const { headers } = settings;
-
-    return GetData({
-      url: createUrlParams(url, config),
-      settings,
-      headers,
-      ...props,
-    }).catch((result) => {
-      console.log(result);
-    });
+  static get = async ({ url, config = { queries: [], order: {} }, headers: customHeaders = {}, ...props }) => {
+    const { headers: defaultHeaders } = settings;
+
+    try {
+      return await GetData({
+        url: createUrlParams(url, config),
+        settings,
+        headers: {
+          ...defaultHeaders,
+          // override here
+          ...customHeaders,
+        },
+        ...props,
+      });
+    } catch (result_1) {
+      console.log(result_1);
+    }
   };
 
-  static getRecordDetail = ({ url, config = { queries: [] }, ...props }) => {
-    const { headers } = settings;
-
-    return GetData({
-      url: createUrlParams(url, config),
-      settings,
-      headers,
-      ...props,
-    }).catch((result) => {
-      console.log(result);
-    });
+  static getRecordDetail = async ({ url, config = { queries: [] }, headers: customHeaders = {}, ...props }) => {
+    const { headers: defaultHeaders } = settings;
+
+    try {
+      return await GetData({
+        url: createUrlParams(url, config),
+        settings,
+        headers: {
+          ...defaultHeaders,
+          // override here
+          ...customHeaders,
+        },
+        ...props,
+      });
+    } catch (result_1) {
+      console.log(result_1);
+    }
   };
 
-  static post = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+  static post = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
+    const { headers: defaultHeaders } = settings;
 
     return PostData({
       url,
       formBody,
       settings,
-      headers,
+      headers: {
+        ...defaultHeaders,
+        // override here
+        ...customHeaders,
+      },
       ...props,
     });
   };
@@ -105,11 +115,11 @@ export default class ApiUtils {
   static upload = ({ url, data }) => {
     return fetch(process.env.REACT_APP_endpoint + url, {
       // Your POST endpoint
-      method: "POST",
+      method: 'POST',
       headers: {
         //   'App-Type': 313,
         //   'App-Version': '1.0.1',
-        Authorization: "Bearer " + localStorage.access_token,
+        Authorization: 'Bearer ' + localStorage.access_token,
         // type:'multipart/formData'
       },
       //   credentials: 'include',
@@ -136,16 +146,17 @@ export default class ApiUtils {
    * @returns
    */
   static getAuthStatus = ({ settings: config, token }) => {
-    headers = headers;
+    // headers = headers;
 
     settings = config;
 
     return GetData({
       url: `auth/profile`,
       settings,
-
-      headers,
-      token
+      headers: {
+        db_ptr: 'nuraho',
+      },
+      token,
     });
   };
 }
@@ -159,7 +170,7 @@ function createUrlParams(url, config) {
   let { queries = [], limit, order } = config;
 
   if (queries.length > 0 || limit > 0) {
-    base_url += "?";
+    base_url += '?';
   }
 
   queries.forEach((ele) => {

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

@@ -122,6 +122,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),
@@ -161,3 +197,27 @@ export const formatMobile = (mobile, visibleDigits = 4) => {
   // Combine masked and visible parts without spacing the visible digits
   return `${maskedWithSpaces} ${visible}`;
 };
+
+/**
+ * Safely parse a JSON value.
+ *
+ * - Accepts JSON strings or plain objects
+ * - Returns null on any invalid or missing data
+ */
+export function safeJSON(value) {
+  if (value == null) return null;
+
+  if (typeof value === 'object' && !Array.isArray(value)) {
+    return value;
+  }
+
+  if (typeof value !== 'string' || value.trim() === '') {
+    return null;
+  }
+
+  try {
+    return JSON.parse(value);
+  } catch {
+    return null;
+  }
+}

package/core/lib/utils/index.js

@@ -1,10 +1,8 @@
-
-
-import { Location } from './location/location.utils'
+import { Location } from './location/location.utils';
 
 import Notification from './notification.utils';
 
-import DateUtils from './date/date.utils'
+import DateUtils from './date/date.utils';
 
 import ApiUtils from './api/api.utils';
 
@@ -16,31 +14,27 @@ import { GetData, PostData, PutData, DeleteData } from './http/http.utils';
 
 import { getExportData } from './generic/generic.utils';
 
-import { ConvertBytesToArray } from './common/common.utils';
+import { ConvertBytesToArray, safeJSON } from './common/common.utils';
 
 import SettingsUtil from './setting.utils';
 
-
 export {
-    // FirebaseUtils,
-
-    Notification,
-
-    Location,
-    DateUtils,
-    ApiUtils,
-    UploadUtils,
-    GetData,
-    PostData,
-    PutData,
-    DeleteData,
-
-    getExportData,
-
-
-    // Common Functions
-    ConvertBytesToArray,
-
-    SettingsUtil,
-    FormUtils
-}  
+  // FirebaseUtils,
+
+  Notification,
+  Location,
+  DateUtils,
+  ApiUtils,
+  UploadUtils,
+  GetData,
+  PostData,
+  PutData,
+  DeleteData,
+  getExportData,
+
+  // Common Functions
+  ConvertBytesToArray,
+  SettingsUtil,
+  FormUtils,
+  safeJSON,
+};

package/core/models/roles/roles.js

@@ -155,6 +155,15 @@ class RolesAPI extends BaseAPI {
 
   /**
    * Cutsom Api for creating user
+  getRole = () => {
+    return ApiUtils.get({
+      url: `core-roles/get-core-roles?active=Y`,
+    });
+  };
+
+
+  /**
+   * Cutsom Api for updating user
    *
    * @param {*} values
    * @returns

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

@@ -6,7 +6,7 @@ import { Skeleton, Typography, message, Switch, Form, Input, Select, Checkbox, R
 
 import AsyncSelect from 'react-select/async';
 
-import { Table, Card, Button, JSONInput, GlobalContext } from './../../../../lib/';
+import { Table, Card, Button, JSONInput, GlobalContext, safeJSON } from './../../../../lib/';
 
 import { ModelsAPI, PagesAPI, RolesAPI } from '../../..';
 
@@ -42,7 +42,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   const [selectedStaff, setSelectedStaff] = useState(null);
   const [staffList, setStaffList] = useState([]);
   /**Converting to JSON */
-  let firmDetails = JSON.parse(user.firm.f_otherdetails1);
+  const firmDetails = safeJSON(user?.firm?.f_otherdetails1) ?? {};
 
   /**Variable for cheaking mandatory condition of mobile*/
   let mobileRequired;

package/core/models/users/users.js

@@ -149,7 +149,13 @@ class Users extends Base {
    * @returns
    */
   create = (formBody) => {
-    return ApiUtils.post({ url: `users/create-user`, formBody });
+    return ApiUtils.post({
+      url: `users/create-user`,
+      formBody,
+      headers: {
+        db_ptr: 'nuraho',
+      },
+    });
   };
 
   /**
@@ -161,7 +167,7 @@ class Users extends Base {
     return ApiUtils.get({
       url: `branch-master/get-records`,
       headers: {
-        db_ptr: process.env.REACT_APP_HO_DB_PTR,
+        db_ptr: 'nuraho',
       },
     });
   };
@@ -271,9 +277,15 @@ class Users extends Base {
    * @returns
    */
   updateUser = ({ id, formBody }) => {
-    return ApiUtils.put({ url: `users/update-user/${id}`, formBody });
+    return ApiUtils.put({
+      url: `users/update-user/${id}`,
+      formBody,
+      headers: {
+        db_ptr: 'nuraho',
+      },
+    });
   };
-  
+
   /* The `getUser` method is a function that takes an object with an `id` property as a parameter. It
   then uses the `ApiUtils.get` function to make a GET request to the endpoint `users/` to fetch
   user data based on the provided `id`. This method is used to retrieve a specific user's
@@ -282,14 +294,13 @@ class Users extends Base {
   getUser = ({ id }) => {
     return ApiUtils.get({ url: `users/${id}` });
   };
-   /* The `getUserRole` method is a function that takes an object with an `id` property as a parameter.
+  /* The `getUserRole` method is a function that takes an object with an `id` property as a parameter.
   It then uses the `ApiUtils.get` function to make a GET request to the endpoint `core-user-roles`
   with the `user_id` parameter set to the provided `id`. This method is used to fetch the role or
   roles associated with a specific user from the API. */
-  
+
   getUserRole = ({ id }) => {
     return ApiUtils.get({ url: `core-user-roles?user_id=${id}&active=Y` });
-
   };
 
   /**
@@ -348,6 +359,13 @@ class Users extends Base {
       url: 'staff/get-all-staff',
     });
   };
+
+  createForgotePassword = (formBody) => {
+    return ApiUtils.post({
+      url: `bookings/trigger-reset-password-link`,
+      formBody,
+    });
+  };
 }
 
 export default Users;