From 6e424556314da3963dbd483b01cedbc211e43c0c Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 22 Feb 2024 12:54:11 -0500 Subject: [PATCH 01/11] Fix activity bar component type validation --- client/src/components/ActivityBar/ActivityBar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index baf94bb99493..dc42f1a8ea1b 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -152,7 +152,7 @@ function onToggleSidebar(toggle: string, to: string | null = null) { :title="activity.title" :tooltip="activity.tooltip" /> Date: Thu, 22 Feb 2024 13:06:08 -0500 Subject: [PATCH 02/11] Switch activity bar on by default --- client/src/composables/usePanels.ts | 2 +- client/src/stores/userStore.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/composables/usePanels.ts b/client/src/composables/usePanels.ts index 46f6f334cc68..2b2d97cb020d 100644 --- a/client/src/composables/usePanels.ts +++ b/client/src/composables/usePanels.ts @@ -15,7 +15,7 @@ export function usePanels() { return true; }); - const showActivityBar = computed(() => showPanels.value && userStore.showActivityBar && !userStore.isAnonymous); + const showActivityBar = computed(() => showPanels.value && userStore.showActivityBar); const showToolbox = computed(() => showPanels.value && !showActivityBar.value); return { diff --git a/client/src/stores/userStore.ts b/client/src/stores/userStore.ts index e5296255d9ac..68b9820585f8 100644 --- a/client/src/stores/userStore.ts +++ b/client/src/stores/userStore.ts @@ -43,7 +43,7 @@ export const useUserStore = defineStore("userStore", () => { // explicitly pass current User, because userStore might not exist yet const toggledSideBar = useUserLocalStorage("user-store-toggled-side-bar", "tools", currentUser); - const showActivityBar = useUserLocalStorage("user-store-show-activity-bar", false, currentUser); + const showActivityBar = useUserLocalStorage("user-store-show-activity-bar", true, currentUser); const preferredListViewMode = useUserLocalStorage("user-store-preferred-list-view-mode", "grid", currentUser); let loadPromise: Promise | null = null; From 9398abeabd73265c313208c3127cbac165dc07bf Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 22 Feb 2024 13:07:29 -0500 Subject: [PATCH 03/11] Remove parsed route from user permission route handler --- client/src/entry/analysis/router.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js index 8714d6fa4da9..0179bcb126d1 100644 --- a/client/src/entry/analysis/router.js +++ b/client/src/entry/analysis/router.js @@ -451,9 +451,9 @@ export function getRouter(Galaxy) { path: "user/permissions", component: UserDatasetPermissions, redirect: redirectAnon(), - props: (route) => ({ + props: { userId: Galaxy.user.id, - }), + }, }, { path: "user/:formId", From 2b1897e960ae5b4f04694414b9ea3feb8c375f8f Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 22 Feb 2024 13:08:53 -0500 Subject: [PATCH 04/11] Require login to access workflow invocations --- client/src/entry/analysis/router.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js index 0179bcb126d1..bde9b7917279 100644 --- a/client/src/entry/analysis/router.js +++ b/client/src/entry/analysis/router.js @@ -524,6 +524,7 @@ export function getRouter(Galaxy) { { path: "workflows/invocations", component: UserInvocations, + redirect: redirectAnon(), }, { path: "workflows/invocations/report", From 6330e4a291f7f3ca9490b7a13e3eae074a913de4 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 22 Feb 2024 14:05:38 -0500 Subject: [PATCH 05/11] Redirect to login page instead of home if login is required for a certain route --- client/src/entry/analysis/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js index bde9b7917279..f6c1ac2d2bf4 100644 --- a/client/src/entry/analysis/router.js +++ b/client/src/entry/analysis/router.js @@ -82,7 +82,7 @@ patchRouterPush(VueRouter); function redirectAnon() { const Galaxy = getGalaxyInstance(); if (!Galaxy.user || !Galaxy.user.id) { - return "/"; + return "/login/start"; } } From e1e7f93d4e9c8f060ed21a30479e05bfe6a9cf36 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 22 Feb 2024 14:08:50 -0500 Subject: [PATCH 06/11] Remove upload button from tool panel --- client/src/components/Panels/ToolBox.vue | 2 - client/src/components/Upload/UploadButton.vue | 62 ------------------- 2 files changed, 64 deletions(-) delete mode 100644 client/src/components/Upload/UploadButton.vue diff --git a/client/src/components/Panels/ToolBox.vue b/client/src/components/Panels/ToolBox.vue index 7296116bc834..a16fa4798c34 100644 --- a/client/src/components/Panels/ToolBox.vue +++ b/client/src/components/Panels/ToolBox.vue @@ -18,7 +18,6 @@ import { filterTools, getValidPanelItems, getValidToolsInCurrentView, getValidTo import ToolSearch from "./Common/ToolSearch.vue"; import ToolSection from "./Common/ToolSection.vue"; -import UploadButton from "@/components/Upload/UploadButton.vue"; const SECTION_IDS_TO_EXCLUDE = ["expression_tools"]; // if this isn't the Workflow Editor panel @@ -253,7 +252,6 @@ function setButtonText() { @onQuery="(q) => (query = q)" @onResults="onResults" />
-
diff --git a/client/src/components/Upload/UploadButton.vue b/client/src/components/Upload/UploadButton.vue deleted file mode 100644 index 110335858d57..000000000000 --- a/client/src/components/Upload/UploadButton.vue +++ /dev/null @@ -1,62 +0,0 @@ - - From 945c5bee5db10e096b86f8ba6793505a8d274bef Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 22 Feb 2024 20:16:01 -0500 Subject: [PATCH 07/11] Indicate activities accessible to anon users --- client/src/components/ActivityBar/ActivityBar.vue | 3 ++- client/src/stores/activitySetup.ts | 11 +++++++++++ client/src/stores/activityStore.ts | 11 +++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index dc42f1a8ea1b..ee818a8f3633 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -143,7 +143,7 @@ function onToggleSidebar(toggle: string, to: string | null = null) { @start="isDragging = true" @end="isDragging = false">
-
+
Date: Fri, 23 Feb 2024 11:28:31 -0500 Subject: [PATCH 08/11] Fix type warnings in activity bar --- client/src/components/ActivityBar/ActivityBar.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index ee818a8f3633..d64cfc7d3fdf 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -114,7 +114,7 @@ function onDragOver(evt: MouseEvent) { /** * Tracks the state of activities which expand or collapse the sidepanel */ -function onToggleSidebar(toggle: string, to: string | null = null) { +function onToggleSidebar(toggle: string = "", to: string | null = null) { // if an activity's dedicated panel/sideBar is already active // but the route is different, don't collapse if (toggle && to && !(route.path === to) && isActiveSideBar(toggle)) { @@ -169,7 +169,7 @@ function onToggleSidebar(toggle: string, to: string | null = null) { :is-active="panelActivityIsActive(activity)" :title="activity.title" :tooltip="activity.tooltip" - :to="activity.to" + :to="activity.to || ''" @click="onToggleSidebar(activity.id, activity.to)" /> - + Date: Mon, 26 Feb 2024 12:54:12 -0500 Subject: [PATCH 09/11] Watch user hash id changes to properly sync activities --- .../src/components/ActivityBar/ActivityBar.vue | 16 ++++++++++++---- client/src/stores/activityStore.ts | 3 +++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index d64cfc7d3fdf..dabb710c0dfa 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -1,10 +1,11 @@