Unverified Commit 32327ae4 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_23.2' into release_24.0

parents f6a45265 346b85fe

client/src/components/Workflow/services.js

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ export class Services { 
    async createWorkflow(workflow) {

        const url = withPrefix("/api/workflows");

        try {

            const { data } = await axios.post(url, { workflow: toSimple(workflow.id, workflow) });

            const { data } = await axios.post(url, { workflow: toSimple(workflow.id, workflow), from_tool_form: true });

            return data;

        } catch (e) {

            rethrowSimple(e);

client/src/components/admin/Notifications/NotificationForm.vue

+2 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ async function sendNewNotification() { 
                :optional="false"

                help="The message can be written in markdown."

                placeholder="Enter message"

                required />

                required

                area />



            <FormElement

                id="notification-variant"

lib/galaxy/selenium/navigates_galaxy.py

+7 −6
Original line number Diff line number Diff line
@@ -1558,7 +1558,7 @@ class NavigatesGalaxy(HasDriver): 
            workflow_run.expand_form_link.wait_for_and_click()

            workflow_run.expanded_form.wait_for_visible()



    def workflow_create_new(self, annotation=None, clear_placeholder=False):

    def workflow_create_new(self, annotation=None, clear_placeholder=False, save_workflow=True):

        self.workflow_index_open()

        self.sleep_for(self.wait_types.UX_RENDER)

        self.click_button_new_workflow()
@@ -1570,6 +1570,7 @@ class NavigatesGalaxy(HasDriver): 
        name_component.wait_for_and_send_keys(name)

        annotation = annotation or self._get_random_name()

        self.components.workflow_editor.edit_annotation.wait_for_and_send_keys(annotation)

        if save_workflow:

            save_button = self.components.workflow_editor.save_button

            save_button.wait_for_visible()

            assert not save_button.has_class("disabled")

lib/galaxy_test/selenium/test_workflow_editor.py

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ steps: 
    def test_integer_input(self):

        editor = self.components.workflow_editor



        name = self.workflow_create_new()

        name = self.workflow_create_new(save_workflow=False)

        self.workflow_editor_add_input(item_name="parameter_input")

        self.screenshot("workflow_editor_parameter_input_new")

        editor.label_input.wait_for_and_send_keys("input1")