From 37a1f8128067781a5fa4bc1aa92f90e821001e25 Mon Sep 17 00:00:00 2001
From: Tahier Hussain <89440263+tahierhussain@users.noreply.github.com>
Date: Wed, 12 Feb 2025 14:24:18 +0530
Subject: [PATCH] FIX: Rearranged the side menu items and handled the disabling
 of side and top menu items (#1130)

Rearranged the sidemenu items and handle disabling of side and top menu items
---
 .../components/navigations/side-nav-bar/SideNavBar.jsx   | 9 +++------
 .../src/components/navigations/top-nav-bar/TopNavBar.jsx | 5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx
index e3e10982b..c06e8731d 100644
--- a/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx
+++ b/frontend/src/components/navigations/side-nav-bar/SideNavBar.jsx
@@ -87,7 +87,7 @@ const SideNavBar = ({ collapsed }) => {
       mainTitle: "MANAGE",
       subMenu: [
         {
-          id: 1.1,
+          id: 1.2,
           title: "API Deployments",
           description: "Unstructured to structured APIs",
           image: apiDeploy,
@@ -197,7 +197,7 @@ const SideNavBar = ({ collapsed }) => {
   ];
 
   if (dashboardSideMenuItem) {
-    unstractMenuItems[2].subMenu.push(dashboardSideMenuItem(orgName));
+    unstractMenuItems[0].subMenu.unshift(dashboardSideMenuItem(orgName));
   }
 
   const data = menu || unstractMenuItems;
@@ -216,10 +216,7 @@ const SideNavBar = ({ collapsed }) => {
       return false;
     }
 
-    return (
-      !unstractSubscriptionPlan?.subscriptionId &&
-      unstractSubscriptionPlan?.planType !== UNSTRACT_SUBSCRIPTION_PLANS?.TRIAL
-    );
+    return unstractSubscriptionPlan?.remainingDays <= 0;
   }, [unstractSubscriptionPlan]);
 
   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 8c1022e14..5a566d086 100644
--- a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx
+++ b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx
@@ -120,10 +120,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) {
       return false;
     }
 
-    return (
-      !unstractSubscriptionPlan?.subscriptionId &&
-      unstractSubscriptionPlan?.planType !== UNSTRACT_SUBSCRIPTION_PLANS?.TRIAL
-    );
+    return unstractSubscriptionPlan?.remainingDays <= 0;
   }, [unstractSubscriptionPlan]);
 
   const isUnstract = !(selectedProduct && selectedProduct !== "unstract");