From 279429c8dc20e9b66b1cd113a4483d1878ecccf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <nemile.re@gmail.com>
Date: Fri, 14 Mar 2025 10:45:42 +0400
Subject: [PATCH] Fix sidebar display on no org zone
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Émile Ré <nemile.re@gmail.com>
---
 apps/console/src/components/NavMain.tsx              | 3 +--
 apps/console/src/components/NavUser.tsx              | 7 -------
 apps/console/src/components/OrganizationSwitcher.tsx | 5 -----
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/apps/console/src/components/NavMain.tsx b/apps/console/src/components/NavMain.tsx
index 13cb87230..20d36ed2e 100644
--- a/apps/console/src/components/NavMain.tsx
+++ b/apps/console/src/components/NavMain.tsx
@@ -27,7 +27,6 @@ import {
   ToyBrick,
   Users,
 } from "lucide-react";
-import { NavMainSkeleton } from "./NavMainSkeleton";
 
 interface NavItem {
   title: string;
@@ -47,7 +46,7 @@ export function NavMain() {
   const items: NavItem[] = getNavItems(organizationId);
 
   if (!organizationId) {
-    return <NavMainSkeleton />;
+    return null;
   }
 
   const isItemActive = (item: { url?: string; items?: { url: string }[] }) => {
diff --git a/apps/console/src/components/NavUser.tsx b/apps/console/src/components/NavUser.tsx
index a4b8e7d6e..c76f565bb 100644
--- a/apps/console/src/components/NavUser.tsx
+++ b/apps/console/src/components/NavUser.tsx
@@ -2,7 +2,6 @@
 
 import { ChevronsUpDown, LogOut } from "lucide-react";
 import { graphql, useFragment } from "react-relay";
-import { useParams } from "react-router";
 
 import { Avatar, AvatarFallback } from "@/components/ui/avatar";
 import {
@@ -20,7 +19,6 @@ import {
   useSidebar,
 } from "@/components/ui/sidebar";
 import { NavUser_viewer$key } from "./__generated__/NavUser_viewer.graphql";
-import { NavUserSkeleton } from "./NavUserSkeleton";
 import { buildEndpoint } from "@/utils";
 
 export const navUserFragment = graphql`
@@ -34,7 +32,6 @@ export const navUserFragment = graphql`
 export function NavUser({ viewer }: { viewer: NavUser_viewer$key }) {
   const { isMobile } = useSidebar();
   const currentUser = useFragment(navUserFragment, viewer);
-  const { organizationId } = useParams();
 
   const handleLogout = async () => {
     fetch(buildEndpoint("/api/console/v1/auth/logout"), {
@@ -45,10 +42,6 @@ export function NavUser({ viewer }: { viewer: NavUser_viewer$key }) {
     });
   };
 
-  if (!organizationId) {
-    return <NavUserSkeleton />;
-  }
-
   return (
     <SidebarMenu>
       <SidebarMenuItem>
diff --git a/apps/console/src/components/OrganizationSwitcher.tsx b/apps/console/src/components/OrganizationSwitcher.tsx
index 9c5dbff8c..bf552def9 100644
--- a/apps/console/src/components/OrganizationSwitcher.tsx
+++ b/apps/console/src/components/OrganizationSwitcher.tsx
@@ -25,7 +25,6 @@ import {
   OrganizationSwitcher_organizations$data,
 } from "./__generated__/OrganizationSwitcher_organizations.graphql";
 import { cn } from "@/lib/utils";
-import { OrganizationSwitcherSkeleton } from "./OrganizationSwitcherSkeleton";
 
 export const organizationSwitcherFragment = graphql`
   fragment OrganizationSwitcher_organizations on User {
@@ -95,10 +94,6 @@ export function OrganizationSwitcher({
     navigate(`/organizations/${org.id}`);
   };
 
-  if (!hasOrganizations) {
-    return <OrganizationSwitcherSkeleton />;
-  }
-
   return (
     <SidebarMenu>
       <SidebarMenuItem>