remove password fields if user is edited

scm-ui/src/repos/containers/RepositoryRoot.js

@@ -1,19 +1,32 @@
 //@flow
 import React from "react";
-import {deleteRepo, fetchRepo, getFetchRepoFailure, getRepository, isFetchRepoPending} from "../modules/repos";
+import {
+  deleteRepo,
+  fetchRepo,
+  getFetchRepoFailure,
+  getRepository,
+  isFetchRepoPending
+} from "../modules/repos";
 
-import {connect} from "react-redux";
+import { connect } from "react-redux";
-import {Route, Switch} from "react-router-dom";
+import { Route, Switch } from "react-router-dom";
-import type {Repository} from "@scm-manager/ui-types";
+import type { Repository } from "@scm-manager/ui-types";
 
-import {ErrorPage, Loading, Navigation, NavLink, Page, Section} from "@scm-manager/ui-components";
+import {
-import {translate} from "react-i18next";
+  ErrorPage,
+  Loading,
+  Navigation,
+  NavLink,
+  Page,
+  Section
+} from "@scm-manager/ui-components";
+import { translate } from "react-i18next";
 import RepositoryDetails from "../components/RepositoryDetails";
 import DeleteNavAction from "../components/DeleteNavAction";
 import Edit from "../containers/Edit";
 import Permissions from "../permissions/containers/Permissions";
 
-import type {History} from "history";
+import type { History } from "history";
 import EditNavLink from "../components/EditNavLink";
 
 import BranchRoot from "./ChangesetsRoot";

scm-ui/src/users/components/UserForm.js

@@ -89,6 +89,7 @@ class UserForm extends React.Component<Props, State> {
     const user = this.state.user;
 
     let nameField = null;
+    let passwordFields = null;
     if (!this.props.user) {
       nameField = (
         <InputField
@@ -100,6 +101,28 @@ class UserForm extends React.Component<Props, State> {
           helpText={t("help.usernameHelpText")}
         />
       );
+      passwordFields = (
+        <>
+          <InputField
+            label={t("user.password")}
+            type="password"
+            onChange={this.handlePasswordChange}
+            value={user ? user.password : ""}
+            validationError={this.state.validatePasswordError}
+            errorMessage={t("validation.password-invalid")}
+            helpText={t("help.passwordHelpText")}
+          />
+          <InputField
+            label={t("validation.validatePassword")}
+            type="password"
+            onChange={this.handlePasswordValidationChange}
+            value={this.state ? this.state.validatePassword : ""}
+            validationError={this.state.passwordValidationError}
+            errorMessage={t("validation.passwordValidation-invalid")}
+            helpText={t("help.passwordConfirmHelpText")}
+          />
+        </>
+      );
     }
     return (
       <form onSubmit={this.submit}>
@@ -120,24 +143,7 @@ class UserForm extends React.Component<Props, State> {
           errorMessage={t("validation.mail-invalid")}
           helpText={t("help.mailHelpText")}
         />
-        <InputField
+        {passwordFields}
-          label={t("user.password")}
-          type="password"
-          onChange={this.handlePasswordChange}
-          value={user ? user.password : ""}
-          validationError={this.state.validatePasswordError}
-          errorMessage={t("validation.password-invalid")}
-          helpText={t("help.passwordHelpText")}
-        />
-        <InputField
-          label={t("validation.validatePassword")}
-          type="password"
-          onChange={this.handlePasswordValidationChange}
-          value={this.state ? this.state.validatePassword : ""}
-          validationError={this.state.passwordValidationError}
-          errorMessage={t("validation.passwordValidation-invalid")}
-          helpText={t("help.passwordConfirmHelpText")}
-        />
         <Checkbox
           label={t("user.admin")}
           onChange={this.handleAdminChange}