From c02bf1120c617bc8a56b2ddc691f16b95fed8e18 Mon Sep 17 00:00:00 2001
From: Mohamed Karray <mohamed.karray.sr@gmail.com>
Date: Thu, 7 Mar 2019 17:49:20 +0100
Subject: [PATCH] fix Redirect to repo redirection url

---
 scm-ui/src/containers/Main.js                 | 2 +-
 scm-ui/src/repos/containers/RepositoryRoot.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index e963fb00f9..6ce4e982fa 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -40,7 +40,7 @@ class Main extends React.Component<Props> {
     return (
       <div className="main">
         <Switch>
-          <Redirect exact path="/" to={url}/>
+          <Redirect exact from="/" to={url}/>
           <Route exact path="/login" component={Login} />
           <Route path="/logout" component={Logout} />
           <ProtectedRoute
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index c0d3d919cd..62c1800100 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -63,7 +63,7 @@ class RepositoryRoot extends React.Component<Props> {
 
   stripEndingSlash = (url: string) => {
     if (url.endsWith("/")) {
-      return url.substring(0, url.length - 2);
+      return url.substring(0, url.length - 1);
     }
     return url;
   };
@@ -102,9 +102,11 @@ class RepositoryRoot extends React.Component<Props> {
     };
 
     const redirectUrlFactory = binder.getExtension("repository.redirect", this.props);
-    let redirectedUrl =url+"/info";
+    let redirectedUrl;
     if (redirectUrlFactory){
       redirectedUrl = url + redirectUrlFactory(this.props);
+    }else{
+      redirectedUrl = url + "/info";
     }
 
     return (
@@ -112,7 +114,7 @@ class RepositoryRoot extends React.Component<Props> {
         <div className="columns">
           <div className="column is-three-quarters is-clipped">
             <Switch>
-              <Redirect exact path={url} to={redirectedUrl}/>
+              <Redirect exact from={this.props.match.url} to={redirectedUrl}/>
               <Route
                 path={`${url}/info`}
                 exact