From e5ce95d6a254f6f82accf37a758ad01675a2fb9d Mon Sep 17 00:00:00 2001 From: Ahmed Awan Date: Thu, 16 Nov 2023 20:06:56 -0600 Subject: [PATCH] Open `HistoryStorageOverview` in center panel from `HistoryPanel` Previously, if we clicked the History storage button for the current history in the `HistoryPanel`, it took over the whole screen because the `StorageDashboardRoutes` are not children of the `Analysis` route. Changed it so the `HistoryStorageOverview` route opens in the center panel as an `Analysis` route (only from the `HistoryPanel`, otherwise, it is still opened as one of the `StorageDashboardRoutes`) Fixes https://github.com/galaxyproject/galaxy/issues/17026 --- .../components/History/CurrentHistory/HistoryCounter.vue | 2 +- client/src/entry/analysis/router.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/client/src/components/History/CurrentHistory/HistoryCounter.vue b/client/src/components/History/CurrentHistory/HistoryCounter.vue index 975491a8a05c..3686321b260b 100644 --- a/client/src/components/History/CurrentHistory/HistoryCounter.vue +++ b/client/src/components/History/CurrentHistory/HistoryCounter.vue @@ -57,7 +57,7 @@ onMounted(() => { }); function onDashboard() { - router.push({ name: "HistoryOverview", params: { historyId: props.history.id } }); + router.push({ name: "HistoryOverviewInAnalysis", params: { historyId: props.history.id } }); } function setFilter(filter: string) { diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js index c995cf368c40..fe9d9812e081 100644 --- a/client/src/entry/analysis/router.js +++ b/client/src/entry/analysis/router.js @@ -68,6 +68,7 @@ import HistoryArchive from "@/components/History/Archiving/HistoryArchive.vue"; import HistoryArchiveWizard from "@/components/History/Archiving/HistoryArchiveWizard.vue"; import NotificationsList from "@/components/Notifications/NotificationsList.vue"; import Sharing from "@/components/Sharing/SharingPage.vue"; +import HistoryStorageOverview from "@/components/User/DiskUsage/Visualizations/HistoryStorageOverview.vue"; import WorkflowPublished from "@/components/Workflow/Published/WorkflowPublished.vue"; Vue.use(VueRouter); @@ -366,6 +367,12 @@ export function getRouter(Galaxy) { published: route.params.actionId == "list_published" ? true : false, }), }, + { + path: "storage/history/:historyId", + name: "HistoryOverviewInAnalysis", + component: HistoryStorageOverview, + props: true, + }, { path: "tours", component: TourList,