From dc9b9ab65f84278faf306eafee8196c24b05d923 Mon Sep 17 00:00:00 2001 From: guerler Date: Sat, 29 Jun 2024 09:52:38 +0200 Subject: [PATCH 1/5] Remove data libraries from masthead --- client/src/components/Masthead/Masthead.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/Masthead/Masthead.vue b/client/src/components/Masthead/Masthead.vue index 1e166a469a03..d8738c1bb58d 100644 --- a/client/src/components/Masthead/Masthead.vue +++ b/client/src/components/Masthead/Masthead.vue @@ -86,7 +86,6 @@ onMounted(() => { - Date: Sat, 29 Jun 2024 09:55:58 +0200 Subject: [PATCH 2/5] Add data libraries to activities --- client/src/stores/activitySetup.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/client/src/stores/activitySetup.ts b/client/src/stores/activitySetup.ts index 724921368c9a..0cb7f4d6913b 100644 --- a/client/src/stores/activitySetup.ts +++ b/client/src/stores/activitySetup.ts @@ -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, @@ -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: "Data Library", + tooltip: "Access Data Libraries", + to: "/libraries", + visible: true, + }, ]; export function convertDropData(data: EventData): Activity | null { From 4a6efea857fdb79d5cb3b24c7c9c56c0b7a9ac80 Mon Sep 17 00:00:00 2001 From: guerler Date: Sat, 29 Jun 2024 10:19:14 +0200 Subject: [PATCH 3/5] Move libraries to activities --- client/src/stores/activitySetup.ts | 2 +- client/src/utils/navigation/navigation.yml | 2 +- lib/galaxy/selenium/navigates_galaxy.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/stores/activitySetup.ts b/client/src/stores/activitySetup.ts index 0cb7f4d6913b..f07e7ede7809 100644 --- a/client/src/stores/activitySetup.ts +++ b/client/src/stores/activitySetup.ts @@ -143,7 +143,7 @@ export const Activities = [ mutable: false, optional: true, panel: false, - title: "Data Library", + title: "Libraries", tooltip: "Access Data Libraries", to: "/libraries", visible: true, diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml index 1408646dbda8..0d220f7dc4e1 100644 --- a/client/src/utils/navigation/navigation.yml +++ b/client/src/utils/navigation/navigation.yml @@ -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' @@ -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' diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py index 4fefd36a282a..95e70392029c 100644 --- a/lib/galaxy/selenium/navigates_galaxy.py +++ b/lib/galaxy/selenium/navigates_galaxy.py @@ -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): From a3bb48d6faa41277489cd7dfc0a33005f1553a85 Mon Sep 17 00:00:00 2001 From: guerler Date: Sat, 29 Jun 2024 11:53:19 +0200 Subject: [PATCH 4/5] Remove data library from galaxy ui tour --- client/src/utils/navigation/navigation.yml | 2 +- config/plugins/tours/core.galaxy_ui.yaml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml index 0d220f7dc4e1..165afcd0202c 100644 --- a/client/src/utils/navigation/navigation.yml +++ b/client/src/utils/navigation/navigation.yml @@ -1007,7 +1007,7 @@ libraries: selectors: _: '#libraries_list' - activity: "#activity-libraries" + activity: '#activity-libraries' create_new_library_btn: '#create-new-lib' permission_library_btn: '.permission_library_btn' toolbtn_save_permissions: '.toolbtn_save_permissions' diff --git a/config/plugins/tours/core.galaxy_ui.yaml b/config/plugins/tours/core.galaxy_ui.yaml index 6eb0a7961701..eb950864e7a7 100644 --- a/config/plugins/tours/core.galaxy_ui.yaml +++ b/config/plugins/tours/core.galaxy_ui.yaml @@ -122,10 +122,6 @@ steps: element: "#analysis" intro: "This is the current view. Start your Analysis 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 Workflows." From 47383067b6a47293f2f29833e3c883c97069bb2e Mon Sep 17 00:00:00 2001 From: guerler Date: Sat, 29 Jun 2024 12:08:17 +0200 Subject: [PATCH 5/5] Adjust masthead jest test --- client/src/components/Masthead/Masthead.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/Masthead/Masthead.test.js b/client/src/components/Masthead/Masthead.test.js index 445cc235e9b9..f299b5b2500f 100644 --- a/client/src/components/Masthead/Masthead.test.js +++ b/client/src/components/Masthead/Masthead.test.js @@ -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");