merge branch heads

scm-ui/src/groups/components/UserNameTable.js

@@ -2,6 +2,7 @@
 import React from "react";
 import Button from "../../components/buttons/Button"
 import { translate } from "react-i18next"
+import RemoveUserButton from "./buttons/RemoveUserButton";
 
 type Props = {
   users: string[];
@@ -26,11 +27,7 @@ class UserNameTable extends React.Component<Props, State> {
                 <tr key={user}>
                   <td key={user}>{user}</td>
                   <td>
-                    <Button
+                    <RemoveUserButton username={user} removeUser={this.removeUser} />
-                      label={t("remove-user-button.label")}
-                      action={this.removeUser.bind(this, user)}
-                      key={user}
-                    />
                   </td>
                 </tr>
               );
@@ -41,9 +38,8 @@ class UserNameTable extends React.Component<Props, State> {
     );
   }
 
-  removeUser(user: string, event: Event) {
+  removeUser = (username: string) => {
-    event.preventDefault();
+    const newUsers = this.props.users.filter(name => name !== username);
-    const newUsers = this.props.users.filter(name => name !== user);
     this.props.userListChanged(newUsers);
   }
 }

scm-ui/src/groups/components/buttons/RemoveUserButton.js

@@ -0,0 +1,34 @@
+//@flow
+import React from "react";
+import { DeleteButton } from "../../../components/buttons";
+import { translate } from "react-i18next";
+import classNames from "classnames";
+
+type Props = {
+  t: string => string,
+  username: string,
+  removeUser: string => void
+};
+
+type State = {};
+
+
+
+class RemoveUserButton extends React.Component<Props, State> {
+  render() {
+    const { t , username, removeUser} = this.props;
+    return (
+      <div className={classNames("is-pulled-right")}>
+        <DeleteButton
+          label={t("remove-user-button.label")}
+          action={(event: Event) => {
+            event.preventDefault();
+            removeUser(username);
+          }}
+        />
+      </div>
+    );
+  }
+}
+
+export default translate("groups")(RemoveUserButton);