Unverified Commit 35ebfd51 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_24.0' into release_24.1

parents e059a164 6a7a889d

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

+6 −4
Original line number Diff line number Diff line
@@ -42,8 +42,10 @@ 
            <div class="editor-top-bar" unselectable="on">

                <span>

                    <span class="sr-only">Workflow Editor</span>

                    <span v-if="!isNewTempWorkflow || name" class="editor-title" :title="name">{{ name }}</span>

                    <i v-else class="editor-title">Create New Workflow</i>

                    <span class="editor-title" :title="name"

                        >{{ name }}

                        <i v-if="hasChanges" class="text-muted"> (unsaved changes) </i>

                    </span>

                </span>



                <b-button-group>
@@ -524,12 +526,12 @@ export default { 
            }

        },

        annotation(newAnnotation, oldAnnotation) {

            if (newAnnotation != oldAnnotation && !this.isNewTempWorkflow) {

            if (newAnnotation != oldAnnotation) {

                this.hasChanges = true;

            }

        },

        name(newName, oldName) {

            if (newName != oldName && !this.isNewTempWorkflow) {

            if (newName != oldName) {

                this.hasChanges = true;

            }

        },

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

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ const { confirm } = useConfirmDialog(); 


const saveHover = computed(() => {

    if (props.isNewTempWorkflow) {

        return "Create a new workflow";

        return "Save Workflow";

    } else if (!props.hasChanges) {

        return "Workflow has no changes";

    } else if (props.hasInvalidConnections) {
@@ -81,7 +81,7 @@ async function onSave() { 
            <BButton

                id="workflow-save-button"

                role="button"

                variant="link"

                :variant="isNewTempWorkflow ? 'primary' : 'link'"

                aria-label="Save Workflow"

                class="editor-button-save"

                :disabled="!isNewTempWorkflow && !hasChanges"

client/src/entry/analysis/App.vue

+15 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import { getAppRoot } from "onload"; 
import { storeToRefs } from "pinia";

import { withPrefix } from "utils/redirect";

import { ref, watch } from "vue";

import { useRoute } from "vue-router/composables";



import short from "@/components/plugins/short";

import { useRouteQueryBool } from "@/composables/route";
@@ -116,7 +117,21 @@ export default { 
            { immediate: true }

        );



        const confirmation = ref(null);

        const route = useRoute();

        watch(

            () => route.fullPath,

            (newVal, oldVal) => {

                // sometimes, the confirmation is not cleared when the route changes

                // and the confirmation alert is shown needlessly

                if (confirmation.value) {

                    confirmation.value = null;

                }

            }

        );



        return {

            confirmation,

            toastRef,

            confirmDialogRef,

            uploadModal,
@@ -128,7 +143,6 @@ export default { 
    data() {

        return {

            config: getGalaxyInstance().config,

            confirmation: null,

            resendUrl: `${getAppRoot()}user/resend_verification`,

            windowManager: null,

        };