Merge pull request #18754 from mvdbeek/fix_job_summary_optional_input

[24.1] Fix job summary for optional unset job data inputs
galaxyproject · Aug 31, 2024 · 63a8957 · 63a8957
2 parents f39f5ab + f1dddfb
commit 63a8957
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
@@ -9132,7 +9132,7 @@ export interface components {
              * @description The values of the job parameter
              */
             value?:
-                | components["schemas"]["EncodedJobParameterHistoryItem"][]
+                | (components["schemas"]["EncodedJobParameterHistoryItem"] | null)[]
                 | number
                 | number
                 | boolean

diff --git a/client/src/components/JobParameters/JobParametersArrayValue.vue b/client/src/components/JobParameters/JobParametersArrayValue.vue
@@ -1,8 +1,9 @@
 <template>
     <div>
         <div v-for="(elVal, pvIndex) in parameter_value" :key="pvIndex">
+            <span v-if="elVal === null">No input provided</span>
             <GenericHistoryItem
-                v-if="['hda', 'hdca', 'dce'].includes(elVal.src)"
+                v-else-if="['hda', 'hdca', 'dce'].includes(elVal.src)"
                 :item-id="elVal.id"
                 :item-src="elVal.src" />
             <span v-else> {{ elVal.hid }}: {{ elVal.name }} </span>

diff --git a/lib/galaxy/managers/jobs.py b/lib/galaxy/managers/jobs.py
@@ -5,10 +5,12 @@
     datetime,
 )
 from typing import (
+    Any,
     cast,
     Dict,
     List,
     Optional,
+    Union,
 )
 
 import sqlalchemy
@@ -989,16 +991,17 @@ def inputs_recursive(input_params, param_values, depth=1, upgrade_messages=None)
                     or input.type == "data_collection"
                     or isinstance(input_value, model.HistoryDatasetAssociation)
                 ):
-                    value = []
+                    value: List[Union[Dict[str, Any], None]] = []
                     for element in listify(input_value):
-                        element_id = element.id
                         if isinstance(element, model.HistoryDatasetAssociation):
                             hda = element
-                            value.append({"src": "hda", "id": element_id, "hid": hda.hid, "name": hda.name})
+                            value.append({"src": "hda", "id": element.id, "hid": hda.hid, "name": hda.name})
                         elif isinstance(element, model.DatasetCollectionElement):
-                            value.append({"src": "dce", "id": element_id, "name": element.element_identifier})
+                            value.append({"src": "dce", "id": element.id, "name": element.element_identifier})
                         elif isinstance(element, model.HistoryDatasetCollectionAssociation):
-                            value.append({"src": "hdca", "id": element_id, "hid": element.hid, "name": element.name})
+                            value.append({"src": "hdca", "id": element.id, "hid": element.hid, "name": element.name})
+                        elif element is None:
+                            value.append(None)
                         else:
                             raise Exception(
                                 f"Unhandled data input parameter type encountered {element.__class__.__name__}"

diff --git a/lib/galaxy/schema/jobs.py b/lib/galaxy/schema/jobs.py
@@ -223,7 +223,7 @@ class JobParameter(Model):
         title="Depth",
         description="The depth of the job parameter.",
     )
-    value: Optional[Union[List[EncodedJobParameterHistoryItem], float, int, bool, str]] = Field(
+    value: Optional[Union[List[Optional[EncodedJobParameterHistoryItem]], float, int, bool, str]] = Field(
         default=None, title="Value", description="The values of the job parameter", union_mode="left_to_right"
     )
     notes: Optional[str] = Field(default=None, title="Notes", description="Notes associated with the job parameter.")