From b69c06960e598177148a936045bcdbe52df8207a Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 21 Dec 2018 13:41:34 +0100
Subject: [PATCH] added icons to navigation

---
 .../ui-components/src/navigation/NavAction.js         | 11 +++++++++--
 .../packages/ui-components/src/navigation/NavLink.js  | 11 ++++++++++-
 .../groups/components/navLinks/DeleteGroupNavLink.js  |  2 +-
 .../groups/components/navLinks/EditGroupNavLink.js    |  2 +-
 scm-ui/src/groups/containers/SingleGroup.js           |  3 ++-
 scm-ui/src/repos/components/DeleteNavAction.js        |  2 +-
 .../users/components/navLinks/DeleteUserNavLink.js    |  2 +-
 .../src/users/components/navLinks/EditUserNavLink.js  |  2 +-
 scm-ui/src/users/containers/SingleUser.js             |  1 +
 9 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/navigation/NavAction.js b/scm-ui-components/packages/ui-components/src/navigation/NavAction.js
index 5eacbb7407..3ae30d4b68 100644
--- a/scm-ui-components/packages/ui-components/src/navigation/NavAction.js
+++ b/scm-ui-components/packages/ui-components/src/navigation/NavAction.js
@@ -2,16 +2,23 @@
 import React from "react";
 
 type Props = {
+  icon?: string,
   label: string,
   action: () => void
 };
 
 class NavAction extends React.Component<Props> {
   render() {
-    const { label, action } = this.props;
+    const { label, icon, action } = this.props;
+
+    let showIcon = null;
+    if (icon) {
+      showIcon = (<><i className={icon}></i>{" "}</>);
+    }
+
     return (
       <li>
-        <a onClick={action}>{label}</a>
+        <a onClick={action}>{showIcon}{label}</a>
       </li>
     );
   }
diff --git a/scm-ui-components/packages/ui-components/src/navigation/NavLink.js b/scm-ui-components/packages/ui-components/src/navigation/NavLink.js
index 9a7c72adb1..53b124ef31 100644
--- a/scm-ui-components/packages/ui-components/src/navigation/NavLink.js
+++ b/scm-ui-components/packages/ui-components/src/navigation/NavLink.js
@@ -6,6 +6,7 @@ import {Link, Route} from "react-router-dom";
 
 type Props = {
   to: string,
+  icon?: string,
   label: string,
   activeOnlyWhenExact?: boolean,
   activeWhenMatch?: (route: any) => boolean
@@ -23,10 +24,17 @@ class NavLink extends React.Component<Props> {
   }
 
   renderLink = (route: any) => {
-    const { to, label } = this.props;
+    const { to, icon, label } = this.props;
+
+    let showIcon = null;
+    if (icon) {
+      showIcon = (<><i className={icon}></i>{" "}</>);
+    }
+
     return (
       <li>
         <Link className={this.isActive(route) ? "is-active" : ""} to={to}>
+          {showIcon}
           {label}
         </Link>
       </li>
@@ -35,6 +43,7 @@ class NavLink extends React.Component<Props> {
 
   render() {
     const { to, activeOnlyWhenExact } = this.props;
+
     return (
       <Route path={to} exact={activeOnlyWhenExact} children={this.renderLink} />
     );
diff --git a/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js b/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js
index 45bbdd3026..8021e468b3 100644
--- a/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js
+++ b/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js
@@ -49,7 +49,7 @@ export class DeleteGroupNavLink extends React.Component<Props> {
     if (!this.isDeletable()) {
       return null;
     }
-    return <NavAction label={t("delete-group-button.label")} action={action} />;
+    return <NavAction icon="fas fa-times" label={t("delete-group-button.label")} action={action} />;
   }
 }
 
diff --git a/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js b/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js
index a0e36bc8d7..8cb46f691d 100644
--- a/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js
+++ b/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js
@@ -18,7 +18,7 @@ class EditGroupNavLink extends React.Component<Props, State> {
     if (!this.isEditable()) {
       return null;
     }
-    return <NavLink label={t("edit-group-button.label")} to={editUrl} />;
+    return <NavLink icon="fas fa-cog" label={t("edit-group-button.label")} to={editUrl} />;
   }
 
   isEditable = () => {
diff --git a/scm-ui/src/groups/containers/SingleGroup.js b/scm-ui/src/groups/containers/SingleGroup.js
index 1dd4aa569f..6a626f325b 100644
--- a/scm-ui/src/groups/containers/SingleGroup.js
+++ b/scm-ui/src/groups/containers/SingleGroup.js
@@ -109,6 +109,7 @@ class SingleGroup extends React.Component<Props> {
                 <NavLink
                   to={`${url}`}
                   label={t("single-group.information-label")}
+                  icon={"fas fa-info-circle"}
                 />
               </Section>
               <Section label={t("single-group.actions-label")}>
@@ -117,7 +118,7 @@ class SingleGroup extends React.Component<Props> {
                   deleteGroup={this.deleteGroup}
                 />
                 <EditGroupNavLink group={group} editUrl={`${url}/edit`} />
-                <NavLink to="/groups" label={t("single-group.back-label")} />
+                <NavLink to="/groups" label={t("single-group.back-label")} icon={"fas fa-undo-alt"} />
               </Section>
             </Navigation>
           </div>
diff --git a/scm-ui/src/repos/components/DeleteNavAction.js b/scm-ui/src/repos/components/DeleteNavAction.js
index c2369a5bfb..2d00b99bd4 100644
--- a/scm-ui/src/repos/components/DeleteNavAction.js
+++ b/scm-ui/src/repos/components/DeleteNavAction.js
@@ -51,7 +51,7 @@ class DeleteNavAction extends React.Component<Props> {
     if (!this.isDeletable()) {
       return null;
     }
-    return <NavAction label={t("delete-nav-action.label")} action={action} />;
+    return <NavAction icon="fas fa-times" label={t("delete-nav-action.label")} action={action} />;
   }
 }
 
diff --git a/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js b/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js
index 47fdae0f92..80c355e999 100644
--- a/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js
+++ b/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js
@@ -49,7 +49,7 @@ class DeleteUserNavLink extends React.Component<Props> {
     if (!this.isDeletable()) {
       return null;
     }
-    return <NavAction label={t("delete-user-button.label")} action={action} />;
+    return <NavAction icon="fas fa-times" label={t("delete-user-button.label")} action={action} />;
   }
 }
 
diff --git a/scm-ui/src/users/components/navLinks/EditUserNavLink.js b/scm-ui/src/users/components/navLinks/EditUserNavLink.js
index 9999428212..3632f8da51 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 icon="fas fa-cog" label={t("edit-user-button.label")} to={editUrl} />;
   }
 
   isEditable = () => {
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index 5f20598962..b6660f2aef 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -111,6 +111,7 @@ class SingleUser extends React.Component<Props> {
             <Navigation>
               <Section label={t("single-user.navigation-label")}>
                 <NavLink
+                  icon="fas fa-info-circle"
                   to={`${url}`}
                   label={t("single-user.information-label")}
                 />