|
1 | 1 | import { useClientSettings } from "../../hooks/useSettings"; |
2 | | -import { selectProjectGroupingSettings } from "../../logicalProject"; |
3 | 2 | import { buildSidebarProjectSnapshots } from "../../sidebarProjectGrouping"; |
4 | 3 | import { useEnvironments, usePrimaryEnvironmentId } from "../../state/environments"; |
5 | 4 | import { useProjects } from "../../state/entities"; |
6 | 5 |
|
7 | 6 | export function useSettingsProjectGroups() { |
8 | 7 | const projects = useProjects(); |
9 | | - const settings = useClientSettings(selectProjectGroupingSettings); |
| 8 | + // Read the grouping fields one by one: a selector that builds an object hands back a new |
| 9 | + // identity on every client settings write, which rebuilds every group and, through the |
| 10 | + // settings scope, re-renders every settings row. |
| 11 | + const sidebarProjectGroupingMode = useClientSettings( |
| 12 | + (settings) => settings.sidebarProjectGroupingMode, |
| 13 | + ); |
| 14 | + const sidebarProjectGroupingOverrides = useClientSettings( |
| 15 | + (settings) => settings.sidebarProjectGroupingOverrides, |
| 16 | + ); |
10 | 17 | const primaryEnvironmentId = usePrimaryEnvironmentId(); |
11 | 18 | const { environments } = useEnvironments(); |
12 | 19 | const labels = new Map(environments.map((entry) => [entry.environmentId, entry.label])); |
13 | 20 | return buildSidebarProjectSnapshots({ |
14 | 21 | projects, |
15 | | - settings, |
| 22 | + settings: { sidebarProjectGroupingMode, sidebarProjectGroupingOverrides }, |
16 | 23 | primaryEnvironmentId, |
17 | 24 | resolveEnvironmentLabel: (id) => labels.get(id) ?? null, |
18 | 25 | }).sort((a, b) => a.displayName.localeCompare(b.displayName)); |
|
0 commit comments