🧪

aslilac · aslilac · commit eea7fd1b47c9 · 2024-05-14T23:17:28.000Z
diff --git a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx
@@ -11,6 +11,7 @@ import {
   PopoverTrigger,
 } from "components/Popover/Popover";
 import { UserAvatar } from "components/UserAvatar/UserAvatar";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { BUTTON_SM_HEIGHT, navHeight } from "theme/constants";
 import { UserDropdownContent } from "./UserDropdownContent";
 
@@ -28,7 +29,11 @@ export const UserDropdown: FC<UserDropdownProps> = ({
   onSignOut,
 }) => {
   const theme = useTheme();
-  const organizationsQuery = useQuery(myOrganizations());
+  const organizationsQuery = useQuery({
+    ...myOrganizations(),
+    enabled: Boolean(localStorage.getItem("enableMultiOrganizationUi")),
+  });
+  const { organizationId, setOrganizationId } = useDashboard();
 
   return (
     <Popover>
@@ -67,6 +72,8 @@ export const UserDropdown: FC<UserDropdownProps> = ({
               buildInfo={buildInfo}
               supportLinks={supportLinks}
               organizations={organizationsQuery.data}
+              organizationId={organizationId}
+              setOrganizationId={setOrganizationId}
               onSignOut={onSignOut}
             />
           </PopoverContent>
diff --git a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx
@@ -20,7 +20,6 @@ import { CopyButton } from "components/CopyButton/CopyButton";
 import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { usePopover } from "components/Popover/Popover";
 import { Stack } from "components/Stack/Stack";
-import { useDashboard } from "modules/dashboard/useDashboard";
 
 export const Language = {
   accountLabel: "Account",
@@ -86,6 +85,8 @@ const styles = {
 export interface UserDropdownContentProps {
   user: TypesGen.User;
   organizations?: TypesGen.Organization[];
+  organizationId?: string;
+  setOrganizationId?: (id: string) => void;
   buildInfo?: TypesGen.BuildInfoResponse;
   supportLinks?: readonly TypesGen.LinkConfig[];
   onSignOut: () => void;
@@ -94,12 +95,13 @@ export interface UserDropdownContentProps {
 export const UserDropdownContent: FC<UserDropdownContentProps> = ({
   user,
   organizations,
+  organizationId,
+  setOrganizationId,
   buildInfo,
   supportLinks,
   onSignOut,
 }) => {
   const popover = usePopover();
-  const { organizationId, setOrganizationId } = useDashboard();
 
   const onPopoverClose = () => {
     popover.setIsOpen(false);
@@ -150,7 +152,7 @@ export const UserDropdownContent: FC<UserDropdownContentProps> = ({
               key={org.id}
               css={styles.menuItem}
               onClick={() => {
-                setOrganizationId(org.id);
+                setOrganizationId?.(org.id);
                 popover.setIsOpen(false);
               }}
             >
