From 2af345bba0c767d49c62aad2af745332b954f237 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Mon, 17 Sep 2018 16:51:09 +0200
Subject: [PATCH] Added navigational link to repo's history

---
 scm-ui/public/locales/en/repos.json           | 3 ++-
 scm-ui/src/changesets/components/DropDown.js  | 1 +
 scm-ui/src/changesets/modules/changesets.js   | 3 +--
 scm-ui/src/repos/containers/RepositoryRoot.js | 7 +++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index 7db2623247..678a7a07b4 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -22,7 +22,8 @@
     "actions-label": "Actions",
     "back-label": "Back",
     "navigation-label": "Navigation",
-    "information": "Information"
+    "information": "Information",
+    "history": "History"
   },
   "create": {
     "title": "Create Repository",
diff --git a/scm-ui/src/changesets/components/DropDown.js b/scm-ui/src/changesets/components/DropDown.js
index 8d73ea4fa5..c045df4af4 100644
--- a/scm-ui/src/changesets/components/DropDown.js
+++ b/scm-ui/src/changesets/components/DropDown.js
@@ -12,6 +12,7 @@ class DropDown extends React.Component<Props> {
   render() {
     const {options, preselectedOption} = this.props;
     return <select value={preselectedOption} onChange={this.change}>
+      <option key=""> </option>
       {options.map(option => {
         return <option key={option}
                        value={option}>{option}</option>
diff --git a/scm-ui/src/changesets/modules/changesets.js b/scm-ui/src/changesets/modules/changesets.js
index cd35801a2f..e5f41fda20 100644
--- a/scm-ui/src/changesets/modules/changesets.js
+++ b/scm-ui/src/changesets/modules/changesets.js
@@ -112,7 +112,7 @@ function extractChangesetsByIds(data: any, oldChangesetsByIds: any) {
 
 //selectors
 export function getChangesetsForNamespaceAndNameFromState(namespace: string, name: string, state: Object) {
-  const key = namespace + "/" + name;
+  const key = createItemId(namespace, name);
   if (!state.changesets[key]) {
     return null;
   }
@@ -121,7 +121,6 @@ export function getChangesetsForNamespaceAndNameFromState(namespace: string, nam
 
 export function getChangesets(namespace: string, name: string, branch: string, state: Object) {
   const key = createItemId(namespace, name, branch);
-  console.log("getChangesets for key " + key);
   if (!state.changesets[key]) {
     return null;
   }
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 75a938279c..958626ce62 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -103,6 +103,12 @@ class RepositoryRoot extends React.Component<Props> {
               component={() => <Edit repository={repository}/>}
             />
             <Route
+              exact
+              path={`${url}/history`}
+              component={() => <Changesets repository={repository}/>}
+            />
+            <Route
+              exact
               path={`${url}/history/:branch`}
               component={() => <Changesets repository={repository}/>}
             />
@@ -111,6 +117,7 @@ class RepositoryRoot extends React.Component<Props> {
             <Navigation>
               <Section label={t("repository-root.navigation-label")}>
                 <NavLink to={url} label={t("repository-root.information")}/>
+                <NavLink activeOnlyWhenExact={false} to={`${url}/history`} label={t("repository-root.history")}/>
                 <EditNavLink repository={repository} editUrl={`${url}/edit`}/>
               </Section>
               <Section label={t("repository-root.actions-label")}>