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 c2b90b1d77..d9682282e9 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 a810d6b08e..a94343576c 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 f8717da346..fdb531eead 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 4414be9523..35f98b2e71 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 5f75df621d..89c1914b95 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 b5784b6538..0fcc488c3d 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 1db19ca7b4..e693fbf3f1 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')} /> - - - + { + !this.currentRecord?.id && ( + + + + ) + } {this.IS_ADMIN && (