Pārlūkot izejas kodu

[Fix][UI Next][V1.0.0-Alpha] Fix the cannot update tenant individually on user info site. (#9237)

songjianet 3 gadi atpakaļ
vecāks
revīzija
0d0674df1f

+ 1 - 1
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);
     }

+ 1 - 1
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());

+ 1 - 1
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);
     }

+ 1 - 1
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();

+ 1 - 1
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)
         ;

+ 1 - 3
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(

+ 15 - 11
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