diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dba5349fec57c118ffe8f97a2a9cd0322b5a8084..47c6823c3f5be1a23cd9458b754306d15d11d13c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/client/src/components/Masthead/Masthead.vue b/client/src/components/Masthead/Masthead.vue index 32a0814bb2d42a1ef7926a9b17d4514e0ae96cef..1f958482b9631b6f64ef71f3be55c56a9fddcc04 100644 --- a/client/src/components/Masthead/Masthead.vue +++ b/client/src/components/Masthead/Masthead.vue @@ -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(() => { +
  • + + NOVA Square Logo + NOVA Dashboard + +