Commit b5cabbfc authored by Ahmed Awan's avatar Ahmed Awan
Browse files

ensure correct version routed to on workflow run 

This is a bug caused in https://github.com/galaxyproject/galaxy/pull/18378 which made the `SaveChangesModal` useless because the version before the save was routed to.
Now, we instead append the version to the route after the user confirms the save (or doesn't) in the modal.
parent 72217d17

client/src/components/Workflow/Editor/Index.vue

+5 −5
Original line number Diff line number Diff line
@@ -801,12 +801,9 @@ export default { 
            this.report.markdown = markdown;

        },

        onRun() {

            const runUrl = `/workflows/run?id=${this.id}${

                this.version !== undefined ? `&version=${this.version}` : ""

            }`;

            this.onNavigate(runUrl);

            this.onNavigate(`/workflows/run?id=${this.id}`, false, false, true);

        },

        async onNavigate(url, forceSave = false, ignoreChanges = false) {

        async onNavigate(url, forceSave = false, ignoreChanges = false, appendVersion = false) {

            if (this.isNewTempWorkflow) {

                await this.onCreate();

            } else if (this.hasChanges && !forceSave && !ignoreChanges) {
@@ -819,6 +816,9 @@ export default { 
                await this.onSave();

            }



            if (appendVersion && this.version !== undefined) {

                url += `&version=${this.version}`;

            }

            this.hasChanges = false;

            await nextTick();

            this.$router.push(url);

client/src/components/Workflow/Editor/SaveChangesModal.vue

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ const busy = ref(false); 


const emit = defineEmits<{

    /** Proceed with or without saving the changes */

    (e: "on-proceed", url: string, forceSave: boolean, ignoreChanges: boolean): void;

    (e: "on-proceed", url: string, forceSave: boolean, ignoreChanges: boolean, appendVersion: boolean): void;

    /** Update the nav URL prop */

    (e: "update:nav-url", url: string): void;

    /** Update the show modal boolean prop */
@@ -49,13 +49,13 @@ function closeModal() { 


function dontSave() {

    busy.value = true;

    emit("on-proceed", props.navUrl, false, true);

    emit("on-proceed", props.navUrl, false, true, true);

}



function saveChanges() {

    busy.value = true;

    closeModal();

    emit("on-proceed", props.navUrl, true, false);

    emit("on-proceed", props.navUrl, true, false, true);

}

</script>