ui-soxo-bootstrap-core 2.6.1-dev.19 → 2.6.1-dev.20

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

@@ -17,6 +17,7 @@ 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...',
@@ -59,6 +60,9 @@ 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([]);
@@ -74,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
@@ -166,7 +183,7 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
     setLoader(true);
 
     // setReports(report)
-
+    fetchSummary();
     const result = await MenusAPI.getMenus(user);
 
     // console.log(result);
@@ -296,6 +313,8 @@ 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

@@ -47,7 +47,7 @@ import BorderStyle from 'pdf-lib/cjs/core/annotation/BorderStyle';
 import SettingsUtil from '../../../utils/settings.utils';
 import SpotlightSearch from '../spotlight-search/spotlight-search.component';
 import { LicenseAlert } from '../../../components';
-import { MenusAPI } from '../../../models';
+// import { MenusAPI } from '../../../models';
 
 const { Title } = Typography;
 
@@ -61,6 +61,8 @@ export default function GlobalHeader({
   sidemenu = [],
   reload,
   meta = {},
+  licenseData,
+  licAlert,
   ...props
 }) {
   let location = useLocation();
@@ -81,26 +83,14 @@ export default function GlobalHeader({
   const { t, i18n } = useTranslation();
   const reduceMotion = useReducedMotion();
   const shouldAnimate = !reduceMotion;
-  const [licenseData, setLicenseData] = useState({});
-
-  const fetchSummary = async () => {
-    console.log('fetching summary');
-    try {
-      const res = await MenusAPI.getSummary();
-      if (res?.data) {
-        setLicenseData(res?.data);
-      }
-    } catch (err) {
-      console.error(err);
-    }
-  };
+
   const spotlightRef = useRef();
 
   useEffect(() => {
     setTimeout(() => {
       i18n.changeLanguage(localStorage.selectedLanguage);
     }, 0);
-    fetchSummary();
+    // fetchSummary();
   }, []);
 
   /**
@@ -351,7 +341,7 @@ export default function GlobalHeader({
           {/* Right Section of the Component Loader Ends */}
         </div>
       </div>
-      {licenseData && (
+      {licAlert && licenseData && (
         <div
           style={{
             marginTop: '3rem',

package/package.json

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