Watch option changes

galaxyproject · Aug 26, 2023 · 3c97f38 · 3c97f38
1 parent 787961f
commit 3c97f38
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/client/src/components/Form/Elements/FormData/FormData.vue b/client/src/components/Form/Elements/FormData/FormData.vue
@@ -276,6 +276,17 @@ function handleIncoming(incoming: Record<string, unknown>, partial = true) {
     }
 }
 
+/**
+ * Set initial value
+ */
+function initialValue() {
+    if ((isLDDA.value || isDCE.value) && props.value && props.value.values) {
+        setValue(matchValues(props.value.values));
+    } else {
+        setValue(currentValue.value);
+    }
+}
+
 /**
  * Matches entries to available options
  */
@@ -425,20 +436,16 @@ onMounted(() => {
     eventBus.$on("waiting", (value: boolean) => {
         waiting.value = value;
     });
-    if ((isLDDA.value || isDCE.value) && props.value && props.value.values) {
-        setValue(matchValues(props.value.values));
-    } else {
-        setValue(currentValue.value);
-    }
+    initialValue();
 });
 
 /**
  * Watch and set current value if user switches to a different select field
  */
 watch(
-    () => [currentLinked.value, currentVariant.value],
+    () => [props.options, currentLinked.value, currentVariant.value],
     () => {
-        setValue(currentValue.value);
+        initialValue();
     }
 );
 </script>

diff --git a/lib/galaxy_test/selenium/test_tool_form.py b/lib/galaxy_test/selenium/test_tool_form.py
@@ -200,7 +200,7 @@ def test_rerun_deleted_dataset(self):
         error_input1 = self.components.tool_form.parameter_error(parameter="input1").wait_for_visible()
         error_col = self.components.tool_form.parameter_error(parameter="col").wait_for_visible()
         error_col_names = self.components.tool_form.parameter_error(parameter="col_names").wait_for_visible()
-        assert error_input1.text == "parameter 'input1': specify a dataset of the required format / build for parameter"
+        assert error_input1.text == "Please provide a value for this option."
         assert error_col.text == "parameter 'col': requires a value, but no legal values defined"
         assert error_col_names.text == "parameter 'col_names': requires a value, but no legal values defined"
         # validate warnings when inputs are restored