ToolStd -> typescript

galaxyproject · Dec 19, 2023 · 136aba2 · 136aba2
1 parent a8dbca0
commit 136aba2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/client/src/components/Markdown/Elements/ToolStd.vue b/client/src/components/Markdown/Elements/ToolStd.vue
@@ -1,35 +1,37 @@
+<script setup lang="ts">
+import { computed } from "vue";
+
+interface Job {
+    tool_stdout?: string;
+    tool_stderr?: string;
+}
+
+type JobsMap = {
+    [key: string]: Job;
+};
+
+interface ToolStdProps {
+    jobId: string;
+    name: "tool_stderr" | "tool_stdout";
+    jobs: JobsMap;
+}
+
+const props = defineProps<ToolStdProps>();
+
+const jobContent = computed(() => {
+    const job = props.jobs[props.jobId];
+    return job && job[props.name];
+});
+</script>
+
 <template>
     <b-card nobody class="content-height">
-        <div :class="name" :job_id="args.job_id">
+        <div :class="name" :job_id="jobId">
             <pre><code class="word-wrap-normal">{{ jobContent }}</code></pre>
         </div>
     </b-card>
 </template>
 
-<script>
-export default {
-    props: {
-        args: {
-            type: Object,
-            required: true,
-        },
-        name: {
-            type: String,
-            required: true,
-        },
-        jobs: {
-            type: Object,
-            default: null,
-        },
-    },
-    computed: {
-        jobContent() {
-            const job = this.jobs[this.args.job_id];
-            return job && job[this.name];
-        },
-    },
-};
-</script>
 <style scoped>
 .content-height {
     max-height: 15rem;

diff --git a/client/src/components/Markdown/MarkdownContainer.vue b/client/src/components/Markdown/MarkdownContainer.vue
@@ -171,7 +171,11 @@ function argToBoolean(args, name, booleanDefault) {
                 v-else-if="name == 'history_dataset_collection_display'"
                 :args="args"
                 :collections="collections" />
-            <ToolStd v-else-if="['tool_stdout', 'tool_stderr'].includes(name)" :args="args" :name="name" :jobs="jobs" />
+            <ToolStd
+                v-else-if="['tool_stdout', 'tool_stderr'].includes(name)"
+                :job-id="args.job_id"
+                :name="name"
+                :jobs="jobs" />
             <HistoryDatasetDisplay
                 v-else-if="['history_dataset_embedded', 'history_dataset_display'].includes(name)"
                 :args="args"