Unverified Commit 2244b997 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_24.2' into dev

parents f18ff059 9976de5b

client/src/components/Markdown/Markdown.vue

+6 −4
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ export default { 
            workflows: {},

            invocations: {},

            loading: true,

            workflowID: "",

            workflowID: undefined,

        };

    },

    computed: {
@@ -159,7 +159,7 @@ export default { 
            return "unavailable";

        },

        workflowVersions() {

            return this.getStoredWorkflowByInstanceId(this.workflowID);

            return this.workflowID ? this.getStoredWorkflowByInstanceId(this.workflowID) : undefined;

        },

        version() {

            return this.markdownConfig.generate_version || "Unknown Galaxy Version";
@@ -172,7 +172,9 @@ export default { 
    },

    created() {

        this.initConfig();

        if (this.workflowID) {

            this.fetchWorkflowForInstanceId(this.workflowID);

        }

    },

    methods: {

        ...mapActions(useWorkflowStore, ["getStoredWorkflowByInstanceId", "fetchWorkflowForInstanceId"]),
@@ -188,7 +190,7 @@ export default { 
                this.workflows = config.workflows || {};

                this.invocations = config.invocations || {};

                this.loading = false;

                this.workflowID = Object.keys(this.markdownConfig.workflows)[0];

                this.workflowID = Object.keys(this.markdownConfig?.workflows ?? {})[0];

            }

        },

        splitMarkdown(markdown) {

lib/galaxy/authnz/psa_authnz.py

+5 −1
Original line number Diff line number Diff line
@@ -176,7 +176,11 @@ class PSAAuthnz(IdentityProvider): 
        user_authnz_token.set_extra_data(extra_data)



    def refresh(self, trans, user_authnz_token):

        if not user_authnz_token or not user_authnz_token.extra_data:

        if (

            not user_authnz_token

            or not user_authnz_token.extra_data

            or "refresh_token" not in user_authnz_token.extra_data

        ):

            return False

        # refresh tokens if they reached their half lifetime

        if "expires" in user_authnz_token.extra_data:

lib/galaxy_test/api/test_datasets.py

+1 −4
Original line number Diff line number Diff line
@@ -709,7 +709,6 @@ class TestDatasetsApi(ApiTestCase): 
        for purged_source_id in expected_purged_source_ids:

            self.dataset_populator.wait_for_purge(history_id, purged_source_id["id"])



    @requires_new_history

    @requires_new_library

    def test_delete_batch_lddas(self):

        # Create a library dataset
@@ -838,9 +837,7 @@ class TestDatasetsApi(ApiTestCase): 


    def test_storage_show(self, history_id):

        hda = self.dataset_populator.new_dataset(history_id, wait=True)

        hda_details = self.dataset_populator.get_history_dataset_details(history_id, dataset=hda)

        dataset_id = hda_details["dataset_id"]

        storage_info_dict = self.dataset_populator.dataset_storage_info(dataset_id)

        storage_info_dict = self.dataset_populator.dataset_storage_info(hda["id"])

        assert_has_keys(storage_info_dict, "object_store_id", "name", "description")



    def test_storage_show_on_discarded(self, history_id):