From af164d31f435f1ff8b54d589d84af9adc8f67fe5 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 18 Jan 2019 09:51:27 +0100
Subject: [PATCH] updated user navigation

---
 scm-ui/public/locales/en/users.json                | 14 ++++----------
 .../users/components/navLinks/EditUserNavLink.js   |  2 +-
 .../components/navLinks/SetPasswordNavLink.js      |  2 +-
 scm-ui/src/users/containers/SingleUser.js          |  8 ++------
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index 2a9ee7b79d..e7a637bc2b 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -26,12 +26,6 @@
       "cancel": "No"
     }
   },
-  "edit-user-button": {
-    "label": "Edit"
-  },
-  "set-password-button": {
-    "label": "Set password"
-  },
   "user-form": {
     "submit": "Submit"
   },
@@ -42,10 +36,10 @@
   "single-user": {
     "error-title": "Error",
     "error-subtitle": "Unknown user error",
-    "navigation-label": "Navigation",
-    "actions-label": "Actions",
-    "information-label": "Information",
-    "back-label": "Back"
+    "navigationLabel": "User Navigation",
+    "informationNavLink": "Information",
+    "editNavLink": "Edit",
+    "setPasswordNavLink": "Set password"
   },
   "validation": {
     "mail-invalid": "This email is invalid",
diff --git a/scm-ui/src/users/components/navLinks/EditUserNavLink.js b/scm-ui/src/users/components/navLinks/EditUserNavLink.js
index 9999428212..3689b445d8 100644
--- a/scm-ui/src/users/components/navLinks/EditUserNavLink.js
+++ b/scm-ui/src/users/components/navLinks/EditUserNavLink.js
@@ -17,7 +17,7 @@ class EditUserNavLink extends React.Component<Props> {
     if (!this.isEditable()) {
       return null;
     }
-    return <NavLink label={t("edit-user-button.label")} to={editUrl} />;
+    return <NavLink label={t("single-user.editNavLink")} to={editUrl} />;
   }
 
   isEditable = () => {
diff --git a/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js b/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js
index 43b7a4b5a4..e9f28d841e 100644
--- a/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js
+++ b/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js
@@ -17,7 +17,7 @@ class ChangePasswordNavLink extends React.Component<Props> {
     if (!this.hasPermissionToSetPassword()) {
       return null;
     }
-    return <NavLink label={t("set-password-button.label")} to={passwordUrl} />;
+    return <NavLink label={t("single-user.setPasswordNavLink")} to={passwordUrl} />;
   }
 
   hasPermissionToSetPassword = () => {
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index 5f20598962..c980585141 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -109,10 +109,10 @@ class SingleUser extends React.Component<Props> {
           </div>
           <div className="column">
             <Navigation>
-              <Section label={t("single-user.navigation-label")}>
+              <Section label={t("single-user.navigationLabel")}>
                 <NavLink
                   to={`${url}`}
-                  label={t("single-user.information-label")}
+                  label={t("single-user.informationNavLink")}
                 />
                 <EditUserNavLink user={user} editUrl={`${url}/edit`} />
                 <SetPasswordNavLink
@@ -120,10 +120,6 @@ class SingleUser extends React.Component<Props> {
                   passwordUrl={`${url}/password`}
                 />
               </Section>
-              <Section label={t("single-user.actions-label")}>
-                <DeleteUserNavLink user={user} deleteUser={this.deleteUser} />
-                <NavLink to="/users" label={t("single-user.back-label")} />
-              </Section>
             </Navigation>
           </div>
         </div>