Commit 7b5f711f authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'dev' into 'main' 

Merge with dev for Release 24.09

See merge request !96
parents 3d2156c1 1c372019

.github/labeler.yml

+7 −6
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ area/toolshed: 
      - lib/toolshed/**/*

      - templates/webapps/tool_shed/**/*

area/UI-UX:

  - all:

    - changed-files:

      - any-glob-to-any-file:

        - client/src/**/*

.github/workflows/maintenance_bot.yaml

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ jobs: 
    if: github.repository_owner == 'galaxyproject'

    permissions:

      contents: read

      issues: write

      pull-requests: write

    runs-on: ubuntu-latest

    env:

.gitlab-ci.yml

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

  CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base"

  CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit"

  GALAXY_VERSION_PYTHON: 24.1.dev1+ornl

  GALAXY_VERSION_DOCKER: 24.1.dev1.ornl

  GALAXY_VERSION_PYTHON: 24.1.dev3+ornl

  GALAXY_VERSION_DOCKER: 24.1.dev3.ornl



# This import is for the func_rse_docker_* functions

before_script:

client/src/api/schema/schema.ts

+8 −2
Original line number Diff line number Diff line
@@ -12850,7 +12850,10 @@ export interface components { 
             * @enum {string}

             */

            type: "aws_s3" | "azure_blob" | "boto3" | "disk" | "generic_s3";

            /** Uuid */

            /**

             * Uuid

             * Format: uuid4

             */

            uuid: string;

            /** Variables */

            variables: {
@@ -12924,7 +12927,10 @@ export interface components { 
            type: "ftp" | "posix" | "s3fs" | "azure";

            /** Uri Root */

            uri_root: string;

            /** Uuid */

            /**

             * Uuid

             * Format: uuid4

             */

            uuid: string;

            /** Variables */

            variables: {

client/src/components/Common/FilterObjectStoreLink.vue

+8 −5
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; 
import { computed, ref } from "vue";



import { ConcreteObjectStoreModel } from "@/api";

import { useObjectStoreStore } from "@/stores/objectStoreStore";



import ObjectStoreSelect from "./ObjectStoreSelect.vue";

import SelectModal from "@/components/Dataset/DatasetStorage/SelectModal.vue";
@@ -12,26 +13,28 @@ import SelectModal from "@/components/Dataset/DatasetStorage/SelectModal.vue"; 
library.add(faTimes);



interface FilterObjectStoreLinkProps {

    value: String | null;

    value?: string;

    objectStores: ConcreteObjectStoreModel[];

}



const props = defineProps<FilterObjectStoreLinkProps>();



const { getObjectStoreNameById } = useObjectStoreStore();



const showModal = ref(false);



const emit = defineEmits<{

    (e: "change", objectStoreId: string | null): void;

    (e: "change", objectStoreId?: string): void;

}>();



function onSelect(objectStoreId: string | null) {

function onSelect(objectStoreId?: string) {

    emit("change", objectStoreId);

    showModal.value = false;

}



const selectionText = computed(() => {

    if (props.value) {

        return props.value;

        return getObjectStoreNameById(props.value);

    } else {

        return "(any)";

    }
@@ -45,7 +48,7 @@ const selectionText = computed(() => { 
        </SelectModal>

        <b-link href="#" @click="showModal = true">{{ selectionText }}</b-link>

        <span v-if="value" v-b-tooltip.hover title="Remove Filter">

            <FontAwesomeIcon icon="times" @click="onSelect(null)" />

            <FontAwesomeIcon icon="times" @click="onSelect(undefined)" />

        </span>

    </span>

</template>