@@ -3,7 +3,7 @@ import { parseT3ProjectFile } from "@t3tools/shared/t3ProjectFile";
33import { useAtomValue } from "@effect/atom-react" ;
44import * as Option from "effect/Option" ;
55import { AsyncResult , Atom } from "effect/reactivity" ;
6- import { createContext , type ReactNode , useContext , useMemo } from "react" ;
6+ import { createContext , type ReactNode , useContext } from "react" ;
77
88import { useEnvironments , usePrimaryEnvironmentId } from "../../state/environments" ;
99import { getProjectFileQueryAtom , optimisticFileAtom } from "../files/projectFilesQueryState" ;
@@ -15,79 +15,51 @@ import { selectSingleEnvironmentScope } from "./settingsScopeAxis";
1515function useMemberProjectFiles ( scope : ReturnType < typeof resolveSettingsScope > ) {
1616 const members = scope . kind === "project" || scope . kind === "checkout" ? scope . members : [ ] ;
1717 return useAtomValue (
18- useMemo (
19- ( ) =>
20- Atom . make ( ( get ) => {
21- const files = new Map < string , T3ProjectFile | null > ( ) ;
22- for ( const member of members ) {
23- const result = get (
24- getProjectFileQueryAtom (
25- member . environmentId ,
26- member . workspaceRoot ,
27- T3_PROJECT_FILE_NAME ,
28- ) ,
29- ) ;
30- if ( result . waiting ) continue ;
31- const data =
32- get (
33- optimisticFileAtom (
34- member . environmentId ,
35- member . workspaceRoot ,
36- T3_PROJECT_FILE_NAME ,
37- ) ,
38- ) ?. data ?? Option . getOrNull ( AsyncResult . value ( result ) ) ;
39- files . set (
40- member . physicalProjectKey ,
41- data === null || data . truncated ? null : parseT3ProjectFile ( data . contents ) ,
42- ) ;
43- }
44- return files ;
45- } ) ,
46- [ members ] ,
47- ) ,
18+ Atom . make ( ( get ) => {
19+ const files = new Map < string , T3ProjectFile | null > ( ) ;
20+ for ( const member of members ) {
21+ const result = get (
22+ getProjectFileQueryAtom ( member . environmentId , member . workspaceRoot , T3_PROJECT_FILE_NAME ) ,
23+ ) ;
24+ if ( result . waiting ) continue ;
25+ const data =
26+ get ( optimisticFileAtom ( member . environmentId , member . workspaceRoot , T3_PROJECT_FILE_NAME ) )
27+ ?. data ?? Option . getOrNull ( AsyncResult . value ( result ) ) ;
28+ files . set (
29+ member . physicalProjectKey ,
30+ data === null || data . truncated ? null : parseT3ProjectFile ( data . contents ) ,
31+ ) ;
32+ }
33+ return files ;
34+ } ) ,
4835 ) ;
4936}
5037
5138function useResolvedSettingsScope ( rawSearch : SettingsScopeSearch , singleEnvironment : boolean ) {
5239 const groups = useSettingsProjectGroups ( ) ;
5340 const { environments : availableEnvironments } = useEnvironments ( ) ;
5441 const primaryEnvironmentId = usePrimaryEnvironmentId ( ) ;
55- const search = useMemo (
56- ( ) =>
57- singleEnvironment
58- ? selectSingleEnvironmentScope (
59- rawSearch ,
60- resolveSettingsScope ( rawSearch , groups , availableEnvironments ) ,
61- availableEnvironments ,
62- primaryEnvironmentId ,
63- )
64- : rawSearch ,
65- [ availableEnvironments , groups , primaryEnvironmentId , rawSearch , singleEnvironment ] ,
66- ) ;
67- const scope = useMemo (
68- ( ) => resolveSettingsScope ( search , groups , availableEnvironments ) ,
69- [ availableEnvironments , groups , search ] ,
70- ) ;
42+ const search = singleEnvironment
43+ ? selectSingleEnvironmentScope (
44+ rawSearch ,
45+ resolveSettingsScope ( rawSearch , groups , availableEnvironments ) ,
46+ availableEnvironments ,
47+ primaryEnvironmentId ,
48+ )
49+ : rawSearch ;
50+ const scope = resolveSettingsScope ( search , groups , availableEnvironments ) ;
7151 const projectFiles = useMemberProjectFiles ( scope ) ;
72- return useMemo ( ( ) => {
73- const selected = selectScopedSettingsEnvironments (
74- scope ,
75- availableEnvironments ,
76- primaryEnvironmentId ,
77- ) ;
78- const targets = resolveScopedSettingsTargets (
79- scope ,
80- selected . connectedEnvironments ,
81- projectFiles ,
82- ) ;
83- const target =
84- targets . find (
85- ( candidate ) => candidate . environmentId === selected . environment ?. environmentId ,
86- ) ??
87- targets [ 0 ] ??
88- null ;
89- return { scope, groups, search, ...selected , targets, target } ;
90- } , [ availableEnvironments , groups , primaryEnvironmentId , projectFiles , scope , search ] ) ;
52+ const selected = selectScopedSettingsEnvironments (
53+ scope ,
54+ availableEnvironments ,
55+ primaryEnvironmentId ,
56+ ) ;
57+ const targets = resolveScopedSettingsTargets ( scope , selected . connectedEnvironments , projectFiles ) ;
58+ const target =
59+ targets . find ( ( candidate ) => candidate . environmentId === selected . environment ?. environmentId ) ??
60+ targets [ 0 ] ??
61+ null ;
62+ return { scope, groups, search, ...selected , targets, target } ;
9163}
9264
9365const SettingsScopeContext = createContext <
@@ -111,10 +83,7 @@ export function SettingsScopeProvider({
11183 children : ReactNode ;
11284} ) {
11385 const resolved = useResolvedSettingsScope ( search , singleEnvironment ) ;
114- const value = useMemo (
115- ( ) => ( { ...resolved , singleEnvironment, selectScope : onChange } ) ,
116- [ onChange , resolved , singleEnvironment ] ,
117- ) ;
86+ const value = { ...resolved , singleEnvironment, selectScope : onChange } ;
11887 return < SettingsScopeContext value = { value } > { children } </ SettingsScopeContext > ;
11988}
12089
0 commit comments