Implement tool markdown reports.

client/src/api/schema/schema.ts

@@ -571,6 +571,23 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/api/datasets/{dataset_id}/report": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Return JSON content Galaxy will use to render Markdown reports */
+        get: operations["report_api_datasets__dataset_id__report_get"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/api/datasets/{dataset_id}/storage": {
         parameters: {
             query?: never;
@@ -16739,6 +16756,27 @@ export interface components {
              */
             values: string;
         };
+        /** ToolReportForDataset */
+        ToolReportForDataset: {
+            /**
+             * Content
+             * @description Raw text contents of the last page revision (type dependent on content_format).
+             * @default
+             */
+            content: string | null;
+            /**
+             * Galaxy Version
+             * @description The version of Galaxy this object was generated with.
+             */
+            generate_time?: string | null;
+            /**
+             * Galaxy Version
+             * @description The version of Galaxy this object was generated with.
+             */
+            generate_version?: string | null;
+        } & {
+            [key: string]: unknown;
+        };
         /** ToolStep */
         ToolStep: {
             /**
@@ -19804,7 +19842,10 @@ export interface operations {
     };
     get_content_as_text_api_datasets__dataset_id__get_content_as_text_get: {
         parameters: {
-            query?: never;
+            query?: {
+                /** @description If non-null, get the specified filename from the extra files for this dataset. */
+                filename?: string | null;
+            };
             header?: {
                 /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
                 "run-as"?: string | null;
@@ -20137,6 +20178,50 @@ export interface operations {
             };
         };
     };
+    report_api_datasets__dataset_id__report_get: {
+        parameters: {
+            query?: never;
+            header?: {
+                /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+                "run-as"?: string | null;
+            };
+            path: {
+                /** @description The ID of the History Dataset. */
+                dataset_id: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Successful Response */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["ToolReportForDataset"];
+                };
+            };
+            /** @description Request Error */
+            "4XX": {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["MessageExceptionModel"];
+                };
+            };
+            /** @description Server Error */
+            "5XX": {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["MessageExceptionModel"];
+                };
+            };
+        };
+    };
     show_storage_api_datasets__dataset_id__storage_get: {
         parameters: {
             query?: {

client/src/components/Dataset/DatasetAsImage/DatasetAsImage.vue

@@ -14,15 +14,14 @@ const { datasetPathDestination } = useDatasetPathDestination();
 
 const props = defineProps<Props>();
 
-const pathDestination = computed<PathDestination | null>(() =>
-    datasetPathDestination.value(props.historyDatasetId, props.path)
-);
+const pathDestination = computedAsync<PathDestination | null>(async () => {
+    return await datasetPathDestination.value(props.historyDatasetId, props.path);
+}, null);
 
 const imageUrl = computed(() => {
     if (props.path === undefined || props.path === "undefined") {
         return `${getAppRoot()}dataset/display?dataset_id=${props.historyDatasetId}`;
     }
-
     return pathDestination.value?.fileLink;
 });
 

client/src/components/Dataset/DatasetIndex/DatasetIndex.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { computedAsync } from "@vueuse/core";
 import { computed } from "vue";
 
 import type { DatasetExtraFiles } from "@/api/datasets";
@@ -13,7 +14,7 @@ const { datasetPathDestination } = useDatasetPathDestination();
 
 const props = defineProps<Props>();
 
-const pathDestination = computed<PathDestination | null>(() =>
+const pathDestination = computedAsync<PathDestination | null>(() =>
     datasetPathDestination.value(props.historyDatasetId, props.path)
 );
 

client/src/components/Dataset/DatasetLink/DatasetLink.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { computedAsync } from "@vueuse/core";
 import { computed } from "vue";
 
 import { hasDetails } from "@/api";
@@ -16,7 +17,7 @@ const { getDataset } = useDatasetStore();
 
 const props = defineProps<Props>();
 
-const pathDestination = computed<PathDestination | null>(() =>
+const pathDestination = computedAsync<PathDestination | null>(() =>
     datasetPathDestination.value(props.historyDatasetId, props.path)
 );
 

client/src/components/History/Content/ContentItem.vue

@@ -189,8 +189,12 @@ const itemUrls = computed<ItemUrls>(() => {
                     : null,
         };
     }
+    let display = `/datasets/${id}/preview`;
+    if (props.item.extension == "tool_markdown") {
+        display = `/datasets/${id}/report`;
+    }
     return {
-        display: `/datasets/${id}/preview`,
+        display: display,
         edit: `/datasets/${id}/edit`,
         showDetails: `/datasets/${id}/details`,
         reportError: `/datasets/${id}/error`,

client/src/components/Markdown/Elements/HistoryDatasetAsTable.vue

@@ -11,17 +11,23 @@ interface HistoryDatasetAsTableProps {
     showColumnHeaders: boolean;
     title?: string;
     footer?: string;
+    path?: string;
 }
 
 const props = withDefaults(defineProps<HistoryDatasetAsTableProps>(), {
     compact: false,
     showColumnHeaders: true,
     title: undefined,
     footer: undefined,
+    path: undefined,
 });
 
 const itemUrl = computed(() => {
-    return `/api/datasets/${props.historyDatasetId}/get_content_as_text`;
+    if (props.path) {
+        return `/api/datasets/${props.historyDatasetId}/get_content_as_text?filename=${props.path}`;
+    } else {
+        return `/api/datasets/${props.historyDatasetId}/get_content_as_text`;
+    }
 });
 
 const metaUrl = computed(() => {

client/src/components/Markdown/Markdown.vue

@@ -22,19 +22,19 @@
                     Edit
                     <FontAwesomeIcon icon="edit" />
                 </b-button>
-                <h1 class="float-right align-middle mr-2 mt-1 h-md">Galaxy {{ markdownConfig.model_class }}</h1>
+                <h1 v-if="title" class="float-right align-middle mr-2 mt-1 h-md">
+                    Galaxy {{ markdownConfig.model_class }}
+                </h1>
                 <span class="float-left font-weight-light">
-                    <h1 class="text-break align-middle">
-                        Title: {{ markdownConfig.title || markdownConfig.model_class }}
-                    </h1>
+                    <h1 v-if="title" class="text-break align-middle">Title: {{ title }}</h1>
                     <h2 v-if="workflowVersions" class="text-break align-middle">
                         Workflow Checkpoint: {{ workflowVersions.version }}
                     </h2>
                 </span>
             </div>
             <b-badge variant="info" class="w-100 rounded mb-3 white-space-normal">
                 <div class="float-left m-1 text-break">Generated with Galaxy {{ version }} on {{ time }}</div>
-                <div class="float-right m-1">Identifier: {{ markdownConfig.id }}</div>
+                <div v-if="showIdentifier" class="float-right m-1">Identifier: {{ markdownConfig.id }}</div>
             </b-badge>
             <div>
                 <b-alert v-if="markdownErrors.length > 0" variant="warning" show>
@@ -119,6 +119,10 @@ export default {
             type: String,
             default: null,
         },
+        showIdentifier: {
+            type: Boolean,
+            default: true,
+        },
     },
     data() {
         return {
@@ -137,6 +141,9 @@ export default {
         effectiveExportLink() {
             return this.enable_beta_markdown_export ? this.exportLink : null;
         },
+        title() {
+            return this.markdownConfig.title || this.markdownConfig.model_class;
+        },
         time() {
             let generateTime = this.markdownConfig.generate_time;
             if (generateTime) {

client/src/components/Markdown/MarkdownContainer.vue

@@ -140,7 +140,8 @@ function argToBoolean(args, name, booleanDefault) {
                 :compact="argToBoolean(args, 'compact', false)"
                 :show-column-headers="argToBoolean(args, 'show_column_headers', true)"
                 :title="args.title"
-                :footer="args.footer" />
+                :footer="args.footer"
+                :path="args.path" />
             <HistoryDatasetLink v-else-if="name == 'history_dataset_link'" :args="args" />
             <HistoryDatasetIndex v-else-if="name == 'history_dataset_index'" :args="args" />
             <InvocationTime v-else-if="name == 'invocation_time'" :args="args" :invocations="invocations" />

client/src/components/Tool/ToolReport.vue

@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+
+import { useConfig } from "@/composables/config";
+import { urlData } from "@/utils/url";
+
+import Markdown from "@/components/Markdown/Markdown.vue";
+
+interface Props {
+    datasetId: string;
+}
+
+const props = defineProps<Props>();
+
+const dataUrl = computed(() => {
+    return `/api/datasets/${props.datasetId}/report`;
+});
+
+const dataRef = ref<unknown>(null);
+
+const { config, isConfigLoaded } = useConfig(true);
+
+urlData({ url: dataUrl.value }).then((data) => {
+    dataRef.value = data;
+});
+</script>
+
+<template>
+    <div>
+        <Markdown
+            v-if="isConfigLoaded && dataRef"
+            :markdown-config="dataRef"
+            :enable-beta-markdown-export="config.enable_beta_markdown_export"
+            download-endpoint="TODO"
+            :show-identifier="false"
+            :read-only="true" />
+        <div v-else>Loading....</div>
+    </div>
+</template>

client/src/composables/datasetPathDestination.ts

@@ -20,11 +20,11 @@ export function useDatasetPathDestination() {
     const cache = ref<{ [key: string]: PathDestinationMap }>({});
 
     const datasetPathDestination = computed(() => {
-        return (dataset_id: string, path?: string) => {
+        return async (dataset_id: string, path?: string) => {
             const targetPath = path ?? "undefined";
-            const pathDestination = cache.value[dataset_id]?.[targetPath];
+            let pathDestination = cache.value[dataset_id]?.[targetPath];
             if (!pathDestination) {
-                getPathDestination(dataset_id, path);
+                pathDestination = (await getPathDestination(dataset_id, path)) ?? undefined;
             }
             return pathDestination ?? null;
         };
@@ -36,7 +36,6 @@ export function useDatasetPathDestination() {
             await datasetExtraFilesStore.fetchDatasetExtFilesByDatasetId({ id: dataset_id });
             datasetExtraFiles = datasetExtraFilesStore.getDatasetExtraFiles(dataset_id);
         }
-
         if (datasetExtraFiles === null) {
             return null;
         }
@@ -66,9 +65,7 @@ export function useDatasetPathDestination() {
             }
             pathDestination.fileLink = getCompositeDatasetLink(dataset_id, datasetEntry.path);
         }
-
         set(cache.value, dataset_id, { [path]: pathDestination });
-
         return pathDestination;
     }
 

client/src/entry/analysis/router.js

@@ -21,6 +21,7 @@ import ToolLanding from "components/Landing/ToolLanding";
 import WorkflowLanding from "components/Landing/WorkflowLanding";
 import PageDisplay from "components/PageDisplay/PageDisplay";
 import PageEditor from "components/PageEditor/PageEditor";
+import ToolReport from "components/Tool/ToolReport";
 import ToolSuccess from "components/Tool/ToolSuccess";
 import ToolsList from "components/ToolsList/ToolsList";
 import ToolsJson from "components/ToolsView/ToolsSchemaJson/ToolsJson";
@@ -239,6 +240,11 @@ export function getRouter(Galaxy) {
                             src: `/datasets/${route.params.datasetId}/display/?preview=True`,
                         }),
                     },
+                    {
+                        path: "datasets/:datasetId/report",
+                        component: ToolReport,
+                        props: true,
+                    },
                     {
                         // legacy route, potentially used by 3rd parties
                         path: "datasets/:datasetId/show_params",