fix Redirect to repo redirection url

This commit is contained in:
Mohamed Karray
2019-03-07 17:49:20 +01:00
parent ab79b94bc0
commit c02bf1120c
2 changed files with 6 additions and 4 deletions

View File

@@ -40,7 +40,7 @@ class Main extends React.Component<Props> {
return ( return (
<div className="main"> <div className="main">
<Switch> <Switch>
<Redirect exact path="/" to={url}/> <Redirect exact from="/" to={url}/>
<Route exact path="/login" component={Login} /> <Route exact path="/login" component={Login} />
<Route path="/logout" component={Logout} /> <Route path="/logout" component={Logout} />
<ProtectedRoute <ProtectedRoute

View File

@@ -63,7 +63,7 @@ class RepositoryRoot extends React.Component<Props> {
stripEndingSlash = (url: string) => { stripEndingSlash = (url: string) => {
if (url.endsWith("/")) { if (url.endsWith("/")) {
return url.substring(0, url.length - 2); return url.substring(0, url.length - 1);
} }
return url; return url;
}; };
@@ -102,9 +102,11 @@ class RepositoryRoot extends React.Component<Props> {
}; };
const redirectUrlFactory = binder.getExtension("repository.redirect", this.props); const redirectUrlFactory = binder.getExtension("repository.redirect", this.props);
let redirectedUrl =url+"/info"; let redirectedUrl;
if (redirectUrlFactory){ if (redirectUrlFactory){
redirectedUrl = url + redirectUrlFactory(this.props); redirectedUrl = url + redirectUrlFactory(this.props);
}else{
redirectedUrl = url + "/info";
} }
return ( return (
@@ -112,7 +114,7 @@ class RepositoryRoot extends React.Component<Props> {
<div className="columns"> <div className="columns">
<div className="column is-three-quarters is-clipped"> <div className="column is-three-quarters is-clipped">
<Switch> <Switch>
<Redirect exact path={url} to={redirectedUrl}/> <Redirect exact from={this.props.match.url} to={redirectedUrl}/>
<Route <Route
path={`${url}/info`} path={`${url}/info`}
exact exact