Unverified Commit 0f28606c authored by José Manuel Domínguez's avatar José Manuel Domínguez Committed by GitHub
Browse files

Merge branch 'dev' into eLabFTW

parents 204b5fef 5f484fca

client/src/api/schema/schema.ts

+7 −90
Original line number Diff line number Diff line
@@ -6054,7 +6054,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "History";

            /**
@@ -6171,7 +6170,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "History";

            /**
@@ -6423,7 +6421,6 @@ export interface components { 
             * Category

             * @default broadcast

             * @constant

             * @enum {string}

             */

            category: "broadcast";

            /**
@@ -6466,7 +6463,6 @@ export interface components { 
             * Category

             * @default broadcast

             * @constant

             * @enum {string}

             */

            category: "broadcast";

            content: components["schemas"]["BroadcastNotificationContent"];
@@ -6515,7 +6511,6 @@ export interface components { 
            /**

             * Browsable

             * @constant

             * @enum {boolean}

             */

            browsable: true;

            /**
@@ -6586,7 +6581,6 @@ export interface components { 
            /**

             * Type

             * @constant

             * @enum {string}

             */

            type: "change_datatype";

        };
@@ -6597,7 +6591,6 @@ export interface components { 
            /**

             * Type

             * @constant

             * @enum {string}

             */

            type: "change_dbkey";

        };
@@ -7276,7 +7269,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Quota";

            /**
@@ -7368,7 +7360,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "User";

            /**
@@ -7798,7 +7789,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "DatasetCollectionElement";

            /**
@@ -7849,7 +7839,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "DatasetCollection";

            /**
@@ -7955,7 +7944,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "HistoryDatasetCollectionAssociation";

            tags: components["schemas"]["TagCollection"];
@@ -8018,7 +8006,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "DatasetHash";

        };
@@ -8320,7 +8307,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "DefaultQuotaAssociation";

            /**
@@ -8735,7 +8721,6 @@ export interface components { 
             * Source

             * @description The source of this dataset, which in the case of the model can only be `hdca`.

             * @constant

             * @enum {string}

             */

            src: "hdca";

        };
@@ -8822,7 +8807,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Job";

            /**
@@ -8951,6 +8935,8 @@ export interface components { 
            error?: string | null;

            /** Success */

            success: boolean;

            /** Uri */

            uri?: string | null;

        };

        /**

         * ExportObjectType
@@ -9057,7 +9043,6 @@ export interface components { 
        };

        /**

         * FavoriteObjectType

         * @constant

         * @enum {string}

         */

        FavoriteObjectType: "tools";
@@ -9483,7 +9468,6 @@ export interface components { 
            /**

             * Src

             * @constant

             * @enum {string}

             */

            src: "ftp_import";

            /** Tags */
@@ -9527,7 +9511,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Group";

            /**
@@ -9547,7 +9530,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "GroupQuotaAssociation";

        };
@@ -9565,7 +9547,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Group";

            /** name of the group */
@@ -9904,7 +9885,6 @@ export interface components { 
             * @description TODO

             * @default file

             * @constant

             * @enum {string}

             */

            api_type: "file";

            /**
@@ -10011,7 +9991,6 @@ export interface components { 
             * History Content Type

             * @description This is always `dataset` for datasets.

             * @constant

             * @enum {string}

             */

            history_content_type: "dataset";

            /**
@@ -10048,7 +10027,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "HistoryDatasetAssociation";

            /**
@@ -10097,7 +10075,6 @@ export interface components { 
             * @description This is always `file` for datasets.

             * @default file

             * @constant

             * @enum {string}

             */

            type: "file";

            /**
@@ -10146,7 +10123,6 @@ export interface components { 
            /**

             * Accessible

             * @constant

             * @enum {boolean}

             */

            accessible: false;

            /** Copied From Ldda Id */
@@ -10170,7 +10146,6 @@ export interface components { 
             * History Content Type

             * @description This is always `dataset` for datasets.

             * @constant

             * @enum {string}

             */

            history_content_type: "dataset";

            /**
@@ -10250,7 +10225,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "HistoryDatasetAssociation";

            /** Purged */
@@ -10308,7 +10282,6 @@ export interface components { 
             * History Content Type

             * @description This is always `dataset` for datasets.

             * @constant

             * @enum {string}

             */

            history_content_type: "dataset";

            /**
@@ -10555,7 +10528,6 @@ export interface components { 
             * History Content Type

             * @description This is always `dataset_collection` for dataset collections.

             * @constant

             * @enum {string}

             */

            history_content_type: "dataset_collection";

            /**
@@ -10592,7 +10564,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "HistoryDatasetCollectionAssociation";

            /**
@@ -10621,7 +10592,6 @@ export interface components { 
             * @description This is always `collection` for dataset collections.

             * @default collection

             * @constant

             * @enum {string}

             */

            type: "collection";

            /**
@@ -10695,7 +10665,6 @@ export interface components { 
             * History Content Type

             * @description This is always `dataset_collection` for dataset collections.

             * @constant

             * @enum {string}

             */

            history_content_type: "dataset_collection";

            /**
@@ -10727,7 +10696,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "HistoryDatasetCollectionAssociation";

            /**
@@ -10751,7 +10719,6 @@ export interface components { 
             * @description This is always `collection` for dataset collections.

             * @default collection

             * @constant

             * @enum {string}

             */

            type: "collection";

            /**
@@ -10940,7 +10907,6 @@ export interface components { 
            /**

             * Type

             * @constant

             * @enum {string}

             */

            type: "hdca";

        };
@@ -11378,7 +11344,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "History";

            /**
@@ -11493,7 +11458,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "History";

            /**
@@ -11828,7 +11792,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "ToolShedRepository";

            /**
@@ -12100,7 +12063,6 @@ export interface components { 
            /**

             * Model

             * @constant

             * @enum {string}

             */

            model: "WorkflowInvocation";

            /**
@@ -12140,7 +12102,6 @@ export interface components { 
             * Source

             * @description Source model of the output dataset.

             * @constant

             * @enum {string}

             */

            src: "hda";

            /**
@@ -12161,7 +12122,6 @@ export interface components { 
             * Source

             * @description Source model of the output dataset collection.

             * @constant

             * @enum {string}

             */

            src: "hdca";

            /**
@@ -12236,7 +12196,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Report";

            /**
@@ -12244,7 +12203,6 @@ export interface components { 
             * @description Format of the invocation report.

             * @default markdown

             * @constant

             * @enum {string}

             */

            render_format: "markdown";

            /**
@@ -12317,7 +12275,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "WorkflowInvocationStep";

            /**
@@ -12383,7 +12340,6 @@ export interface components { 
             * @description The source model of the output.

             * @default hdca

             * @constant

             * @enum {string}

             */

            src: "hdca";

        };
@@ -12398,7 +12354,6 @@ export interface components { 
            /**

             * Model

             * @constant

             * @enum {string}

             */

            model: "ImplicitCollectionJobs";

            /**
@@ -12425,7 +12380,6 @@ export interface components { 
            /**

             * Model

             * @constant

             * @enum {string}

             */

            model: "Job";

            /**
@@ -12452,7 +12406,6 @@ export interface components { 
            /**

             * Model

             * @constant

             * @enum {string}

             */

            model: "WorkflowInvocationStep";

            /**
@@ -12481,7 +12434,6 @@ export interface components { 
             * @description The source model of the output.

             * @default hda

             * @constant

             * @enum {string}

             */

            src: "hda";

            /**
@@ -12622,9 +12574,8 @@ export interface components { 
            /**

             * Replacement Parameters

             * @description Class of parameters mostly used for string replacement in PJAs. In best practice workflows, these should be replaced with input parameters

             * @default {}

             */

            replacement_params: Record<string, never> | null;

            replacement_params?: Record<string, never> | null;

            /**

             * Require Exact Tool Versions

             * @description If true, exact tool versions are required for workflow invocation.
@@ -12634,9 +12585,8 @@ export interface components { 
            /**

             * Resource Parameters

             * @description If a workflow_resource_params_file file is defined and the target workflow is configured to consumer resource parameters, they can be specified with this parameter. See https://github.com/galaxyproject/galaxy/pull/4830 for more information.

             * @default {}

             */

            resource_params: Record<string, never> | null;

            resource_params?: Record<string, never> | null;

            /**

             * Scheduler

             * @description Scheduler to use for workflow invocation.
@@ -12740,7 +12690,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Job";

            /**
@@ -12923,7 +12872,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Job";

            /**
@@ -13191,7 +13139,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Job";

            /**
@@ -13387,7 +13334,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "LibraryDatasetDatasetAssociation";

            /** Name */
@@ -13671,7 +13617,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "LibraryDataset";

            /** Name */
@@ -13716,7 +13661,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "LibraryFolder";

            /** Name */
@@ -13857,7 +13801,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "LibraryFolder";

            /**
@@ -13905,7 +13848,6 @@ export interface components { 
        };

        /**

         * LibraryFolderPermissionAction

         * @constant

         * @enum {string}

         */

        LibraryFolderPermissionAction: "set_permissions";
@@ -13964,7 +13906,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Library";

            /**
@@ -14075,7 +14016,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Library";

            /**
@@ -14209,7 +14149,6 @@ export interface components { 
         * @description These notification categories cannot be opt-out by the user.

         *

         *     The user will always receive notifications from these categories.

         * @constant

         * @enum {string}

         */

        MandatoryNotificationCategory: "broadcast";
@@ -14839,7 +14778,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Page";

            /**
@@ -14916,7 +14854,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Page";

            /**
@@ -15316,7 +15253,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Quota";

            /**
@@ -15369,7 +15305,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Quota";

            /**
@@ -15711,7 +15646,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Role";

            /**
@@ -16244,7 +16178,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Job";

            /**
@@ -16480,7 +16413,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "StoredWorkflow";

            /**
@@ -16687,7 +16619,6 @@ export interface components { 
            /**

             * Type

             * @constant

             * @enum {string}

             */

            type: "boolean";

        };
@@ -16707,7 +16638,6 @@ export interface components { 
            /**

             * Type

             * @constant

             * @enum {string}

             */

            type: "integer";

        };
@@ -16724,7 +16654,6 @@ export interface components { 
            /**

             * Type

             * @constant

             * @enum {string}

             */

            type: "path_component";

        };
@@ -16744,7 +16673,6 @@ export interface components { 
            /**

             * Type

             * @constant

             * @enum {string}

             */

            type: "string";

        };
@@ -17664,7 +17592,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "User";

            /**
@@ -17803,7 +17730,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "UserQuotaAssociation";

            /**
@@ -17974,7 +17900,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "VisualizationRevision";

            /**
@@ -18021,7 +17946,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "Visualization";

            /**
@@ -18224,7 +18148,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "WorkflowInvocation";

            /**
@@ -18293,7 +18216,6 @@ export interface components { 
             * Model class

             * @description The name of the database model class.

             * @constant

             * @enum {string}

             */

            model_class: "WorkflowInvocation";

            /**
@@ -18368,7 +18290,6 @@ export interface components { 
             * @description This API yields a particular workflow instance, newer workflows belonging to the same storedworkflow may have different state.

             * @default true

             * @constant

             * @enum {boolean}

             */

            instance: true;

            /**
@@ -18381,7 +18302,6 @@ export interface components { 
             * @description Indicates if legacy parameters are already normalized to be indexed by the order_index and are specified as a dictionary per step. Legacy-style parameters could previously be specified as one parameter per step or by tool ID.

             * @default true

             * @constant

             * @enum {boolean}

             */

            parameters_normalized: true;

            /**
@@ -18402,15 +18322,13 @@ export interface components { 
            /**

             * Replacement Parameters

             * @description Class of parameters mostly used for string replacement in PJAs. In best practice workflows, these should be replaced with input parameters

             * @default {}

             */

            replacement_params: Record<string, never> | null;

            replacement_params?: Record<string, never> | null;

            /**

             * Resource Parameters

             * @description If a workflow_resource_params_file file is defined and the target workflow is configured to consumer resource parameters, they can be specified with this parameter. See https://github.com/galaxyproject/galaxy/pull/4830 for more information.

             * @default {}

             */

            resource_params: Record<string, never> | null;

            resource_params?: Record<string, never> | null;

            /**

             * Use cached job

             * @description Indicated whether to use a cached job for workflow invocation.
@@ -29042,7 +28960,6 @@ export interface operations { 
            };

            path: {

                library_id: string;

                /** @example F0123456789ABCDEF */

                id: string;

            };

            cookie?: never;

client/src/components/ActivityBar/ActivityBar.vue

+3 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ defineExpose({ 
                                v-if="activity.id === 'upload'"

                                :id="`${activity.id}`"

                                :key="activity.id"

                                :activity-bar-id="props.activityBarId"

                                :icon="activity.icon"

                                :title="activity.title"

                                :tooltip="activity.tooltip" />
@@ -235,6 +236,7 @@ defineExpose({ 
                                v-else-if="activity.to && activity.id === 'interactivetools'"

                                :id="`${activity.id}`"

                                :key="activity.id"

                                :activity-bar-id="props.activityBarId"

                                :icon="activity.icon"

                                :is-active="isActiveRoute(activity.to)"

                                :title="activity.title"
@@ -272,6 +274,7 @@ defineExpose({ 
                <NotificationItem

                    v-if="isConfigLoaded && config.enable_notification_system"

                    id="notifications"

                    :activity-bar-id="props.activityBarId"

                    :icon="faBell"

                    :is-active="isActiveSideBar('notifications') || isActiveRoute('/user/notifications')"

                    title="Notifications"

client/src/components/ActivityBar/ActivityItem.vue

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ const meta = computed(() => store.metaForId(props.id)); 
</script>



<template>

    <Popper reference-is="span" popper-is="span" :placement="tooltipPlacement">

    <Popper :placement="tooltipPlacement">

        <template v-slot:reference>

            <b-nav-item

                :id="`activity-${id}`"

client/src/components/ActivityBar/ActivitySettings.vue

+4 −13
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ function executeActivity(activity: Activity) { 
</script>



<template>

    <div class="activity-settings rounded no-highlight">

        <div v-if="foundActivities" class="activity-settings-content">

    <div>

        <div v-if="foundActivities">

            <button

                v-for="activity in filteredActivities"

                :key="activity.id"
@@ -122,7 +122,7 @@ function executeActivity(activity: Activity) { 
                </div>

            </button>

        </div>

        <div v-else class="activity-settings-content">

        <div v-else>

            <b-alert v-localize class="py-1 px-2" show> No matching activities found. </b-alert>

        </div>

    </div>
@@ -131,16 +131,6 @@ function executeActivity(activity: Activity) { 
<style lang="scss">

@import "theme/blue.scss";



.activity-settings {

    overflow-y: hidden;

    display: flex;

    flex-direction: column;

}



.activity-settings-content {

    overflow-y: auto;

}



.activity-settings-item {

    background: none;

    border: none;
@@ -148,6 +138,7 @@ function executeActivity(activity: Activity) { 
    transition: none;

    width: 100%;

}



.activity-settings-item:hover {

    background: $gray-200;

}

client/src/components/ActivityBar/Items/InteractiveItem.vue

+4 −3
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ const totalCount = computed(() => entryPoints.value.length); 


export interface Props {

    id: string;

    activityBarId: string;

    title: string;

    icon: IconDefinition;

    isActive: boolean;

    to: string;

}



defineProps<Props>();

const props = defineProps<Props>();



const emit = defineEmits<{

    (e: "click"): void;
@@ -27,7 +28,7 @@ const emit = defineEmits<{ 


const tooltip = computed(() =>

    totalCount.value === 1

        ? `You currently have 1 active interactive tool`

        ? "You currently have 1 active interactive tool"

        : `You currently have ${totalCount.value} active interactive tools`

);

</script>
@@ -36,7 +37,7 @@ const tooltip = computed(() => 
    <ActivityItem

        v-if="totalCount > 0"

        :id="id"

        :activity-bar-id="id"

        :activity-bar-id="props.activityBarId"

        :icon="icon"

        :indicator="totalCount"

        :is-active="isActive"