Skip to content

Commit 5edb977

Browse files
committed
Begin to handle dataset details in dataset display component
1 parent 65bd631 commit 5edb977

3 files changed

Lines changed: 17 additions & 16 deletions

File tree

client/src/components/Dataset/DatasetDisplay.vue

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<script setup lang="ts">
22
import axios from "axios";
33
import { onMounted, ref } from "vue";
4+
45
import { withPrefix } from "@/utils/redirect";
56
67
import TabularChunkedView from "components/Visualizations/Tabular/TabularChunkedView.vue";
78
9+
const MAX_PEEK_SIZE_BINARY = 100000;
10+
811
interface Props {
912
datasetId: string;
1013
isPreview: boolean;
@@ -14,7 +17,6 @@ const props = withDefaults(defineProps<Props>(), {});
1417
1518
const content = ref();
1619
const datasetDetails = ref();
17-
const deleted = ref(true);
1820
1921
onMounted(async () => {
2022
const detailsUrl = withPrefix(`/api/datasets/${props.datasetId}`);
@@ -36,8 +38,8 @@ onMounted(async () => {
3638
</script>
3739

3840
<template>
39-
<div>
40-
<div v-if="deleted" class="errormessagelarge" id="deleted-data-message">
41+
<div v-if="datasetDetails">
42+
<div v-if="datasetDetails.deleted" id="deleted-data-message" class="errormessagelarge">
4143
You are viewing a deleted dataset.
4244
</div>
4345
<div class="warningmessagelarge">
@@ -47,15 +49,15 @@ onMounted(async () => {
4749
</div>
4850
<div class="warningmessagelarge">
4951
This is a binary (or unknown to Galaxy) dataset of size ${ file_size }. Preview is not implemented for this filetype. Displaying
50-
%if truncated:
51-
first 100KB
52-
%endif
53-
as ASCII text<br/>
52+
<span v-if="datasetDetails.file_size > MAX_PEEK_SIZE_BINARY">
53+
first 100KB
54+
</span>
55+
as ASCII text<br/>
5456
<a href="${h.url_for( controller='dataset', action='display', dataset_id=trans.security.encode_id( data.id ), to_ext=data.ext )}">Download</a>
5557
</div>
56-
<TabularChunkedView v-if="content" :options="{ dataset_config: { ...datasetDetails, first_data_chunk: content } }" />
57-
<pre>
58-
{{ content }}
58+
<TabularChunkedView v-if="content && content.ck_data" :options="{ dataset_config: { ...datasetDetails, first_data_chunk: content } }" />
59+
<pre v-else>
60+
{{ content }}
5961
</pre>
6062
</div>
6163
</template>

client/src/components/Dataset/DatasetView.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import { bytesToString } from "@/utils/utils";
1313
import DatasetError from "../DatasetInformation/DatasetError.vue";
1414
import LoadingSpan from "../LoadingSpan.vue";
1515
import DatasetAsImage from "./DatasetAsImage/DatasetAsImage.vue";
16+
import DatasetDisplay from "./DatasetDisplay.vue";
1617
import DatasetState from "./DatasetState.vue";
1718
import Heading from "@/components/Common/Heading.vue";
1819
import DatasetAttributes from "@/components/DatasetInformation/DatasetAttributes.vue";
1920
import DatasetDetails from "@/components/DatasetInformation/DatasetDetails.vue";
2021
import VisualizationsList from "@/components/Visualizations/Index.vue";
2122
import VisualizationFrame from "@/components/Visualizations/VisualizationFrame.vue";
22-
import DatasetDisplay from "./DatasetDisplay.vue";
2323
2424
const datasetStore = useDatasetStore();
2525
const datatypeStore = useDatatypeStore();
@@ -202,7 +202,7 @@ watch(
202202
class="p-3" />
203203
<DatasetDisplay
204204
v-else
205-
:datasetId="datasetId"
205+
:dataset-id="datasetId"
206206
:is-preview="true"
207207
@load="iframeLoading = false" />
208208
</div>
@@ -219,7 +219,7 @@ watch(
219219
</div>
220220
<DatasetDisplay
221221
v-else
222-
:datasetId="datasetId"
222+
:dataset-id="datasetId"
223223
:is-preview="true"
224224
@load="iframeLoading = false" />
225225
</div>

lib/galaxy/datatypes/data.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,8 @@ def display_data(
602602
else: # displaying
603603
trans.log_event(f"Display dataset id: {str(dataset.id)}")
604604
max_peek_size = _get_max_peek_size(dataset)
605-
if (
606-
_is_binary_file(dataset) and preview and hasattr(trans, "fill_template_mako")
607-
): # preview file which format is unknown (to Galaxy), we still try to display this as text
605+
if _is_binary_file(dataset) and preview:
606+
# preview file which format is unknown (to Galaxy), we still try to display this as text
608607
return self._serve_binary_file_contents_as_text(trans, dataset, headers, file_size, max_peek_size)
609608
else: # text/html, or image, or display was called without preview flag
610609
return self._serve_file_contents(trans, dataset, headers, preview, file_size, max_peek_size)

0 commit comments

Comments
 (0)