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

Merge pull request #19478 from mvdbeek/fix_version_flicker_job_rerun 

[24.1] Fix version flicker on job rerun
parents 7b6f23b0 5093aec4

client/src/components/Tool/ToolForm.vue

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ export default { 
            console.debug("ToolForm - Requesting tool.", this.id);

            return getToolFormData(this.id, this.currentVersion, this.job_id, this.history_id)

                .then((data) => {

                    this.currentVersion = data.version;

                    this.formConfig = data;

                    this.remapAllowed = this.job_id && data.job_remap;

                    this.showForm = true;

client/src/utils/navigation/navigation.yml

+1 −0
Original line number Diff line number Diff line
@@ -595,6 +595,7 @@ tool_form: 
    drilldown_select_all: 'div.ui-form-element[id="form-element-${parameter}"] div.select-all-checkbox'

    drilldown_option: '.drilldown-option'

    drilldown_expand: '.fa-caret-down'

    tool_version_button: ".tool-versions"



  labels:

    generate_tour: 'Generate Tour'

lib/galaxy_test/selenium/test_tool_form.py

+21 −0
Original line number Diff line number Diff line
@@ -170,6 +170,20 @@ class TestToolForm(SeleniumTestCase, UsesHistoryItemAssertions): 
        self.history_panel_wait_for_hid_ok(2)

        self._check_dataset_details_for_inttest_value(2)



    @selenium_test

    def test_rerun_with_non_latest_version(self):

        version = "0.1+galaxy6"

        self._run_multiple_version_test_tool(version)

        self.history_panel_wait_for_hid_ok(1)

        self.hda_click_primary_action_button(1, "rerun")

        self.components.tool_form.tool_version_button.wait_for_and_click()

        menu_element = self.wait_for_selector_visible(".dropdown-menu.show")

        menu_options = menu_element.find_elements(By.CSS_SELECTOR, "a.dropdown-item")

        for menu_option in menu_options:

            if f"Selected {version}" in menu_option.text:

                return

        raise Exception("Tool version does not match job version")



    @selenium_test

    def test_rerun_deleted_dataset(self):

        # upload a first dataset that should not become selected on re-run
@@ -314,6 +328,13 @@ class TestToolForm(SeleniumTestCase, UsesHistoryItemAssertions): 
        self.tool_set_value("inttest", inttest_value)

        self.tool_form_execute()



    def _run_multiple_version_test_tool(self, version):

        self.home()

        self.tool_open("multiple_versions")

        self.components.tool_form.tool_version_button.wait_for_and_click()

        self.select_dropdown_item(f"Switch to {version}")

        self.tool_form_execute()





class TestLoggedInToolForm(SeleniumTestCase):

    ensure_registered = True