Merge pull request #18468 from guerler/move_libraries

Moves Libraries from Masthead to Activity Bar

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");

client/src/components/Masthead/Masthead.vue

@@ -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"

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: "Libraries",
+        tooltip: "Access Data Libraries",
+        to: "/libraries",
+        visible: true,
+    },
 ];
 
 export function convertDropData(data: EventData): Activity | null {

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'

config/plugins/tours/core.galaxy_ui.yaml

@@ -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>."

lib/galaxy/selenium/navigates_galaxy.py

@@ -1323,7 +1323,7 @@ class NavigatesGalaxy(HasDriver):
 
     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):