Fix EditUser submit bug

jsx/src/components/AddUser/AddUser.pre.jsx

@@ -36,14 +36,7 @@ const AddUser = (props) => {
                       type="checkbox"
                       value=""
                       id="admin-check"
-                      onChange={(e) =>
+                      onChange={(e) => setAdmin(e.target.checked)}
-                        // this.setState(
-                        //   Object.assign({}, this.state, {
-                        //     admin: e.target.checked,
-                        //   })
-                        // )
-                        setAdmin(e.target.checked)
-                      }
                     />
                     <span> </span>
                     <label className="form-check-label">Admin</label>

jsx/src/components/EditUser/EditUser.js

@@ -12,9 +12,7 @@ const withUserAPI = withProps((props) => ({
   deleteUser: (username) => jhapiRequest("/users/" + username, "DELETE"),
   failRegexEvent: () =>
     alert(
-      "Removed " +
+      "Cannot change username - either contains special characters or is too short."
-        JSON.stringify(removed_users) +
-        " for either containing special characters or being too short."
     ),
   refreshUserData: () =>
     jhapiRequest("/users", "GET")

jsx/src/components/EditUser/EditUser.pre.jsx

@@ -79,24 +79,34 @@ const EditUser = (props) => {
                   id="submit"
                   className="btn btn-primary"
                   onClick={() => {
-                    if (updatedUsername == "" && admin == has_admin) return;
+                    if (updatedUsername == "" && admin == has_admin) {
-                    if (
+                      return;
-                      updatedUsername.length > 2 &&
+                    } else if (updatedUsername != "") {
-                      /[!@#$%^&*(),.?":{}|<>]/g.test(updatedUsername) == false
+                      if (
-                    ) {
+                        updatedUsername.length > 2 &&
-                      editUser(
+                        /[!@#$%^&*(),.?":{}|<>]/g.test(updatedUsername) == false
-                        username,
+                      ) {
-                        updatedUsername != "" ? updatedUsername : username,
+                        editUser(
-                        admin
+                          username,
-                      )
+                          updatedUsername != "" ? updatedUsername : username,
+                          admin
+                        )
+                          .then((data) => {
+                            history.push("/");
+                            refreshUserData();
+                          })
+                          .catch((err) => {});
+                      } else {
+                        setUpdatedUsername("");
+                        failRegexEvent();
+                      }
+                    } else {
+                      editUser(username, username, admin)
                         .then((data) => {
                           history.push("/");
                           refreshUserData();
                         })
                         .catch((err) => {});
-                    } else {
-                      setUpdatedUsername(null);
-                      failRegexEvent();
                     }
                   }}
                 >