Commit ec1e881e authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch '115-update-galaxy-to-latest-24-1' into 'dev' 

Update Galaxy to the recent upstream version

See merge request !91
parents 5a9564a3 a2b3b5cc

.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:

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>

client/src/components/FileSources/FileSourceTypeSpan.vue

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
import { computed } from "vue";



const MESSAGES = {

    posix: "This is a simple path based object store that assumes the all the relevant paths are already mounted on the Galaxy server and target worker nodes.",

    posix: "This is a simple path based storage location that assumes the all the relevant paths are already mounted on the Galaxy server and target worker nodes.",

    s3fs: "This is an remote file source plugin based on the Amazon Simple Storage Service (S3) interface. The AWS interface has become an industry standard and many storage vendors support it and use it to expose 'object' based storage.",

};