diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java index 0102f4af6446..d05ec1c7fa21 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java @@ -59,12 +59,6 @@ public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDe }) private WebElement buttonConfirm; - @FindBys({ - @FindBy(className = "n-dialog__action"), - @FindBy(className = "n-button--default-type"), - }) - private WebElement publishSuccessButtonCancel; - @FindBy(className = "items") private List workflowList; @@ -98,9 +92,7 @@ public WorkflowDefinitionTab publish(String workflow) { .orElseThrow(() -> new RuntimeException("Can not find publish button in workflow definition")) .click(); - ((JavascriptExecutor) driver).executeScript("arguments[0].click();", buttonConfirm()); - - ((JavascriptExecutor) driver).executeScript("arguments[0].click();", publishSuccessButtonCancel()); + driver.executeScript("arguments[0].click();", buttonConfirm()); return this; } diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/ShellTaskForm.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/ShellTaskForm.java index fd15e384e97d..d84708f2907e 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/ShellTaskForm.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/ShellTaskForm.java @@ -17,10 +17,12 @@ package org.apache.dolphinscheduler.e2e.pages.project.workflow.task; +import org.apache.dolphinscheduler.e2e.core.Constants; import org.apache.dolphinscheduler.e2e.pages.common.CodeEditor; import org.apache.dolphinscheduler.e2e.pages.project.workflow.WorkflowForm; import lombok.Getter; +import lombok.SneakyThrows; import org.openqa.selenium.WebDriver; @@ -39,7 +41,9 @@ public ShellTaskForm(WorkflowForm parent) { this.driver = parent.driver(); } + @SneakyThrows public ShellTaskForm script(String script) { + Thread.sleep(Constants.DEFAULT_SLEEP_MILLISECONDS); codeEditor.content(script); return this; diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts index 692d4df2d4e8..947f1b06b526 100644 --- a/dolphinscheduler-ui/src/locales/en_US/project.ts +++ b/dolphinscheduler-ui/src/locales/en_US/project.ts @@ -232,7 +232,6 @@ export default { workflow_relation_no_data_result_desc: 'There is not any workflows. Please create a workflow, and then visit this page again.', wait_to_run: 'Wait to run', - want_to_set_timing: 'Would you like to set the workflow timing?', confirm_to_online: 'Confirm to make the workflow online?', confirm_to_offline: 'Confirm to make the workflow offline?', time_to_online: 'Confirm to make the Scheduler online?', diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts b/dolphinscheduler-ui/src/locales/zh_CN/project.ts index 4c2e18da7118..6c46fcd3cc37 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts @@ -230,7 +230,6 @@ export default { workflow_relation_no_data_result_desc: '目前没有任何工作流,请先创建工作流,再访问该页面', wait_to_run: '等待执行', - want_to_set_timing: '现在想去配置该工作流定时?', confirm_to_online: '是否确定上线该工作流?', confirm_to_offline: '是否确定下线该工作流?', time_to_online: '是否确定上线该定时?', diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/index.tsx b/dolphinscheduler-ui/src/views/projects/workflow/definition/index.tsx index 29d9a8ef6a85..6d0a28cba433 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/definition/index.tsx +++ b/dolphinscheduler-ui/src/views/projects/workflow/definition/index.tsx @@ -23,8 +23,7 @@ import { NPagination, NSpace, NTooltip, - NPopconfirm, - NModal + NPopconfirm } from 'naive-ui' import { defineComponent, @@ -82,10 +81,6 @@ export default defineComponent({ requestData() } - const confirmToSetWorkflowTiming = () => { - variables.timingShowRef = true - } - const handleSearch = () => { variables.page = 1 requestData() @@ -143,7 +138,6 @@ export default defineComponent({ batchExportWorkflow, batchCopyWorkflow, handleCopyUpdateList, - confirmToSetWorkflowTiming, ...toRefs(variables), uiSettingStore, trim @@ -311,16 +305,6 @@ export default defineComponent({ v-model:show={this.copyShowRef} onUpdateList={this.handleCopyUpdateList} /> - { - variables.setTimingDialogShowRef = true - if (row?.schedule) { - variables.row = row.schedule - variables.timingType = 'update' - variables.timingState = row.scheduleReleaseState - } getTableData({ pageSize: variables.pageSize, pageNo: variables.page,