diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index 9a440d5ddd27..0e2c54e7b181 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -16,6 +16,7 @@ import ActivityItem from "./ActivityItem.vue"; import InteractiveItem from "./Items/InteractiveItem.vue"; import NotificationItem from "./Items/NotificationItem.vue"; import UploadItem from "./Items/UploadItem.vue"; +import AdminPanel from "@/components/admin/AdminPanel.vue"; import FlexPanel from "@/components/Panels/FlexPanel.vue"; import MultiviewPanel from "@/components/Panels/MultiviewPanel.vue"; import NotificationsPanel from "@/components/Panels/NotificationsPanel.vue"; @@ -31,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"]); @@ -173,7 +174,7 @@ watch( :to="activity.to" @click="onToggleSidebar()" /> + @@ -219,6 +229,7 @@ watch( + 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) }} 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); } } }); diff --git a/client/src/components/admin/AdminPanel.vue b/client/src/components/admin/AdminPanel.vue index 8853ed812d39..b6a5ea2bfd45 100644 --- a/client/src/components/admin/AdminPanel.vue +++ b/client/src/components/admin/AdminPanel.vue @@ -1,17 +1,135 @@ + + - - 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 ); 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"); + }, }); } diff --git a/client/src/entry/analysis/modules/Admin.vue b/client/src/entry/analysis/modules/Admin.vue index 25b052ab08af..9abb973c30ef 100644 --- a/client/src/entry/analysis/modules/Admin.vue +++ b/client/src/entry/analysis/modules/Admin.vue @@ -1,29 +1,3 @@ - - diff --git a/client/src/stores/userStore.ts b/client/src/stores/userStore.ts index 1d5c688d2709..0eb44ca2ab2f 100644 --- a/client/src/stores/userStore.ts +++ b/client/src/stores/userStore.ts @@ -34,6 +34,10 @@ export const useUserStore = defineStore("userStore", () => { 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, 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, 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")