@@ -608,15 +608,15 @@ export const CreateWorkspacePageViewExperimental: FC<
608608
609609< div className = "flex flex-col gap-9" >
610610{ parameters . map ( ( parameter , index ) => {
611- // Find the current parameter's value by name instead of index
612- // to ensure values persist correctly when parameter order changes
613- const currentParameterValueIndex = form . values . rich_parameter_values ?. findIndex (
614- ( p ) => p . name === parameter . name
615- ) ?? - 1 ;
616-
617- // Use the found index for the parameter field, or fallback to current index
618- const parameterFieldIndex = currentParameterValueIndex !== - 1 ? currentParameterValueIndex index ;
619- const parameterField = `rich_parameter_values.${ parameterFieldIndex } ;
611+ const currentParameterValueIndex =
612+ form . values . rich_parameter_values ?. findIndex (
613+ ( p ) => p . name === parameter . name ,
614+ ) ?? - 1 ;
615+ const parameterFieldIndex =
616+ currentParameterValueIndex !== - 1
617+ ? currentParameterValueIndex
618+ index ;
619+ const parameterField = `rich_parameter_values.${ parameterFieldIndex } ;
620620const isPresetParameter = presetParameterNames . includes (
621621parameter . name ,
622622) ;
@@ -638,9 +638,12 @@ export const CreateWorkspacePageViewExperimental: FC<
638638}
639639
640640// Get the form value by parameter name to ensure correct value mapping
641- const formValue = currentParameterValueIndex !== - 1
642- ?form . values ?. rich_parameter_values ?. [ currentParameterValueIndex ] ?. value || ""
643- :"" ;
641+ const formValue =
642+ currentParameterValueIndex !== - 1
643+ ?form . values ?. rich_parameter_values ?. [
644+ currentParameterValueIndex
645+ ] ?. value || ""
646+ :"" ;
644647
645648return (
646649< DynamicParameter