Improvements to structured.ts.

galaxyproject · Feb 18, 2024 · 3e440d0 · 3e440d0
1 parent da54f5c
commit 3e440d0
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/client/src/components/Tool/structured.ts b/client/src/components/Tool/structured.ts
@@ -319,7 +319,10 @@ function validateParameter(inputKey: string, inputValue: any, parameterModel: To
         }
     } else if (isGxConditional(parameterModel)) {
         const testParameter = parameterModel.test_parameter;
-        const testParameterOptional = testParameter.optional;
+        let testParameterEffectivelyOptional = testParameter.optional;
+        if (!testParameterEffectivelyOptional && "value" in testParameter && testParameter.value !== null) {
+            testParameterEffectivelyOptional = true;
+        }
         const whens = parameterModel.whens;
         const testParameterName = testParameter.name;
         const testParameterValue = inputValue[testParameterName];
@@ -335,8 +338,8 @@ function validateParameter(inputKey: string, inputValue: any, parameterModel: To
                 break;
             }
         }
-        if (!testParameterValueFoundInWhen && !testParameterOptional) {
-            results.push(`Non optional parameter ${testParameterName} was not found in inputs.`);
+        if (!testParameterValueFoundInWhen && !testParameterEffectivelyOptional) {
+            results.push(`Non optional conditional test parameter ${testParameterName} was not found in inputs.`);
         }
     }
     if (checkType && !checkType(inputValue)) {
@@ -377,6 +380,12 @@ function validateParameters(
         if (toolInput && "optional" in toolInput && toolInput.optional === true) {
             continue;
         }
+        if (toolInput && "value" in toolInput && toolInput.value !== null) {
+            continue;
+        }
+        if (isGxConditional(parameterModel)) {
+            continue;
+        }
         results.push(`Non optional parameter ${inputKey} was not found in inputs.`);
     }
     return results;