chore: add org display to workspace topbar

Parkreiner · Parkreiner · commit 4956ebb2700c · 2024-09-04T16:41:05.000Z
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
@@ -116,6 +116,12 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
 		linkToTemplate(workspace.organization_name, workspace.template_name),
 	);
 
+	// Organization logic
+	const { organizations, showOrganizations } = useDashboard();
+	const matchedOrganization = organizations.find(
+		(o) => o.id === workspace.organization_id,
+	);
+
 	return (
 		<Topbar css={{ gridArea: "topbar" }}>
 			<Tooltip title="Back to workspaces">
@@ -146,6 +152,24 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
 						<span>{workspace.owner_name}</span>
 					</Tooltip>
 
+					{showOrganizations && (
+						<>
+							<TopbarDivider />
+
+							{matchedOrganization && (
+								<UserAvatar
+									size="xs"
+									username={matchedOrganization.display_name}
+									avatarURL={matchedOrganization.icon}
+								/>
+							)}
+
+							<Tooltip title="Organization">
+								<span>{workspace.organization_name}</span>
+							</Tooltip>
+						</>
+					)}
+
 					<TopbarDivider />
 
 					<Popover mode="hover">
