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

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

@@ -17,7 +17,6 @@ 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...',
@@ -68,6 +67,7 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
   // const [reports, setReports] = useState([]);
 
   var config = {};
+
   //fetch license summary
 
   // Variable decides the control of homepage

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

@@ -1,92 +1,18 @@
 export const boxVariants = {
-    entering: { x: -24, opacity: 0, scale: 0.985 },
+    entering: { x: -50, opacity: 0},
     entered: {
         x: 0,
         opacity: 1,
-        scale: 1,
         transition: {
             x: {
-                duration: 0.45,
+                duration: 0.5,
                 ease: [.62,.28,.23,.99]
             },
             opacity: {
-                duration: 0.35,
+                duration: 0.5,
                 ease: [.62,.28,.23,.99]
-            },
-            scale: {
-                duration: 0.45,
-                ease: [.22,1,.36,1]
             }
         },
         
     }
-  };
-
-export const headerShellVariants = {
-  hidden: {
-    y: -14,
-    opacity: 0,
-    scale: 0.995,
-    filter: 'blur(6px)',
-  },
-  visible: {
-    y: 0,
-    opacity: 1,
-    scale: 1,
-    filter: 'blur(0px)',
-    transition: {
-      duration: 0.45,
-      ease: [.22,1,.36,1],
-      when: 'beforeChildren',
-      staggerChildren: 0.045,
-    },
-  },
-};
-
-export const headerClusterVariants = {
-  hidden: { opacity: 0, x: -12 },
-  visible: {
-    opacity: 1,
-    x: 0,
-    transition: {
-      duration: 0.32,
-      ease: [.22,1,.36,1],
-    },
-  },
-};
-
-export const headerActionsVariants = {
-  hidden: {},
-  visible: {
-    transition: {
-      staggerChildren: 0.05,
-      delayChildren: 0.08,
-    },
-  },
-};
-
-export const headerActionItemVariants = {
-  hidden: { opacity: 0, y: -8, scale: 0.98 },
-  visible: {
-    opacity: 1,
-    y: 0,
-    scale: 1,
-    transition: {
-      duration: 0.28,
-      ease: [.22,1,.36,1],
-    },
-  },
-};
-
-export const contentRevealVariants = {
-  hidden: { opacity: 0, y: 10 },
-  visible: {
-    opacity: 1,
-    y: 0,
-    transition: {
-      duration: 0.35,
-      ease: [.22,1,.36,1],
-      delay: 0.08,
-    },
-  },
-};
+  }

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

@@ -5,16 +5,9 @@
 
 import React, { useState, useEffect, useContext, useRef } from 'react';
 
-import { motion, useAnimation, useReducedMotion } from 'framer-motion';
+import { animationControls, motion, useAnimation } from 'framer-motion';
 
-import {
-  boxVariants,
-  contentRevealVariants,
-  headerActionItemVariants,
-  headerActionsVariants,
-  headerClusterVariants,
-  headerShellVariants,
-} from './animations';
+import { boxVariants } from './animations';
 
 import { GlobalContext } from './../../Store';
 
@@ -46,8 +39,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 LicenseAlert from '../../../components/license-management/license-alert';
 
 const { Title } = Typography;
 
@@ -61,8 +53,8 @@ export default function GlobalHeader({
   sidemenu = [],
   reload,
   meta = {},
-  licenseData,
   licAlert,
+  licenseData,
   ...props
 }) {
   let location = useLocation();
@@ -74,6 +66,7 @@ export default function GlobalHeader({
 
   // Variable to handle toggling of menu
   const [collapsed, setCollapsed] = useState(false);
+
   // varibale handle branch switcher
 
   // const [searchModalVisible, setSearchModalVisible] = useState(false);
@@ -81,8 +74,6 @@ export default function GlobalHeader({
   const { globalCustomerHeader = () => {} } = appSettings;
 
   const { t, i18n } = useTranslation();
-  const reduceMotion = useReducedMotion();
-  const shouldAnimate = !reduceMotion;
 
   const spotlightRef = useRef();
 
@@ -90,7 +81,7 @@ export default function GlobalHeader({
     setTimeout(() => {
       i18n.changeLanguage(localStorage.selectedLanguage);
     }, 0);
-    // fetchSummary();
+    fetchSummary();
   }, []);
 
   /**
@@ -135,11 +126,6 @@ export default function GlobalHeader({
   const boxControls = useAnimation();
 
   async function animate() {
-    if (!shouldAnimate) {
-      boxControls.set('entered');
-      return;
-    }
-
     await boxControls.start('entered');
 
     //await boxControls.start("show");
@@ -147,12 +133,10 @@ export default function GlobalHeader({
 
   useEffect(() => {
     animate();
-  }, [shouldAnimate]);
+  }, []);
 
   useEffect(() => {}, [state.theme]);
 
-  const motionProps = shouldAnimate ? { initial: 'hidden', animate: 'visible' } : { initial: false, animate: false };
-
   return (
     <>
       <div
@@ -215,14 +199,12 @@ export default function GlobalHeader({
           >
             {/* For not connected section */}
             {!isConnected && !kiosk ? (
-              <motion.div
-                variants={headerShellVariants}
-                {...motionProps}
+              <div
                 className={`page-wrapper ${!collapsed ? 'open' : 'close'}`}
                 // style={{ background: state.theme.colors.headerBg }}
               >
                 {/*  */}
-                <motion.div className="page-header-name" variants={headerClusterVariants}>
+                <div className="page-header-name">
                   <ProgressBar isLoading={loading} />
 
                   <span type onClick={!isMobile ? toggleCollapsed : hideToggle} className="toggle-box toggle-menu">
@@ -247,15 +229,15 @@ export default function GlobalHeader({
                       {menu.caption}
                     </h4>
                   ) : null}
-                </motion.div>
+                </div>
 
                 {/* Page Menu Actions */}
 
                 {user.role || user.id ? (
-                  <motion.div className="page-menu" variants={headerActionsVariants}>
+                  <div className="page-menu">
                     {/* Search Input in header start */}
                     {!isMobile && (
-                      <motion.div className="header-action header-action-search" variants={headerActionItemVariants}>
+                      <div>
                         <Input
                           placeholder="Search (Shift + F)"
                           prefix={<SearchOutlined />}
@@ -265,17 +247,13 @@ export default function GlobalHeader({
                         />
 
                         <SpotlightSearch ref={(elem) => SettingsUtil.registerModal(elem)} props={props} />
-                      </motion.div>
+                      </div>
                     )}
                     {/* Search Input in header start */}
 
                     {/** branchswitcher Option  */}
                     {/* branch switcher controlled with env for matria and nura */}
-                    {!process.env.REACT_APP_SHOW_BRANCH_SWITCHER ? (
-                      <motion.div className="branch-switcher header-action" variants={headerActionItemVariants}>
-                        {globalCustomerHeader()}
-                      </motion.div>
-                    ) : null}
+                    {!process.env.REACT_APP_SHOW_BRANCH_SWITCHER ? <div className="branch-switcher">{globalCustomerHeader()}</div> : null}
                     {/* <div className="branch-switcher">{globalCustomerHeader()}</div> */}
 
                     {/* Search Option */}
@@ -289,11 +267,9 @@ export default function GlobalHeader({
                       <>
                         {/* Models */}
                         {menu && menu.id ? (
-                          <motion.div className="header-action" variants={headerActionItemVariants}>
-                            <Link to={`/menus/${menu.id}`}>
-                              <Button type="default" size={'small'} icon={<SettingOutlined />}></Button>
-                            </Link>
-                          </motion.div>
+                          <Link to={`/menus/${menu.id}`}>
+                            <Button type="default" size={'small'} icon={<SettingOutlined />}></Button>
+                          </Link>
                         ) : null}
                         {/* Models Ends */}
                       </>
@@ -302,40 +278,29 @@ export default function GlobalHeader({
 
                     {/* Reload Button */}
 
-                    <motion.div className="header-action" variants={headerActionItemVariants}>
-                      <Button onClick={reload} icon={<ReloadOutlined />} type="default" size={'small'}></Button>
-                    </motion.div>
+                    <Button onClick={reload} icon={<ReloadOutlined />} type="default" size={'small'}></Button>
 
                     {/* Reload Button Ends */}
 
                     {/** Switch Languages starts */}
-                    {process.env.REACT_APP_ENABLE_LANGUAGE_SWITCHER ? (
-                      <motion.div className="header-action" variants={headerActionItemVariants}>
-                        <LanguageSwitcher />
-                      </motion.div>
-                    ) : null}
+                    {process.env.REACT_APP_ENABLE_LANGUAGE_SWITCHER ? <LanguageSwitcher /> : null}
                     {/** Switch Languages ends */}
 
                     {/* User Profile */}
-                    <motion.div className="header-profile-wrap header-action" variants={headerActionItemVariants}>
+                    <div style={{ padding: '10px' }}>
                       <ProfileAvatar />
-                      <span className="header-profile-name" style={{ color: state.theme.colors.colorText }}>
-                        {' '}
-                        {user.name}{' '}
-                      </span>
-                    </motion.div>
+                      <span style={{ color: state.theme.colors.colorText }}> {user.name} </span>
+                    </div>
                     {/* User Profile Ends */}
-                  </motion.div>
+                  </div>
                 ) : null}
 
                 {/* Page Menu Actions Ends */}
-              </motion.div>
+              </div>
             ) : null}
 
             {/* The children is rendered */}
-            <motion.div className="page-content-stage" variants={contentRevealVariants} {...motionProps}>
-              {children}
-            </motion.div>
+            {children}
             {/* The children is rendered */}
           </div>
           {/* Right Section of the Component Loader Ends */}

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

@@ -123,7 +123,7 @@
   .right-section {
     margin-top: 0px;
     width: 100%;
-    overflow-x: auto;
+    overflow-x: scroll;
     position: relative;
     padding: 15px;
     margin-left: 212px;
@@ -155,10 +155,12 @@
       }
     }
 
-    @media only screen and (max-width: 768px) {
+   @media only screen and (max-width: 768px) {
       margin-left: 0 !important; // remove left margin on mobile
       padding: 10px !important;
     }
+
+
   }
 
   .profile-avatar {
@@ -201,19 +203,16 @@
     display: flex;
     justify-content: space-between;
     // padding: 3px 8px;
-    border: 1px solid rgba(224, 229, 238, 0.9);
+    border-bottom: 1px solid #d7d7d787;
     position: fixed;
-    height: 58px;
+    height: 56px;
     top: 0;
-    background: linear-gradient(180deg, rgba(255, 255, 255, 0.96) 0%, rgba(249, 250, 252, 0.98) 100%);
-    backdrop-filter: blur(12px);
+    background: white;
     z-index: 1000;
     width: 92%;
     overflow-x: hidden;
     overflow-y: hidden;
-    padding: 8px 12px;
-    border-radius: 0 0 14px 14px;
-    box-shadow: 0 10px 26px rgba(16, 24, 40, 0.06);
+    padding: 15px;
 
     &.open {
       width: calc(100% - 212px);
@@ -221,27 +220,20 @@
       left: 212px;
     }
 
-    &.close {
-      width: calc(100% - 96px);
-      left: 88px;
-    }
+  @media only screen and (max-width: 768px) {
+    padding: 8px 10px 8px 14px !important;
+    left: 0 !important;
+    width: 100% !important;
 
-    @media only screen and (max-width: 768px) {
-      padding: 8px 10px 8px 14px !important;
-      left: 0 !important;
+    &.open {
       width: 100% !important;
-
-      &.open {
-        width: 100% !important;
-        left: 0 !important;
-      }
+      left: 0 !important;
     }
+  }
+
 
     .page-header-name {
       display: flex;
-      align-items: center;
-      gap: 8px;
-      min-width: 0;
     }
 
     &.hidden {
@@ -251,41 +243,23 @@
     .toggle-box {
       display: flex;
       align-items: center;
-      justify-content: center;
       cursor: pointer;
-      min-width: 34px;
-      height: 34px;
-      border-radius: 10px;
-      background: rgba(255, 255, 255, 0.8);
-      transition:
-        background-color 180ms ease,
-        border-color 180ms ease,
-        box-shadow 180ms ease,
-        transform 180ms ease;
 
       h4 {
         margin-bottom: 0px;
       }
-
-      &:hover {
-        background: rgba(247, 248, 251, 0.98);
-        border-color: rgba(219, 225, 235, 0.95);
-        box-shadow: 0 2px 8px rgba(71, 85, 105, 0.08);
-        transform: translateY(-1px);
-      }
     }
 
     .toggle-menu {
-      margin-right: 2px;
+      margin-right: 10px;
       cursor: pointer;
       // padding: 10px;
       // border-radius: 4px;
       // border: 1px solid #dcdcdc;
-      margin-right: 6px;
-      border: 1px solid rgba(225, 231, 240, 0.95);
+      margin-right: 10px;
 
       span {
-        margin-right: 0;
+        margin-right: 10px;
       }
 
       &:hover {
@@ -306,97 +280,22 @@
     .page-menu {
       display: flex;
       align-items: center;
-      gap: 8px;
-      min-width: 0;
-      padding: 4px 6px;
-      border-radius: 12px;
-      border: 1px solid rgba(228, 233, 242, 0.9);
-      background: rgba(255, 255, 255, 0.72);
-      backdrop-filter: blur(8px);
+      gap: 15px;
 
       a {
-        margin: 0;
-      }
-
-      .header-action {
-        display: inline-flex;
-        align-items: center;
-        min-height: 34px;
-      }
-
-      .header-action .ant-btn {
-        border-radius: 10px;
-        border-color: rgba(223, 229, 238, 0.95);
-        background: rgba(255, 255, 255, 0.9);
-        box-shadow: none;
-        transition:
-          border-color 180ms ease,
-          box-shadow 180ms ease,
-          transform 180ms ease,
-          background-color 180ms ease;
-      }
-
-      .header-action .ant-btn:hover {
-        background: rgba(247, 248, 251, 0.98);
-        border-color: rgba(219, 225, 235, 0.95);
-        box-shadow: 0 2px 8px rgba(71, 85, 105, 0.08);
-        transform: translateY(-1px);
-      }
-
-      .header-action-search {
-        position: relative;
-      }
-
-      .header-action-search .ant-input-affix-wrapper {
-        height: 34px;
-        border-radius: 10px;
-        border-color: rgba(223, 229, 238, 0.95);
-        background: rgba(255, 255, 255, 0.9);
-        box-shadow: none;
-        transition:
-          border-color 180ms ease,
-          box-shadow 180ms ease,
-          background-color 180ms ease;
-      }
-
-      .header-action-search .ant-input-affix-wrapper:hover {
-        border-color: rgba(214, 221, 232, 0.95);
-        background: rgba(249, 250, 252, 0.98);
-      }
-
-      .header-action-search .ant-input-affix-wrapper:focus-within {
-        border-color: rgba(148, 163, 184, 0.95);
-        box-shadow: 0 0 0 3px rgba(148, 163, 184, 0.14);
+        margin: 0px 5px;
       }
 
       .branch-selection {
         margin: 0px 10px;
       }
-      .branch-switcher {
+       .branch-switcher {
         .branches {
           .ant-select {
             min-width: 150px;
           }
         }
       }
-
-      .header-profile-wrap {
-        padding: 0 6px 0 2px;
-        border-radius: 10px;
-        border: 1px solid rgba(228, 233, 242, 0.75);
-        background: rgba(255, 255, 255, 0.82);
-        gap: 4px;
-      }
-
-      .header-profile-name {
-        display: inline-block;
-        max-width: 132px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        font-size: 12px;
-        font-weight: 600;
-      }
     }
 
     .header-blk {
@@ -416,10 +315,6 @@
       margin-bottom: 10px;
     }
   }
-
-  .page-content-stage {
-    will-change: transform, opacity;
-  }
 }
 
 .side-drawer-content-wrapper {
@@ -428,40 +323,7 @@
       padding: 0px;
     }
   }
-}
-
-@media only screen and (max-width: 1100px) {
-  .global-header {
-    .page-wrapper {
-      .page-menu {
-        gap: 6px;
-      }
-
-      .page-menu .header-profile-name {
-        max-width: 88px;
-      }
-
-      .page-menu .header-action-search .ant-input-affix-wrapper {
-        width: 210px !important;
-      }
-    }
-  }
-}
-
-@media only screen and (max-width: 900px) {
-  .global-header {
-    .page-wrapper {
-      padding: 7px 10px;
-
-      .page-menu {
-        padding: 4px;
-      }
-
-      .page-menu .header-profile-name {
-        display: none;
-      }
-    }
-  }
+ 
 }
 
 .sidebar-container {
@@ -499,7 +361,7 @@
       .ant-drawer-body {
         padding: 0px;
       }
-      .ant-drawer-header {
+      .ant-drawer-header{
         padding: 2px 20px;
       }
     }

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

@@ -22,89 +22,7 @@ export const boxVariants = {
     },
     right: { x: [null, 150, 0] },
     zoom: { scale: [null, 2, 1], rotate: [0, 90, 0] }
-  };
-
-export const sidebarIntroVariants = {
-  hidden: {
-    opacity: 0,
-    y: -10,
-    filter: 'blur(6px)',
-  },
-  visible: {
-    opacity: 1,
-    y: 0,
-    filter: 'blur(0px)',
-    transition: {
-      duration: 0.35,
-      ease: [.22,1,.36,1],
-    },
-  },
-};
-
-export const sidebarMenuSurfaceVariants = {
-  hidden: {
-    opacity: 0,
-    x: -10,
-    filter: 'blur(4px)',
-  },
-  visible: {
-    opacity: 1,
-    x: 0,
-    filter: 'blur(0px)',
-    transition: {
-      duration: 0.4,
-      ease: [.22,1,.36,1],
-      when: 'beforeChildren',
-      staggerChildren: 0.035,
-      delayChildren: 0.05,
-    },
-  },
-};
-
-export const sidebarGroupVariants = {
-  hidden: {},
-  visible: {
-    transition: {
-      staggerChildren: 0.03,
-    },
-  },
-};
-
-export const sidebarItemRevealVariants = {
-  hidden: { opacity: 0, x: -8, y: 2 },
-  visible: {
-    opacity: 1,
-    x: 0,
-    y: 0,
-    transition: {
-      duration: 0.26,
-      ease: [.22,1,.36,1],
-    },
-  },
-};
-
-export const sidebarLoaderContainerVariants = {
-  hidden: { opacity: 0 },
-  visible: {
-    opacity: 1,
-    transition: {
-      staggerChildren: 0.06,
-      delayChildren: 0.04,
-    },
-  },
-};
-
-export const sidebarLoaderRowVariants = {
-  hidden: { opacity: 0, x: -8 },
-  visible: {
-    opacity: 1,
-    x: 0,
-    transition: {
-      duration: 0.25,
-      ease: [.22,1,.36,1],
-    },
-  },
-};
+  }
   
   export const barsVariant = {
     animate: { transition: { staggerChildren: 0.095 } }
@@ -131,4 +49,4 @@ export const sidebarLoaderRowVariants = {
       scale: [1, 0, 1],
       rotate: [0, 360, 0]
     }
-  }
+  }