Merge pull request #3270 from Bima42/3165-add-environment-switch-dropdown

feat: being able to switch environments from breadcrumbs
This commit is contained in:
Mauricio Siu
2025-12-18 00:20:00 -06:00
committed by GitHub
9 changed files with 117 additions and 18 deletions
@@ -1,22 +1,36 @@
import Link from "next/link"; import Link from "next/link";
import { Fragment } from "react"; import { Fragment } from "react";
import { ChevronDown } from "lucide-react";
import { import {
Breadcrumb, Breadcrumb,
BreadcrumbItem, BreadcrumbItem,
BreadcrumbLink, BreadcrumbLink,
BreadcrumbList, BreadcrumbList,
BreadcrumbSeparator, BreadcrumbSeparator,
BreadcrumbPage,
} from "@/components/ui/breadcrumb"; } from "@/components/ui/breadcrumb";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
import { SidebarTrigger } from "@/components/ui/sidebar"; import { SidebarTrigger } from "@/components/ui/sidebar";
interface Props { interface BreadcrumbEntry {
list: { name: string;
href?: string;
dropdownItems?: {
name: string; name: string;
href?: string; href: string;
}[]; }[];
} }
interface Props {
list: BreadcrumbEntry[];
}
export const BreadcrumbSidebar = ({ list }: Props) => { export const BreadcrumbSidebar = ({ list }: Props) => {
return ( return (
<header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12"> <header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12">
@@ -29,13 +43,29 @@ export const BreadcrumbSidebar = ({ list }: Props) => {
{list.map((item, index) => ( {list.map((item, index) => (
<Fragment key={item.name}> <Fragment key={item.name}>
<BreadcrumbItem className="block"> <BreadcrumbItem className="block">
<BreadcrumbLink href={item?.href} asChild={!!item?.href}> {item.dropdownItems && item.dropdownItems.length > 0 ? (
{item.href ? ( <DropdownMenu>
<Link href={item?.href}>{item?.name}</Link> <DropdownMenuTrigger className="flex items-center gap-1 hover:text-foreground transition-colors outline-none">
) : ( {item.name}
item?.name <ChevronDown className="h-4 w-4 opacity-50" />
)} </DropdownMenuTrigger>
</BreadcrumbLink> <DropdownMenuContent align="start">
{item.dropdownItems.map((subItem) => (
<DropdownMenuItem key={subItem.href} asChild>
<Link href={subItem.href}>{subItem.name}</Link>
</DropdownMenuItem>
))}
</DropdownMenuContent>
</DropdownMenu>
) : (
<BreadcrumbLink href={item?.href} asChild={!!item?.href}>
{item.href ? (
<Link href={item?.href}>{item?.name}</Link>
) : (
<BreadcrumbPage>{item?.name}</BreadcrumbPage>
)}
</BreadcrumbLink>
)}
</BreadcrumbItem> </BreadcrumbItem>
{index + 1 < list.length && ( {index + 1 < list.length && (
<BreadcrumbSeparator className="block" /> <BreadcrumbSeparator className="block" />
@@ -279,6 +279,16 @@ const EnvironmentPage = (
const [isBulkActionLoading, setIsBulkActionLoading] = useState(false); const [isBulkActionLoading, setIsBulkActionLoading] = useState(false);
const { projectId, environmentId } = props; const { projectId, environmentId } = props;
const { data: auth } = api.user.get.useQuery(); const { data: auth } = api.user.get.useQuery();
const { data: environments } = api.environment.byProjectId.useQuery({
projectId: projectId,
});
const environmentDropdownItems =
environments?.map((env) => ({
name: env.name,
href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
})) || [];
const [sortBy, setSortBy] = useState<string>(() => { const [sortBy, setSortBy] = useState<string>(() => {
if (typeof window !== "undefined") { if (typeof window !== "undefined") {
return localStorage.getItem("servicesSort") || "lastDeploy-desc"; return localStorage.getItem("servicesSort") || "lastDeploy-desc";
@@ -863,6 +873,7 @@ const EnvironmentPage = (
}, },
{ {
name: currentEnvironment.name, name: currentEnvironment.name,
dropdownItems: environmentDropdownItems,
}, },
]} ]}
/> />
@@ -91,6 +91,15 @@ const Service = (
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: auth } = api.user.get.useQuery(); const { data: auth } = api.user.get.useQuery();
const { data: environments } = api.environment.byProjectId.useQuery({
projectId: data?.environment?.project?.projectId || "",
});
const environmentDropdownItems =
environments?.map((env) => ({
name: env.name,
href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
})) || [];
return ( return (
<div className="pb-10"> <div className="pb-10">
<UseKeyboardNav forPage="application" /> <UseKeyboardNav forPage="application" />
@@ -98,11 +107,11 @@ const Service = (
list={[ list={[
{ name: "Projects", href: "/dashboard/projects" }, { name: "Projects", href: "/dashboard/projects" },
{ {
name: data?.environment.project.name || "", name: data?.environment?.project?.name || "",
}, },
{ {
name: data?.environment?.name || "", name: data?.environment?.name || "",
href: `/dashboard/project/${projectId}/environment/${environmentId}`, dropdownItems: environmentDropdownItems,
}, },
{ {
name: data?.name || "", name: data?.name || "",
@@ -80,6 +80,14 @@ const Service = (
const { data: auth } = api.user.get.useQuery(); const { data: auth } = api.user.get.useQuery();
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: environments } = api.environment.byProjectId.useQuery({
projectId: data?.environment?.projectId || "",
});
const environmentDropdownItems =
environments?.map((env) => ({
name: env.name,
href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
})) || [];
return ( return (
<div className="pb-10"> <div className="pb-10">
@@ -92,7 +100,7 @@ const Service = (
}, },
{ {
name: data?.environment?.name || "", name: data?.environment?.name || "",
href: `/dashboard/project/${projectId}/environment/${environmentId}`, dropdownItems: environmentDropdownItems,
}, },
{ {
name: data?.name || "", name: data?.name || "",
@@ -62,6 +62,15 @@ const Mariadb = (
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: environments } = api.environment.byProjectId.useQuery({
projectId: data?.environment?.projectId || "",
});
const environmentDropdownItems =
environments?.map((env) => ({
name: env.name,
href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
})) || [];
return ( return (
<div className="pb-10"> <div className="pb-10">
<UseKeyboardNav forPage="mariadb" /> <UseKeyboardNav forPage="mariadb" />
@@ -73,7 +82,7 @@ const Mariadb = (
}, },
{ {
name: data?.environment?.name || "", name: data?.environment?.name || "",
href: `/dashboard/project/${projectId}/environment/${environmentId}`, dropdownItems: environmentDropdownItems,
}, },
{ {
name: data?.name || "", name: data?.name || "",
@@ -61,6 +61,14 @@ const Mongo = (
const { data: auth } = api.user.get.useQuery(); const { data: auth } = api.user.get.useQuery();
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: environments } = api.environment.byProjectId.useQuery({
projectId: data?.environment?.projectId || "",
});
const environmentDropdownItems =
environments?.map((env) => ({
name: env.name,
href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
})) || [];
return ( return (
<div className="pb-10"> <div className="pb-10">
@@ -73,7 +81,7 @@ const Mongo = (
}, },
{ {
name: data?.environment?.name || "", name: data?.environment?.name || "",
href: `/dashboard/project/${projectId}/environment/${environmentId}`, dropdownItems: environmentDropdownItems,
}, },
{ {
name: data?.name || "", name: data?.name || "",
@@ -60,6 +60,14 @@ const MySql = (
const { data: auth } = api.user.get.useQuery(); const { data: auth } = api.user.get.useQuery();
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: environments } = api.environment.byProjectId.useQuery({
projectId: data?.environment?.projectId || "",
});
const environmentDropdownItems =
environments?.map((env) => ({
name: env.name,
href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
})) || [];
return ( return (
<div className="pb-10"> <div className="pb-10">
@@ -72,7 +80,7 @@ const MySql = (
}, },
{ {
name: data?.environment?.name || "", name: data?.environment?.name || "",
href: `/dashboard/project/${projectId}/environment/${environmentId}`, dropdownItems: environmentDropdownItems,
}, },
{ {
name: data?.name || "", name: data?.name || "",
@@ -60,6 +60,14 @@ const Postgresql = (
const { data: auth } = api.user.get.useQuery(); const { data: auth } = api.user.get.useQuery();
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: environments } = api.environment.byProjectId.useQuery({
projectId: data?.environment?.projectId || "",
});
const environmentDropdownItems =
environments?.map((env) => ({
name: env.name,
href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
})) || [];
return ( return (
<div className="pb-10"> <div className="pb-10">
@@ -72,7 +80,7 @@ const Postgresql = (
}, },
{ {
name: data?.environment?.name || "", name: data?.environment?.name || "",
href: `/dashboard/project/${projectId}/environment/${environmentId}`, dropdownItems: environmentDropdownItems,
}, },
{ {
name: data?.name || "", name: data?.name || "",
@@ -60,6 +60,14 @@ const Redis = (
const { data: auth } = api.user.get.useQuery(); const { data: auth } = api.user.get.useQuery();
const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: environments } = api.environment.byProjectId.useQuery({
projectId: data?.environment?.projectId || "",
});
const environmentDropdownItems =
environments?.map((env) => ({
name: env.name,
href: `/dashboard/project/${projectId}/environment/${env.environmentId}`,
})) || [];
return ( return (
<div className="pb-10"> <div className="pb-10">
@@ -72,7 +80,7 @@ const Redis = (
}, },
{ {
name: data?.environment?.name || "", name: data?.environment?.name || "",
href: `/dashboard/project/${projectId}/environment/${environmentId}`, dropdownItems: environmentDropdownItems,
}, },
{ {
name: data?.name || "", name: data?.name || "",