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

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,4 +1,4 @@
-import React, { useState, useEffect, useContext } from 'react';
+import React, { useState, useEffect, useContext, useRef } from 'react';
 
 import { Route, Switch } from 'react-router-dom';
 
@@ -17,6 +17,27 @@ import ReportingDashboard from '../../modules/reporting/components/reporting-das
 import PropTypes from 'prop-types';
 
 import { MenusAPI, CoreScripts } from '../../models';
+import LicenseAlert from '../license-management/license-alert';
+
+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
@@ -24,7 +45,7 @@ import { MenusAPI, CoreScripts } from '../../models';
  * @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([]);
@@ -34,12 +55,20 @@ 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
@@ -49,7 +78,20 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
   if (process.env.REACT_APP_DISABLEHOMEPAGE) {
     disableHomepage = JSON.parse(process.env.REACT_APP_DISABLEHOMEPAGE);
   }
-
+  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
@@ -70,14 +112,56 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
     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 +180,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 +205,6 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
       dispatch({ type: 'settings', payload: result.result.settings });
     }
 
-
     // Reports length
     if (reports.length) {
       reportMenus = [
@@ -161,7 +239,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 +247,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 +313,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 === 1) {
+      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];
   }
 };
@@ -94,7 +94,7 @@ export const GlobalProvider = ({ children, CustomModels,CustomComponents, appSet
 
   const [state, dispatch] = useReducer(AppReducer, initialState);
 
-  console.log(state);
+  // console.log(state);
 
   const { isMobile } = useDeviceDetect();
 

package/core/lib/components/global-header/global-header.js

@@ -49,7 +49,7 @@ import { useTranslation } from "react-i18next";
 import BorderStyle from "pdf-lib/cjs/core/annotation/BorderStyle";
 
 import SettingsUtil from "../../../utils/settings.utils";
-import { SpotlightSearch } from "..";
+import SpotlightSearch from "../spotlight-search/spotlight-search.component";
 
 
 
@@ -410,4 +410,4 @@ function ProfileAvatar() {
       {/* {user.name} */}
     </Link>
   );
-}
+}

package/core/lib/components/sidemenu/sidemenu.js

@@ -39,18 +39,18 @@ function CollapsedIconMenu({ menu, collapsed, icon, caption }) {
   // Import t and i18n from useTranslation
   const { t, i18n } = useTranslation();
   const { state } = useContext(GlobalContext);
-    const [isMobile, setIsMobile] = useState(false);
+  const [isMobile, setIsMobile] = useState(false);
 
-    useEffect(() => {
-      const handleResize = () => {
-        setIsMobile(window.innerWidth < 768); // Common breakpoint for mobile
-      };
+  useEffect(() => {
+    const handleResize = () => {
+      setIsMobile(window.innerWidth < 768); // Common breakpoint for mobile
+    };
 
-      handleResize(); // Set initial value
-      window.addEventListener('resize', handleResize);
+    handleResize(); // Set initial value
+    window.addEventListener('resize', handleResize);
 
-      return () => window.removeEventListener('resize', handleResize);
-    }, []);
+    return () => window.removeEventListener('resize', handleResize);
+  }, []);
 
   const menuText = t(caption);
   const menuContent = (
@@ -85,8 +85,14 @@ function CollapsedIconMenu({ menu, collapsed, icon, caption }) {
     </>
   );
 
-    // On mobile, or when the menu is collapsed (based on original logic), don't show the popover tooltip.
-    return isMobile || collapsed ? menuContent : <Popover content={menuText} placement="right">{menuContent}</Popover>;
+  // On mobile, or when the menu is collapsed (based on original logic), don't show the popover tooltip.
+  return isMobile || collapsed ? (
+    menuContent
+  ) : (
+    <Popover content={menuText} placement="right">
+      {menuContent}
+    </Popover>
+  );
 }
 
 export default function SideMenu({ loading, modules = [], callback, appSettings, collapsed }) {
@@ -123,7 +129,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
    * Logout Function
    */
   async function handleLogout() {
-    let dbPtrValue = appSettings.headers.db_ptr;
+    // let dbPtrValue = appSettings.headers.db_ptr;
     const isEnvThemeTrue = process.env.REACT_APP_THEME === 'true';
 
     //  Only clear localStorage if theme is not 'true'
@@ -137,7 +143,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
       // const result = Users.logout()
       localStorage.clear();
 
-      localStorage.setItem('db_ptr', dbPtrValue);
+      // localStorage.setItem('db_ptr', dbPtrValue);
 
       let userInfo = {
         dms: {},

package/core/lib/components/sidemenu/sidemenu.scss

@@ -263,7 +263,7 @@
 
 .ant-menu-item:hover {
   background-color: #e6f7ff !important;
-  color: #1677ff !important;
+  color: #1a90ff9e !important;
 }
 
 /* Tooltip styling if needed */

package/core/lib/elements/basic/country-phone-input/country-phone-input.js

@@ -11,21 +11,26 @@ import 'react-phone-input-2/lib/style.css';
 import PropTypes from 'prop-types';
 import './phone-input.scss';
 
-export default function CountryPhoneInput({ value, onChange, disabled, disableCountryCode, required, defaultCountryCode, onBlur,className }) {
+export default function CountryPhoneInput({
+  value,
+  onChange,
+  disabled,
+  disableCountryCode,
+  required,
+  defaultCountryCode,
+  onBlur,
+  className,
+  onKeyDown,
+}) {
   const inputRef = useRef();
   const hasInitializedRef = useRef(false); // IMPORTANT
 
   const [phone, setPhone] = useState('');
-
   /**
    * run ONLY ONCE when initial value has dial code
    */
   useEffect(() => {
-    if (
-      !hasInitializedRef.current &&
-      value?.code?.dialCode &&
-      value?.value
-    ) {
+    if (!hasInitializedRef.current && value?.code?.dialCode && value?.value) {
       setPhone(value.code.dialCode + value.value);
       hasInitializedRef.current = true; // 👈 mark as done
     }
@@ -54,7 +59,7 @@ export default function CountryPhoneInput({ value, onChange, disabled, disableCo
         // country={disableCountryCode ? false : 'in'}
         value={phone}
         onChange={handleInput}
-        inputProps={{ required: required }}
+        inputProps={{ required: required, onKeyDown: onKeyDown }}
         disabled={disabled}
         onBlur={onBlur}
       />
@@ -73,4 +78,4 @@ CountryPhoneInput.propTypes = {
   disableCountryCode: PropTypes.bool,
   /** A boolean indicating whether the input is required or not. This prop is optional. */
   required: PropTypes.bool,
-};
+};

package/core/lib/elements/basic/dragabble-wrapper/draggable-wrapper.js

@@ -102,7 +102,7 @@ export default function DraggableWrapper({ id, index, movePanel, item, dragEnabl
         >
           <div style={{ flex: 1 }}>
             {dragEnabled && <span style={{ marginRight: 8 }}>⋮⋮</span>}
-            <span>{item.name}</span>
+            <span>{item.caption}</span>
             {dragEnabled ? (
               <span style={{ marginLeft: 8, fontSize: 11, color: '#999' }}>(Level {level})</span>
             ) : (

package/core/lib/elements/basic/menu-tree/menu-tree.js

@@ -23,7 +23,7 @@
  */
 
 import React from 'react';
-import { Checkbox, Collapse } from 'antd';
+import { Checkbox, Collapse, Tag } from 'antd';
 
 const { Panel } = Collapse;
 
@@ -73,11 +73,15 @@ export const MenuTree = ({ menus, selectedMenus = [], toggleMenu, parentId = nul
               background: '#fff',
               display: 'flex',
               alignItems: 'center',
-              gap: 8,
+              justifyContent: 'space-between',
             }}
           >
-            {showCheckbox && <Checkbox checked={selectedMenus.includes(menu.id)} onChange={(e) => onParentChange(e.target.checked)} />}
-            <span>{menu.title || menu.caption}</span>
+            {/* Left Side */}
+            <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+              {showCheckbox && <Checkbox checked={selectedMenus.includes(menu.id)} onChange={(e) => onParentChange(e.target.checked)} />}
+              <span>{menu.caption}</span>
+            </div>
+            <Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
           </div>
         );
       }
@@ -91,15 +95,24 @@ export const MenuTree = ({ menus, selectedMenus = [], toggleMenu, parentId = nul
           <Panel
             key={menu.id}
             header={
-              <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
-                {showCheckbox && (
-                  <Checkbox
-                    checked={children.every((c) => selectedMenus.includes(c.id))}
-                    indeterminate={children.some((c) => selectedMenus.includes(c.id)) && !children.every((c) => selectedMenus.includes(c.id))}
-                    onChange={(e) => onParentChange(e.target.checked)}
-                  />
-                )}
-                <span>{menu.title || menu.caption}</span>
+              <div
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'space-between',
+                }}
+              >
+                <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+                  {showCheckbox && (
+                    <Checkbox
+                      checked={children.every((c) => selectedMenus.includes(c.id))}
+                      indeterminate={children.some((c) => selectedMenus.includes(c.id)) && !children.every((c) => selectedMenus.includes(c.id))}
+                      onChange={(e) => onParentChange(e.target.checked)}
+                    />
+                  )}
+                  <span>{menu.caption}</span>
+                </div>
+                <Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
               </div>
             }
           >

package/core/lib/models/forms/components/form-creator/form-creator.scss

@@ -4,7 +4,7 @@
     }
 
     .new-record {
-            gap: 10px !important;
+        gap: 10px !important;
     }
 
     .form-item-element {
@@ -22,9 +22,10 @@
                 // right: 0px;
             }
         }
-     
+
     }
-    .submit-button{
+
+    .submit-button {
         margin-top: 10px;
     }
 }