diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx index dd9ecc963840af..9f0f7c58c6a293 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx @@ -66,6 +66,7 @@ export const ConfigurationStepForm: FC = ({ const [loadingFieldOptions, setLoadingFieldOptions] = useState(false); const [fieldOptionsFetchFail, setFieldOptionsFetchFail] = useState(false); const [loadingDepVarOptions, setLoadingDepVarOptions] = useState(false); + const [loadedDepVarOptions, setLoadedDepVarOptions] = useState(false); const [dependentVariableFetchFail, setDependentVariableFetchFail] = useState(false); const [dependentVariableOptions, setDependentVariableOptions] = useState< EuiComboBoxOptionOption[] @@ -124,7 +125,7 @@ export const ConfigurationStepForm: FC = ({ requiredFieldsError !== undefined || unsupportedFieldsError !== undefined; - const loadDepVarOptions = async (formState: State['form']) => { + const loadDepVarOptions = (formState: State['form']) => { setLoadingDepVarOptions(true); setMaxDistinctValuesError(undefined); @@ -152,11 +153,13 @@ export const ConfigurationStepForm: FC = ({ depVarUpdate = ''; } setDependentVariableOptions(depVarOptions); + setLoadedDepVarOptions(true); setLoadingDepVarOptions(false); setDependentVariableFetchFail(false); setFormState({ dependentVariable: depVarUpdate }); } } catch (e) { + setLoadedDepVarOptions(true); setLoadingDepVarOptions(false); setDependentVariableFetchFail(true); } @@ -331,7 +334,7 @@ export const ConfigurationStepForm: FC = ({ > - {isJobTypeWithDepVar && ( + {isJobTypeWithDepVar && loadedDepVarOptions && (