Merge pull request #19703 from davelopez/fix_markdown_dialog_types

Fix MarkdownDialog types
galaxyproject · Feb 26, 2025 · d8a8aff · d8a8aff
2 parents f942729 + 0937f33
commit d8a8aff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/client/src/components/DataDialog/DataDialog.vue b/client/src/components/DataDialog/DataDialog.vue
@@ -44,7 +44,7 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits<{
     (e: "onCancel"): void;
-    (e: "onOk", results: Array<Record>): void;
+    (e: "onOk", results: unknown): void;
     (e: "onUpload"): void;
 }>();
 

diff --git a/client/src/components/Markdown/MarkdownDialog.vue b/client/src/components/Markdown/MarkdownDialog.vue
@@ -29,6 +29,7 @@ const props = withDefaults(defineProps<MarkdownDialogProps>(), {
     argumentName: undefined,
     argumentType: undefined,
     argumentPayload: undefined,
+    labels: undefined,
 });
 
 const emit = defineEmits<{
@@ -120,7 +121,7 @@ async function getHistories() {
     return data;
 }
 
-function onData(response: string) {
+function onData(response: unknown) {
     dataShow.value = false;
     emit("onInsert", `${props.argumentName}(history_dataset_id=${response})`);
 }
@@ -252,17 +253,22 @@ if (props.argumentType == "workflow_id") {
             @onOk="onOk"
             @onCancel="onCancel" />
         <MarkdownVisualization
-            v-else-if="visualizationShow"
+            v-else-if="visualizationShow && currentHistoryId !== null"
             :argument-name="argumentName"
             :argument-payload="argumentPayload"
             :labels="effectiveLabels"
             :use-labels="useLabels"
             :history="currentHistoryId"
             @onOk="onVisualization"
             @onCancel="onCancel" />
-        <DataDialog v-else-if="dataShow" :history="currentHistoryId" format="id" @onOk="onData" @onCancel="onCancel" />
+        <DataDialog
+            v-else-if="dataShow && currentHistoryId !== null"
+            :history="currentHistoryId"
+            format="id"
+            @onOk="onData"
+            @onCancel="onCancel" />
         <DatasetCollectionDialog
-            v-else-if="dataCollectionShow"
+            v-else-if="dataCollectionShow && currentHistoryId !== null"
             :history="currentHistoryId"
             format="id"
             @onOk="onDataCollection"