l-min-components 1.0.614 → 1.0.620

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.0.614",
+  "version": "1.0.620",
   "type": "module",
   "files": [
     "src/assets",

package/src/components/AppMainLayout/index.jsx

@@ -45,6 +45,7 @@ const AppMainLayout = () => {
   const [hideAffilicates, setHideAffilicates] = useState(false);
   const [affiliatesActive, setAffiliatesActive] = useState(false);
   const [accessToken, setAccessToken] = useState("");
+  const [envType, setEnvType] = useState("");
 
   useEffect(() => {
     if (window.location.host.includes("coming")) {
@@ -86,6 +87,18 @@ const AppMainLayout = () => {
     setAccessToken(cookieValue);
   }, [defaultAcct]);
 
+  // setting current environment type
+  useEffect(() => {
+    if (window.location.hostname.includes("staging")) {
+      setEnvType("staging");
+    } else if (window.location.hostname.includes("localhost")) {
+      setEnvType("localhost");
+    } else {
+      setEnvType("live");
+    }
+  }, []);
+  console.log("envType", envType)
+
   return (
     <OutletContext.Provider
       value={{
@@ -111,6 +124,7 @@ const AppMainLayout = () => {
         setHideAffilicates,
         affiliatesActive,
         accessToken,
+        envType
       }}
     >
       <Layout

package/src/components/header/account-dropdown.jsx

@@ -9,6 +9,7 @@ import {
 } from "./index.styled";
 import { useLocation, useNavigate } from "react-router-dom";
 import useHeader from "./getHeaderDetails";
+import { OutletContext } from "..";
 /**
  * @param {{
  *  type: string,
@@ -24,6 +25,7 @@ const AccountDropdown = (props) => {
   const { pathname } = useLocation();
   useEffect(() => {}, [pathname]);
   const { setDefaultAccount, handleSetDefaultAccount } = useHeader();
+  const { envType } = useContext(OutletContext);
 
   useEffect(() => {
     if (props?.selectedAccount?.type === "DEVELOPER") {
@@ -102,6 +104,10 @@ const AccountDropdown = (props) => {
               ))}
             </div>
           )} */}
+
+
+          {envType === "live"  && 
+          <>
           {props?.developerAccountData.length > 0 && (
             <div>
               <h3 style={{ marginBottom: 10 }}>Developer accounts</h3>
@@ -145,6 +151,11 @@ const AccountDropdown = (props) => {
               ))}
             </div>
           )}
+          </>
+          }
+
+          {envType === "staging" || envType === "localhost" ? 
+          <> 
           {props?.instructorAccountData?.length > 0 && (
             <div>
               <h3>Instructor account</h3>
@@ -253,6 +264,9 @@ const AccountDropdown = (props) => {
               ))}
             </div>
           )}
+          </> : 
+          <></>
+          }
           {/* // )} */}
         </AccountDropdownBody>
 

package/src/components/header/index.jsx

@@ -52,6 +52,7 @@ const HeaderComponent = (props) => {
   const { pathname } = useLocation();
   const { setGeneralData, generalData } = useContext(OutletContext);
   const [selectedAccount, setSelectedAccount] = useState();
+  const prevAccountRef = useRef(); 
 
   useEffect(() => {
     setIsOpen(false);
@@ -59,6 +60,15 @@ const HeaderComponent = (props) => {
     handleGetUserDetails();
     handleGetDefaultAccount();
   }, []);
+
+  // Reload when another account is selected
+  useEffect(() => {
+    if (selectedAccount && selectedAccount !== prevAccountRef.current) {
+      window.location.reload(); 
+    }
+    prevAccountRef.current = selectedAccount;
+  }, [selectedAccount]);
+
   useEffect(() => {
     if (userAccountsDetail?.data) {
       setGeneralData((generalData) => ({
@@ -148,6 +158,15 @@ const HeaderComponent = (props) => {
         }));
     }
   }, [selectedAccount])
+
+  useEffect(()=>{
+    if(selectedAccount){
+        setGeneralData((generalData) => ({
+          ...generalData,
+          defaultAccount: getDefaultAccount?.data,          
+        }));
+    }
+  }, [getDefaultAccount?.response])
   
   const containerRef = useRef(null);
   const secondContainerRef = useRef(null);

package/src/components/sideBar/sideMenu/index.jsx

@@ -71,18 +71,18 @@ const SideMenu = ({
       console.log(window.location.pathname, "pathname");
       // checking developer account routes
       if (
-        (window.location.pathname.includes("api") && path === "/") ||
-        (window.location.pathname === "/" && path === "/")
+        (window.location.pathname.includes("api") && path === "/developer") ||
+        (window.location.pathname === "/" && path === "/developer")
       ) {
         return (statusText = true);
       }
       if (
         window.location.pathname.includes("documentation") &&
-        path === "/documentation"
+        path === "/developer/documentation"
       ) {
         return (statusText = true);
       }
-      if (window.location.pathname.includes("report") && path === "/report") {
+      if (window.location.pathname.includes("developer/report") && path === "/developer/report") {
         return (statusText = true);
       }