From f1224b9073a5ecab6c9be3ff3b2fd7b36475267b Mon Sep 17 00:00:00 2001 From: Vladimir Metnev Date: Fri, 3 Nov 2017 16:47:00 +0200 Subject: [PATCH] fix(routing): fix detection of routerRoutes fix(routing): fix detection of routerRoute --- src/common/routing/routes.js | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/common/routing/routes.js b/src/common/routing/routes.js index 85d5fd15..c30becb3 100644 --- a/src/common/routing/routes.js +++ b/src/common/routing/routes.js @@ -1,6 +1,6 @@ // @flow import React from 'react' -import {Route} from 'react-router-dom' +import {Route, Redirect} from 'react-router-dom' import RouteAuth from 'components/addons/RouteAuth' import {asyncComponent} from 'react-async-component' import {Loader, Dimmer, Header, Icon} from 'semantic-ui-react' @@ -11,11 +11,10 @@ function asyncComponentCreator (url) { const importCreator = (url: string) => async () => { // Read Webpack docs about code-splitting for more info. if (process.env.BROWSER) { - const resolve = import(/* webpackMode: "lazy", webpackChunkName: "[request].lazy" */ `containers/${url}/index.jsx`) - return resolve + // const resolve = import(/* webpackMode: "lazy", webpackChunkName: "[request].lazy" */ `containers/${url}/index.jsx`) + return import(/* webpackMode: "lazy", webpackChunkName: "[request].lazy" */ `containers/${url}/index.jsx`) } - const resolve = import(/* webpackMode: "eager" */ `containers/${url}/index.jsx`) - return resolve + return import(/* webpackMode: "eager" */ `containers/${url}/index.jsx`) } return asyncComponent({ @@ -79,13 +78,17 @@ function routingFnCreator (useFor: 'sidebar' | 'routing' | 'all' = 'all') { exact: true, tag: Route, component: asyncComponentCreator('Login') - } + }, // find the way to add/remove routes conditionally - // { - // name: '404', - // tag: RouteAuth, - // component: asyncComponentCreator('NotFound') - // } + { + name: '404', + tag: RouteAuth, + component: asyncComponentCreator('NotFound') + }, + { + tag: Redirect, + to: '/auth' + } ] const fns = { @@ -100,7 +103,7 @@ function routingFnCreator (useFor: 'sidebar' | 'routing' | 'all' = 'all') { // Returns routing for React-Router routing (x: Array = routes) { return x - .filter(a => !a.sidebarVisible) + .filter(a => !!a.tag) .map(a => _.pick(a, ['path', 'name', 'strict', 'exact', 'component', 'tag'])) }, all () {