ui-soxo-bootstrap-core 2.6.1-dev.27 → 2.6.1-dev.28

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

@@ -9,7 +9,7 @@ import { animationControls, motion, useAnimation } from 'framer-motion';
 
 import { boxVariants } from './animations';
 
-import { GlobalContext } from './../../Store';
+import { GlobalContext, GlobalProvider } from "./../../Store";
 
 import { Link, useLocation } from 'react-router-dom';
 
@@ -21,7 +21,7 @@ import { Button } from '../../elements';
 
 import GenericHeader from '../header/generic-header';
 
-import { MenuOutlined, UserOutlined, SettingOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { MenuOutlined, UserOutlined, SettingOutlined, QuestionOutlined } from '@ant-design/icons';
 
 import { Drawer } from 'antd';
 
@@ -43,7 +43,8 @@ import { LicenseAlert } from '../../../components';
 
 const { Title } = Typography;
 
-export default function GlobalHeader({
+
+function GlobalHeaderContent({
   loading,
   appSettings,
   children,
@@ -60,9 +61,12 @@ export default function GlobalHeader({
   let location = useLocation();
   // let location = {};
 
-  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);
@@ -74,8 +78,6 @@ export default function GlobalHeader({
 
   const { t, i18n } = useTranslation();
 
-  const helpDeskUrl = process.env.REACT_APP_HELP_DESK_URL
-
   const spotlightRef = useRef();
 
   useEffect(() => {
@@ -135,6 +137,15 @@ export default function GlobalHeader({
     animate();
   }, []);
 
+  useEffect(() => {
+
+  }, [state.theme]);
+
+
+
+
+
+
   useEffect(() => { }, [state.theme]);
 
   return (
@@ -283,11 +294,11 @@ export default function GlobalHeader({
                     {/* Reload Button Ends */}
 
                     {/* Help-desk-btn */}
-                    {helpDeskUrl ? <Tooltip title="Application support">
+                    {helpDeskSetting?.showSupportBtn ? <Tooltip title={helpDeskSetting?.toolTipText}>
                       <span>
                         <Button
-                          onClick={() => window.open(helpDeskUrl, '_blank')}
-                          icon={<QuestionCircleOutlined />}
+                          onClick={() => window.open(helpDeskSetting?.helpDeskLink ?? '', '_blank')}
+                          icon={<QuestionOutlined />}
                           type="default"
                           size="small"
                         />
@@ -335,6 +346,23 @@ 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.1-dev.27",
+  "version": "2.6.1-dev.28",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"