From 8ae03bb51fa8df656b95c1ffafd15e1dd2d7601c Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 14 Mar 2024 16:22:42 -0400
Subject: [PATCH 1/4] Swap Datasets list to use standard SwitchToHistory Link
 component, minor enhancement to accept a filter on switchtohistorylink which
 may be generally useful

---
 .../src/components/Dataset/DatasetHistory.vue | 21 -------------------
 client/src/components/Dataset/DatasetList.vue | 10 +++++----
 .../History/SwitchToHistoryLink.vue           |  7 ++++++-
 3 files changed, 12 insertions(+), 26 deletions(-)
 delete mode 100644 client/src/components/Dataset/DatasetHistory.vue

diff --git a/client/src/components/Dataset/DatasetHistory.vue b/client/src/components/Dataset/DatasetHistory.vue
deleted file mode 100644
index 14fc8ac349dc..000000000000
--- a/client/src/components/Dataset/DatasetHistory.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-    <div>
-        {{ historyName }}
-    </div>
-</template>
-<script>
-import { mapState } from "pinia";
-import { useHistoryStore } from "stores/historyStore";
-
-export default {
-    props: {
-        item: Object,
-    },
-    computed: {
-        ...mapState(useHistoryStore, ["getHistoryNameById"]),
-        historyName() {
-            return this.getHistoryNameById(this.item.history_id);
-        },
-    },
-};
-</script>
diff --git a/client/src/components/Dataset/DatasetList.vue b/client/src/components/Dataset/DatasetList.vue
index b418d488e914..4d3dee39858d 100644
--- a/client/src/components/Dataset/DatasetList.vue
+++ b/client/src/components/Dataset/DatasetList.vue
@@ -16,7 +16,9 @@
                     <DatasetName :item="row.item" @showDataset="onShowDataset" @copyDataset="onCopyDataset" />
                 </template>
                 <template v-slot:cell(history_id)="row">
-                    <DatasetHistory :item="row.item" />
+                    <SwitchToHistoryLink
+                        :historyId="row.item.history_id"
+                        :filters="{ deleted: row.item.deleted, visible: row.item.visible, hid: row.item.hid }" />
                 </template>
                 <template v-slot:cell(tags)="row">
                     <StatelessTags
@@ -49,17 +51,17 @@ import { copyDataset, getDatasets } from "@/api/datasets";
 import { updateTags } from "@/api/tags";
 import { useHistoryStore } from "@/stores/historyStore";
 
-import DatasetHistory from "./DatasetHistory";
-import DatasetName from "./DatasetName";
+import DatasetName from "./DatasetName.vue";
+import SwitchToHistoryLink from "@/components/History/SwitchToHistoryLink.vue";
 
 export default {
     components: {
-        DatasetHistory,
         DatasetName,
         LoadingSpan,
         DelayedInput,
         UtcDate,
         StatelessTags,
+        SwitchToHistoryLink,
     },
     data() {
         return {
diff --git a/client/src/components/History/SwitchToHistoryLink.vue b/client/src/components/History/SwitchToHistoryLink.vue
index 39fb8e945dc1..d691384ceaac 100644
--- a/client/src/components/History/SwitchToHistoryLink.vue
+++ b/client/src/components/History/SwitchToHistoryLink.vue
@@ -18,6 +18,7 @@ const historyStore = useHistoryStore();
 
 interface Props {
     historyId: string;
+    filters?: Record<string, string | boolean>;
 }
 
 const props = defineProps<Props>();
@@ -30,7 +31,11 @@ const actionText = computed(() => (canSwitch.value ? "Switch to" : "View in new
 
 function onClick(history: HistorySummary) {
     if (canSwitch.value) {
-        historyStore.setCurrentHistory(history.id);
+        if (props.filters) {
+            historyStore.applyFilters(history.id, props.filters);
+        } else {
+            historyStore.setCurrentHistory(history.id);
+        }
         return;
     }
     viewHistoryInNewTab(history);

From 77ad424783771e9ccf1f2ece2f0917bfb6649e62 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 14 Mar 2024 17:16:56 -0400
Subject: [PATCH 2/4] Drop show-in-history option from datasetlist dropdown,
 now that it's in the history column natively, keep the action language the
 same though when applying filter -- maybe revisit this, because the hid
 filtering feels weird.

---
 client/src/components/Dataset/DatasetList.vue         |  2 +-
 client/src/components/Dataset/DatasetName.vue         |  7 -------
 client/src/components/History/SwitchToHistoryLink.vue | 10 +++++++++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/src/components/Dataset/DatasetList.vue b/client/src/components/Dataset/DatasetList.vue
index 4d3dee39858d..132e2610b4d6 100644
--- a/client/src/components/Dataset/DatasetList.vue
+++ b/client/src/components/Dataset/DatasetList.vue
@@ -17,7 +17,7 @@
                 </template>
                 <template v-slot:cell(history_id)="row">
                     <SwitchToHistoryLink
-                        :historyId="row.item.history_id"
+                        :history-id="row.item.history_id"
                         :filters="{ deleted: row.item.deleted, visible: row.item.visible, hid: row.item.hid }" />
                 </template>
                 <template v-slot:cell(tags)="row">
diff --git a/client/src/components/Dataset/DatasetName.vue b/client/src/components/Dataset/DatasetName.vue
index be8e5382a9c3..a881f591ffab 100644
--- a/client/src/components/Dataset/DatasetName.vue
+++ b/client/src/components/Dataset/DatasetName.vue
@@ -20,10 +20,6 @@
             <span class="name">{{ getName }}</span>
         </b-link>
         <div class="dropdown-menu" aria-labelledby="dataset-dropdown">
-            <a class="dropdown-item" href="#" @click.prevent="showDataset">
-                <span class="fa fa-eye fa-fw mr-1" />
-                <span>Show in History containing dataset</span>
-            </a>
             <a class="dropdown-item" href="#" @click.prevent="copyDataset">
                 <span class="fa fa-copy fa-fw mr-1" />
                 <span>Copy to current History</span>
@@ -56,9 +52,6 @@ export default {
         copyDataset(item) {
             this.$emit("copyDataset", this.item);
         },
-        showDataset(item) {
-            this.$emit("showDataset", this.item);
-        },
     },
 };
 </script>
diff --git a/client/src/components/History/SwitchToHistoryLink.vue b/client/src/components/History/SwitchToHistoryLink.vue
index d691384ceaac..96149ac48bcc 100644
--- a/client/src/components/History/SwitchToHistoryLink.vue
+++ b/client/src/components/History/SwitchToHistoryLink.vue
@@ -27,7 +27,15 @@ const history = computed(() => historyStore.getHistoryById(props.historyId));
 
 const canSwitch = computed(() => !!history.value && !history.value.archived && !history.value.purged);
 
-const actionText = computed(() => (canSwitch.value ? "Switch to" : "View in new tab"));
+const actionText = computed(() => {
+    if (canSwitch.value) {
+        if (props.filters) {
+            return "Show in history";
+        }
+        return "Switch to";
+    }
+    return "View in new tab";
+});
 
 function onClick(history: HistorySummary) {
     if (canSwitch.value) {

From d1725aae152990c8b69460b5b7cf1658d0d4f513 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 14 Mar 2024 13:53:19 -0400
Subject: [PATCH 3/4] Disable published dataset list for anonymous users.

---
 client/src/entry/analysis/menu.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/entry/analysis/menu.js b/client/src/entry/analysis/menu.js
index 495b0ae231a2..78daf6f7b0dd 100644
--- a/client/src/entry/analysis/menu.js
+++ b/client/src/entry/analysis/menu.js
@@ -105,6 +105,7 @@ export function fetchMenu(options = {}) {
                 {
                     title: _l("Datasets"),
                     url: "/datasets/list_published",
+                    hidden: !Galaxy.user.id,
                 },
                 {
                     title: _l("Histories"),

From 23d03da97558ff946eb290840b8cbf48d1ff4a10 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 15 Mar 2024 10:49:13 -0400
Subject: [PATCH 4/4] Update tests to reflect shift of show-in-history option.

---
 client/src/components/Dataset/DatasetName.test.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/components/Dataset/DatasetName.test.js b/client/src/components/Dataset/DatasetName.test.js
index f56bd1a55e93..02daca265e0b 100644
--- a/client/src/components/Dataset/DatasetName.test.js
+++ b/client/src/components/Dataset/DatasetName.test.js
@@ -14,10 +14,7 @@ describe("Dataset Name", () => {
         const state = wrapper.findAll(".name");
         expect(state.length).toBe(1);
         expect(state.at(0).text()).toBe("name");
-        const $linkShow = wrapper.find(".dropdown-item:first-child");
-        $linkShow.trigger("click");
-        expect(Array.isArray(wrapper.emitted().showDataset)).toBe(true);
-        const $linkCopy = wrapper.find(".dropdown-item:last-child");
+        const $linkCopy = wrapper.find(".dropdown-item:first-child");
         $linkCopy.trigger("click");
         expect(Array.isArray(wrapper.emitted().copyDataset)).toBe(true);
     });