INCREMENTAL REBASEME

dannon · Jul 15, 2023 · 097812d · 097812d
1 parent f5fae5a
commit 097812d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/client/src/components/Dataset/DatasetView.vue b/client/src/components/Dataset/DatasetView.vue
@@ -20,11 +20,12 @@ const displayUrl = computed(() => `/datasets/${props.datasetId}/display/?preview
 <template>
     <div>
         <header class="dataset-header">
-            <h1>Dataset {{ datasetId }}</h1>
+            <h2>Dataset {{ datasetId }}</h2>
+            <code>More toplevel details here</code>
         </header>
-        <div class="dataset-tabs">
+        <div class="dataset-tabs h-100">
             <b-tabs pills card>
-                <b-tab title="Preview" active>
+                <b-tab title="Preview" active class="h-100">
                     <iframe
                         :src="displayUrl"
                         title="galaxy dataset display frame"

diff --git a/client/src/components/History/Content/ContentItem.vue b/client/src/components/History/Content/ContentItem.vue
@@ -205,6 +205,7 @@ export default {
                 reportError: `/datasets/${id}/error`,
                 rerun: `/tool_runner/rerun?id=${id}`,
                 visualize: `/visualizations?dataset_id=${id}`,
+                view: `/datasets/${id}`,
             };
         },
     },

diff --git a/client/src/components/History/Content/ContentOptions.vue b/client/src/components/History/Content/ContentOptions.vue
@@ -21,8 +21,8 @@
             class="display-btn px-1"
             size="sm"
             variant="link"
-            :href="displayUrl"
-            @click.prevent.stop="$emit('display')">
+            :href="viewUrl"
+            @click.prevent.stop="$emit('view')">
             <icon icon="eye" />
         </b-button>
         <b-button
@@ -106,6 +106,9 @@ export default {
         displayUrl() {
             return prependPath(this.itemUrls.display);
         },
+        viewUrl() {
+            return prependPath(this.itemUrls.view);
+        },
         editUrl() {
             return prependPath(this.itemUrls.edit);
         },

diff --git a/client/src/components/Visualizations/PluginList.vue b/client/src/components/Visualizations/PluginList.vue
@@ -12,7 +12,7 @@
                 <table v-if="match(plugin)">
                     <tr class="plugin-list-item" :data-plugin-name="plugin.name" @click="select(plugin)">
                         <td>
-                            <img v-if="plugin.logo" alt="ui thumbnails" class="plugin-list-image" :src="plugin.logo" />
+                            <img v-if="plugin.logo" alt="ui thumbnails" class="plugin-list-image" :src="withPrefix(plugin.logo)" />
                             <div v-else class="plugin-list-icon fa fa-eye" />
                         </td>
                         <td>
@@ -58,6 +58,7 @@ import axios from "axios";
 import DelayedInput from "components/Common/DelayedInput";
 import { getAppRoot } from "onload/loadConfig";
 import _l from "utils/localization";
+import { withPrefix } from "utils/redirect";
 
 export default {
     components: {