From f9f93b338e27c4a5443c5cab815e19acc5d5dba0 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 30 Jul 2018 09:36:44 +0200
Subject: [PATCH] match user and users path in primary navigation

---
 scm-ui/src/components/navigation/PrimaryNavigation.js  |  1 +
 .../src/components/navigation/PrimaryNavigationLink.js | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/components/navigation/PrimaryNavigation.js b/scm-ui/src/components/navigation/PrimaryNavigation.js
index bb853c9808..4fff895d90 100644
--- a/scm-ui/src/components/navigation/PrimaryNavigation.js
+++ b/scm-ui/src/components/navigation/PrimaryNavigation.js
@@ -20,6 +20,7 @@ class PrimaryNavigation extends React.Component<Props> {
           />
           <PrimaryNavigationLink
             to="/users"
+            match="/(user|users)"
             label={t("primary-navigation.users")}
           />
           <PrimaryNavigationLink
diff --git a/scm-ui/src/components/navigation/PrimaryNavigationLink.js b/scm-ui/src/components/navigation/PrimaryNavigationLink.js
index b7c1b5e59b..217a6c9478 100644
--- a/scm-ui/src/components/navigation/PrimaryNavigationLink.js
+++ b/scm-ui/src/components/navigation/PrimaryNavigationLink.js
@@ -5,6 +5,7 @@ import { Route, Link } from "react-router-dom";
 type Props = {
   to: string,
   label: string,
+  match?: string,
   activeOnlyWhenExact?: boolean
 };
 
@@ -19,9 +20,14 @@ class PrimaryNavigationLink extends React.Component<Props> {
   };
 
   render() {
-    const { to, activeOnlyWhenExact } = this.props;
+    const { to, match, activeOnlyWhenExact } = this.props;
+    const path = match ? match : to;
     return (
-      <Route path={to} exact={activeOnlyWhenExact} children={this.renderLink} />
+      <Route
+        path={path}
+        exact={activeOnlyWhenExact}
+        children={this.renderLink}
+      />
     );
   }
 }