Commit 5f376139 authored by Duggan, John's avatar Duggan, John
Browse files

Merge branch '141-add-nova-link-to-header' into 'dev' 

Add NOVA link to header

Closes #141

See merge request !128
parents d5a4910d 34d97b5e

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ variables: 
  CONTAINER_GALAXY_URL: "${NDIP_DOCKER_REPOSITORY}/${CI_PROJECT_PATH}"

  CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base"

  CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit"

  GALAXY_VERSION_PYTHON: 24.2.dev5+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev5.ornl

  GALAXY_VERSION_PYTHON: 24.2.dev6+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev6.ornl



# This import is for the func_rse_docker_* functions

before_script:

client/src/components/Masthead/Masthead.vue

+15 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ import { BNavbar, BNavbarBrand, BNavbarNav } from "bootstrap-vue"; 
import { storeToRefs } from "pinia";

import { userLogout } from "utils/logout";

import { withPrefix } from "utils/redirect";

import { onMounted, ref } from "vue";

import { computed, onMounted, ref } from "vue";

import { useRouter } from "vue-router/composables";



import { useConfig } from "@/composables/config";
@@ -45,6 +45,14 @@ const props = defineProps({ 
const extensionTabs = ref([]);

const windowToggle = ref(false);



const novaUrl = computed(() => {

    if (isConfigLoaded.value) {

        return config.value.dashboard_url;

    }



    return "";

});



function openUrl(url, target = null) {

    if (!target) {

        router.push(url);
@@ -94,6 +102,12 @@ onMounted(() => { 
            </span>

        </BNavbarNav>

        <BNavbarNav v-if="isConfigLoaded" class="mr-1">

            <li v-if="novaUrl" class="cursor-pointer justify-content-center mx-2">

                <a class="text-white" :href="novaUrl" target="_blank">

                    <img :src="withPrefix('/static/nova_square.png')" alt="NOVA Square Logo" class="mr-1" width="24" />

                    NOVA Dashboard

                </a>

            </li>

            <MastheadItem

                v-if="windowTab"

                :id="windowTab.id"

lib/galaxy/config/sample/galaxy.yml.sample

+4 −0
Original line number Diff line number Diff line
@@ -1399,6 +1399,10 @@ galaxy: 
  # change the default logo including the galaxy brand title.

  #display_galaxy_brand: true



  # Add a link to the dashboard for managing interactive tools to the

  # masthead.

  #dashboard_url: ''



  # Format string used when showing date and time information. The

  # string may contain: - the directives used by Python time.strftime()

  # function (see

lib/galaxy/config/schemas/config_schema.yml

+7 −0
Original line number Diff line number Diff line
@@ -1656,6 +1656,13 @@ mapping: 
          URL prefix for Galaxy application. If Galaxy should be served under a prefix set this to

          the desired prefix value.



      dashboard_url:

        type: str

        default: ''

        required: false

        desc: |

          URL of the dashboard for managing interactive tools.



      galaxy_infrastructure_url:

        type: str

        default: http://localhost:8080

lib/galaxy/managers/configuration.py

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ class ConfigSerializer(base.ModelSerializer): 
            # TODO: this is available from user data, remove

            "is_admin_user": lambda *a, **c: False,

            "brand": _use_config,

            "dashboard_url": _use_config,

            "logo_url": _use_config,

            "logo_src": _use_config,

            "logo_src_secondary": _use_config,