Commit c4af349d authored by Duggan, John's avatar Duggan, John
Browse files

Merge branch 'dev' into 'main' 

Merge 'dev' into 'main'

See merge request !130
parents bfe680f0 6c0d37ba

.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.dev4+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev4.ornl

  GALAXY_VERSION_PYTHON: 24.2.dev7+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev7.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/authnz/custos_authnz.py

+0 −1
Original line number Diff line number Diff line
@@ -590,7 +590,6 @@ class OIDCAuthnzBase(IdentityProvider): 


        custos_authnz_token = self._get_custos_authnz_token(sa_session, user_id, self.config.provider)

        user = custos_authnz_token.user if custos_authnz_token else None

        self.refresh(sa_session, custos_authnz_token, 90)

        return user, decoded_jwt

lib/galaxy/authnz/psa_authnz.py

+0 −1
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ class PSAAuthnz(IdentityProvider): 
        user_id = decoded_jwt["unique_name"]

        authnz_token = self._get_authnz_token(sa_session, user_id, self.config["provider"])

        user = authnz_token.user if authnz_token else None

        self.refresh(sa_session, authnz_token, 90)

        return user, decoded_jwt



    @staticmethod

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