@@ -48,7 +48,7 @@ const CreateWorkspacePageExperimental: FC = () => {
4848const navigate = useNavigate ( ) ;
4949const [ searchParams ] = useSearchParams ( ) ;
5050
51- const [ currentResponse , setCurrentResponse ] =
51+ const [ latestResponse , setLatestResponse ] =
5252useState < DynamicParametersResponse | null > ( null ) ;
5353const wsResponseId = useRef < number > ( - 1 ) ;
5454const ws = useRef < WebSocket | null > ( null ) ;
@@ -131,22 +131,17 @@ const CreateWorkspacePageExperimental: FC = () => {
131131} ,
132132) ;
133133
134- const onMessage = useCallback (
135- ( response :DynamicParametersResponse ) => {
136- setCurrentResponse ( ( prev ) => {
137- if ( prev && prev ?. id >= response . id ) {
138- return prev ;
139- }
134+ const onMessage = useEffectEvent ( ( response :DynamicParametersResponse ) => {
135+ if ( latestResponse && latestResponse ?. id >= response . id ) {
136+ return ;
137+ }
140138
141- if ( ! initialParamsSentRef . current && response . parameters . length > 0 ) {
142- sendInitialParameters ( [ ...response . parameters ] ) ;
143- }
139+ if ( ! initialParamsSentRef . current && response . parameters . length > 0 ) {
140+ sendInitialParameters ( [ ...response . parameters ] ) ;
141+ }
144142
145- return response ;
146- } ) ;
147- } ,
148- [ sendInitialParameters ] ,
149- ) ;
143+ setLatestResponse ( response ) ;
144+ } ) ;
150145
151146// Initialize the WebSocket connection when there is a valid template version ID
152147useEffect ( ( ) => {
@@ -269,18 +264,18 @@ const CreateWorkspacePageExperimental: FC = () => {
269264} , [ automateWorkspaceCreation , autoCreateReady ] ) ;
270265
271266const sortedParams = useMemo ( ( ) => {
272- if ( ! currentResponse ?. parameters ) {
267+ if ( ! latestResponse ?. parameters ) {
273268return [ ] ;
274269}
275- return [ ...currentResponse . parameters ] . sort ( ( a , b ) => a . order - b . order ) ;
276- } , [ currentResponse ?. parameters ] ) ;
270+ return [ ...latestResponse . parameters ] . sort ( ( a , b ) => a . order - b . order ) ;
271+ } , [ latestResponse ?. parameters ] ) ;
277272
278273return (
279274< >
280275< Helmet >
281276< title > { pageTitle ( title ) } </ title >
282277</ Helmet >
283- { ! currentResponse ||
278+ { ! latestResponse ||
284279! templateQuery . data ||
285280isLoadingFormData ||
286281isLoadingExternalAuth ||
@@ -290,7 +285,7 @@ const CreateWorkspacePageExperimental: FC = () => {
290285< CreateWorkspacePageViewExperimental
291286mode = { mode }
292287defaultName = { defaultName }
293- diagnostics = { currentResponse ?. diagnostics ?? [ ] }
288+ diagnostics = { latestResponse ?. diagnostics ?? [ ] }
294289disabledParams = { disabledParams }
295290defaultOwner = { defaultOwner }
296291owner = { owner }