ui-soxo-bootstrap-core 2.6.32-dev.2 → 2.6.32

package/core/components/index.js

@@ -1,3 +1,7 @@
+
+
+
+
 import LandingAPI from './landing-api/landing-api';
 
 import ExtraInfoDetail from './extra-info/extra-info-details';
@@ -7,6 +11,11 @@ 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, LicenseAlert };
+export {
+    LandingAPI,
+    RootApplicationAPI,
+    ExtraInfoDetail,
+    HomePageAPI,
+    ExternalWindow
+}

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

@@ -2,20 +2,9 @@ import { useContext, useEffect, useRef, useState } from 'react';
 
 import { Route, Switch } from 'react-router-dom';
 
-import { Skeleton, message, Modal } from 'antd';
-
-import {
-  GlobalHeader,
-  ChangePassword,
-  useTranslation,
-  GlobalContext,
-  ModuleRoutes,
-  SpotlightSearch,
-  SettingsUtil,
-  Profile,
-  Card,
-  safeJSON,
-} from '../../lib';
+import { Skeleton } from 'antd';
+
+import { Card, ChangePassword, GlobalContext, GlobalHeader, ModuleRoutes, Profile, SettingsUtil, SpotlightSearch, useTranslation } from '../../lib';
 
 import './landing-api.scss';
 
@@ -57,6 +46,7 @@ function getRandomMessage(previousMessage = '') {
  */
 export default function LandingApi({ history, CustomComponents, CustomModels, appSettings, transitionPending = false, onHomeReady, ...props }) {
   const [loader, setLoader] = useState(false);
+
   // const [modules, setModules] = useState([]);
 
   const [connected] = useState();
@@ -69,31 +59,11 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
 
   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
-  // 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);
-  //   }
-  // };
-
   // Variable decides the control of homepage
   // #TODO This is a temporary fix - Homemage
 
@@ -103,70 +73,6 @@ 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
@@ -182,67 +88,6 @@ 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();
@@ -293,12 +138,9 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
    */
   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
-    fetchSummary();
   }
 
   // const keyMap = {
@@ -320,7 +162,7 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
     setLoader(true);
 
     // setReports(report)
-    fetchSummary();
+
     const result = await MenusAPI.getMenus(user);
 
     // console.log(result);
@@ -450,8 +292,6 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
         modules={allModules}
         user={user}
         history={history}
-        licenseData={licenseData}
-        licAlert={licAlert}
       >
         {loader ? (
           <Card className="skeleton-card">

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

@@ -2,91 +2,136 @@
  *
  * Global header component
  */
+
 import { useContext, useEffect, useRef, useState } from 'react';
+
 import { motion, useAnimation } from 'framer-motion';
+
 import { boxVariants } from './animations';
+
 import { GlobalContext, GlobalProvider } from './../../Store';
+
 import { Link, useLocation } from 'react-router-dom';
+
 import { Avatar, Input, Tooltip, Typography } from 'antd';
+
 import ProgressBar from '../progress-bar/progress-bar'; // Adjust the path as needed
+
 import { Button } from '../../elements';
+
 import GenericHeader from '../header/generic-header';
+
+
 import { CustomerServiceOutlined, MenuOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons';
+
 import { Drawer } from 'antd';
+
 import { ReloadOutlined, SearchOutlined } from '@ant-design/icons';
+
 import SideMenu from './../sidemenu/sidemenu';
+
 import './global-header.scss';
+
 import LanguageSwitcher from '../language-switcher/language-switcher';
+
 import { useTranslation } from 'react-i18next';
+
 import SettingsUtil from '../../../utils/settings.utils';
 import SpotlightSearch from '../spotlight-search/spotlight-search.component';
-import { LicenseAlert } from '../../../components';
+
 const { Title } = Typography;
-function GlobalHeaderContent({ loading, appSettings, children, isConnected, history, modules = [], sidemenu = [], reload, meta = {}, licAlert,
-  licenseData ,...props }) {
+
+function GlobalHeaderContent({ loading, appSettings, children, isConnected, history, modules = [], sidemenu = [], reload, meta = {}, ...props }) {
   let location = useLocation();
   // let location = {};
+
   const { isMobile, user = { locations: [] }, kiosk, state, settings } = useContext(GlobalContext);
+
   const [visible, setVisible] = useState(false);
   const helpDeskSetting = settings?.HELPATR || {};
+
   // Variable to handle toggling of menu
   const [collapsed, setCollapsed] = useState(false);
   // varibale handle branch switcher
+
   // const [searchModalVisible, setSearchModalVisible] = useState(false);
+
   const { globalCustomerHeader = () => {} } = appSettings;
+
   const { t, i18n } = useTranslation();
+
   const spotlightRef = useRef();
+
   useEffect(() => {
     setTimeout(() => {
       i18n.changeLanguage(localStorage.selectedLanguage);
     }, 0);
   }, []);
+
   /**
    * Function to handle toggling of menu
    */
+
   const toggleCollapsed = () => {
     setVisible(true);
+
     collapsed === true ? setCollapsed(false) : setCollapsed(true);
   };
+
   const openSearchModal = () => {
     //  input to avoid typing
     SettingsUtil.openSpotlightModal();
   };
+
   /**
    * Function to remove toggling on mobile view
    */
   const hideToggle = () => {
     setVisible(true);
+
     setCollapsed(false);
   };
+
   /**
    * onClose Function
    */
+
   const onClose = () => {
     setVisible(false);
   };
+
   // const { model = {} } = menu;
+
   const { model: BaseModel = {}, menu = {} } = meta;
+
   const { model = {} } = menu;
+
   //Animations//
   const boxControls = useAnimation();
+
   async function animate() {
     await boxControls.start('entered');
+
     //await boxControls.start("show");
   }
+
   useEffect(() => {
     animate();
   }, []);
+
   useEffect(() => {}, [state.theme]);
+
   return (
     <div
       className={`global-header ${process.env.REACT_APP_THEME}  ${isConnected && !kiosk ? 'connected' : ''}`}
       style={{
         // background: state.theme.colors.bodyBackground,
-        height: 'auto',
+
+        height: 10,
       }}
     >
       {/* <MenuOutlined style={{left:'1%',top:'1%', fontSize:18, position:'absolute', zIndex:999}} onClick={showSidebar}/> */}
+
       <div className="layout-content">
         <div
           //whileHover="hover"
@@ -129,6 +174,7 @@ function GlobalHeaderContent({ loading, appSettings, children, isConnected, hist
             </Drawer>
           )}
         </div>
+
         {/* Right Section of the Component Loader */}
         <div
           className={`right-section ${!collapsed ? 'open' : 'close'} ${kiosk ? 'kioskon' : ''}`}
@@ -143,9 +189,11 @@ function GlobalHeaderContent({ loading, appSettings, children, isConnected, hist
               {/*  */}
               <div className="page-header-name">
                 <ProgressBar isLoading={loading} />
+
                 <span type onClick={!isMobile ? toggleCollapsed : hideToggle} className="toggle-box toggle-menu">
                   <MenuOutlined />
                 </span>
+
                 {/* Back Button */}
                 {location.pathname !== '/' ? (
                   <span
@@ -158,30 +206,39 @@ function GlobalHeaderContent({ loading, appSettings, children, isConnected, hist
                   </span>
                 ) : null}
                 {/* Back Button Ends */}
+
                 {location.pathname !== '/' ? (
                   <h4 className="menu-caption header-caption" style={{ color: state.theme.colors.headerColor }}>
                     {menu.caption}
                   </h4>
                 ) : null}
               </div>
+
               {/* Page Menu Actions */}
+
               {user.role || user.id ? (
                 <div className="page-menu">
                   {/* Search Input in header start */}
                   {!isMobile && (
                     <div>
                       <Input placeholder="Search (Shift + F)" prefix={<SearchOutlined />} onClick={openSearchModal} readOnly style={{ width: 250 }} />
+
                       <SpotlightSearch ref={(elem) => SettingsUtil.registerModal(elem)} props={props} />
                     </div>
                   )}
                   {/* Search Input in header start */}
+
                   {/** branchswitcher Option  */}
                   {/* branch switcher controlled with env for matria and nura */}
                   {!process.env.REACT_APP_SHOW_BRANCH_SWITCHER ? <div className="branch-switcher">{globalCustomerHeader()}</div> : null}
                   {/* <div className="branch-switcher">{globalCustomerHeader()}</div> */}
+
                   {/* Search Option */}
+
                   {/* <ModalSearch /> */}
+
                   {/* Search Option Ends */}
+
                   {/* Configurator Actions */}
                   {user.isAdmin ? (
                     <>
@@ -195,9 +252,13 @@ function GlobalHeaderContent({ loading, appSettings, children, isConnected, hist
                     </>
                   ) : null}
                   {/* Configurator Actions Ends */}
+
                   {/* Reload Button */}
+
                   <Button onClick={reload} icon={<ReloadOutlined />} type="default" size={'small'}></Button>
+
                   {/* Reload Button Ends */}
+
                   {/* Help-desk-btn */}
                   {helpDeskSetting?.showSupportBtn
                     ? (() => {
@@ -216,9 +277,11 @@ function GlobalHeaderContent({ loading, appSettings, children, isConnected, hist
                         );
                       })()
                     : null}
+
                   {/** Switch Languages starts */}
                   {process.env.REACT_APP_ENABLE_LANGUAGE_SWITCHER ? <LanguageSwitcher /> : null}
                   {/** Switch Languages ends */}
+
                   {/* User Profile */}
                   <div style={{ padding: '10px' }}>
                     <ProfileAvatar />
@@ -227,49 +290,44 @@ function GlobalHeaderContent({ loading, appSettings, children, isConnected, hist
                   {/* User Profile Ends */}
                 </div>
               ) : null}
+
               {/* Page Menu Actions Ends */}
             </div>
           ) : null}
+
           {/* The children is rendered */}
           {children}
           {/* The children is rendered */}
         </div>
         {/* Right Section of the Component Loader Ends */}
       </div>
-      {licAlert && licenseData && (
-        <div
-          style={{
-            // top: 0,
-            marginTop: '3rem',
-            right: '2%',
-            position: 'absolute',
-            zIndex: 999,
-          }}
-        >
-          <LicenseAlert data={licenseData} />
-        </div>
-      )}
     </div>
   );
 }
+
 export default function GlobalHeader(props) {
   const context = useContext(GlobalContext);
+
   if (context.dispatch) {
     return <GlobalHeaderContent {...props} />;
   }
+
   return (
     <GlobalProvider {...props} appSettings={props.appSettings}>
       <GlobalHeaderContent {...props} />
     </GlobalProvider>
   );
 }
+
 /**
  *
  * @returns
  */
 function ProfileAvatar() {
   const { user = { locations: [] } } = useContext(GlobalContext);
+
   useEffect(() => {}, []);
+
   return (
     <Link className="profile-avatar" to="/profile">
       {user.photograph ? (
@@ -279,7 +337,8 @@ function ProfileAvatar() {
       ) : (
         <Avatar shape="square" size="small" icon={<UserOutlined />} />
       )}
+
       {/* {user.name} */}
     </Link>
   );
-}
+}

package/core/lib/components/index.js

@@ -109,7 +109,7 @@ import ConsentComponent from './consent/consent'
 import TaskOverviewLegacy from './../models/process/components/task-overview-legacy/task-overview-legacy'
 
 import ReportingDashboard from '../../modules/reporting/components/reporting-dashboard/reporting-dashboard';
-import ReportingTable from '../../modules/reporting/components/reporting-dashboard/reporting-table'
+
 import ProcessStepsPage from '../../modules/steps/steps'
 export {
 
@@ -198,7 +198,7 @@ export {
   TaskOverviewLegacy,
   // WebCamera,
   ConsentComponent,
-ReportingTable,
+
   ReportingDashboard,
   ProcessStepsPage
 

package/core/lib/elements/complex/qrscanner/qrscanner.js

@@ -8,7 +8,7 @@
  */
 
 import React, { useEffect, useRef } from 'react';
-import { Html5Qrcode } from 'html5-qrcode/cjs/index.js';
+import { Html5Qrcode } from 'html5-qrcode';
 
 /**
  * QrScanner Component

package/core/models/core-scripts/core-scripts.js

@@ -69,6 +69,7 @@ class CoreScript extends Base {
     // Settings db pointer
     if (!dbPtr) dbPtr = localStorage.db_ptr;
     return ApiUtils.post({
+        // baseUrl: 'http://localhost:8002/dev/',  
       url: `core-scripts/dashboardquery/${id}`,
       formBody,
       headers: {
@@ -90,20 +91,6 @@ class CoreScript extends Base {
     });
   };
 
-  getCorescript = (formBody,dbPtr) => {
-   
-    if (!dbPtr) dbPtr = localStorage.db_ptr;
-    return ApiUtils.post({
-    //   baseUrl: 'http://localhost:8002/dev/',
-      url: `core-scripts/get-core-script`,
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: 'Bearer ' + localStorage.access_token,
-        db_ptr: dbPtr,
-      },
-      formBody,
-    });
-  };
   getQuery = (formBody) => {
     return ApiUtils.post({
       url: `core-scripts/execute-script-api`,

package/core/models/menus/menus.js

@@ -160,29 +160,6 @@ class MenusAPI extends Base {
     });
   };
 
-  getBranches = () => {
-    return ApiUtils.get({
-      url: 'branches',
-    });
-  };
-
-  switchBranch = (formBody, dbPtr) => {
-    return ApiUtils.post({
-      url: `auth/switch-branch`,
-      headers: { db_ptr: dbPtr },
-      formBody,
-    });
-  };
-
-  getProfile = (token) => {
-    return ApiUtils.get({
-      url: 'auth/profile',
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
-    });
-  };
-
   /**
    * create menu
    */
@@ -208,6 +185,7 @@ class MenusAPI extends Base {
         : 'menus/get-menus'; // NURA
 
     if (!dbPtr) dbPtr = localStorage.db_ptr;
+
     return this.get({
       url,
       config,
@@ -327,12 +305,6 @@ class MenusAPI extends Base {
       // }
     ];
   };
-  // license summary api call
-  getSummary = () => {
-    return ApiUtils.get({
-      url: 'license/summary',
-    });
-  };
 }
 
 export default MenusAPI;

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

@@ -161,6 +161,10 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
 
         setDisabled(true);
       }
+      /** If user has FA set to false , then disable authentication */
+      if (formContent?.FA === false) {
+        setAuthentication(false);
+      }
     }
   }, []);
 

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

@@ -68,7 +68,7 @@ export default function UserEdit(record) {
             doctor_code: apiData.doctor_code,
             staff_code: apiData.staff_id,
             auth_type: apiData.auth_type,
-            FA: apiData.FA,
+            FA: otherDetails.FA,
             active: apiData.active ? true : false,
           };
           // Set form data state