You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by zh...@apache.org on 2022/03/28 09:55:23 UTC
[dolphinscheduler] branch dev updated: [Fix][UI Next][V1.0.0-Alpha] Fix the cannot update tenant individually on user info site. (#9237)
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 0d0674d [Fix][UI Next][V1.0.0-Alpha] Fix the cannot update tenant individually on user info site. (#9237)
0d0674d is described below
commit 0d0674df1f78d666fc7c2155629627380aa0a9b1
Author: songjianet <17...@qq.com>
AuthorDate: Mon Mar 28 17:55:15 2022 +0800
[Fix][UI Next][V1.0.0-Alpha] Fix the cannot update tenant individually on user info site. (#9237)
---
.../e2e/cases/FileManageE2ETest.java | 2 +-
.../e2e/cases/FunctionManageE2ETest.java | 2 +-
.../e2e/cases/UdfManageE2ETest.java | 2 +-
.../dolphinscheduler/e2e/cases/UserE2ETest.java | 2 +-
.../e2e/cases/WorkflowE2ETest.java | 2 +-
.../e2e/pages/security/UserPage.java | 4 +---
.../user-manage/components/user-detail-modal.tsx | 26 +++++++++++++---------
7 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java
index c2b90b1..d968228 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java
@@ -101,7 +101,7 @@ public class FileManageE2ETest {
new WebDriverWait(userPage.driver(), 20).until(ExpectedConditions.visibilityOfElementLocated(
new By.ByClassName("name")));
- userPage.update(user, user, password, email, phone, tenant)
+ userPage.update(user, user, email, phone, tenant)
.goToNav(ResourcePage.class)
.goToTab(FileManagePage.class);
}
diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java
index a810d6b..a943435 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java
@@ -102,7 +102,7 @@ public class FunctionManageE2ETest {
new WebDriverWait(userPage.driver(), 20).until(ExpectedConditions.visibilityOfElementLocated(
new By.ByClassName("name")));
- UdfManagePage udfManagePage = userPage.update(user, user, password, email, phone, tenant)
+ UdfManagePage udfManagePage = userPage.update(user, user, email, phone, tenant)
.goToNav(ResourcePage.class)
.goToTab(UdfManagePage.class)
.uploadFile(testUploadUdfFilePath.toFile().getAbsolutePath());
diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java
index f8717da..fdb531e 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java
@@ -97,7 +97,7 @@ public class UdfManageE2ETest {
new WebDriverWait(userPage.driver(), 20).until(ExpectedConditions.visibilityOfElementLocated(
new By.ByClassName("name")));
- userPage.update(user, user, password, email, phone, tenant)
+ userPage.update(user, user, email, phone, tenant)
.goToNav(ResourcePage.class)
.goToTab(UdfManagePage.class);
}
diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java
index 4414be9..35f98b2 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java
@@ -122,7 +122,7 @@ class UserE2ETest {
browser.navigate().refresh();
- page.update(user, editUser, editPassword, editEmail, editPhone, tenant);
+ page.update(user, editUser, editEmail, editPhone, tenant);
await().untilAsserted(() -> {
browser.navigate().refresh();
diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
index 5f75df6..89c1914 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
@@ -74,7 +74,7 @@ class WorkflowE2ETest {
new WebDriverWait(userPage.driver(), 20).until(ExpectedConditions.visibilityOfElementLocated(
new By.ByClassName("name")));
- userPage.update(user, user, password, email, phone, tenant)
+ userPage.update(user, user, email, phone, tenant)
.goToNav(ProjectPage.class)
.create(project)
;
diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java
index b5784b6..0fcc488 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java
@@ -83,7 +83,7 @@ public final class UserPage extends NavBarPage implements SecurityPage.Tab {
return this;
}
- public UserPage update(String user, String editUser, String editPassword, String editEmail, String editPhone,
+ public UserPage update(String user, String editUser, String editEmail, String editPhone,
String tenant) {
userList().stream()
.filter(it -> it.findElement(By.className("name")).getAttribute("innerHTML").contains(user))
@@ -97,8 +97,6 @@ public final class UserPage extends NavBarPage implements SecurityPage.Tab {
editUserForm().inputUserName().sendKeys(Keys.BACK_SPACE);
editUserForm().inputUserName().sendKeys(editUser);
- editUserForm().inputUserPassword().sendKeys(editPassword);
-
createUserForm().btnSelectTenantDropdown().click();
new WebDriverWait(driver, 5).until(ExpectedConditions.visibilityOfElementLocated(new By.ByClassName(
diff --git a/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx b/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx
index 1db19ca..e693fbf 100644
--- a/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx
@@ -112,17 +112,21 @@ export const UserModal = defineComponent({
placeholder={t('security.user.username_tips')}
/>
</NFormItem>
- <NFormItem
- label={t('security.user.user_password')}
- path='userPassword'
- >
- <NInput
- class='input-password'
- type='password'
- v-model:value={this.formData.userPassword}
- placeholder={t('security.user.user_password_tips')}
- />
- </NFormItem>
+ {
+ !this.currentRecord?.id && (
+ <NFormItem
+ label={t('security.user.user_password')}
+ path='userPassword'
+ >
+ <NInput
+ class='input-password'
+ type='password'
+ v-model:value={this.formData.userPassword}
+ placeholder={t('security.user.user_password_tips')}
+ />
+ </NFormItem>
+ )
+ }
{this.IS_ADMIN && (
<NFormItem label={t('security.user.tenant_code')} path='tenantId'>
<NSelect