Merge pull request #644 from zenml-io/staging

Release

Author: Cahllagerfeld

package.json

@@ -26,6 +26,7 @@
 		"@dagrejs/dagre": "^1.1.2",
 		"@fontsource/inter": "^5.0.18",
 		"@hookform/resolvers": "^3.5.0",
+		"@radix-ui/react-tabs": "^1.1.0",
 		"@tanstack/react-query": "^5.40.1",
 		"@tanstack/react-table": "^8.17.3",
 		"@tisoap/react-flow-smart-edge": "^3.0.0",

pnpm-lock.yaml

@@ -5,7 +5,9 @@ import { Avatar, AvatarFallback, AvatarImage, Skeleton } from "@zenml-io/react-c
 import { SettingsMenu } from "./Menu";
 
 export function DisplayServer() {
-	const { data, isError, isPending } = useServerSettings({ throwOnError: true });
+	const { data, isError, isPending } = useServerSettings({
+		throwOnError: true
+	});
 
 	if (isPending) return <Skeleton className="h-9 w-full" />;
 	if (isError) return null;
@@ -38,7 +40,9 @@ export function ServerSettingsMenu() {
 			},
 			{
 				name: "Secrets",
-				href: routes.settings.secrets.overview
+				href: routes.settings.secrets.overview,
+				isActiveOverride: (pathname: string) =>
+					pathname.startsWith(routes.settings.secrets.overview)
 			},
 			{
 				name: "Connectors",

src/app/settings/LayoutSidebar.tsx

@@ -3,6 +3,7 @@ import NavLink from "@/components/NavLink";
 type MenuItem = {
 	name: string;
 	href: string;
+	isActiveOverride?: (pathname: string) => boolean;
 };
 
 type MenuProps = {
@@ -15,7 +16,7 @@ export function SettingsMenu({ items }: MenuProps) {
 			<ul className="flex w-full flex-row flex-wrap items-center gap-1 lg:flex-col lg:items-start">
 				{items.map((item) => (
 					<li key={item.name} className="lg:w-full">
-						<NavLink end to={item.href}>
+						<NavLink end to={item.href} isActiveOverride={item.isActiveOverride}>
 							{item.name}
 						</NavLink>
 					</li>