@@ -142,7 +142,7 @@ import type { SidebarThreadSummary } from "../types";
142142import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell" ;
143143import { cn } from "~/lib/utils" ;
144144import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon" ;
145- import { ProjectEnvironmentLabel , resolveProjectGroupMachine } from "./ProjectEnvironmentLabel " ;
145+ import { ProjectEnvironmentBadge } from "./ProjectEnvironmentBadge " ;
146146import { buildThreadActionMenuItems } from "./threadActionMenu.logic" ;
147147import {
148148 animateSidebarLayoutChanges ,
@@ -2335,18 +2335,17 @@ export default function Sidebar() {
23352335 // while the popup search filters the same collection.
23362336 const projectScopeItems = useMemo (
23372337 ( ) => [
2338- { value : "all" , label : "All projects" , environmentLabels : [ ] as readonly string [ ] } ,
2338+ { value : "all" , label : "All projects" } ,
23392339 ...projectGroups . map ( ( project ) => ( {
23402340 value : project . projectKey ,
23412341 label : project . displayName ,
2342- environmentLabels : project . environmentLabels ,
23432342 } ) ) ,
23442343 ] ,
23452344 [ projectGroups ] ,
23462345 ) ;
23472346 // Same-named projects on two machines are only told apart by where they
2348- // live, so rows carry their environment once the catalog spans more than
2349- // one; a single-machine catalog stays as it was.
2347+ // live, so rows on another machine carry its icon once the catalog spans
2348+ // more than one environment ; a single-machine catalog stays as it was.
23502349 const showProjectEnvironments = useMemo (
23512350 ( ) => projectGroupsSpanEnvironments ( projectGroups ) ,
23522351 [ projectGroups ] ,
@@ -2380,21 +2379,9 @@ export default function Sidebar() {
23802379 activeScopeKey : projectScopeKey ,
23812380 query : projectScopeMenuState . query ,
23822381 matches : ( item , query ) =>
2383- projectScopeFilter . contains ( item , query , ( candidate ) => candidate . label ) ||
2384- ( showProjectEnvironments &&
2385- projectScopeFilter . contains (
2386- item . environmentLabels . join ( " · " ) ,
2387- query ,
2388- ( candidate ) => candidate ,
2389- ) ) ,
2382+ projectScopeFilter . contains ( item , query , ( candidate ) => candidate . label ) ,
23902383 } ) ,
2391- [
2392- projectScopeFilter ,
2393- projectScopeItems ,
2394- projectScopeKey ,
2395- projectScopeMenuState . query ,
2396- showProjectEnvironments ,
2397- ] ,
2384+ [ projectScopeFilter , projectScopeItems , projectScopeKey , projectScopeMenuState . query ] ,
23982385 ) ;
23992386 const scopedProjectGroup = useMemo (
24002387 ( ) =>
@@ -4472,31 +4459,17 @@ export default function Sidebar() {
44724459 { scopedProjectGroup ?. displayName ?? "All projects" }
44734460 </ span >
44744461 { scopedProjectGroup && showProjectEnvironments ? (
4475- < ProjectEnvironmentLabel
4476- // The trigger has no tooltip, so at narrow sidebar
4477- // widths the label yields to the project name.
4478- className = "shrink"
4479- labels = { scopedProjectGroup . environmentLabels }
4480- machine = { resolveProjectGroupMachine ( {
4481- group : scopedProjectGroup ,
4482- primaryEnvironmentId,
4483- machineByEnvironmentId : environmentMachineById ,
4484- } ) }
4462+ < ProjectEnvironmentBadge
4463+ group = { scopedProjectGroup }
4464+ primaryEnvironmentId = { primaryEnvironmentId }
4465+ machineByEnvironmentId = { environmentMachineById }
44854466 />
44864467 ) : null }
44874468 < ChevronDownIcon className = "-mr-px size-4 shrink-0" />
44884469 </ ComboboxTrigger >
44894470 < ComboboxPopup
44904471 align = "start"
4491- // Anchor-wide by default; grows past the trigger only when
4492- // rows carry environment labels, up to 20rem, so a project
4493- // name and where it lives both stay readable.
4494- className = { cn (
4495- "min-w-0 overflow-hidden" ,
4496- showProjectEnvironments
4497- ? "w-max min-w-(--anchor-width) max-w-[min(20rem,var(--available-width))]"
4498- : "w-(--anchor-width)" ,
4499- ) }
4472+ className = "w-(--anchor-width) min-w-0 overflow-hidden"
45004473 >
45014474 < ComboboxSearchInput
45024475 aria-label = "Search projects"
@@ -4548,13 +4521,10 @@ export default function Sidebar() {
45484521 ) }
45494522 < span className = "min-w-0 flex-1 truncate text-sm" > { item . label } </ span >
45504523 { project && showProjectEnvironments ? (
4551- < ProjectEnvironmentLabel
4552- labels = { project . environmentLabels }
4553- machine = { resolveProjectGroupMachine ( {
4554- group : project ,
4555- primaryEnvironmentId,
4556- machineByEnvironmentId : environmentMachineById ,
4557- } ) }
4524+ < ProjectEnvironmentBadge
4525+ group = { project }
4526+ primaryEnvironmentId = { primaryEnvironmentId }
4527+ machineByEnvironmentId = { environmentMachineById }
45584528 />
45594529 ) : null }
45604530 { project ? (
0 commit comments