1- import { useMemo } from "react" ;
2-
31import { orderItemsByPreferredIds , sortSidebarV2ProjectGroups } from "../components/Sidebar.logic" ;
42import { getProjectOrderKey , selectProjectGroupingSettings } from "../logicalProject" ;
53import { buildSidebarProjectSnapshots } from "../sidebarProjectGrouping" ;
@@ -16,33 +14,24 @@ export function useSidebarProjectGroups() {
1614 const groupingSettings = useClientSettings ( selectProjectGroupingSettings ) ;
1715 const environments = useEnvironmentIdentities ( ) ;
1816 const primaryEnvironmentId = usePrimaryEnvironmentId ( ) ;
19- const orderedProjects = useMemo (
20- ( ) =>
21- orderItemsByPreferredIds ( {
22- items : projects ,
23- preferredIds : projectOrder ,
24- getId : getProjectOrderKey ,
25- getPreferenceIds : ( project ) => [
26- getProjectOrderKey ( project ) ,
27- legacyProjectCwdPreferenceKey ( project . workspaceRoot ) ,
28- ] ,
29- } ) ,
30- [ projectOrder , projects ] ,
31- ) ;
32- const unsortedGroups = useMemo ( ( ) => {
33- const labels = new Map (
34- environments . map ( ( environment ) => [ environment . environmentId , environment . label ] as const ) ,
35- ) ;
36- return buildSidebarProjectSnapshots ( {
37- projects : sortOrder === "manual" ? orderedProjects : projects ,
38- groupScratchProjects : true ,
39- settings : groupingSettings ,
40- primaryEnvironmentId,
41- resolveEnvironmentLabel : ( environmentId ) => labels . get ( environmentId ) ?? null ,
42- } ) ;
43- } , [ environments , groupingSettings , orderedProjects , primaryEnvironmentId , projects , sortOrder ] ) ;
44- return useMemo (
45- ( ) => sortSidebarV2ProjectGroups ( unsortedGroups , threads , sortOrder ) ,
46- [ sortOrder , threads , unsortedGroups ] ,
17+ const orderedProjects = orderItemsByPreferredIds ( {
18+ items : projects ,
19+ preferredIds : projectOrder ,
20+ getId : getProjectOrderKey ,
21+ getPreferenceIds : ( project ) => [
22+ getProjectOrderKey ( project ) ,
23+ legacyProjectCwdPreferenceKey ( project . workspaceRoot ) ,
24+ ] ,
25+ } ) ;
26+ const labels = new Map (
27+ environments . map ( ( environment ) => [ environment . environmentId , environment . label ] as const ) ,
4728 ) ;
29+ const unsortedGroups = buildSidebarProjectSnapshots ( {
30+ projects : sortOrder === "manual" ? orderedProjects : projects ,
31+ groupScratchProjects : true ,
32+ settings : groupingSettings ,
33+ primaryEnvironmentId,
34+ resolveEnvironmentLabel : ( environmentId ) => labels . get ( environmentId ) ?? null ,
35+ } ) ;
36+ return sortSidebarV2ProjectGroups ( unsortedGroups , threads , sortOrder ) ;
4837}
0 commit comments