ui-soxo-bootstrap-core 2.6.20 → 2.6.21

package/core/lib/Store.js

@@ -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 = {};
 

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

@@ -3,7 +3,7 @@
  * Global header component
  */
 
-import React, { useState, useEffect, useContext,useRef } from "react";
+import React, { useState, useEffect, useContext, useRef } from "react";
 
 import { animationControls, motion, useAnimation } from "framer-motion";
 
@@ -11,11 +11,11 @@ import {
   boxVariants,
 } from "./animations"
 
-import { GlobalContext } from "./../../Store";
+import { GlobalContext, GlobalProvider } from "./../../Store";
 
 import { Link, useLocation } from "react-router-dom";
 
-import { Typography, Avatar ,Input} from "antd";
+import { Typography, Avatar, Input, Tooltip } from "antd";
 
 
 
@@ -31,6 +31,7 @@ import {
   MenuOutlined,
   UserOutlined,
   SettingOutlined,
+  QuestionOutlined,
 } from "@ant-design/icons";
 
 import { Drawer } from "antd";
@@ -58,7 +59,7 @@ const { Title } = Typography;
 
 
 
-export default function GlobalHeader({
+function GlobalHeaderContent({
   loading,
   appSettings,
   children,
@@ -76,17 +77,18 @@ export default function GlobalHeader({
 
 
 
-  const { isMobile, user = { locations: [] }, kiosk, state } = useContext(GlobalContext);
+  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);
 
@@ -107,8 +109,8 @@ export default function GlobalHeader({
 
 
   }, []);
- 
-  
+
+
 
 
   /**
@@ -125,9 +127,9 @@ export default function GlobalHeader({
     //  input to avoid typing
     SettingsUtil.openSpotlightModal();
   };
-  
- 
-  
+
+
+
 
   /**
    * Function to remove toggling on mobile view
@@ -170,10 +172,10 @@ export default function GlobalHeader({
 
   }, [state.theme]);
 
- 
-  
-  
-  
+
+
+
+
 
 
   return (
@@ -196,7 +198,7 @@ export default function GlobalHeader({
           //whileHover="hover"
           //whileTap="tap"
           className={`left-bar ${!isConnected && !isMobile ? "" : "hide"}${!collapsed ? "open" : "close"}${kiosk && !isConnected ? "kioskon" : ""}`}
-          // style={{ background: state.theme.colors.leftSectionBackground }}
+        // style={{ background: state.theme.colors.leftSectionBackground }}
         >
 
           {!isMobile && !isConnected ? (
@@ -288,34 +290,34 @@ export default function GlobalHeader({
               </div>
 
               {/* Page Menu Actions */}
-              
+
               {user.role || user.id ? (
                 <div className="page-menu">
-                   {/* Search Input in header start */}
-                 { !isMobile && (
-                              
+                  {/* 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}/>
-                    
+                      <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 */}
+                  )}
+                  {/* 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>
+                  ) : null}
                   {/* <div className="branch-switcher">{globalCustomerHeader()}</div> */}
 
 
@@ -342,7 +344,7 @@ export default function GlobalHeader({
                   ) : null}
                   {/* Configurator Actions Ends */}
 
-                 
+
 
 
 
@@ -355,6 +357,18 @@ export default function GlobalHeader({
 
                   {/* Reload Button Ends */}
 
+                  {/* Help-desk-btn */}
+                  {helpDeskSetting?.showSupportBtn ? <Tooltip title={helpDeskSetting?.toolTipText}>
+                    <span>
+                      <Button
+                        onClick={() => window.open(helpDeskSetting?.helpDeskLink ?? '', '_blank')}
+                        icon={<QuestionOutlined />}
+                        type="default"
+                        size="small"
+                      />
+                    </span>
+                  </Tooltip> : null}
+
                   {/** Switch Languages starts */}
                   {process.env.REACT_APP_ENABLE_LANGUAGE_SWITCHER ? <LanguageSwitcher /> : null}
                   {/** Switch Languages ends */}
@@ -383,6 +397,22 @@ export default function GlobalHeader({
 }
 
 
+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 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.6.20",
+  "version": "2.6.21",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"