FIX: Unstract Subscription Plugin Fixes (#1113)

* Fixed issue in disabling the side menu items * Allow access to the '/pricing' page only for admins
Zipstack · Feb 4, 2025 · bef823f · bef823f
1 parent cc56b29
commit bef823f
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 11 deletions.
diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx
@@ -46,6 +46,14 @@ try {
   // Plugin unavailable.
 }
 
+let selectedProductStore;
+let selectedProduct;
+try {
+  selectedProductStore = require("../../../plugins/llm-whisperer/store/select-product-store.js");
+} catch {
+  // Ignore if hook not available
+}
+
 const SideNavBar = ({ collapsed }) => {
   const navigate = useNavigate();
   const { sessionDetails } = useSessionStore();
@@ -62,6 +70,12 @@ const SideNavBar = ({ collapsed }) => {
     // Do nothing
   }
 
+  if (selectedProductStore?.useSelectedProductStore) {
+    selectedProduct = selectedProductStore.useSelectedProductStore(
+      (state) => state?.selectedProduct
+    );
+  }
+
   let menu;
   if (sideMenu) {
     menu = sideMenu.useSideMenu();
@@ -193,7 +207,12 @@ const SideNavBar = ({ collapsed }) => {
   }
 
   const shouldDisableAll = useMemo(() => {
-    if (!unstractSubscriptionPlan || !UNSTRACT_SUBSCRIPTION_PLANS) {
+    const isUnstract = !(selectedProduct && selectedProduct !== "unstract");
+    if (
+      !unstractSubscriptionPlan ||
+      !UNSTRACT_SUBSCRIPTION_PLANS ||
+      !isUnstract
+    ) {
       return false;
     }
 
@@ -203,13 +222,11 @@ const SideNavBar = ({ collapsed }) => {
     );
   }, [unstractSubscriptionPlan]);
 
-  if (shouldDisableAll) {
-    data.forEach((mainMenuItem) => {
-      mainMenuItem.subMenu.forEach((subMenuItem) => {
-        subMenuItem.disable = true;
-      });
+  data.forEach((mainMenuItem) => {
+    mainMenuItem.subMenu.forEach((subMenuItem) => {
+      subMenuItem.disable = shouldDisableAll;
     });
-  }
+  });
 
   return (
     <Sider

diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx
@@ -26,6 +26,7 @@ import {
   getBaseUrl,
   homePagePath,
   onboardCompleted,
+  UNSTRACT_ADMIN,
 } from "../../../helpers/GetStaticData.js";
 import useLogout from "../../../hooks/useLogout.js";
 import "../../../layouts/page-layout/PageLayout.css";
@@ -132,7 +133,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) {
     const { role } = sessionDetails;
     const isReviewer = role === "unstract_reviewer";
     const isSupervisor = role === "unstract_supervisor";
-    const isAdmin = role === "unstract_admin";
+    const isAdmin = role === UNSTRACT_ADMIN;
 
     setShowOnboardBanner(
       !onboardCompleted(sessionDetails?.adapters) &&
@@ -297,7 +298,11 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) {
       });
     }
 
-    if (isUnstract && UnstractPricingMenuLink) {
+    if (
+      isUnstract &&
+      UnstractPricingMenuLink &&
+      sessionDetails?.role === UNSTRACT_ADMIN
+    ) {
       menuItems.push({
         key: "7",
         label: <UnstractPricingMenuLink orgName={orgName} />,

diff --git a/frontend/src/helpers/GetStaticData.js b/frontend/src/helpers/GetStaticData.js
@@ -586,6 +586,8 @@ const TRIAL_PLAN = "TRIAL";
 
 const homePagePath = cloudHomePagePath || "tools";
 
+const UNSTRACT_ADMIN = "unstract_admin";
+
 export {
   CONNECTOR_TYPE_MAP,
   O_AUTH_PROVIDERS,
@@ -639,4 +641,5 @@ export {
   generateCoverageKey,
   TRIAL_PLAN,
   homePagePath,
+  UNSTRACT_ADMIN,
 };
diff --git a/frontend/src/index.css b/frontend/src/index.css
@@ -135,6 +135,14 @@ body {
   padding-left: 6px;
 }
 
+.pad-top-20 {
+  padding-top: 20px;
+}
+
+.pad-bottom-20 {
+  padding-bottom: 20px;
+}
+
 .cur-pointer {
   cursor: pointer;
 }

diff --git a/frontend/src/routes/useMainAppRoutes.js b/frontend/src/routes/useMainAppRoutes.js
@@ -19,7 +19,8 @@ import { CustomTools } from "../pages/CustomTools.jsx";
 import { CustomToolsHelper } from "../components/helpers/custom-tools/CustomToolsHelper.js";
 import { ToolIdePage } from "../pages/ToolIdePage.jsx";
 import { OutputAnalyzerPage } from "../pages/OutputAnalyzerPage.jsx";
-import { deploymentTypes } from "../helpers/GetStaticData.js";
+import { deploymentTypes, UNSTRACT_ADMIN } from "../helpers/GetStaticData.js";
+import { useSessionStore } from "../store/session-store.js";
 
 let RequirePlatformAdmin;
 let PlatformAdminPage;
@@ -94,6 +95,8 @@ try {
 }
 
 function useMainAppRoutes() {
+  const { role } = useSessionStore((state) => state?.sessionDetails);
+
   const routes = (
     <>
       <Route path=":orgName" element={<FullPageLayout />}>
@@ -108,7 +111,7 @@ function useMainAppRoutes() {
         {UnstractUsagePage && (
           <Route path="dashboard" element={<UnstractUsagePage />} />
         )}
-        {UnstractSubscriptionPage && (
+        {UnstractSubscriptionPage && role === UNSTRACT_ADMIN && (
           <Route path="pricing" element={<UnstractSubscriptionPage />} />
         )}
         <Route path="profile" element={<ProfilePage />} />