From 71fc38dd1d6ae7d7915e5e8cb8ae458ccff34dfb Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 18 Jan 2019 13:42:11 +0100
Subject: [PATCH] first try on delete user

---
 scm-ui/public/locales/en/users.json                |  3 ++-
 .../DeleteUserNavLink.js => DeleteUser.js}         |  8 ++++----
 ...eleteUserNavLink.test.js => DeleteUser.test.js} | 14 +++++++-------
 scm-ui/src/users/components/UserForm.js            |  4 ++++
 scm-ui/src/users/components/navLinks/index.js      |  1 -
 scm-ui/src/users/containers/SingleUser.js          |  1 -
 6 files changed, 17 insertions(+), 14 deletions(-)
 rename scm-ui/src/users/components/{navLinks/DeleteUserNavLink.js => DeleteUser.js} (81%)
 rename scm-ui/src/users/components/{navLinks/DeleteUserNavLink.test.js => DeleteUser.test.js} (82%)

diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index cb08387ef2..efcfab95b7 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -27,7 +27,8 @@
     }
   },
   "user-form": {
-    "submit": "Submit"
+    "submit": "Submit",
+    "deleteUser": "Delete User"
   },
   "add-user": {
     "title": "Create User",
diff --git a/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js b/scm-ui/src/users/components/DeleteUser.js
similarity index 81%
rename from scm-ui/src/users/components/navLinks/DeleteUserNavLink.js
rename to scm-ui/src/users/components/DeleteUser.js
index 47fdae0f92..4037f5bed6 100644
--- a/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js
+++ b/scm-ui/src/users/components/DeleteUser.js
@@ -2,7 +2,7 @@
 import React from "react";
 import { translate } from "react-i18next";
 import type { User } from "@scm-manager/ui-types";
-import { NavAction, confirmAlert } from "@scm-manager/ui-components";
+import { DeleteButton, confirmAlert } from "@scm-manager/ui-components";
 
 type Props = {
   user: User,
@@ -11,7 +11,7 @@ type Props = {
   deleteUser: (user: User) => void
 };
 
-class DeleteUserNavLink extends React.Component<Props> {
+class DeleteUser extends React.Component<Props> {
   static defaultProps = {
     confirmDialog: true
   };
@@ -49,8 +49,8 @@ class DeleteUserNavLink extends React.Component<Props> {
     if (!this.isDeletable()) {
       return null;
     }
-    return <NavAction label={t("delete-user-button.label")} action={action} />;
+    return <DeleteButton label={t("user-form.deleteUser")} action={action} />;
   }
 }
 
-export default translate("users")(DeleteUserNavLink);
+export default translate("users")(DeleteUser);
diff --git a/scm-ui/src/users/components/navLinks/DeleteUserNavLink.test.js b/scm-ui/src/users/components/DeleteUser.test.js
similarity index 82%
rename from scm-ui/src/users/components/navLinks/DeleteUserNavLink.test.js
rename to scm-ui/src/users/components/DeleteUser.test.js
index 500235ab94..55c49c6648 100644
--- a/scm-ui/src/users/components/navLinks/DeleteUserNavLink.test.js
+++ b/scm-ui/src/users/components/DeleteUser.test.js
@@ -1,8 +1,8 @@
 import React from "react";
 import { mount, shallow } from "enzyme";
-import "../../../tests/enzyme";
+import "../../tests/enzyme";
 import "../../../tests/i18n";
-import DeleteUserNavLink from "./DeleteUserNavLink";
+import DeleteUser from "../DeleteUser";
 
 import { confirmAlert } from "@scm-manager/ui-components";
 jest.mock("@scm-manager/ui-components", () => ({
@@ -10,14 +10,14 @@ jest.mock("@scm-manager/ui-components", () => ({
   NavAction: require.requireActual("@scm-manager/ui-components").NavAction
 }));
 
-describe("DeleteUserNavLink", () => {
+describe("DeleteUser", () => {
   it("should render nothing, if the delete link is missing", () => {
     const user = {
       _links: {}
     };
 
     const navLink = shallow(
-      <DeleteUserNavLink user={user} deleteUser={() => {}} />
+      <DeleteUser user={user} deleteUser={() => {}} />
     );
     expect(navLink.text()).toBe("");
   });
@@ -32,7 +32,7 @@ describe("DeleteUserNavLink", () => {
     };
 
     const navLink = mount(
-      <DeleteUserNavLink user={user} deleteUser={() => {}} />
+      <DeleteUser user={user} deleteUser={() => {}} />
     );
     expect(navLink.text()).not.toBe("");
   });
@@ -47,7 +47,7 @@ describe("DeleteUserNavLink", () => {
     };
 
     const navLink = mount(
-      <DeleteUserNavLink user={user} deleteUser={() => {}} />
+      <DeleteUser user={user} deleteUser={() => {}} />
     );
     navLink.find("a").simulate("click");
 
@@ -69,7 +69,7 @@ describe("DeleteUserNavLink", () => {
     }
 
     const navLink = mount(
-      <DeleteUserNavLink
+      <DeleteUser
         user={user}
         confirmDialog={false}
         deleteUser={capture}
diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index 2d3a519f15..dde5d9bf18 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -10,6 +10,7 @@ import {
   validation as validator
 } from "@scm-manager/ui-components";
 import * as userValidator from "./userValidation";
+import DeleteUser from "./DeleteUser";
 
 type Props = {
   submitForm: User => void,
@@ -153,6 +154,9 @@ class UserForm extends React.Component<Props, State> {
               label={t("user-form.submit")}
             />
           </div>
+          <div className="column">
+            <DeleteUser user={user} />
+          </div>
         </div>
       </form>
     );
diff --git a/scm-ui/src/users/components/navLinks/index.js b/scm-ui/src/users/components/navLinks/index.js
index a6d8370c00..64f7536c4c 100644
--- a/scm-ui/src/users/components/navLinks/index.js
+++ b/scm-ui/src/users/components/navLinks/index.js
@@ -1,3 +1,2 @@
-export { default as DeleteUserNavLink } from "./DeleteUserNavLink";
 export { default as EditUserNavLink } from "./EditUserNavLink";
 export { default as SetPasswordNavLink } from "./SetPasswordNavLink";
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index c8e3990f6d..6fb3ccfd37 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -26,7 +26,6 @@ import {
 } from "../modules/users";
 
 import {
-  DeleteUserNavLink,
   EditUserNavLink,
   SetPasswordNavLink
 } from "./../components/navLinks";