fix: don't highlight inactive org in management settings sidebar (#14059)

aslilac · web-flow · commit 56dfc64bb063 · 2024-07-30T09:33:22.000-06:00
diff --git a/site/src/pages/ManagementSettingsPage/Sidebar.tsx b/site/src/pages/ManagementSettingsPage/Sidebar.tsx
@@ -15,11 +15,15 @@ import { useOrganizationSettings } from "./ManagementSettingsLayout";
 
 export const Sidebar: FC = () => {
   const { organizations } = useOrganizationSettings();
-  const { organization = getOrganizationNameByDefault(organizations) } =
-    useParams() as { organization: string };
+  const { organization } = useParams() as { organization?: string };
   const { multiple_organizations: organizationsEnabled } =
     useFeatureVisibility();
 
+  let organizationName = organization;
+  if (location.pathname === "/organizations") {
+    organizationName = getOrganizationNameByDefault(organizations);
+  }
+
   // TODO: Do something nice to scroll to the active org.
 
   return (
@@ -44,7 +48,7 @@ export const Sidebar: FC = () => {
             <OrganizationSettingsNavigation
               key={org.id}
               organization={org}
-              active={org.name === organization}
+              active={org.name === organizationName}
             />
           ))}
         </>
