Browse Source

Unify the element selector rules for E2E (#7409)

* Unify the element selector rules for E2E

* Fix typo in docker swarm
3.0.0/version-upgrade
kezhenxu94 3 years ago committed by GitHub
parent
commit
03a71297dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      dolphinscheduler-e2e/README.md
  2. 6
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/LoginPage.java
  3. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/common/NavBarPage.java
  4. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/ProjectDetailPage.java
  5. 8
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/ProjectPage.java
  6. 8
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java
  7. 2
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowForm.java
  8. 8
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowInstanceTab.java
  9. 2
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowRunDialog.java
  10. 6
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowSaveDialog.java
  11. 4
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/TaskNodeForm.java
  12. 2
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/SecurityPage.java
  13. 14
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/TenantPage.java
  14. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue
  15. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  16. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
  17. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
  18. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
  19. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
  20. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
  21. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  22. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
  23. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
  24. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
  25. 10
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
  26. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
  27. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
  28. 6
      dolphinscheduler-ui/src/js/conf/login/App.vue
  29. 4
      dolphinscheduler-ui/src/js/module/components/nav/nav.vue
  30. 6
      dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js

6
dolphinscheduler-e2e/README.md

@ -14,13 +14,13 @@ following fields,
```java ```java
public final class LoginPage { public final class LoginPage {
@FindBy(id = "input-username") @FindBy(id = "inputUsername")
private WebElement inputUsername; private WebElement inputUsername;
@FindBy(id = "input-password") @FindBy(id = "inputPassword")
private WebElement inputPassword; private WebElement inputPassword;
@FindBy(id = "button-login") @FindBy(id = "btnLogin")
private WebElement buttonLogin; private WebElement buttonLogin;
} }
``` ```

6
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/LoginPage.java

@ -33,13 +33,13 @@ import lombok.SneakyThrows;
@Getter @Getter
public final class LoginPage extends NavBarPage { public final class LoginPage extends NavBarPage {
@FindBy(id = "input-username") @FindBy(id = "inputUsername")
private WebElement inputUsername; private WebElement inputUsername;
@FindBy(id = "input-password") @FindBy(id = "inputPassword")
private WebElement inputPassword; private WebElement inputPassword;
@FindBy(id = "button-login") @FindBy(id = "btnLogin")
private WebElement buttonLogin; private WebElement buttonLogin;
public LoginPage(RemoteWebDriver driver) { public LoginPage(RemoteWebDriver driver) {

4
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/common/NavBarPage.java

@ -33,9 +33,9 @@ import lombok.Getter;
public class NavBarPage { public class NavBarPage {
protected final RemoteWebDriver driver; protected final RemoteWebDriver driver;
@FindBy(id = "project-tab") @FindBy(id = "tabProject")
private WebElement projectTab; private WebElement projectTab;
@FindBy(id = "security-tab") @FindBy(id = "tabSecurity")
private WebElement securityTab; private WebElement securityTab;
public NavBarPage(RemoteWebDriver driver) { public NavBarPage(RemoteWebDriver driver) {

4
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/ProjectDetailPage.java

@ -31,9 +31,9 @@ import lombok.Getter;
@Getter @Getter
public final class ProjectDetailPage extends NavBarPage { public final class ProjectDetailPage extends NavBarPage {
@FindBy(className = "process-definition") @FindBy(className = "tab-process-definition")
private WebElement menuProcessDefinition; private WebElement menuProcessDefinition;
@FindBy(className = "process-instance") @FindBy(className = "tab-process-instance")
private WebElement menuProcessInstances; private WebElement menuProcessInstances;
public ProjectDetailPage(RemoteWebDriver driver) { public ProjectDetailPage(RemoteWebDriver driver) {

8
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/ProjectPage.java

@ -37,10 +37,10 @@ import lombok.Getter;
@Getter @Getter
public final class ProjectPage extends NavBarPage implements NavBarItem { public final class ProjectPage extends NavBarPage implements NavBarItem {
@FindBy(id = "button-create-project") @FindBy(id = "btnCreateProject")
private WebElement buttonCreateProject; private WebElement buttonCreateProject;
@FindBy(className = "rows-project") @FindBy(className = "items-project")
private List<WebElement> projectList; private List<WebElement> projectList;
@FindBys({ @FindBys({
@ -105,10 +105,10 @@ public final class ProjectPage extends NavBarPage implements NavBarItem {
PageFactory.initElements(driver, this); PageFactory.initElements(driver, this);
} }
@FindBy(id = "input-project-name") @FindBy(id = "inputProjectName")
private WebElement inputProjectName; private WebElement inputProjectName;
@FindBy(id = "button-submit") @FindBy(id = "btnSubmit")
private WebElement buttonSubmit; private WebElement buttonSubmit;
} }
} }

8
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java

@ -34,18 +34,18 @@ import java.util.stream.Collectors;
@Getter @Getter
public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDetailPage.Tab { public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDetailPage.Tab {
@FindBy(id = "button-create-process") @FindBy(id = "btnCreateProcess")
private WebElement buttonCreateProcess; private WebElement buttonCreateProcess;
@FindBy(className = "select-all") @FindBy(className = "select-all")
private WebElement checkBoxSelectAll; private WebElement checkBoxSelectAll;
@FindBy(className = "button-delete-all") @FindBy(className = "btn-delete-all")
private WebElement buttonDeleteAll; private WebElement buttonDeleteAll;
@FindBys({ @FindBys({
@FindBy(className = "el-popconfirm"), @FindBy(className = "el-popconfirm"),
@FindBy(className = "el-button--primary"), @FindBy(className = "el-button--primary"),
}) })
private List<WebElement> buttonConfirm; private List<WebElement> buttonConfirm;
@FindBy(className = "rows-workflow-definitions") @FindBy(className = "items")
private List<WebElement> workflowList; private List<WebElement> workflowList;
public WorkflowDefinitionTab(RemoteWebDriver driver) { public WorkflowDefinitionTab(RemoteWebDriver driver) {
@ -88,7 +88,7 @@ public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDe
final Supplier<List<WebElement>> cancelButtons = () -> final Supplier<List<WebElement>> cancelButtons = () ->
workflowList() workflowList()
.stream() .stream()
.flatMap(it -> it.findElements(By.className("button-cancel-publish")).stream()) .flatMap(it -> it.findElements(By.className("btn-cancel-publish")).stream())
.filter(WebElement::isDisplayed) .filter(WebElement::isDisplayed)
.collect(Collectors.toList()); .collect(Collectors.toList());

2
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowForm.java

@ -42,7 +42,7 @@ public final class WorkflowForm {
private final WebDriver driver; private final WebDriver driver;
private final WorkflowSaveDialog saveForm; private final WorkflowSaveDialog saveForm;
@FindBy(id = "button-save") @FindBy(id = "btnSave")
private WebElement buttonSave; private WebElement buttonSave;
public WorkflowForm(WebDriver driver) { public WorkflowForm(WebDriver driver) {

8
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowInstanceTab.java

@ -36,11 +36,11 @@ import lombok.RequiredArgsConstructor;
@Getter @Getter
public final class WorkflowInstanceTab extends NavBarPage implements ProjectDetailPage.Tab { public final class WorkflowInstanceTab extends NavBarPage implements ProjectDetailPage.Tab {
@FindBy(className = "rows-workflow-instances") @FindBy(className = "items-workflow-instances")
private List<WebElement> instanceList; private List<WebElement> instanceList;
@FindBy(className = "select-all") @FindBy(className = "select-all")
private WebElement checkBoxSelectAll; private WebElement checkBoxSelectAll;
@FindBy(className = "button-delete-all") @FindBy(className = "btn-delete-all")
private WebElement buttonDeleteAll; private WebElement buttonDeleteAll;
@FindBys({ @FindBys({
@FindBy(className = "el-popconfirm"), @FindBy(className = "el-popconfirm"),
@ -82,7 +82,7 @@ public final class WorkflowInstanceTab extends NavBarPage implements ProjectDeta
private final WebElement row; private final WebElement row;
public WebElement rerunButton() { public WebElement rerunButton() {
return row.findElement(By.className("button-rerun")); return row.findElement(By.className("btn-rerun"));
} }
public boolean isSuccess() { public boolean isSuccess() {
@ -94,7 +94,7 @@ public final class WorkflowInstanceTab extends NavBarPage implements ProjectDeta
} }
public Row rerun() { public Row rerun() {
row.findElements(By.className("button-rerun")) row.findElements(By.className("btn-rerun"))
.stream() .stream()
.filter(WebElement::isDisplayed) .filter(WebElement::isDisplayed)
.findFirst() .findFirst()

2
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowRunDialog.java

@ -29,7 +29,7 @@ import lombok.Getter;
public final class WorkflowRunDialog { public final class WorkflowRunDialog {
private final WorkflowDefinitionTab parent; private final WorkflowDefinitionTab parent;
@FindBy(id = "button-submit") @FindBy(id = "btnSubmit")
private WebElement buttonSubmit; private WebElement buttonSubmit;
public WorkflowRunDialog(WorkflowDefinitionTab parent) { public WorkflowRunDialog(WorkflowDefinitionTab parent) {

6
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowSaveDialog.java

@ -38,9 +38,9 @@ public final class WorkflowSaveDialog {
private final WebDriver driver; private final WebDriver driver;
private final WorkflowForm parent; private final WorkflowForm parent;
@FindBy(id = "input-name") @FindBy(id = "inputName")
private WebElement inputName; private WebElement inputName;
@FindBy(id = "button-submit") @FindBy(id = "btnSubmit")
private WebElement buttonSubmit; private WebElement buttonSubmit;
@FindBys({ @FindBys({
@FindBy(className = "input-param-key"), @FindBy(className = "input-param-key"),
@ -52,7 +52,7 @@ public final class WorkflowSaveDialog {
@FindBy(tagName = "input"), @FindBy(tagName = "input"),
}) })
private List<WebElement> inputParamVal; private List<WebElement> inputParamVal;
@FindBy(id = "select-tenant") @FindBy(id = "selectTenant")
private WebElement selectTenant; private WebElement selectTenant;
public WorkflowSaveDialog(WorkflowForm parent) { public WorkflowSaveDialog(WorkflowForm parent) {

4
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/TaskNodeForm.java

@ -34,9 +34,9 @@ import java.util.stream.Stream;
@Getter @Getter
public abstract class TaskNodeForm { public abstract class TaskNodeForm {
@FindBy(id = "input-node-name") @FindBy(id = "inputNodeName")
private WebElement inputNodeName; private WebElement inputNodeName;
@FindBy(id = "button-submit") @FindBy(id = "btnSubmit")
private WebElement buttonSubmit; private WebElement buttonSubmit;
@FindBys({ @FindBys({
@FindBy(className = "input-param-key"), @FindBy(className = "input-param-key"),

2
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/SecurityPage.java

@ -30,7 +30,7 @@ import lombok.Getter;
@Getter @Getter
public class SecurityPage extends NavBarPage implements NavBarItem { public class SecurityPage extends NavBarPage implements NavBarItem {
@FindBy(className = "tenant-manage") @FindBy(className = "tab-tenant-manage")
private WebElement menuTenantManage; private WebElement menuTenantManage;
public SecurityPage(RemoteWebDriver driver) { public SecurityPage(RemoteWebDriver driver) {

14
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/TenantPage.java

@ -37,10 +37,10 @@ import lombok.Getter;
@Getter @Getter
public final class TenantPage extends NavBarPage implements SecurityPage.Tab { public final class TenantPage extends NavBarPage implements SecurityPage.Tab {
@FindBy(id = "button-create-tenant") @FindBy(id = "btnCreateTenant")
private WebElement buttonCreateTenant; private WebElement buttonCreateTenant;
@FindBy(className = "rows-tenant") @FindBy(className = "items")
private List<WebElement> tenantList; private List<WebElement> tenantList;
@FindBys({ @FindBys({
@ -93,19 +93,19 @@ public final class TenantPage extends NavBarPage implements SecurityPage.Tab {
PageFactory.initElements(driver, this); PageFactory.initElements(driver, this);
} }
@FindBy(id = "input-tenant-code") @FindBy(id = "inputTenantCode")
private WebElement inputTenantCode; private WebElement inputTenantCode;
@FindBy(id = "select-queue") @FindBy(id = "selectQueue")
private WebElement selectQueue; private WebElement selectQueue;
@FindBy(id = "input-description") @FindBy(id = "inputDescription")
private WebElement inputDescription; private WebElement inputDescription;
@FindBy(id = "button-submit") @FindBy(id = "btnSubmit")
private WebElement buttonSubmit; private WebElement buttonSubmit;
@FindBy(id = "button-cancel") @FindBy(id = "btnCancel")
private WebElement buttonCancel; private WebElement buttonCancel;
} }
} }

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue

@ -143,7 +143,7 @@
type="primary" type="primary"
size="mini" size="mini"
@click="saveProcess" @click="saveProcess"
id="button-save" id="btnSave"
>{{ $t("Save") }}</el-button >{{ $t("Save") }}</el-button
> >
<el-button <el-button

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@ -65,7 +65,7 @@
:disabled="isDetails" :disabled="isDetails"
:placeholder="$t('Please enter name (required)')" :placeholder="$t('Please enter name (required)')"
maxlength="100" maxlength="100"
id="input-node-name" id="inputNodeName"
> >
</el-input> </el-input>
</div> </div>
@ -443,7 +443,7 @@
:loading="spinnerLoading" :loading="spinnerLoading"
@click="ok()" @click="ok()"
:disabled="isDetails" :disabled="isDetails"
id="button-submit" id="btnSubmit"
>{{ spinnerLoading ? $t("Loading...") : $t("Confirm") }} >{{ spinnerLoading ? $t("Loading...") : $t("Confirm") }}
</el-button> </el-button>
</div> </div>

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue

@ -20,7 +20,7 @@
@change="_onChange" @change="_onChange"
v-model="selectedValue" v-model="selectedValue"
size="small" size="small"
id="select-tenant" id="selectTenant"
style="width: 180px"> style="width: 180px">
<el-option <el-option
v-for="item in itemList" v-for="item in itemList"

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@ -22,7 +22,7 @@
type="text" type="text"
size="small" size="small"
v-model="name" v-model="name"
id="input-name" id="inputName"
:disabled="router.history.current.name === 'projects-instance-details'" :disabled="router.history.current.name === 'projects-instance-details'"
:placeholder="$t('Please enter name (required)')"> :placeholder="$t('Please enter name (required)')">
</el-input> </el-input>
@ -102,7 +102,7 @@
</div> </div>
</template> </template>
<el-button type="text" size="small" @click="close()"> {{$t('Cancel')}} </el-button> <el-button type="text" size="small" @click="close()"> {{$t('Cancel')}} </el-button>
<el-button type="primary" size="small" round :disabled="isDetails" @click="ok()" id="button-submit">{{$t('Add')}}</el-button> <el-button type="primary" size="small" round :disabled="isDetails" @click="ok()" id="btnSubmit">{{$t('Add')}}</el-button>
</div> </div>
</div> </div>
</div> </div>

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

@ -17,7 +17,7 @@
<template> <template>
<div class="list-model" style="position: relative;"> <div class="list-model" style="position: relative;">
<div class="table-box"> <div class="table-box">
<el-table :data="list" size="mini" style="width: 100%" @selection-change="_arrDelChange" row-class-name="rows-workflow-definitions"> <el-table :data="list" size="mini" style="width: 100%" @selection-change="_arrDelChange" row-class-name="items">
<el-table-column type="selection" width="50" :selectable="selectable" class-name="select-all"></el-table-column> <el-table-column type="selection" width="50" :selectable="selectable" class-name="select-all"></el-table-column>
<el-table-column prop="id" :label="$t('#')" width="50"></el-table-column> <el-table-column prop="id" :label="$t('#')" width="50"></el-table-column>
<el-table-column :label="$t('Process Name')" min-width="200"> <el-table-column :label="$t('Process Name')" min-width="200">
@ -75,7 +75,7 @@
<span><el-button type="warning" size="mini" v-if="scope.row.releaseState === 'OFFLINE'" icon="el-icon-upload2" @click="_poponline(scope.row)" circle class="button-publish"></el-button></span> <span><el-button type="warning" size="mini" v-if="scope.row.releaseState === 'OFFLINE'" icon="el-icon-upload2" @click="_poponline(scope.row)" circle class="button-publish"></el-button></span>
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('offline')" placement="top" :enterable="false"> <el-tooltip :content="$t('offline')" placement="top" :enterable="false">
<span><el-button type="danger" size="mini" icon="el-icon-download" v-if="scope.row.releaseState === 'ONLINE'" @click="_downline(scope.row)" circle class="button-cancel-publish"></el-button></span> <span><el-button type="danger" size="mini" icon="el-icon-download" v-if="scope.row.releaseState === 'ONLINE'" @click="_downline(scope.row)" circle class="btn-cancel-publish"></el-button></span>
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('Copy Workflow')" placement="top" :enterable="false"> <el-tooltip :content="$t('Copy Workflow')" placement="top" :enterable="false">
<span><el-button type="primary" size="mini" :disabled="scope.row.releaseState === 'ONLINE'" icon="el-icon-document-copy" @click="_copyProcess(scope.row)" circle></el-button></span> <span><el-button type="primary" size="mini" :disabled="scope.row.releaseState === 'ONLINE'" icon="el-icon-document-copy" @click="_copyProcess(scope.row)" circle></el-button></span>
@ -115,7 +115,7 @@
:title="$t('Delete?')" :title="$t('Delete?')"
@onConfirm="_delete({},-1)" @onConfirm="_delete({},-1)"
> >
<el-button style="position: absolute; bottom: -48px; left: 19px;" type="primary" size="mini" :disabled="!strSelectCodes" slot="reference" class="button-delete-all">{{$t('Delete')}}</el-button> <el-button style="position: absolute; bottom: -48px; left: 19px;" type="primary" size="mini" :disabled="!strSelectCodes" slot="reference" class="btn-delete-all">{{$t('Delete')}}</el-button>
</el-popconfirm> </el-popconfirm>
</el-tooltip> </el-tooltip>
<el-button type="primary" size="mini" :disabled="!strSelectCodes" style="position: absolute; bottom: -48px; left: 80px;" @click="_batchExport(item)" >{{$t('Export')}}</el-button> <el-button type="primary" size="mini" :disabled="!strSelectCodes" style="position: absolute; bottom: -48px; left: 80px;" @click="_batchExport(item)" >{{$t('Export')}}</el-button>

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue

@ -191,7 +191,7 @@
</div> </div>
<div class="submit"> <div class="submit">
<el-button type="text" size="small" @click="close()"> {{$t('Cancel')}} </el-button> <el-button type="text" size="small" @click="close()"> {{$t('Cancel')}} </el-button>
<el-button type="primary" size="small" round :loading="spinnerLoading" @click="ok()" id="button-submit">{{spinnerLoading ? $t('Loading...') : $t('Start')}} </el-button> <el-button type="primary" size="small" round :loading="spinnerLoading" @click="ok()" id="btnSubmit">{{spinnerLoading ? $t('Loading...') : $t('Start')}} </el-button>
</div> </div>
</div> </div>
</template> </template>

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue

@ -20,7 +20,7 @@
<template slot="conditions"> <template slot="conditions">
<m-conditions @on-conditions="_onConditions"> <m-conditions @on-conditions="_onConditions">
<template slot="button-group"> <template slot="button-group">
<el-button size="mini" @click="() => this.$router.push({name: 'definition-create'})" id="button-create-process">{{$t('Create process')}}</el-button> <el-button size="mini" @click="() => this.$router.push({name: 'definition-create'})" id="btnCreateProcess">{{$t('Create process')}}</el-button>
<el-button size="mini" @click="_uploading">{{$t('Import process')}}</el-button> <el-button size="mini" @click="_uploading">{{$t('Import process')}}</el-button>
</template> </template>
</m-conditions> </m-conditions>

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@ -17,7 +17,7 @@
<template> <template>
<div class="list-model" style="position: relative;"> <div class="list-model" style="position: relative;">
<div class="table-box"> <div class="table-box">
<el-table class="fixed" :data="list" size="mini" style="width: 100%" @selection-change="_arrDelChange" row-class-name="rows-workflow-instances"> <el-table class="fixed" :data="list" size="mini" style="width: 100%" @selection-change="_arrDelChange" row-class-name="items-workflow-instances">
<el-table-column type="selection" width="50" class-name="select-all"></el-table-column> <el-table-column type="selection" width="50" class-name="select-all"></el-table-column>
<el-table-column prop="id" :label="$t('#')" width="50"></el-table-column> <el-table-column prop="id" :label="$t('#')" width="50"></el-table-column>
<el-table-column :label="$t('Process Name')" min-width="200"> <el-table-column :label="$t('Process Name')" min-width="200">
@ -80,7 +80,7 @@
</span> </span>
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('Rerun')" placement="top" :enterable="false"> <el-tooltip :content="$t('Rerun')" placement="top" :enterable="false">
<span><el-button type="primary" size="mini" :disabled="scope.row.state !== 'SUCCESS' && scope.row.state !== 'PAUSE' && scope.row.state !== 'FAILURE' && scope.row.state !== 'STOP'" icon="el-icon-refresh" @click="_reRun(scope.row,scope.$index)" circle class="button-rerun"></el-button></span> <span><el-button type="primary" size="mini" :disabled="scope.row.state !== 'SUCCESS' && scope.row.state !== 'PAUSE' && scope.row.state !== 'FAILURE' && scope.row.state !== 'STOP'" icon="el-icon-refresh" @click="_reRun(scope.row,scope.$index)" circle class="btn-rerun"></el-button></span>
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('Recovery Failed')" placement="top" :enterable="false"> <el-tooltip :content="$t('Recovery Failed')" placement="top" :enterable="false">
<span> <span>
@ -233,7 +233,7 @@
:title="$t('Delete?')" :title="$t('Delete?')"
@onConfirm="_delete({},-1)" @onConfirm="_delete({},-1)"
> >
<el-button style="position: absolute; bottom: -48px; left: 19px;" type="primary" size="mini" :disabled="!strDelete" slot="reference" class="button-delete-all">{{$t('Delete')}}</el-button> <el-button style="position: absolute; bottom: -48px; left: 19px;" type="primary" size="mini" :disabled="!strDelete" slot="reference" class="btn-delete-all">{{$t('Delete')}}</el-button>
</el-popconfirm> </el-popconfirm>
</el-tooltip> </el-tooltip>
</div> </div>

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue

@ -16,14 +16,14 @@
*/ */
<template> <template>
<m-popover ref="popover" :nameText="item ? $t('Edit') : $t('Create Project')" :ok-text="item ? $t('Edit') : $t('Submit')" <m-popover ref="popover" :nameText="item ? $t('Edit') : $t('Create Project')" :ok-text="item ? $t('Edit') : $t('Submit')"
@close="_close" @ok="_ok" ok-id="button-submit"> @close="_close" @ok="_ok" ok-id="btnSubmit">
<template slot="content"> <template slot="content">
<div class="projects-create-model"> <div class="projects-create-model">
<m-list-box-f> <m-list-box-f>
<template slot="name"><strong>*</strong>{{ $t('Project Name') }}</template> <template slot="name"><strong>*</strong>{{ $t('Project Name') }}</template>
<template slot="content"> <template slot="content">
<el-input <el-input
id="input-project-name" id="inputProjectName"
v-model="projectName" v-model="projectName"
:placeholder="$t('Please enter name')" :placeholder="$t('Please enter name')"
maxlength="60" maxlength="60"

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue

@ -17,7 +17,7 @@
<template> <template>
<div class="list-model"> <div class="list-model">
<div class="table-box"> <div class="table-box">
<el-table :data="list" size="mini" style="width: 100%" row-class-name="rows-project"> <el-table :data="list" size="mini" style="width: 100%" row-class-name="items-project">
<el-table-column type="index" :label="$t('#')" width="50"></el-table-column> <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
<el-table-column :label="$t('Project Name')"> <el-table-column :label="$t('Project Name')">
<template slot-scope="scope"> <template slot-scope="scope">

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue

@ -19,7 +19,7 @@
<template slot="conditions"> <template slot="conditions">
<m-conditions @on-conditions="_onConditions"> <m-conditions @on-conditions="_onConditions">
<template slot="button-group"> <template slot="button-group">
<el-button size="mini" @click="_create('')" id="button-create-project">{{ $t('Create Project') }}</el-button> <el-button size="mini" @click="_create('')" id="btnCreateProject">{{ $t('Create Project') }}</el-button>
<el-dialog <el-dialog
:title="item ? $t('Edit') : $t('Create Project')" :title="item ? $t('Edit') : $t('Create Project')"
v-if="createProjectDialog" v-if="createProjectDialog"

10
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue

@ -16,8 +16,8 @@
*/ */
<template> <template>
<m-popover <m-popover
okId="button-submit" okId="btnSubmit"
cancelId="button-cancel" cancelId="btnCancel"
ref="popover" ref="popover"
:ok-text="item ? $t('Edit') : $t('Submit')" :ok-text="item ? $t('Edit') : $t('Submit')"
@ok="_ok" @ok="_ok"
@ -28,7 +28,7 @@
<template slot="name"><strong>*</strong>{{$t('OS Tenant Code')}}</template> <template slot="name"><strong>*</strong>{{$t('OS Tenant Code')}}</template>
<template slot="content"> <template slot="content">
<el-input <el-input
id="input-tenant-code" id="inputTenantCode"
type="input" type="input"
:disabled="item ? true : false" :disabled="item ? true : false"
v-model="tenantCode" v-model="tenantCode"
@ -43,7 +43,7 @@
<template slot="content"> <template slot="content">
<el-select v-model="queueId" size="small"> <el-select v-model="queueId" size="small">
<el-option <el-option
id="select-queue" id="selectQueue"
v-for="city in queueList" v-for="city in queueList"
:key="city.id" :key="city.id"
:value="city.id" :value="city.id"
@ -56,7 +56,7 @@
<template slot="name">{{$t('Description')}}</template> <template slot="name">{{$t('Description')}}</template>
<template slot="content"> <template slot="content">
<el-input <el-input
id="input-description" id="inputDescription"
type="textarea" type="textarea"
v-model="description" v-model="description"
size="small" size="small"

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue

@ -17,7 +17,7 @@
<template> <template>
<div class="list-model"> <div class="list-model">
<div class="table-box"> <div class="table-box">
<el-table :data="list" size="mini" style="width: 100%" row-class-name="rows-tenant"> <el-table :data="list" size="mini" style="width: 100%" row-class-name="items">
<el-table-column type="index" :label="$t('#')" width="50"></el-table-column> <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
<el-table-column prop="tenantCode" :label="$t('OS Tenant Code')" min-width="100"></el-table-column> <el-table-column prop="tenantCode" :label="$t('OS Tenant Code')" min-width="100"></el-table-column>
<el-table-column :label="$t('Description')" min-width="100"> <el-table-column :label="$t('Description')" min-width="100">

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue

@ -19,7 +19,7 @@
<template slot="conditions"> <template slot="conditions">
<m-conditions @on-conditions="_onConditions"> <m-conditions @on-conditions="_onConditions">
<template slot="button-group" v-if="isADMIN"> <template slot="button-group" v-if="isADMIN">
<el-button id="button-create-tenant" size="mini" @click="_create('')">{{$t('Create Tenant')}}</el-button> <el-button id="btnCreateTenant" size="mini" @click="_create('')">{{$t('Create Tenant')}}</el-button>
<el-dialog <el-dialog
:title="item ? $t('Edit Tenant') : $t('Create Tenant')" :title="item ? $t('Edit Tenant') : $t('Create Tenant')"
v-if="createTenementDialog" v-if="createTenementDialog"

6
dolphinscheduler-ui/src/js/conf/login/App.vue

@ -24,7 +24,7 @@
<label>{{$t('User Name')}}</label> <label>{{$t('User Name')}}</label>
<div> <div>
<el-input <el-input
id="input-username" id="inputUsername"
type="text" type="text"
v-model.trim="userName" v-model.trim="userName"
:placeholder="$t('Please enter user name')" :placeholder="$t('Please enter user name')"
@ -40,7 +40,7 @@
<label>{{$t('Password')}}</label> <label>{{$t('Password')}}</label>
<div> <div>
<el-input <el-input
id="input-password" id="inputPassword"
type="password" type="password"
v-model="userPassword" v-model="userPassword"
:placeholder="$t('Please enter your password')" :placeholder="$t('Please enter your password')"
@ -53,7 +53,7 @@
</p> </p>
</div> </div>
<div class="list" style="margin-top: 10px;"> <div class="list" style="margin-top: 10px;">
<el-button id="button-login" style="width: 365px" type="primary" round :loading="spinnerLoading" long @click="_ok">{{spinnerLoading ? $t('Loading...') : ` ${$t('Login')} `}} </el-button> <el-button id="btnLogin" style="width: 365px" type="primary" round :loading="spinnerLoading" long @click="_ok">{{spinnerLoading ? $t('Loading...') : ` ${$t('Login')} `}} </el-button>
</div> </div>
</div> </div>
</div> </div>

4
dolphinscheduler-ui/src/js/module/components/nav/nav.vue

@ -29,7 +29,7 @@
</div> </div>
<div class="clearfix list"> <div class="clearfix list">
<div class="nav-links"> <div class="nav-links">
<router-link :to="{ path: '/projects'}" tag="a" active-class="active" id="project-tab"> <router-link :to="{ path: '/projects'}" tag="a" active-class="active" id="tabProject">
<span><em class="ansiconfont el-icon-tickets"></em>{{$t('Project Manage')}}</span><strong></strong> <span><em class="ansiconfont el-icon-tickets"></em>{{$t('Project Manage')}}</span><strong></strong>
</router-link> </router-link>
</div> </div>
@ -57,7 +57,7 @@
</div> </div>
<div class="clearfix list" > <div class="clearfix list" >
<div class="nav-links"> <div class="nav-links">
<router-link :to="{ path: '/security'}" tag="a" active-class="active" v-ps="['ADMIN_USER']" id="security-tab"> <router-link :to="{ path: '/security'}" tag="a" active-class="active" v-ps="['ADMIN_USER']" id="tabSecurity">
<span><em class="ansfont ri-shield-check-line"></em>{{$t('Security')}}</span><strong></strong> <span><em class="ansfont ri-shield-check-line"></em>{{$t('Security')}}</span><strong></strong>
</router-link> </router-link>
</div> </div>

6
dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js

@ -52,14 +52,14 @@ const menu = {
path: 'definition', path: 'definition',
id: 0, id: 0,
enabled: true, enabled: true,
classNames: 'process-definition' classNames: 'tab-process-definition'
}, },
{ {
name: `${i18n.$t('Process Instance')}`, name: `${i18n.$t('Process Instance')}`,
path: 'instance', path: 'instance',
id: 1, id: 1,
enabled: true, enabled: true,
classNames: 'process-instance' classNames: 'tab-process-instance'
}, },
{ {
name: `${i18n.$t('Task Instance')}`, name: `${i18n.$t('Task Instance')}`,
@ -98,7 +98,7 @@ const menu = {
enabled: true, enabled: true,
icon: 'el-icon-user-solid', icon: 'el-icon-user-solid',
children: [], children: [],
classNames: 'tenant-manage' classNames: 'tab-tenant-manage'
}, },
{ {
name: `${i18n.$t('User Manage')}`, name: `${i18n.$t('User Manage')}`,

Loading…
Cancel
Save