@@ -33,7 +33,9 @@ import { type RelayEnvironmentView, useConnectionController } from "./useConnect
3333
3434interface CloudEnvironmentRowsProps {
3535 readonly connectedCloudEnvironments : ReadonlyArray < ConnectedEnvironmentSummary > ;
36- readonly onReconnectEnvironment : ( environmentId : EnvironmentId ) => void ;
36+ readonly onSetEnvironmentEnabled : ( environmentId : EnvironmentId , enabled : boolean ) => void ;
37+ /** Long-press on a saved row. The callback owns the confirm. */
38+ readonly onRemoveEnvironment : ( environmentId : EnvironmentId ) => void ;
3739 readonly showcaseAvailableEnvironments ?: ReadonlyArray < RelayEnvironmentView > ;
3840 readonly showcaseSignedIn ?: boolean ;
3941 /**
@@ -97,11 +99,6 @@ function CloudEnvironmentRowsContent(
9799 [ controller ] ,
98100 ) ;
99101
100- const handleDisconnectCloudEnvironment = useCallback (
101- ( environmentId : EnvironmentId ) => controller . removeEnvironment ( environmentId ) ,
102- [ controller ] ,
103- ) ;
104-
105102 const handleToggleCloudError = useCallback ( ( environmentId : string ) => {
106103 setExpandedErrorId ( ( current ) => ( current === environmentId ? null : environmentId ) ) ;
107104 } , [ ] ) ;
@@ -144,8 +141,10 @@ function CloudEnvironmentRowsContent(
144141 key = { environment . environmentId }
145142 environment = { environment }
146143 borderTop = { index !== 0 }
147- onConnect = { ( ) => props . onReconnectEnvironment ( environment . environmentId ) }
148- onDisconnect = { ( ) => handleDisconnectCloudEnvironment ( environment . environmentId ) }
144+ onSetEnabled = { ( enabled ) =>
145+ props . onSetEnvironmentEnabled ( environment . environmentId , enabled )
146+ }
147+ onRemove = { ( ) => props . onRemoveEnvironment ( environment . environmentId ) }
149148 errorExpanded = { expandedErrorId === environment . environmentId }
150149 onToggleError = { ( ) => handleToggleCloudError ( environment . environmentId ) }
151150 />
@@ -204,38 +203,42 @@ function CloudEnvironmentRowsContent(
204203 ) ;
205204}
206205
206+ /**
207+ * A saved T3 Connect environment. The switch turns it on or off; off keeps the
208+ * registration and cache but drops the connection and hides its errors.
209+ * Long-press removes it from this device.
210+ */
207211function ConnectedCloudEnvironmentRow ( props : {
208212 readonly environment : ConnectedEnvironmentSummary ;
209213 readonly borderTop : boolean ;
210214 readonly errorExpanded : boolean ;
211- readonly onConnect : ( ) => void ;
212- readonly onDisconnect : ( ) => void ;
215+ readonly onSetEnabled : ( enabled : boolean ) => void ;
216+ readonly onRemove : ( ) => void ;
213217 readonly onToggleError : ( ) => void ;
214218} ) {
215219 const serverConfig = useAtomValue (
216220 serverEnvironment . configValueAtom ( props . environment . environmentId ) ,
217221 ) ;
222+ const enabled = props . environment . isEnabled ;
218223 return (
219- < View >
224+ < Pressable
225+ accessibilityHint = "Long press to remove from this device"
226+ onLongPress = { props . onRemove }
227+ >
220228 < CloudEnvironmentRowShell
221229 borderTop = { props . borderTop }
222- connectionError = { props . environment . connectionError }
223- connectionErrorTraceId = { props . environment . connectionErrorTraceId }
224- connectionState = { props . environment . connectionState }
230+ connectionError = { enabled ? props . environment . connectionError : null }
231+ connectionErrorTraceId = { enabled ? props . environment . connectionErrorTraceId : null }
232+ connectionState = { enabled ? props . environment . connectionState : "available" }
225233 errorExpanded = { props . errorExpanded }
226234 label = { props . environment . environmentLabel }
227235 machine = { resolveEnvironmentMachineKind ( serverConfig ) }
228- onValueChange = { ( enabled ) => {
229- if ( enabled ) {
230- props . onConnect ( ) ;
231- return ;
232- }
233- props . onDisconnect ( ) ;
234- } }
236+ onValueChange = { props . onSetEnabled }
235237 onToggleError = { props . onToggleError }
236- value = { props . environment . connectionState !== "available" }
238+ { ...( enabled ? { } : { statusText : "Off" } ) }
239+ value = { enabled }
237240 />
238- </ View >
241+ </ Pressable >
239242 ) ;
240243}
241244
0 commit comments