fix sidebar highlighting

aslilac · aslilac · commit ed8e84fa0da7 · 2025-01-29T22:38:36.000Z
diff --git a/site/src/modules/management/OrganizationSidebarView.tsx b/site/src/modules/management/OrganizationSidebarView.tsx
@@ -60,7 +60,9 @@ export const OrganizationSidebarView: FC<SidebarProps> = ({
 };
 
 function urlForSubpage(organizationName: string, subpage = ""): string {
-	return `/organizations/${organizationName}/${subpage}`;
+	return [`/organizations/${organizationName}`, subpage]
+		.filter(Boolean)
+		.join("/");
 }
 
 interface OrganizationsSettingsNavigationProps {
diff --git a/site/src/pages/GroupsPage/GroupsPage.tsx b/site/src/pages/GroupsPage/GroupsPage.tsx
@@ -78,7 +78,7 @@ export const GroupsPage: FC = () => {
 			<GroupsPageView
 				groups={groupsQuery.data}
 				canCreateGroup={permissions.createGroup}
-				isTemplateRBACEnabled={groupsEnabled}
+				groupsEnabled={groupsEnabled}
 			/>
 		</>
 	);

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,9 @@ export const OrganizationSidebarView: FC<SidebarProps> = ({`
`60`	`60`	`};`
`61`	`61`
`62`	`62`	`function urlForSubpage(organizationName: string, subpage = ""): string {`
`63`		- return `/organizations/${organizationName}/${subpage}`;
	`63`	+ return [`/organizations/${organizationName}`, subpage]
	`64`	`+ .filter(Boolean)`
	`65`	`+ .join("/");`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`interface OrganizationsSettingsNavigationProps {`