Merge pull request #198 from wrappid/WRPD-enhancement-183

enhancement: delivery oriented fix
wrappid · Apr 6, 2024 · db01e2b · db01e2b
2 parents 68aeac3 + f746f64
commit db01e2b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package/components/layouts/_system/AppContainerLayout.js b/package/components/layouts/_system/AppContainerLayout.js
@@ -171,7 +171,7 @@ export default function AppContainerLayout() {
   };
 
   const getRightDrawer = () => {
-    return <CoreDrawer open={false} />;
+    return null;
   };
 
   return (

diff --git a/package/components/surfaces/DefaultAppBarContent.js b/package/components/surfaces/DefaultAppBarContent.js
@@ -9,6 +9,7 @@ import { UtilityClasses, WrappidDataContext } from "@wrappid/styles";
 import { useDispatch, useSelector } from "react-redux";
 
 import CoreToolbar from "./CoreToolbar";
+import { CoreResourceContext } from "../../config/contextHandler";
 import { getSettingMeta } from "../../store/action/mdmAction";
 import CoreClasses from "../../styles/CoreClasses";
 import CoreAvatar from "../dataDisplay/CoreAvatar";
@@ -25,6 +26,7 @@ import QuickAddPopOver from "../utils/QuickAddPopOver";
 export default function DefaultAppBarContent(props) {
   const dispatch = useDispatch();
   let { config } = React.useContext(WrappidDataContext);
+  let { appLogo } = React.useContext(CoreResourceContext);
   const auth = useSelector((state) => state.auth);
   const mdm = useSelector((state) => state.mdm);
   const [getSettingMetaFlag, setGetSettingMetaFlag] = useState(false);
@@ -33,7 +35,7 @@ export default function DefaultAppBarContent(props) {
 
   const {
     handleDrawer,
-    logo,
+    logo = null,
     logoEnabled: _logoEnabled = true,
     leftMenuEnabled: _leftMenuEnabled = true,
   } = props;
@@ -126,7 +128,7 @@ export default function DefaultAppBarContent(props) {
             <CoreImage
               height={40}
               width={120}
-              src={logo}
+              src={logo || appLogo}
               alt="WRAPPID" />
           )}
         </CoreStack>

diff --git a/package/components/utils/CoreProfilePopOver.js b/package/components/utils/CoreProfilePopOver.js
@@ -7,7 +7,6 @@ import { useSelector } from "react-redux";
 
 import CoreApiVersion from "./CoreApiVersion";
 import CoreAppVersion from "./CoreAppVersion";
-import { CoreRouteRegistryContext } from "../../config/contextHandler";
 import CoreClasses from "../../styles/CoreClasses";
 import CoreAvatar from "../dataDisplay/CoreAvatar";
 import CoreDivider from "../dataDisplay/CoreDivider";
@@ -28,7 +27,6 @@ export default function CoreProfilePopOver(props) {
   const navigate = nativeUseNavigate();
   const auth = useSelector((state) => state?.auth);
   const profile = useSelector((state) => state?.profile);
-  const routeRegistry = useContext(CoreRouteRegistryContext);
 
   const { profileRegistration } = useSelector((state) => state?.api);
 
@@ -47,13 +45,13 @@ export default function CoreProfilePopOver(props) {
       },
       id   : "viewProfile",
       label: "View Profile",
-      link : routeRegistry?.profile,
+      link : "/profile",
     },
     {
       icon : { icon: "settings", type: __IconTypes.MATERIAL_OUTLINED_ICON },
       id   : "settings",
       label: "Settings",
-      link : routeRegistry?.settings,
+      link : "/settings",
     } /* -- ,
     { type: MENU_SEPERATOR },
     {