From 27f02c7e8773c267a6ab53f89523d5b2bfd99ed0 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Wed, 23 Jan 2019 17:12:10 +0100
Subject: [PATCH] added default icon for subnavigation and removed icons from
 subnavigation navlinks

---
 .../ui-components/src/navigation/SubNavigation.js        | 9 ++++++++-
 .../groups/components/navLinks/GeneralGroupNavLink.js    | 2 +-
 scm-ui/src/repos/components/GeneralRepoNavLink.js        | 2 +-
 scm-ui/src/repos/components/PermissionsNavLink.js        | 2 +-
 .../src/users/components/navLinks/GeneralUserNavLink.js  | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/navigation/SubNavigation.js b/scm-ui-components/packages/ui-components/src/navigation/SubNavigation.js
index 0eef244f59..7acfd93841 100644
--- a/scm-ui-components/packages/ui-components/src/navigation/SubNavigation.js
+++ b/scm-ui-components/packages/ui-components/src/navigation/SubNavigation.js
@@ -4,6 +4,7 @@ import {Link, Route} from "react-router-dom";
 
 type Props = {
   to: string,
+  icon?: string,
   label: string,
   activeOnlyWhenExact?: boolean,
   activeWhenMatch?: (route: any) => boolean,
@@ -21,7 +22,12 @@ class SubNavigation extends React.Component<Props> {
   }
 
   renderLink = (route: any) => {
-    const { to, label } = this.props;
+    const { to, icon, label } = this.props;
+
+    let defaultIcon = "fas fa-cog";
+    if (icon) {
+      defaultIcon = icon;
+    }
 
     let children = null;
     if(this.isActive(route)) {
@@ -33,6 +39,7 @@ class SubNavigation extends React.Component<Props> {
     return (
       <li>
         <Link className={this.isActive(route) ? "is-active" : ""} to={to}>
+          <><i className={defaultIcon}></i>{" "}</>
           {label}
         </Link>
         {children}
diff --git a/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js b/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js
index 291742cf25..b04e572937 100644
--- a/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js
+++ b/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js
@@ -21,7 +21,7 @@ class GeneralGroupNavLink extends React.Component<Props> {
     if (!this.isEditable()) {
       return null;
     }
-    return <NavLink to={editUrl} icon="fas fa-cog" label={t("singleGroup.menu.generalNavLink")} />;
+    return <NavLink to={editUrl} label={t("singleGroup.menu.generalNavLink")} />;
   }
 }
 
diff --git a/scm-ui/src/repos/components/GeneralRepoNavLink.js b/scm-ui/src/repos/components/GeneralRepoNavLink.js
index 314c86c6ff..650cf0f62c 100644
--- a/scm-ui/src/repos/components/GeneralRepoNavLink.js
+++ b/scm-ui/src/repos/components/GeneralRepoNavLink.js
@@ -21,7 +21,7 @@ class GeneralRepoNavLink extends React.Component<Props> {
     if (!this.isEditable()) {
       return null;
     }
-    return <NavLink to={editUrl} icon="fas fa-cog" label={t("repositoryRoot.menu.generalNavLink")} />;
+    return <NavLink to={editUrl} label={t("repositoryRoot.menu.generalNavLink")} />;
   }
 }
 
diff --git a/scm-ui/src/repos/components/PermissionsNavLink.js b/scm-ui/src/repos/components/PermissionsNavLink.js
index 1d6d52eb0b..773ad94246 100644
--- a/scm-ui/src/repos/components/PermissionsNavLink.js
+++ b/scm-ui/src/repos/components/PermissionsNavLink.js
@@ -20,7 +20,7 @@ class PermissionsNavLink extends React.Component<Props> {
     }
     const { permissionUrl, t } = this.props;
     return (
-      <NavLink to={permissionUrl} icon="fas fa-lock" label={t("repositoryRoot.menu.permissionsNavLink")} />
+      <NavLink to={permissionUrl} label={t("repositoryRoot.menu.permissionsNavLink")} />
     );
   }
 }
diff --git a/scm-ui/src/users/components/navLinks/GeneralUserNavLink.js b/scm-ui/src/users/components/navLinks/GeneralUserNavLink.js
index a9b3b9a37f..e222a7bec2 100644
--- a/scm-ui/src/users/components/navLinks/GeneralUserNavLink.js
+++ b/scm-ui/src/users/components/navLinks/GeneralUserNavLink.js
@@ -21,7 +21,7 @@ class GeneralUserNavLink extends React.Component<Props> {
     if (!this.isEditable()) {
       return null;
     }
-    return <NavLink to={editUrl} icon="fas fa-cog" label={t("singleUser.menu.generalNavLink")} />;
+    return <NavLink to={editUrl} label={t("singleUser.menu.generalNavLink")} />;
   }
 }