ui-soxo-bootstrap-core 2.6.1-dev.7 → 2.6.2

package/core/lib/pages/change-password/change-password.js

@@ -39,7 +39,7 @@ function ChangePassword({ history }) {
 
 	const [loading, setLoading] = useState(false);
 
-	console.log(user);
+
 
 	const onFinish = (values) => {
 
@@ -55,34 +55,24 @@ function ChangePassword({ history }) {
 					confirm_password: values.conpassword
 				}
 
-				ApiUtils.post({
-					url: `users/change-password`,
-					formBody,
-					hideError: true
-				}).then((result) => {
-
-					var msg = Object.values(result)
-
-					if (msg[0] === 'INCORRECT PASSWORD') {
-						//If current Password is entered wrong
-						message.error('Incorrect Password')
-						setLoading(false);
-						return false
-					}
-					else {
+        ApiUtils.post({
+          url: `users/change-password`,
+          formBody,
+          hideError: true
+        })
+          .then((result) => {          
 
 						setLoading(false);
 
 						history.goBack();
 
-						// Update successful.
-						message.success('Your password has been updated!')
-					}
-
-				}).catch(function (error) {
-
-					// An error happened.
-					message.error(error.result || error.message)
+              // Update successful.
+              message.success(result.result || 'Your password has been updated!');
+          
+            }).catch(function (error) {
+			
+				// An error happened.
+            	message.warning(error.result || error.message);
 
 					setLoading(false);
 

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, checkExpiryStatus } from '../../utils/common/common.utils';
 
 import { MailOutlined, MessageOutlined, WhatsAppOutlined } from '@ant-design/icons';
 
@@ -50,9 +50,6 @@ const tailLayout = {
 
 const LICENSE_EXPIRY = '2026-12-12';
 
-const headers = {
-  db_ptr: 'nuraho',
-};
 //password valdity expire
 const PASSWORD_VALIDITY_DAYS = 90;
 
@@ -62,7 +59,7 @@ const PASSWORD_VALIDITY_DAYS = 90;
  * @returns
  */
 function LoginPhone({ history, appSettings }) {
-  const { brandLogo, heroImage, footerLogo } = appSettings;
+  const { brandLogo, heroImage, footerLogo, headers } = appSettings;
 
   //  Hook for OTP Timer
   const { expired: otpExpired, formatted, startFromExpiry } = useOtpTimer();
@@ -130,7 +127,8 @@ function LoginPhone({ history, appSettings }) {
     const lastPasswordChange = otherDetails?.last_password_change;
 
     if (lastPasswordChange) {
-      const passwordExpiryDate = new Date(lastPasswordChange);
+      const onlyDate = new Date(lastPasswordChange).toISOString().split('T')[0];
+      const passwordExpiryDate = new Date(onlyDate);
       passwordExpiryDate.setDate(passwordExpiryDate.getDate() + PASSWORD_VALIDITY_DAYS);
 
       const passwordStatus = checkExpiryStatus({
@@ -215,7 +213,7 @@ function LoginPhone({ history, appSettings }) {
               setUser(data);
               //  Set default communication mode automatically
               if (result.data.mode) {
-                setCommunicationMode(result.data.mode);
+                setCommunicationMode(result.data.mode); // <--- fix
               }
             } else {
               let d = user;
@@ -234,17 +232,6 @@ function LoginPhone({ history, appSettings }) {
               localStorage.setItem('userInfo', JSON.stringify(userInfo));
               if (refresh_token) localStorage.setItem('refresh_token', refresh_token);
 
-              // Setting DBPTR
-              if (user?.organization_details) {
-                const data = safeJSON(user?.organization_details);
-
-                const defaultBranch = data.branch.find((b) => b.defaultBranch === true);
-
-                const defaultDbptr = defaultBranch?.dbPtr;
-
-                localStorage.setItem('db_ptr', defaultDbptr);
-              }
-
               history.push('/');
             }
           } else {
@@ -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);
@@ -405,16 +392,6 @@ function LoginPhone({ history, appSettings }) {
           // Setting refresh_token
           if (result.refresh_token) localStorage.setItem('refresh_token', result.refresh_token);
 
-          // Setting DBPTR
-          if (result?.user?.organization_details) {
-            const data = safeJSON(result?.user?.organization_details);
-
-            const defaultBranch = data.branch.find((b) => b.defaultBranch === 'true');
-            const defaultDbptr = defaultBranch?.dbPtr;
-
-            localStorage.setItem('db_ptr', defaultDbptr);
-          }
-
           dispatch({ type: 'user', payload: userInfo });
           // set user info into local storage
           localStorage.setItem('userInfo', JSON.stringify(userInfo));
@@ -791,7 +768,7 @@ function LoginPhone({ history, appSettings }) {
                     <h4></h4>
                   </div>
 
-                  {/* {!process.env.REACT_APP_SHOW_BRANCH_SWITCHER && <div className="branch-switcher">{globalCustomerHeader()}</div>} */}
+                  {!process.env.REACT_APP_SHOW_BRANCH_SWITCHER && <div className="branch-switcher">{globalCustomerHeader()}</div>}
 
                   {process.env.REACT_APP_ENABLE_LDAP === 'true' && (
                     <Button loading={ldaploading} type="secondary" className="SubmitBtn" onClick={loginWithLdap}>
@@ -830,8 +807,8 @@ function LoginPhone({ history, appSettings }) {
                   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.'
+                      ? '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' : 'Reset Password'}
                 />

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,18 +90,12 @@ 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>
@@ -102,7 +103,7 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
       <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} />

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

@@ -1,4 +1,10 @@
-import { PostData, GetData, PutData, PatchData, DeleteData } from './../http/http.utils';
+import {
+  PostData,
+  GetData,
+  PutData,
+  PatchData,
+  DeleteData,
+} from "./../http/http.utils";
 
 let headers = {};
 
@@ -23,56 +29,40 @@ export default class ApiUtils {
     return this.user;
   };
 
-  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 get = ({ url, config = { queries: [], order: {} }, ...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 getRecordDetail = ({ url, config = { queries: [] }, ...props }) => {
+    const { headers } = settings;
+
+    return GetData({
+      url: createUrlParams(url, config),
+      settings,
+      headers,
+      ...props,
+    }).catch((result) => {
+      console.log(result);
+    });
   };
 
-  static post = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
-    const { headers: defaultHeaders } = settings;
+  static post = ({ url, formBody, ...props }) => {
+    const { headers } = settings;
 
     return PostData({
       url,
       formBody,
       settings,
-      headers: {
-        ...defaultHeaders,
-        // override here
-        ...customHeaders,
-      },
+      headers,
       ...props,
     });
   };
@@ -115,11 +105,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',
@@ -146,17 +136,16 @@ export default class ApiUtils {
    * @returns
    */
   static getAuthStatus = ({ settings: config, token }) => {
-    // headers = headers;
+    headers = headers;
 
     settings = config;
 
     return GetData({
       url: `auth/profile`,
       settings,
-      headers: {
-        db_ptr: 'nuraho',
-      },
-      token,
+
+      headers,
+      token
     });
   };
 }
@@ -170,7 +159,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

@@ -197,27 +197,3 @@ 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/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

@@ -1,8 +1,10 @@
-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';
 
@@ -14,27 +16,31 @@ import { GetData, PostData, PutData, DeleteData } from './http/http.utils';
 
 import { getExportData } from './generic/generic.utils';
 
-import { ConvertBytesToArray, safeJSON } from './common/common.utils';
+import { ConvertBytesToArray } 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,
-  safeJSON,
-};
+    // FirebaseUtils,
+
+    Notification,
+
+    Location,
+    DateUtils,
+    ApiUtils,
+    UploadUtils,
+    GetData,
+    PostData,
+    PutData,
+    DeleteData,
+
+    getExportData,
+
+
+    // Common Functions
+    ConvertBytesToArray,
+
+    SettingsUtil,
+    FormUtils
+}  

package/core/models/base/base.js

@@ -88,13 +88,9 @@ class BaseAPI {
      * Get the data from the table
      */
     get(config = {}) {
-        const { url, headers, ...rest } = config;
-        return ApiUtils.get({
-            url: url || this.endpoint,
-            headers,
-            config: rest,
-            ...rest,
-        });
+        // Get the records from firebase
+
+        return ApiUtils.get({ url: config.url || this.endpoint, config });
     }
 
     getRelations(id) {

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

@@ -474,7 +474,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         </Button>
       )}
 
-      <Button
+      {/* <Button
         size="small"
         type="default"
         onClick={() => {
@@ -484,7 +484,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">

package/core/models/menus/menus.js

@@ -177,34 +177,23 @@ class MenusAPI extends Base {
    * @param {*} menu
    * @returns
    */
-  getMenus = (config, dbPtr = null) => {
+  getMenus = (config) => {
     // 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 = (role_id) => {
-    const url = `menus/get-menus-by-role/${role_id}`;
+  getCoreMenuLists = () => {
+    const url = 'core-menus/core-menus?step=1&header_id=null';
+
     return this.get({
       url,
     }).then((result) => result);

package/core/models/roles/roles.js

@@ -155,15 +155,6 @@ 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