refactor: simplify AdvanceBreadcrumb component by removing props and utilizing URL query parameters for ID retrieval

This commit is contained in:
Mauricio Siu
2026-02-26 22:44:57 -06:00
parent b1b1dbc1ce
commit ebf5f486bc
@@ -36,12 +36,7 @@ import { Separator } from "@/components/ui/separator";
import { SidebarTrigger } from "@/components/ui/sidebar"; import { SidebarTrigger } from "@/components/ui/sidebar";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
interface AdvanceBreadcrumbProps { type AdvanceBreadcrumbProps = {};
projectId?: string;
environmentId?: string;
serviceId?: string;
serviceType?: ServiceType;
}
const getServiceIcon = (type: ServiceType, className = "size-4") => { const getServiceIcon = (type: ServiceType, className = "size-4") => {
const icons: Record<ServiceType, React.ReactNode> = { const icons: Record<ServiceType, React.ReactNode> = {
@@ -163,17 +158,31 @@ const extractServicesFromEnvironment = (
return services; return services;
}; };
export const AdvanceBreadcrumb = ({ export const AdvanceBreadcrumb = () => {
projectId,
environmentId,
serviceId,
}: AdvanceBreadcrumbProps) => {
const router = useRouter(); const router = useRouter();
const { query } = router;
// Read IDs from URL (dynamic route segments)
const projectId =
typeof query.projectId === "string" ? query.projectId : null;
const environmentId =
typeof query.environmentId === "string" ? query.environmentId : null;
const serviceId =
(typeof query.applicationId === "string" ? query.applicationId : null) ??
(typeof query.composeId === "string" ? query.composeId : null) ??
(typeof query.postgresId === "string" ? query.postgresId : null) ??
(typeof query.mysqlId === "string" ? query.mysqlId : null) ??
(typeof query.mariadbId === "string" ? query.mariadbId : null) ??
(typeof query.redisId === "string" ? query.redisId : null) ??
(typeof query.mongoId === "string" ? query.mongoId : null) ??
null;
const [projectOpen, setProjectOpen] = useState(false); const [projectOpen, setProjectOpen] = useState(false);
const [serviceOpen, setServiceOpen] = useState(false); const [serviceOpen, setServiceOpen] = useState(false);
const [environmentOpen, setEnvironmentOpen] = useState(false); const [environmentOpen, setEnvironmentOpen] = useState(false);
const [projectSearch, setProjectSearch] = useState(""); const [projectSearch, setProjectSearch] = useState("");
const [serviceSearch, setServiceSearch] = useState(""); const [serviceSearch, setServiceSearch] = useState("");
const [environmentSearch, setEnvironmentSearch] = useState("");
const [expandedProjectId, setExpandedProjectId] = useState<string | null>( const [expandedProjectId, setExpandedProjectId] = useState<string | null>(
null, null,
); );
@@ -183,19 +192,19 @@ export const AdvanceBreadcrumb = ({
// Fetch current project data // Fetch current project data
const { data: currentProject } = api.project.one.useQuery( const { data: currentProject } = api.project.one.useQuery(
{ projectId: projectId || "" }, { projectId: projectId ?? "" },
{ enabled: !!projectId }, { enabled: !!projectId },
); );
// Fetch current environment // Fetch current environment
const { data: currentEnvironment } = api.environment.one.useQuery( const { data: currentEnvironment } = api.environment.one.useQuery(
{ environmentId: environmentId || "" }, { environmentId: environmentId ?? "" },
{ enabled: !!environmentId }, { enabled: !!environmentId },
); );
// Fetch environments for current project // Fetch environments for current project
const { data: projectEnvironments } = api.environment.byProjectId.useQuery( const { data: projectEnvironments } = api.environment.byProjectId.useQuery(
{ projectId: projectId || "" }, { projectId: projectId ?? "" },
{ enabled: !!projectId }, { enabled: !!projectId },
); );
@@ -276,6 +285,12 @@ export const AdvanceBreadcrumb = ({
s.appName?.toLowerCase().includes(serviceSearch.toLowerCase()), s.appName?.toLowerCase().includes(serviceSearch.toLowerCase()),
); );
// Filter environments based on search
const filteredEnvironments =
projectEnvironments?.filter((env) =>
env.name.toLowerCase().includes(environmentSearch.toLowerCase()),
) ?? [];
// If we're just on the projects page, show simple breadcrumb // If we're just on the projects page, show simple breadcrumb
if (!projectId) { if (!projectId) {
return ( return (
@@ -367,7 +382,7 @@ export const AdvanceBreadcrumb = ({
<span className="font-medium"> <span className="font-medium">
{project.name} {project.name}
</span> </span>
<span className="text-xs text-muted-foreground"> <span className="text-muted-foreground">
{project.environments.length} env {project.environments.length} env
{project.environments.length !== 1 {project.environments.length !== 1
? "s" ? "s"
@@ -442,39 +457,58 @@ export const AdvanceBreadcrumb = ({
<Button <Button
variant="ghost" variant="ghost"
aria-expanded={environmentOpen} aria-expanded={environmentOpen}
className="h-auto px-2 py-1.5 hover:bg-accent gap-1" className="h-auto px-2 py-1.5 hover:bg-accent gap-2"
> >
<p className="text-xs font-normal"> <span className="font-medium max-w-[150px] truncate">
{currentEnvironment?.name || "production"} {currentEnvironment?.name || "production"}
</p> </span>
<ChevronDown className="size-3 text-muted-foreground" /> <ChevronDown className="size-4 text-muted-foreground" />
</Button> </Button>
</PopoverTrigger> </PopoverTrigger>
<PopoverContent <PopoverContent
className="w-[200px] p-1" className="w-[350px] p-0"
align="start" align="start"
sideOffset={8} sideOffset={8}
> >
<div className="space-y-1"> <Command shouldFilter={false}>
{projectEnvironments.map((env) => { <div className="relative">
const isSelected = env.environmentId === environmentId; <CommandInput
return ( placeholder="Find Environment..."
<button value={environmentSearch}
type="button" onValueChange={setEnvironmentSearch}
key={env.environmentId} className="w-full focus:ring-0"
onClick={() => />
handleEnvironmentSelect(env.environmentId) <kbd className="pointer-events-none h-5 absolute right-2 top-1/2 -translate-y-1/2 select-none items-center gap-1 rounded border bg-muted px-1.5 font-mono text-[10px] font-medium opacity-100 flex">
} Esc
className="flex items-center justify-between w-full px-2 py-1.5 text-sm rounded-md hover:bg-accent cursor-pointer" </kbd>
> </div>
<p className="text-xs">{env.name}</p> <CommandList>
{isSelected && ( <CommandEmpty>No environments found.</CommandEmpty>
<Check className="size-3 text-primary" /> <CommandGroup>
)} <ScrollArea className="h-[300px]">
</button> {filteredEnvironments.map((env) => {
); const isSelected =
})} env.environmentId === environmentId;
</div> return (
<CommandItem
key={env.environmentId}
value={env.environmentId}
onSelect={() =>
handleEnvironmentSelect(env.environmentId)
}
className="flex items-center justify-between py-2 cursor-pointer"
>
<span className="font-medium">{env.name}</span>
{isSelected && (
<Check className="size-4 text-primary" />
)}
</CommandItem>
);
})}
</ScrollArea>
</CommandGroup>
</CommandList>
</Command>
</PopoverContent> </PopoverContent>
</Popover> </Popover>
)} )}
@@ -532,7 +566,7 @@ export const AdvanceBreadcrumb = ({
key={service.id} key={service.id}
value={service.id} value={service.id}
onSelect={() => handleServiceSelect(service)} onSelect={() => handleServiceSelect(service)}
className="flex items-center justify-between py-3 px-2 cursor-pointer" className="flex items-center justify-between py-2 cursor-pointer"
> >
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<div className="flex items-center justify-center size-8 rounded-md bg-muted"> <div className="flex items-center justify-center size-8 rounded-md bg-muted">