Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moves Libraries from Masthead to Activity Bar #18468

Merged
merged 5 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/components/Masthead/Masthead.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe("Masthead.vue", () => {
});

it("should render simple tab item links", () => {
expect(wrapper.findAll("li.nav-item").length).toBe(5);
expect(wrapper.findAll("li.nav-item").length).toBe(4);
// Ensure specified link title respected.
expect(wrapper.find("#help").text()).toBe("Support, Contact, and Community");
expect(wrapper.find("#help a").attributes("href")).toBe("/about");
Expand Down
1 change: 0 additions & 1 deletion client/src/components/Masthead/Masthead.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ onMounted(() => {
</span>
</BNavbarNav>
<BNavbarNav v-if="isConfigLoaded" class="mr-1">
<MastheadItem id="library" icon="fa-database" tooltip="Data Libraries" @click="openUrl('/libraries')" />
<MastheadItem
v-if="windowTab"
:id="windowTab.id"
Expand Down
15 changes: 14 additions & 1 deletion client/src/stores/activitySetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export const Activities = [
},
{
anonymous: true,
description: "Display and create new Pages.",
description: "Display and create new pages.",
icon: "fa-file-contract",
id: "pages",
mutable: false,
Expand All @@ -135,6 +135,19 @@ export const Activities = [
to: "/pages/list",
visible: true,
},
{
anonymous: false,
description: "Display Data Libraries with datasets available to all users.",
icon: "fa-database",
id: "libraries",
mutable: false,
optional: true,
panel: false,
title: "Libraries",
tooltip: "Access Data Libraries",
to: "/libraries",
visible: true,
},
];

export function convertDropData(data: EventData): Activity | null {
Expand Down
2 changes: 1 addition & 1 deletion client/src/utils/navigation/navigation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ masthead:

help: '#help'
home: '#analysis'
libraries: '#library'
login: '#user'
logout: '.dropdown-menu > li > a > .fa-sign-out-alt'
logged_in_only: '.loggedin-only'
Expand Down Expand Up @@ -1008,6 +1007,7 @@ libraries:

selectors:
_: '#libraries_list'
activity: '#activity-libraries'
create_new_library_btn: '#create-new-lib'
permission_library_btn: '.permission_library_btn'
toolbtn_save_permissions: '.toolbtn_save_permissions'
Expand Down
4 changes: 0 additions & 4 deletions config/plugins/tours/core.galaxy_ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ steps:
element: "#analysis"
intro: "This is the current view. Start your <b>Analysis</b> from here."

- title: "Data Libraries"
component: masthead.libraries
intro: "Get access to source data."

- title: "Workflow"
component: workflows.activity
intro: "Create, manage, import, export and share your <b>Workflows</b>."
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/selenium/navigates_galaxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ def create_new_library(self):

def libraries_open(self):
self.home()
self.components.masthead.libraries.wait_for_and_click()
self.components.libraries.activity.wait_for_and_click()
self.components.libraries.selector.wait_for_visible()

def libraries_open_with_name(self, name):
Expand Down
Loading