Add content chunked to header

Author: guerler

client/src/components/Dataset/DatasetDisplay.vue

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import axios from "axios";
 import { BAlert } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
 import { computed, ref, watch } from "vue";
@@ -24,8 +23,8 @@ const { getDataset, isLoadingDataset } = useDatasetStore();
 
 const props = defineProps<Props>();
 
-const content = ref();
 const contentTruncated = ref();
+const contentChunked = ref();
 const errorMessage = ref();
 const sanitizedJobImported = ref();
 const sanitizedToolId = ref();
@@ -52,11 +51,11 @@ watch(
     () => props.datasetId,
     async () => {
         try {
-            const { data, headers } = await axios.get(previewUrl.value);
-            content.value = data;
-            contentTruncated.value = headers["x-content-truncated"];
-            sanitizedJobImported.value = headers["x-sanitized-job-imported"];
-            sanitizedToolId.value = headers["x-sanitized-tool-id"];
+            const { headers } = await fetch(previewUrl.value, { method: "HEAD" });
+            contentChunked.value = headers.get("x-content-chunked");
+            contentTruncated.value = headers.get("x-content-truncated");
+            sanitizedJobImported.value = headers.get("x-sanitized-job-imported");
+            sanitizedToolId.value = headers.get("x-sanitized-tool-id");
             errorMessage.value = "";
         } catch (e) {
             errorMessage.value = errorMessageAsString(e);
@@ -84,8 +83,8 @@ watch(
         <div v-if="dataset.deleted" id="deleted-data-message" class="errormessagelarge">
             You are viewing a deleted dataset.
         </div>
-        <TabularChunkedView v-if="content && content.ck_data" :options="{ ...dataset, first_data_chunk: content }" />
-        <div v-else-if="content" class="h-100">
+        <TabularChunkedView v-if="contentChunked" :options="dataset" />
+        <div v-else class="h-100">
             <div v-if="isBinary">
                 This is a binary (or unknown to Galaxy) dataset of size {{ bytesToString(dataset.file_size) }}. Preview
                 is not implemented for this filetype. Displaying as ASCII text.

client/src/components/Dataset/Tabular/TabularChunkedView.vue

@@ -16,7 +16,6 @@ interface TabularChunkedViewProps {
     options: {
         id: string;
         file_ext: string;
-        first_data_chunk: TabularChunk;
         metadata_columns: number;
         metadata_column_types: string[];
         metadata_column_names: string[];
@@ -159,14 +158,6 @@ function nextChunk() {
             loading.value = false;
         });
 }
-
-onMounted(() => {
-    // Render first chunk if available.
-    if (props.options.first_data_chunk) {
-        processChunk(props.options.first_data_chunk);
-        loading.value = false;
-    }
-});
 </script>
 
 <template>

lib/galaxy/datatypes/binary.py

@@ -819,6 +819,7 @@ def display_data(
         elif to_ext or not preview:
             return super().display_data(trans, dataset, preview, filename, to_ext, **kwd)
         else:
+            headers["x-content-chunked"] = "true"
             return self.get_chunk(trans, dataset, 0), headers
 
     def validate(self, dataset: DatasetProtocol, **kwd) -> DatatypeValidation:

lib/galaxy/datatypes/tabular.py

@@ -200,6 +200,7 @@ def display_data(
                 with compression_utils.get_fileobj(dataset.get_file_name(), "rb") as fh:
                     return util.unicodify(fh.read(max_peek_size)), headers
         else:
+            headers["x-content-chunked"] = "true"
             return self.get_chunk(trans, dataset, 0), headers
 
     def display_as_markdown(self, dataset_instance: DatasetProtocol) -> str: