maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-29 05:00:43 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

NamedRedirect: import routeConfiguration and remove context.flattenedRoutes

Browse source
This commit is contained in:
Vesa Luusua 2017-10-10 20:10:59 +03:00
parent 3a11c6b95c
commit 8ccbbe9c03
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/NamedRedirect/NamedRedirect.js
View file

@ -4,17 +4,16 @@
*/
import React, { PropTypes } from 'react';
import { Redirect } from 'react-router-dom';
import routeConfiguration from '../../routeConfiguration';
import { pathByRouteName } from '../../util/routes';
import { withFlattenedRoutes } from '../../util/contextHelpers';
import * as propTypes from '../../util/propTypes';
const NamedRedirect = props => {
const { name, search, state, params, flattenedRoutes, push } = props;
const pathname = pathByRouteName(name, flattenedRoutes, params);
const { name, search, state, params, push } = props;
const pathname = pathByRouteName(name, routeConfiguration(), params);
return <Redirect to={{ pathname, search, state }} push={push} />;
};
const { arrayOf, object, string, bool } = PropTypes;
const { bool, object, string } = PropTypes;
NamedRedirect.defaultProps = { search: '', state: {}, push: false, params: {} };
@ -24,7 +23,6 @@ NamedRedirect.propTypes = {
state: object,
push: bool,
params: object,
flattenedRoutes: arrayOf(propTypes.route).isRequired,
};
export default withFlattenedRoutes(NamedRedirect);
export default NamedRedirect;