Unverified Commit 88188854 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #19761 from davelopez/24.2_move_workflow_save_button 

[24.2] Move Workflow Editor save button
parents 47ec11e5 7719a5e3

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

+9 −9
Original line number Diff line number Diff line
@@ -129,15 +129,6 @@ 
                        <span class="editor-title" :title="name"

                            >{{ name }}

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

                            <b-button

                                v-if="hasChanges"

                                id="workflow-save-button"

                                class="py-1 px-2"

                                variant="link"

                                :title="saveWorkflowTitle"

                                @click="saveOrCreate">

                                <FontAwesomeIcon :icon="faSave" />

                            </b-button>

                        </span>

                    </span>
@@ -154,6 +145,15 @@ 
                            @click="undoRedoStore.redo()">

                            <FontAwesomeIcon icon="fa-arrow-right" />

                        </b-button>

                        <b-button

                            id="workflow-save-button"

                            class="py-1 px-2"

                            variant="link"

                            :disabled="!hasChanges"

                            :title="saveWorkflowTitle"

                            @click="saveOrCreate">

                            <FontAwesomeIcon :icon="faSave" />

                        </b-button>

                    </b-button-group>

                </div>

                <WorkflowGraph

client/src/components/Workflow/Editor/modules/activities.ts

+11 −1
Original line number Diff line number Diff line
@@ -98,7 +98,17 @@ export const workflowEditorActivities = [ 
        optional: true,

    },

    {

        description: "Save this workflow with a different name and annotation",

        description: "Save this workflow.",

        icon: faSave,

        id: "save-workflow",

        title: "Save",

        tooltip: "Save current changes",

        visible: true,

        click: true,

        optional: true,

    },

    {

        description: "Save this workflow with a different name and annotation.",

        icon: farSave,

        id: "save-workflow-as",

        title: "Save as",

lib/galaxy_test/selenium/framework.py

+0 −1
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ class TestWithSeleniumMixin(GalaxyTestSeleniumContext, UsesApiTestCaseMixin, Use 
        save_button.wait_for_visible()

        assert not save_button.has_class("disabled")

        save_button.wait_for_and_click()

        save_button.wait_for_absent()

        self.sleep_for(self.wait_types.UX_RENDER)



    @retry_assertion_during_transitions

lib/galaxy_test/selenium/test_workflow_editor.py

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class TestWorkflowEditor(SeleniumTestCase, RunsWorkflows): 


        # shouldn't have changes on fresh load

        save_button = self.components.workflow_editor.save_button

        assert save_button.is_absent

        save_button.assert_disabled()



        self.screenshot("workflow_editor_blank")