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

package/core/components/extra-info/extra-info-details.js

@@ -21,7 +21,7 @@ import ExtraInfo from './extra-info';
 
 const { TabPane } = Tabs;
 
-export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition = 'left', showDrawerData, dbPtr, callback, ...record }) {
+export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition = 'left', showDrawerData, dbPtr, callback, drawerWidth = '35%', ...record }) {
   // State to control drawer
   const [open, setOpen] = useState(false);
 
@@ -121,7 +121,7 @@ export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition =
         {/*  */}
 
         {/*  */}
-        <Drawer width={'35%'} title={title} onClose={onClose} open={open}>
+        <Drawer width={drawerWidth} title={title} onClose={onClose} open={open}>
           <div className="main-drawer-content">
             <div className="drawer-container">
               <div className="drawer-click">

package/core/components/index.js

@@ -1,7 +1,3 @@
-
-
-
-
 import LandingAPI from './landing-api/landing-api';
 
 import ExtraInfoDetail from './extra-info/extra-info-details';
@@ -11,11 +7,6 @@ import RootApplicationAPI from './root-application-api/root-application-api';
 import { HomePageAPI } from '../modules';
 
 import { ExternalWindow } from './external-window/external-window';
+import LicenseAlert from './license-management/license-alert';
 
-export {
-    LandingAPI,
-    RootApplicationAPI,
-    ExtraInfoDetail,
-    HomePageAPI,
-    ExternalWindow
-}
+export { LandingAPI, RootApplicationAPI, ExtraInfoDetail, HomePageAPI, ExternalWindow, LicenseAlert };

package/core/components/landing-api/landing-api.js

@@ -1,10 +1,21 @@
-import React, { useState, useEffect, useContext } from 'react';
+import React, { useState, useEffect, useContext, useRef } from 'react';
 
 import { Route, Switch } from 'react-router-dom';
 
-import { Skeleton } from 'antd';
-
-import { GlobalHeader, ChangePassword, useTranslation, GlobalContext, ModuleRoutes, SpotlightSearch, SettingsUtil, Profile, Card } from '../../lib';
+import { Skeleton, message, Modal } from 'antd';
+
+import {
+  GlobalHeader,
+  ChangePassword,
+  useTranslation,
+  GlobalContext,
+  ModuleRoutes,
+  SpotlightSearch,
+  SettingsUtil,
+  Profile,
+  Card,
+  safeJSON,
+} from '../../lib';
 
 import './landing-api.scss';
 
@@ -18,15 +29,34 @@ import PropTypes from 'prop-types';
 
 import { MenusAPI, CoreScripts } from '../../models';
 
+const motivatingMessages = [
+  'Setting things up for a great start...',
+  'Good things are loading. Stay with us.',
+  'Almost there. Preparing your workspace.',
+  'You are one moment away from your dashboard.',
+  'Getting everything ready for you.',
+  'Great care takes a second. Loading now.',
+];
+
+function getRandomMessage(previousMessage = '') {
+  const options = motivatingMessages.filter((message) => message !== previousMessage);
+
+  if (!options.length) {
+    return motivatingMessages[0];
+  }
+
+  const randomIndex = Math.floor(Math.random() * options.length);
+  return options[randomIndex];
+}
+
 /**
  * Landing API
  *
  * @param {*} param0
  * @returns
  */
-export default function LandingApi({ history, CustomComponents, CustomModels, appSettings, ...props }) {
+export default function LandingApi({ history, CustomComponents, CustomModels, appSettings, transitionPending = false, onHomeReady, ...props }) {
   const [loader, setLoader] = useState(false);
-
   // const [modules, setModules] = useState([]);
 
   const [connected] = useState();
@@ -34,13 +64,22 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
   const { dispatch, user = {} } = useContext(GlobalContext);
 
   const [allModules, setAllModules] = useState();
+  const homeReadyNotifiedRef = useRef(false);
+  const messageIntervalRef = useRef(null);
 
   const [meta, setMeta] = useState({});
+  const [loadingMessage, setLoadingMessage] = useState('');
+  const [licenseData, setLicenseData] = useState(null);
+
+  const [licAlert, setLicAlert] = useState(false);
+  // License data state
 
   // const [reports, setReports] = useState([]);
 
   var config = {};
 
+  //fetch license summary
+
   // Variable decides the control of homepage
   // #TODO This is a temporary fix - Homemage
 
@@ -50,6 +89,70 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
     disableHomepage = JSON.parse(process.env.REACT_APP_DISABLEHOMEPAGE);
   }
 
+  /**
+   * Normalizes the user's branch access list from `organization_details`.
+   *
+   * The API can return `organization_details` as a JSON string, so we always
+   * parse it through `safeJSON` before reading the branch collection.
+   *
+   * @returns {Array} List of branches the current user can access.
+   */
+  const getAccessibleBranches = () => {
+    const orgDetails = safeJSON(user?.organization_details);
+    return Array.isArray(orgDetails?.branch) ? orgDetails.branch : [];
+  };
+
+  /**
+   * Resolves the currently selected branch record using the persisted db pointer.
+   *
+   * @param {Array} branches
+   * @returns {Object|null}
+   */
+  const getCurrentBranchRecord = (branches) => {
+    const currentDbPtr = localStorage.getItem('db_ptr');
+    return branches.find((branch) => String(branch.dbPtr) === String(currentDbPtr)) || null;
+  };
+
+  /**
+   * Resolves the target branch from the URL `index` query parameter.
+   *
+   * @param {Array} branches
+   * @param {string|null} branchId
+   * @returns {Object|null}
+   */
+  const getBranchRecordById = (branches, branchId) => {
+    return branches.find((branch) => String(branch.branch_id) === String(branchId)) || null;
+  };
+
+  /**
+   * Persists branch-specific auth data after a successful switch.
+   *
+   * @param {Object} tokenBundle
+   * @param {string} dbPtr
+   */
+  const persistBranchSession = (tokenBundle, dbPtr) => {
+    const accessToken = tokenBundle?.access_token;
+    const refreshToken = tokenBundle?.refresh_token;
+
+    if (accessToken) localStorage.setItem('access_token', accessToken);
+    if (refreshToken) localStorage.setItem('refresh_token', refreshToken);
+    if (dbPtr) localStorage.setItem('db_ptr', dbPtr);
+  };
+
+  const fetchSummary = async () => {
+    try {
+      const res = await MenusAPI.getSummary();
+      if (res?.data) {
+        setLicenseData(res?.data);
+        setLicAlert(true);
+      } else {
+        setLicenseData(null);
+        setLicAlert(false);
+      }
+    } catch (err) {
+      console.error(err);
+    }
+  };
   // useEffect(() => {
 
   //     // Initialize the menus for the logged in user
@@ -65,19 +168,122 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
   //     }
   // }, [loader]);
 
+  /**
+   * Synchronizes the active branch with the `index` query parameter.
+   *
+   * Flow:
+   * 1. Read the target branch id from the URL.
+   * 2. Compare it against the branch represented by the current `db_ptr`.
+   * 3. Switch branch only when the user has access and the branch actually differs.
+   * 4. Refresh auth/profile state and reload menus for the new branch context.
+   */
+  useEffect(() => {
+    const handleUrlBranchSwitch = async () => {
+      const searchParams = new URLSearchParams(history.location.search);
+      const urlDbPtr = searchParams.get('index');
+      if (!urlDbPtr) return;
+
+      const accessibleBranches = getAccessibleBranches();
+      const currentBranch = getCurrentBranchRecord(accessibleBranches);
+      const targetBranch = getBranchRecordById(accessibleBranches, urlDbPtr);
+
+      if (!targetBranch || String(currentBranch?.branch_id) === String(urlDbPtr)) return;
+
+      setLoader(true);
+
+      try {
+        const switchResult = await MenusAPI.switchBranch(
+          {
+            firm_id: targetBranch.firm_ptr,
+            branch_id: targetBranch.branch_id,
+          },
+          targetBranch.dbPtr
+        );
+
+        if (!switchResult?.success) {
+          Modal.error({
+            title: 'Branch Switch Failed',
+            content: switchResult?.message || 'An error occurred while attempting to switch branches.',
+          });
+          return;
+        }
+
+        persistBranchSession(switchResult?.token, targetBranch.dbPtr);
+        window.dispatchEvent(new CustomEvent('branchChanged', { detail: targetBranch.dbPtr }));
+
+        const accessToken = switchResult?.token?.access_token;
+        const profileResult = await MenusAPI.getProfile(accessToken);
+        const updatedUser = { ...profileResult, loggedCheckDone: true };
+
+        dispatch({ type: 'user', payload: updatedUser });
+        localStorage.setItem('userInfo', JSON.stringify(updatedUser));
+
+        await initializeUserMenus();
+      } catch (error) {
+        console.error('Auto branch switch failed:', error);
+      } finally {
+        setLoader(false);
+      }
+    };
+
+    if (user?.id && history?.location) handleUrlBranchSwitch();
+  }, [history?.location?.search, user?.id]);
+
   useEffect(() => {
     // Initialize the menus for the logged in user
     initializeUserMenus();
   }, []);
 
+  useEffect(() => {
+    if (!transitionPending) {
+      homeReadyNotifiedRef.current = false;
+      return;
+    }
+
+    if (!loader && allModules && !homeReadyNotifiedRef.current) {
+      homeReadyNotifiedRef.current = true;
+      if (typeof onHomeReady === 'function') {
+        onHomeReady();
+      }
+    }
+  }, [transitionPending, loader, allModules, onHomeReady]);
+
+  useEffect(() => {
+    if (!loader) {
+      setLoadingMessage('');
+
+      if (messageIntervalRef.current) {
+        clearInterval(messageIntervalRef.current);
+        messageIntervalRef.current = null;
+      }
+
+      return;
+    }
+
+    setLoadingMessage((previousMessage) => getRandomMessage(previousMessage));
+
+    messageIntervalRef.current = setInterval(() => {
+      setLoadingMessage((previousMessage) => getRandomMessage(previousMessage));
+    }, 2200);
+
+    return () => {
+      if (messageIntervalRef.current) {
+        clearInterval(messageIntervalRef.current);
+        messageIntervalRef.current = null;
+      }
+    };
+  }, [loader]);
+
   /**
    * Initialize the user menus
    */
   async function initializeUserMenus() {
     // need to find what implement, with a login who has the respective value ("wug_custreportids")
+
     const report = await loadScripts(user);
 
     await loadMenus(report);
+    // fetch license summary
   }
 
   // const keyMap = {
@@ -96,26 +302,21 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
    * @param reports
    */
   async function loadMenus(reports) {
-
     setLoader(true);
 
     // setReports(report)
-
+    fetchSummary();
     const result = await MenusAPI.getMenus(user);
 
     // console.log(result);
 
     if (result && Array.isArray(result.result) && result.result.length) {
-
       // setModules(result.result);
-
       // result.result.map((ele) => {
       //     let languageString = JSON.parse(ele.attributes)
       //     console.log('language_string', languageString);
       //     if (languageString && languageString.languages) {
-
       //         const language = i18n.language;
-
       //         i18n.addResourceBundle(language, 'translation', languageString.languages[i18n.language]);
       //     }
       // })
@@ -126,7 +327,6 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
       dispatch({ type: 'settings', payload: result.result.settings });
     }
 
-
     // Reports length
     if (reports.length) {
       reportMenus = [
@@ -161,7 +361,6 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
         //If there is no roles assigned to the user
         setAllModules([...coreModules]);
       }
-
     } else {
       //  for nura
       if (result && result.result.menus && reportMenus) {
@@ -170,14 +369,10 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
         //If there is no roles assigned to the user
         setAllModules([...coreModules]);
       }
-
-
     }
     setLoader(false);
-
   }
 
-
   /**
    * Load the scripts
    *
@@ -240,11 +435,14 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
         modules={allModules}
         user={user}
         history={history}
+        licenseData={licenseData}
+        licAlert={licAlert}
       >
         {loader ? (
           <Card className="skeleton-card">
             <div className="skeleton-wrapper">
               <Skeleton paragraph={{ rows: 4 }} />
+              <p className="motivating-text">{loadingMessage}</p>
             </div>
           </Card>
         ) : (

package/core/components/landing-api/landing-api.scss

@@ -11,9 +11,31 @@
     }
 
     .skeleton-wrapper {
+        .motivating-text {
+            margin-top: 14px;
+            margin-bottom: 4px;
+            font-size: 14px;
+            line-height: 20px;
+            text-align: center;
+            color: #5e6d86;
+            font-weight: 500;
+            animation: skeletonTextFade 0.4s ease-in-out;
+        }
     }
 
     .wrapper-loader {
         margin: 20px;
     }
 }
+
+@keyframes skeletonTextFade {
+    from {
+        opacity: 0;
+        transform: translateY(2px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}

package/core/components/license-management/license-alert.js

@@ -0,0 +1,97 @@
+import { Alert } from 'antd';
+import React, { useState, useEffect } from 'react';
+
+export default function LicenseAlert({ data }) {
+  // setting visibility of alert based on license status
+  const [visible, setVisible] = useState(true);
+  // resolve alert configuration based on license data
+  const alertConfig = resolveLicenseAlert(data);
+  // auto-hide alert after 10 seconds or when data changes
+  useEffect(() => {
+    if (alertConfig) {
+      setVisible(true);
+
+      const timer = setTimeout(() => {
+        setVisible(false);
+      }, 10000); // 10 seconds
+
+      return () => {
+        clearTimeout(timer);
+      };
+    }
+  }, [data]);
+  // if no alert configuration or not visible, render nothing
+  if (!alertConfig || !visible) return null;
+
+  return (
+    // render the alert with appropriate type, message, and description
+    <Alert
+      type={alertConfig.type}
+      message={alertConfig.message}
+      description={alertConfig.description}
+      showIcon
+      closable
+      onClose={() => setVisible(false)}
+    />
+  );
+}
+// function to determine alert configuration based on license data
+function resolveLicenseAlert(data) {
+  if (!data) return null;
+  // destructure relevant fields from license data
+  const { status, expiresInDays, isExpiringSoon, gracePeriod } = data;
+
+  // ===== NOT INSTALLED =====
+  if (status === 'NOT_INSTALLED') {
+    return {
+      type: 'error',
+      message: 'License not found',
+      description: 'Please install a valid license to continue.',
+    };
+  }
+
+  // ===== GRACE PERIOD =====
+  if (gracePeriod) {
+    return {
+      type: 'warning',
+      message: 'Grace period mode',
+      description: 'License expired. Running in read-only mode.',
+    };
+  }
+
+  // ===== EXPIRING SOON =====
+  if (status === 'ACTIVE' && isExpiringSoon) {
+    let descriptionText = '';
+    // customize message based on how soon the license is expiring
+    if (expiresInDays === 0) {
+      descriptionText = 'Your license will expire today. Please renew immediately.';
+    } else {
+      descriptionText = `Your license will expire in ${expiresInDays} days. Please plan for renewal.`;
+    }
+
+    return {
+      type: 'warning',
+      message: 'License expiring soon',
+      description: descriptionText,
+    };
+  }
+
+  // ===== NOT INSTALLED =====
+  if (status === 'NOT_INSTALLED') {
+    return {
+      type: 'error',
+      message: 'License not found',
+      description: 'Please install a valid license to continue.',
+    };
+  }
+  // =====EXPIRED=====
+  if (status === 'EXPIRED') {
+    return {
+      type: 'error',
+      message: 'License expired',
+      description: 'Your license has expired. Please renew or install a new license.',
+    };
+  }
+
+  return null;
+}

package/core/lib/Store.js

@@ -50,7 +50,7 @@ const initialTheme = () => {
     //  manage theme with env
     const isEnvThemeTrue = process.env.REACT_APP_THEME;
 
-    console.log('REACT_APP_THEME:', isEnvThemeTrue);
+    // console.log('REACT_APP_THEME:', isEnvThemeTrue);
     const matchedTheme = themes.find((t) => t.name === isEnvThemeTrue);
 
     if (matchedTheme) return matchedTheme;
@@ -64,7 +64,7 @@ const initialTheme = () => {
     // Fallback to default
     return themes[0];
   } catch (e) {
-    console.error('Error loading theme:', e);
+    // console.error('Error loading theme:', e);
     return themes[0];
   }
 };
@@ -72,12 +72,16 @@ const initialTheme = () => {
 const initialState = {
   defaultBranch: {},
   theme: initialTheme(), // Set the initial theme from themes.json
+  settings: {},
 };
 
 /**
  * Context for sharing state accross app
  */
-export const GlobalContext = createContext(initialState);
+export const GlobalContext = createContext({
+  ...initialState,
+  state: initialState,
+});
 
 let app = {};
 
@@ -94,7 +98,7 @@ export const GlobalProvider = ({ children, CustomModels,CustomComponents, appSet
 
   const [state, dispatch] = useReducer(AppReducer, initialState);
 
-  console.log(state);
+  // console.log(state);
 
   const { isMobile } = useDeviceDetect();