From 304999c7819fc6147763b6c0a01ad2992dd5644b Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 2 Apr 2024 09:50:19 +0300 Subject: [PATCH 01/16] Add admin activity to activity bar --- client/src/components/ActivityBar/ActivityBar.vue | 4 +++- client/src/stores/activitySetup.ts | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index 9a440d5ddd27..ac6670309fc3 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -11,6 +11,7 @@ import { type Activity, useActivityStore } from "@/stores/activityStore"; import { useEventStore } from "@/stores/eventStore"; import { useUserStore } from "@/stores/userStore"; +import AdminPanel from "@/components/admin/AdminPanel.vue"; import VisualizationPanel from "../Panels/VisualizationPanel.vue"; import ActivityItem from "./ActivityItem.vue"; import InteractiveItem from "./Items/InteractiveItem.vue"; @@ -173,7 +174,7 @@ watch( :to="activity.to" @click="onToggleSidebar()" /> + diff --git a/client/src/stores/activitySetup.ts b/client/src/stores/activitySetup.ts index 8cc09c127844..5ed3d5bcf134 100644 --- a/client/src/stores/activitySetup.ts +++ b/client/src/stores/activitySetup.ts @@ -113,6 +113,18 @@ export const Activities = [ to: "/datasets/list", visible: false, }, + { + anonymous: true, + description: "Adminstration.", + icon: "wrench", + id: "admin", + mutable: false, + optional: false, + title: "Admin", + to: null, + tooltip: "Search and run tools", + visible: true, + }, ]; export function convertDropData(data: EventData): Activity | null { From 1e1afb950aea40e036a1344309abf01606c4fd6f Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 2 Apr 2024 09:52:06 +0300 Subject: [PATCH 02/16] Parse admin properties to admin panel --- client/src/components/ActivityBar/ActivityBar.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index ac6670309fc3..fe2d57eafc12 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -49,6 +49,15 @@ const isDragging = ref(false); // sync built-in activities with cached activities activityStore.sync(); + +const adminProperties = computed(() => { + return { + enableQuotas: config.value.enable_quotas, + isToolshedInstalled: config.value.tool_shed_urls && config.value.tool_shed_urls.length > 0, + versionMajor: config.value.version_major, + }; +}); + /** * Checks if the route of an activity is currently being visited and panels are collapsed */ @@ -220,7 +229,7 @@ watch( - + From f84e20cd09a819d7c4493bf620104d2b8c267818 Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 2 Apr 2024 09:57:12 +0300 Subject: [PATCH 03/16] Remove side panel from admin component --- client/src/entry/analysis/modules/Admin.vue | 24 +-------------------- client/src/stores/activitySetup.ts | 2 +- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/client/src/entry/analysis/modules/Admin.vue b/client/src/entry/analysis/modules/Admin.vue index 25b052ab08af..b2a66b8f511f 100644 --- a/client/src/entry/analysis/modules/Admin.vue +++ b/client/src/entry/analysis/modules/Admin.vue @@ -1,27 +1,5 @@ - - diff --git a/client/src/components/admin/AdminPanel.vue b/client/src/components/admin/AdminPanel.vue index 8853ed812d39..d4f3d11f4e79 100644 --- a/client/src/components/admin/AdminPanel.vue +++ b/client/src/components/admin/AdminPanel.vue @@ -1,8 +1,131 @@ + + - - From 5a03f054c10e0849b3b242286b4b16898ec5d5fa Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 2 Apr 2024 16:54:10 +0300 Subject: [PATCH 07/16] Use activity panel component for admin panel --- client/src/components/admin/AdminPanel.vue | 36 ++++++++++------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/client/src/components/admin/AdminPanel.vue b/client/src/components/admin/AdminPanel.vue index d4f3d11f4e79..5c9fc8f01d3c 100644 --- a/client/src/components/admin/AdminPanel.vue +++ b/client/src/components/admin/AdminPanel.vue @@ -3,6 +3,8 @@ import { computed } from "vue"; import { useConfig } from "@/composables/config"; +import ActivityPanel from "@/components/Panels/ActivityPanel.vue"; + const { config, isConfigLoaded } = useConfig(); const adminProperties = computed(() => { @@ -122,30 +124,26 @@ const sections = computed(() => { From 62324d88fcd71a40bcf5ce4aa5d81d8d1271cb2d Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 2 Apr 2024 17:32:23 +0300 Subject: [PATCH 08/16] Change admin activity icon --- .../components/ActivityBar/ActivityBar.vue | 2 +- client/src/components/admin/AdminPanel.vue | 21 ++++++++----------- client/src/components/plugins/icons.js | 2 ++ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index 54c745018e25..a82906c41628 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -207,7 +207,7 @@ watch( @click="onToggleSidebar('notifications')" /> {
-
-

{{ section.title }}

-
-
- - {{ item.title }} - +
+

{{ section.title }}

+
+
+ + {{ item.title }} + +
+
-
-
diff --git a/client/src/components/plugins/icons.js b/client/src/components/plugins/icons.js index f0d6d8688efe..a7a4224b70ca 100644 --- a/client/src/components/plugins/icons.js +++ b/client/src/components/plugins/icons.js @@ -48,6 +48,7 @@ import { faTrash, faTrashRestore, faUndo, + faUserCog, faUserLock, faWrench, } from "@fortawesome/free-solid-svg-icons"; @@ -102,6 +103,7 @@ library.add( faTrashRestore, faExclamationTriangle, faUndo, + faUserCog, faUserLock, faWrench ); From a863e92e56ee93b4cbcb97e2400b1d4fcbd7773b Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 2 Apr 2024 17:46:11 +0300 Subject: [PATCH 09/16] Add variant option for admin activity? --- .../src/components/ActivityBar/ActivityBar.vue | 16 ++++++++-------- .../src/components/ActivityBar/ActivityItem.vue | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index a82906c41628..5956e2c94035 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -205,21 +205,21 @@ watch( :is-active="isActiveSideBar('notifications') || isActiveRoute('/user/notifications')" title="Notifications" @click="onToggleSidebar('notifications')" /> - +
diff --git a/client/src/components/ActivityBar/ActivityItem.vue b/client/src/components/ActivityBar/ActivityItem.vue index c6ce2a2ee75b..0586a1657f99 100644 --- a/client/src/components/ActivityBar/ActivityItem.vue +++ b/client/src/components/ActivityBar/ActivityItem.vue @@ -24,6 +24,7 @@ export interface Props { progressStatus?: string; options?: Option[]; to?: string; + variant?: string; } const props = withDefaults(defineProps(), { @@ -37,6 +38,7 @@ const props = withDefaults(defineProps(), { to: undefined, tooltip: undefined, tooltipPlacement: "right", + variant: "primary", }); const emit = defineEmits<{ @@ -70,7 +72,7 @@ function onClick(evt: MouseEvent): void { width: `${Math.round(progressPercentage)}%`, }" /> - +
{{ Math.min(indicator, 99) }} From dcac4f51c7c8ed28ae4a7e1a7edcbf61dd6c8269 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 3 Apr 2024 10:55:19 +0300 Subject: [PATCH 10/16] Adjust admin panel unit test case --- .../src/components/admin/AdminPanel.test.js | 43 +++++++++++++------ 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/client/src/components/admin/AdminPanel.test.js b/client/src/components/admin/AdminPanel.test.js index f30528512d6f..33919a126cbc 100644 --- a/client/src/components/admin/AdminPanel.test.js +++ b/client/src/components/admin/AdminPanel.test.js @@ -1,10 +1,19 @@ import { mount } from "@vue/test-utils"; import { getLocalVue } from "tests/jest/helpers"; +import { useConfig } from "@/composables/config"; + import MountTarget from "./AdminPanel.vue"; const localVue = getLocalVue(true); +jest.mock("@/composables/config", () => ({ + useConfig: jest.fn(() => ({ + config: { value: { enable_quotas: true, tool_shed_urls: ["tool_shed_url"], version_major: "1.0.1" } }, + isConfigLoaded: true, + })), +})); + function createTarget(propsData = {}) { return mount(MountTarget, { localVue, @@ -16,21 +25,29 @@ function createTarget(propsData = {}) { } describe("AdminPanel", () => { - it("ensure reactivity to prop changes", async () => { - const wrapper = createTarget(); - const sections = { - isToolshedInstalled: "#admin-link-toolshed", - enableQuotas: "#admin-link-quotas", - }; - for (const elementId of Object.values(sections)) { - expect(wrapper.find(elementId).exists()).toBe(false); - } + it("ensure section visibility with config changes", async () => { + const options = [ + { + name: "tool_shed_urls", + elementId: "#admin-link-toolshed", + value: ["toolshed_url"], + }, + { + name: "enable_quotas", + elementId: "#admin-link-quotas", + value: true, + }, + ]; for (const available of [true, false]) { - for (const [propId, elementId] of Object.entries(sections)) { + for (const option of options) { const props = {}; - props[propId] = available; - await wrapper.setProps(props); - expect(wrapper.find(elementId).exists()).toBe(available); + props[option.name] = available ? option.value : undefined; + useConfig.mockImplementation(() => ({ + config: { value: { ...props, version_major: "1.0.1" } }, + isConfigLoaded: true, + })); + const wrapper = createTarget(); + expect(wrapper.find(option.elementId).exists()).toBe(available); } } }); From cd6ac2b91a27d91e2766ef1a53b044fa080ff455 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 3 Apr 2024 10:59:31 +0300 Subject: [PATCH 11/16] Add admin flag to userStore, show admin activity only for admins --- client/src/components/ActivityBar/ActivityBar.vue | 3 ++- client/src/stores/userStore.ts | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index 5956e2c94035..db9e4f975598 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -32,7 +32,7 @@ const { hashedUserId } = useHashedUserId(); const eventStore = useEventStore(); const activityStore = useActivityStore(); -const { isAnonymous } = storeToRefs(userStore); +const { isAdmin, isAnonymous } = storeToRefs(userStore); const emit = defineEmits(["dragstart"]); @@ -213,6 +213,7 @@ watch( tooltip="Edit preferences" @click="onToggleSidebar('settings')" /> { loadPromise = null; } + const isAdmin = computed(() => { + return currentUser.value?.is_admin ?? false; + }); + const isAnonymous = computed(() => { return !("email" in (currentUser.value || [])); }); @@ -121,6 +125,7 @@ export const useUserStore = defineStore("userStore", () => { return { currentUser, currentPreferences, + isAdmin, isAnonymous, currentTheme, currentFavorites, From 9ed2f68221086ee38f4dd9e1647257ffcb147f60 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 5 Apr 2024 12:16:05 +0300 Subject: [PATCH 12/16] Fix admin activity label --- 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 db9e4f975598..0e2c54e7b181 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -218,7 +218,7 @@ watch( icon="user-cog" :is-active="isActiveSideBar('admin')" title="Admin" - tooltip="Configure this Instance" + tooltip="Administer this Galaxy" variant="danger" @click="onToggleSidebar('admin')" /> From ec2c21f1243bda27c7a9a614c293ecd85e62612a Mon Sep 17 00:00:00 2001 From: guerler Date: Sat, 6 Apr 2024 17:41:11 +0300 Subject: [PATCH 13/16] Use activity bar admin link to access admin tests --- client/src/utils/navigation/navigation.yml | 1 + lib/galaxy/selenium/navigates_galaxy.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml index e5ad92e15441..bbd7621b5450 100644 --- a/client/src/utils/navigation/navigation.yml +++ b/client/src/utils/navigation/navigation.yml @@ -952,6 +952,7 @@ admin: allowlist: '#admin-link-allowlist' selectors: + activity: '#activity-admin' warning: '#center .alert-warning' # TODO: place betters IDS or something on this in these grids in the DOM jobs_title: '#jobs-title' diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py index dca758b952c0..73f769723ff2 100644 --- a/lib/galaxy/selenium/navigates_galaxy.py +++ b/lib/galaxy/selenium/navigates_galaxy.py @@ -1237,7 +1237,7 @@ def navigate_to_published_pages(self): self.components.masthead.pages.wait_for_and_click() def admin_open(self): - self.components.masthead.admin.wait_for_and_click() + self.components.admin.activity.wait_for_and_click() def create_quota( self, From 2c5a4de5f8a1c187f7b3b35b7679b37f67aada95 Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 7 Apr 2024 06:44:35 +0300 Subject: [PATCH 14/16] Fix failing admin user display selenium test case --- lib/galaxy_test/selenium/test_admin_app.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/galaxy_test/selenium/test_admin_app.py b/lib/galaxy_test/selenium/test_admin_app.py index 0f38ed068614..8b48eac653be 100644 --- a/lib/galaxy_test/selenium/test_admin_app.py +++ b/lib/galaxy_test/selenium/test_admin_app.py @@ -192,7 +192,6 @@ def test_admin_user_display(self): admin_component.registration_form.wait_for_visible() self.screenshot("admin_user_registration") - self.admin_open() admin_component.index.groups.wait_for_and_click() admin_component.groups_grid.wait_for_visible() self.screenshot("admin_groups") @@ -201,7 +200,6 @@ def test_admin_user_display(self): admin_component.groups_create_view.wait_for_visible() self.screenshot("admin_groups_create") - self.admin_open() admin_component.index.roles.wait_for_and_click() admin_component.roles_grid.wait_for_visible() self.screenshot("admin_roles") From 8effaea761d26778e1e811b28efd0285255772bb Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 9 Apr 2024 08:43:59 +0300 Subject: [PATCH 15/16] Toggle admin activity panel when clicking on admin tab in masthead --- client/src/entry/analysis/menu.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/src/entry/analysis/menu.js b/client/src/entry/analysis/menu.js index 75a5190cf4fb..ec1de4f190af 100644 --- a/client/src/entry/analysis/menu.js +++ b/client/src/entry/analysis/menu.js @@ -2,6 +2,8 @@ import { getGalaxyInstance } from "app"; import _l from "utils/localization"; import { userLogout } from "utils/logout"; +import { useUserStore } from "@/stores/userStore"; + export function fetchMenu(options = {}) { const Galaxy = getGalaxyInstance(); const menu = []; @@ -121,6 +123,10 @@ export function fetchMenu(options = {}) { url: "/admin", tooltip: _l("Administer this Galaxy"), cls: "admin-only", + onclick: () => { + const userStore = useUserStore(); + userStore.toggleSideBar("admin"); + }, }); } From 7d55361442f7d36def8bdd6db07461ef2fdc6801 Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 9 Apr 2024 08:46:49 +0300 Subject: [PATCH 16/16] Re-apply suggestion by @martenson to revise toolshed condition in admin panel --- client/src/components/admin/AdminPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/admin/AdminPanel.vue b/client/src/components/admin/AdminPanel.vue index 6c938a234fdd..b6a5ea2bfd45 100644 --- a/client/src/components/admin/AdminPanel.vue +++ b/client/src/components/admin/AdminPanel.vue @@ -10,7 +10,7 @@ const { config, isConfigLoaded } = useConfig(); const adminProperties = computed(() => { return { enableQuotas: config.value.enable_quotas, - isToolshedInstalled: config.value.tool_shed_urls && config.value.tool_shed_urls.length > 0, + isToolshedInstalled: config.value.tool_shed_urls?.length > 0 ?? false, versionMajor: config.value.version_major, }; });