From 7d09ca2d3525b3833cca26f7be8abc6df1395a93 Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Mon, 27 Jan 2025 19:24:14 +0530 Subject: [PATCH 01/10] Fixed related to unstract subscription plugins --- .../navigations/side-nav-bar/SideNavBar.jsx | 121 +++++++++++------- frontend/src/routes/useMainAppRoutes.js | 5 +- 2 files changed, 77 insertions(+), 49 deletions(-) diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx index 2d58d5cd8..9b1077c00 100644 --- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx +++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx @@ -31,8 +31,12 @@ try { // Plugin unavailable. } +let unstractSubscriptionPlan; +let useUnstractSubscriptionPlanStore; let dashboardSideMenuItem; try { + useUnstractSubscriptionPlanStore = + require("../../../plugins/store/unstract-subscription-plan-store").useUnstractSubscriptionPlanStore; dashboardSideMenuItem = require("../../../plugins/unstract-subscription/helper/constants").dashboardSideMenuItem; } catch (err) { @@ -43,6 +47,17 @@ const SideNavBar = ({ collapsed }) => { const navigate = useNavigate(); const { sessionDetails } = useSessionStore(); const { orgName, flags } = sessionDetails; + + try { + if (useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); + } + } catch (error) { + // Do nothing + } + let menu; if (sideMenu) { menu = sideMenu.useSideMenu(); @@ -170,7 +185,19 @@ const SideNavBar = ({ collapsed }) => { const data = menu || unstractMenuItems; if (getMenuItem && flags?.app_deployment) { - data[0]?.subMenu?.splice(1, 0, getMenuItem?.default(orgName)); + data[0]?.subMenu?.splice(1, 0, getMenuItem.default(orgName)); + } + + const shouldDisableAll = + !unstractSubscriptionPlan.subscriptionId && + unstractSubscriptionPlan.planType !== "TRIAL"; + + if (shouldDisableAll) { + data.forEach((mainMenuItem) => { + mainMenuItem.subMenu.forEach((subMenuItem) => { + subMenuItem.disable = true; + }); + }); } return ( @@ -184,53 +211,51 @@ const SideNavBar = ({ collapsed }) => { >
- {data?.map((item, index) => { - return ( -
- {!collapsed && ( - - {item.mainTitle} - - )} - - {item.subMenu.map((el) => { - return ( - - { - !el.disable && navigate(el.path); - }} - > - side_icon - {!collapsed && ( -
- - {el.title} - - - {el.description} - -
- )} - - - ); - })} - - {index < data.length - 1 && ( - - )} -
- ); - })} + {data?.map((item, index) => ( +
+ {!collapsed && ( + + {item.mainTitle} + + )} + + {item.subMenu.map((el) => ( + + { + if (!el.disable) { + navigate(el.path); + } + }} + > + side_icon + {!collapsed && ( +
+ + {el.title} + + + {el.description} + +
+ )} + + + ))} + + {index < data.length - 1 && ( + + )} +
+ ))}
diff --git a/frontend/src/routes/useMainAppRoutes.js b/frontend/src/routes/useMainAppRoutes.js index f77e96ad5..7309a63b7 100644 --- a/frontend/src/routes/useMainAppRoutes.js +++ b/frontend/src/routes/useMainAppRoutes.js @@ -109,7 +109,10 @@ function useMainAppRoutes() { } /> )} {UnstractSubscriptionPage && ( - } /> + } + /> )} } /> Date: Tue, 28 Jan 2025 13:24:37 +0530 Subject: [PATCH 02/10] Restrict routing from top navbar if case if subscription expired --- .../navigations/side-nav-bar/SideNavBar.jsx | 11 ++++-- .../navigations/top-nav-bar/TopNavBar.jsx | 38 +++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx index 9b1077c00..a6ec9df90 100644 --- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx +++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx @@ -34,11 +34,14 @@ try { let unstractSubscriptionPlan; let useUnstractSubscriptionPlanStore; let dashboardSideMenuItem; +let UNSTRACT_SUBSCRIPTION_PLANS; try { useUnstractSubscriptionPlanStore = require("../../../plugins/store/unstract-subscription-plan-store").useUnstractSubscriptionPlanStore; - dashboardSideMenuItem = - require("../../../plugins/unstract-subscription/helper/constants").dashboardSideMenuItem; + const unstractSubscriptionConstants = require("../../../plugins/unstract-subscription/helper/constants"); + dashboardSideMenuItem = unstractSubscriptionConstants?.dashboardSideMenuItem; + UNSTRACT_SUBSCRIPTION_PLANS = + unstractSubscriptionConstants?.UNSTRACT_SUBSCRIPTION_PLANS; } catch (err) { // Plugin unavailable. } @@ -189,8 +192,8 @@ const SideNavBar = ({ collapsed }) => { } const shouldDisableAll = - !unstractSubscriptionPlan.subscriptionId && - unstractSubscriptionPlan.planType !== "TRIAL"; + !unstractSubscriptionPlan?.subscriptionId && + unstractSubscriptionPlan?.planType !== UNSTRACT_SUBSCRIPTION_PLANS?.TRIAL; if (shouldDisableAll) { data.forEach((mainMenuItem) => { diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx index 2dd2d23ed..aeb3b2e49 100644 --- a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx +++ b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx @@ -68,6 +68,18 @@ try { // Ignore if hook not available } +let unstractSubscriptionPlan; +let useUnstractSubscriptionPlanStore; +let UNSTRACT_SUBSCRIPTION_PLANS; +try { + useUnstractSubscriptionPlanStore = + require("../../../plugins/store/unstract-subscription-plan-store").useUnstractSubscriptionPlanStore; + UNSTRACT_SUBSCRIPTION_PLANS = + require("../../../plugins/unstract-subscription/helper/constants").UNSTRACT_SUBSCRIPTION_PLANS; +} catch (err) { + // Plugin unavailable. +} + function TopNavBar({ isSimpleLayout, topNavBarOptions }) { const navigate = useNavigate(); const { sessionDetails } = useSessionStore(); @@ -89,6 +101,27 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { ); } + try { + if (useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); + } + } catch (error) { + // Do nothing + } + + const shouldDisableRouting = useMemo(() => { + if (!unstractSubscriptionPlan || !UNSTRACT_SUBSCRIPTION_PLANS) { + return false; + } + + return ( + !unstractSubscriptionPlan?.subscriptionId && + unstractSubscriptionPlan?.planType !== UNSTRACT_SUBSCRIPTION_PLANS?.TRIAL + ); + }, [unstractSubscriptionPlan]); + const isUnstract = !(selectedProduct && selectedProduct !== "unstract"); // Check user role and whether the onboarding is incomplete @@ -185,6 +218,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -223,6 +257,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -238,6 +273,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -250,6 +286,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -277,6 +314,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { cascadeOptions, orgName, orgId, + shouldDisableRouting, ]); // Function to get the initials from the user name From 363883671cad0f15366b376a446e8a699c77e165 Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Tue, 28 Jan 2025 14:18:03 +0530 Subject: [PATCH 03/10] Modified the to keep the time as optional in the response --- frontend/src/helpers/GetStaticData.js | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/frontend/src/helpers/GetStaticData.js b/frontend/src/helpers/GetStaticData.js index e75e1e560..fc597d652 100644 --- a/frontend/src/helpers/GetStaticData.js +++ b/frontend/src/helpers/GetStaticData.js @@ -170,21 +170,30 @@ const listOfAppDeployments = [ }, ]; -const getReadableDateAndTime = (timestamp) => { +const getReadableDateAndTime = (timestamp, includeTime = true) => { const currentDate = new Date(timestamp); - // Options for formatting the date and time - const options = { - year: "numeric", - month: "long", - day: "numeric", + if (isNaN(currentDate)) { + return "Invalid date"; + } + + // Options for formatting the date + const dateOptions = { year: "numeric", month: "long", day: "numeric" }; + const formattedDate = currentDate.toLocaleDateString("en-US", dateOptions); + + if (!includeTime) { + return formattedDate; + } + + // Options for formatting the time + const timeOptions = { hour: "2-digit", minute: "2-digit", second: "2-digit", timeZoneName: "short", }; - const formattedDate = currentDate.toLocaleDateString("en-US", options); - const formattedTime = currentDate.toLocaleTimeString("en-US", options); + const formattedTime = currentDate.toLocaleTimeString("en-US", timeOptions); + return formattedDate + ", " + formattedTime; }; From 4e15ba1fb22986196e942ecd86e0675b5765a6b8 Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Tue, 28 Jan 2025 14:43:50 +0530 Subject: [PATCH 04/10] Fixed the bugs in disabling the navigation menu items --- .../navigations/side-nav-bar/SideNavBar.jsx | 16 ++++++++++++---- .../navigations/top-nav-bar/TopNavBar.jsx | 10 +++++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx index a6ec9df90..ffdd218dd 100644 --- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx +++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx @@ -16,6 +16,7 @@ import task from "../../../assets/task.svg"; import VectorDbIcon from "../../../assets/vector-db.svg"; import TextExtractorIcon from "../../../assets/text-extractor.svg"; import { useSessionStore } from "../../../store/session-store"; +import { useMemo } from "react"; let getMenuItem; try { @@ -191,11 +192,18 @@ const SideNavBar = ({ collapsed }) => { data[0]?.subMenu?.splice(1, 0, getMenuItem.default(orgName)); } - const shouldDisableAll = - !unstractSubscriptionPlan?.subscriptionId && - unstractSubscriptionPlan?.planType !== UNSTRACT_SUBSCRIPTION_PLANS?.TRIAL; + const shouldDisableAll = useMemo(() => { + if (!unstractSubscriptionPlan || !UNSTRACT_SUBSCRIPTION_PLANS) { + return undefined; + } + + return ( + !unstractSubscriptionPlan?.subscriptionId && + unstractSubscriptionPlan?.planType !== UNSTRACT_SUBSCRIPTION_PLANS?.TRIAL + ); + }, [unstractSubscriptionPlan]); - if (shouldDisableAll) { + if (shouldDisableAll === false) { data.forEach((mainMenuItem) => { mainMenuItem.subMenu.forEach((subMenuItem) => { subMenuItem.disable = true; diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx index aeb3b2e49..2127716f5 100644 --- a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx +++ b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx @@ -113,7 +113,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { const shouldDisableRouting = useMemo(() => { if (!unstractSubscriptionPlan || !UNSTRACT_SUBSCRIPTION_PLANS) { - return false; + return undefined; } return ( @@ -218,7 +218,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -257,7 +257,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -273,7 +273,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -286,7 +286,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { From 56e2370c8baff11d0db1e75fe6fcd9b871a9512f Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Tue, 28 Jan 2025 15:01:55 +0530 Subject: [PATCH 05/10] Fixed sonar cloud issues --- .../navigations/side-nav-bar/SideNavBar.jsx | 20 ++++++++++--------- .../navigations/top-nav-bar/TopNavBar.jsx | 18 +++++++++-------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx index ffdd218dd..7ae3ddf1d 100644 --- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx +++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx @@ -16,7 +16,7 @@ import task from "../../../assets/task.svg"; import VectorDbIcon from "../../../assets/vector-db.svg"; import TextExtractorIcon from "../../../assets/text-extractor.svg"; import { useSessionStore } from "../../../store/session-store"; -import { useMemo } from "react"; +import { useEffect, useMemo } from "react"; let getMenuItem; try { @@ -52,15 +52,17 @@ const SideNavBar = ({ collapsed }) => { const { sessionDetails } = useSessionStore(); const { orgName, flags } = sessionDetails; - try { - if (useUnstractSubscriptionPlanStore) { - unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( - (state) => state?.unstractSubscriptionPlan - ); + useEffect(() => { + try { + if (useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); + } + } catch (error) { + // Do nothing } - } catch (error) { - // Do nothing - } + }, [useUnstractSubscriptionPlanStore]); let menu; if (sideMenu) { diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx index 2127716f5..531df1cb4 100644 --- a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx +++ b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx @@ -101,15 +101,17 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { ); } - try { - if (useUnstractSubscriptionPlanStore) { - unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( - (state) => state?.unstractSubscriptionPlan - ); + useEffect(() => { + try { + if (useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); + } + } catch (error) { + // Do nothing } - } catch (error) { - // Do nothing - } + }, [useUnstractSubscriptionPlanStore]); const shouldDisableRouting = useMemo(() => { if (!unstractSubscriptionPlan || !UNSTRACT_SUBSCRIPTION_PLANS) { From bf330b11c0a34a4e94dde1a198f8a711b629d645 Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Tue, 28 Jan 2025 15:05:49 +0530 Subject: [PATCH 06/10] Reverted back the approach to call the global store conditionally, as it is intentional --- .../navigations/side-nav-bar/SideNavBar.jsx | 20 +++++++++---------- .../navigations/top-nav-bar/TopNavBar.jsx | 18 ++++++++--------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx index 7ae3ddf1d..ffdd218dd 100644 --- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx +++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx @@ -16,7 +16,7 @@ import task from "../../../assets/task.svg"; import VectorDbIcon from "../../../assets/vector-db.svg"; import TextExtractorIcon from "../../../assets/text-extractor.svg"; import { useSessionStore } from "../../../store/session-store"; -import { useEffect, useMemo } from "react"; +import { useMemo } from "react"; let getMenuItem; try { @@ -52,17 +52,15 @@ const SideNavBar = ({ collapsed }) => { const { sessionDetails } = useSessionStore(); const { orgName, flags } = sessionDetails; - useEffect(() => { - try { - if (useUnstractSubscriptionPlanStore) { - unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( - (state) => state?.unstractSubscriptionPlan - ); - } - } catch (error) { - // Do nothing + try { + if (useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); } - }, [useUnstractSubscriptionPlanStore]); + } catch (error) { + // Do nothing + } let menu; if (sideMenu) { diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx index 531df1cb4..2127716f5 100644 --- a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx +++ b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx @@ -101,17 +101,15 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { ); } - useEffect(() => { - try { - if (useUnstractSubscriptionPlanStore) { - unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( - (state) => state?.unstractSubscriptionPlan - ); - } - } catch (error) { - // Do nothing + try { + if (useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); } - }, [useUnstractSubscriptionPlanStore]); + } catch (error) { + // Do nothing + } const shouldDisableRouting = useMemo(() => { if (!unstractSubscriptionPlan || !UNSTRACT_SUBSCRIPTION_PLANS) { From e7162cf76ac85db4cd2bb12984b621bd95407b23 Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Tue, 28 Jan 2025 15:35:16 +0530 Subject: [PATCH 07/10] Fix sonar cloud issues --- .../navigations/side-nav-bar/SideNavBar.jsx | 14 +++++++------- .../navigations/top-nav-bar/TopNavBar.jsx | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx index ffdd218dd..982a1dfaf 100644 --- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx +++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx @@ -33,12 +33,11 @@ try { } let unstractSubscriptionPlan; -let useUnstractSubscriptionPlanStore; +let unstractSubscriptionPlanStore; let dashboardSideMenuItem; let UNSTRACT_SUBSCRIPTION_PLANS; try { - useUnstractSubscriptionPlanStore = - require("../../../plugins/store/unstract-subscription-plan-store").useUnstractSubscriptionPlanStore; + unstractSubscriptionPlanStore = require("../../../plugins/store/unstract-subscription-plan-store"); const unstractSubscriptionConstants = require("../../../plugins/unstract-subscription/helper/constants"); dashboardSideMenuItem = unstractSubscriptionConstants?.dashboardSideMenuItem; UNSTRACT_SUBSCRIPTION_PLANS = @@ -53,10 +52,11 @@ const SideNavBar = ({ collapsed }) => { const { orgName, flags } = sessionDetails; try { - if (useUnstractSubscriptionPlanStore) { - unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( - (state) => state?.unstractSubscriptionPlan - ); + if (unstractSubscriptionPlanStore?.useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = + unstractSubscriptionPlanStore?.useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); } } catch (error) { // Do nothing diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx index 2127716f5..3c3011e0b 100644 --- a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx +++ b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx @@ -69,11 +69,10 @@ try { } let unstractSubscriptionPlan; -let useUnstractSubscriptionPlanStore; +let unstractSubscriptionPlanStore; let UNSTRACT_SUBSCRIPTION_PLANS; try { - useUnstractSubscriptionPlanStore = - require("../../../plugins/store/unstract-subscription-plan-store").useUnstractSubscriptionPlanStore; + unstractSubscriptionPlanStore = require("../../../plugins/store/unstract-subscription-plan-store"); UNSTRACT_SUBSCRIPTION_PLANS = require("../../../plugins/unstract-subscription/helper/constants").UNSTRACT_SUBSCRIPTION_PLANS; } catch (err) { @@ -102,10 +101,11 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { } try { - if (useUnstractSubscriptionPlanStore) { - unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( - (state) => state?.unstractSubscriptionPlan - ); + if (unstractSubscriptionPlanStore?.useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = + unstractSubscriptionPlanStore?.useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); } } catch (error) { // Do nothing From 9300ab00d9e13c8c0a4b9d4ce71defea84404f9c Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Tue, 28 Jan 2025 15:45:06 +0530 Subject: [PATCH 08/10] Minor fix --- .../navigations/side-nav-bar/SideNavBar.jsx | 6 ++--- .../navigations/top-nav-bar/TopNavBar.jsx | 24 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx index 982a1dfaf..796af2116 100644 --- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx +++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx @@ -16,7 +16,7 @@ import task from "../../../assets/task.svg"; import VectorDbIcon from "../../../assets/vector-db.svg"; import TextExtractorIcon from "../../../assets/text-extractor.svg"; import { useSessionStore } from "../../../store/session-store"; -import { useMemo } from "react"; +import { useEffect, useMemo } from "react"; let getMenuItem; try { @@ -194,7 +194,7 @@ const SideNavBar = ({ collapsed }) => { const shouldDisableAll = useMemo(() => { if (!unstractSubscriptionPlan || !UNSTRACT_SUBSCRIPTION_PLANS) { - return undefined; + return false; } return ( @@ -203,7 +203,7 @@ const SideNavBar = ({ collapsed }) => { ); }, [unstractSubscriptionPlan]); - if (shouldDisableAll === false) { + if (shouldDisableAll) { data.forEach((mainMenuItem) => { mainMenuItem.subMenu.forEach((subMenuItem) => { subMenuItem.disable = true; diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx index 3c3011e0b..aeb3b2e49 100644 --- a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx +++ b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx @@ -69,10 +69,11 @@ try { } let unstractSubscriptionPlan; -let unstractSubscriptionPlanStore; +let useUnstractSubscriptionPlanStore; let UNSTRACT_SUBSCRIPTION_PLANS; try { - unstractSubscriptionPlanStore = require("../../../plugins/store/unstract-subscription-plan-store"); + useUnstractSubscriptionPlanStore = + require("../../../plugins/store/unstract-subscription-plan-store").useUnstractSubscriptionPlanStore; UNSTRACT_SUBSCRIPTION_PLANS = require("../../../plugins/unstract-subscription/helper/constants").UNSTRACT_SUBSCRIPTION_PLANS; } catch (err) { @@ -101,11 +102,10 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { } try { - if (unstractSubscriptionPlanStore?.useUnstractSubscriptionPlanStore) { - unstractSubscriptionPlan = - unstractSubscriptionPlanStore?.useUnstractSubscriptionPlanStore( - (state) => state?.unstractSubscriptionPlan - ); + if (useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); } } catch (error) { // Do nothing @@ -113,7 +113,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { const shouldDisableRouting = useMemo(() => { if (!unstractSubscriptionPlan || !UNSTRACT_SUBSCRIPTION_PLANS) { - return undefined; + return false; } return ( @@ -218,7 +218,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -257,7 +257,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -273,7 +273,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { @@ -286,7 +286,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { From 11bfa89aef2551c1bc0d3e4b196ab95602eedd09 Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Tue, 28 Jan 2025 15:45:48 +0530 Subject: [PATCH 09/10] Removed useEffect --- frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx index 796af2116..57d0820bd 100644 --- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx +++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx @@ -16,7 +16,7 @@ import task from "../../../assets/task.svg"; import VectorDbIcon from "../../../assets/vector-db.svg"; import TextExtractorIcon from "../../../assets/text-extractor.svg"; import { useSessionStore } from "../../../store/session-store"; -import { useEffect, useMemo } from "react"; +import { useMemo } from "react"; let getMenuItem; try { From 2d620c3d6f397b51885edb3d5ecdd2432d818185 Mon Sep 17 00:00:00 2001 From: Tahier Hussain Date: Tue, 28 Jan 2025 15:48:05 +0530 Subject: [PATCH 10/10] Minor fix --- .../navigations/top-nav-bar/TopNavBar.jsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx index aeb3b2e49..7cf512ad4 100644 --- a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx +++ b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx @@ -69,11 +69,10 @@ try { } let unstractSubscriptionPlan; -let useUnstractSubscriptionPlanStore; +let unstractSubscriptionPlanStore; let UNSTRACT_SUBSCRIPTION_PLANS; try { - useUnstractSubscriptionPlanStore = - require("../../../plugins/store/unstract-subscription-plan-store").useUnstractSubscriptionPlanStore; + unstractSubscriptionPlanStore = require("../../../plugins/store/unstract-subscription-plan-store"); UNSTRACT_SUBSCRIPTION_PLANS = require("../../../plugins/unstract-subscription/helper/constants").UNSTRACT_SUBSCRIPTION_PLANS; } catch (err) { @@ -102,10 +101,11 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) { } try { - if (useUnstractSubscriptionPlanStore) { - unstractSubscriptionPlan = useUnstractSubscriptionPlanStore( - (state) => state?.unstractSubscriptionPlan - ); + if (unstractSubscriptionPlanStore?.useUnstractSubscriptionPlanStore) { + unstractSubscriptionPlan = + unstractSubscriptionPlanStore?.useUnstractSubscriptionPlanStore( + (state) => state?.unstractSubscriptionPlan + ); } } catch (error) { // Do nothing