@@ -10,7 +10,7 @@ import {
1010import type { EnvironmentId , ProjectId , ScopedProjectRef } from "@t3tools/contracts" ;
1111import { useEffect , useMemo , useSyncExternalStore } from "react" ;
1212
13- import { useAllEnvironmentProjectSnapshotsReady } from "./state/entities" ;
13+ import { useAllEnvironmentProjectSnapshotsReady , useProjects } from "./state/entities" ;
1414import { pendingWindowScopeSeed , windowProjectFilterState } from "./windowSidebarScope.fork" ;
1515
1616/**
@@ -45,9 +45,12 @@ export function useWindowProjectFilter(
4545 filter,
4646 setFilter : state . set ,
4747 scopeKey : projectFilterScopeKey ( filter ) ,
48- projectKeys : projectFilterProjectKeys ( filter ) ,
48+ projectKeys : projectFilterProjectKeys (
49+ filter ,
50+ groups . flatMap ( ( group ) => group . members ) ,
51+ ) ,
4952 } ) ,
50- [ filter , state ] ,
53+ [ filter , groups , state ] ,
5154 ) ;
5255}
5356
@@ -71,7 +74,15 @@ export function filterProjectsToWindow<Project extends WindowFilterableProject>(
7174export function useWindowProjectKeys ( ) : ReadonlySet < string > | null {
7275 const state = windowProjectFilterState ( ) ;
7376 const stored = useSyncExternalStore ( state . subscribe , state . get ) ;
74- return useMemo ( ( ) => projectFilterProjectKeys ( stored ) , [ stored ] ) ;
77+ const projects = useProjects ( ) ;
78+ return useMemo (
79+ ( ) =>
80+ projectFilterProjectKeys (
81+ stored ,
82+ projects . map ( ( project ) => scopeProjectRef ( project . environmentId , project . id ) ) ,
83+ ) ,
84+ [ stored , projects ] ,
85+ ) ;
7586}
7687
7788/** A project a link names explicitly; `environmentId` is absent on older links. */
@@ -124,6 +135,7 @@ export function windowLandingProjects<Project extends WindowFilterableProject>(
124135 projects : ReadonlyArray < Project > ,
125136 projectKeys : ReadonlySet < string > | null ,
126137 pendingSeed : ScopedProjectRef | null ,
138+ fallbackToAll = true ,
127139) : ReadonlyArray < Project > {
128140 const seeded =
129141 pendingSeed === null
@@ -135,19 +147,22 @@ export function windowLandingProjects<Project extends WindowFilterableProject>(
135147 ) ;
136148 if ( seeded . length > 0 ) return seeded ;
137149 const shown = filterProjectsToWindow ( projects , projectKeys ) ;
138- return shown . length > 0 ? shown : projects ;
150+ return shown . length > 0 || ! fallbackToAll ? shown : projects ;
139151}
140152
141153/** `windowLandingProjects` for this window. */
142154export function useWindowLandingProjects < Project extends WindowFilterableProject > (
143155 projects : ReadonlyArray < Project > ,
144156) : ReadonlyArray < Project > {
145157 const projectKeys = useWindowProjectKeys ( ) ;
158+ const state = windowProjectFilterState ( ) ;
159+ const filter = useSyncExternalStore ( state . subscribe , state . get ) ;
160+ const fallbackToAll = filter . mode !== "exclude" ;
146161 // Read on each change of the inputs: the seed only ever goes from pending to
147162 // applied, and applying it changes `projectKeys`.
148163 const pendingSeed = pendingWindowScopeSeed ( ) ;
149164 return useMemo (
150- ( ) => windowLandingProjects ( projects , projectKeys , pendingSeed ) ,
151- [ pendingSeed , projectKeys , projects ] ,
165+ ( ) => windowLandingProjects ( projects , projectKeys , pendingSeed , fallbackToAll ) ,
166+ [ pendingSeed , projectKeys , projects , fallbackToAll ] ,
152167 ) ;
153168}
0 commit comments