Fix/utilsrefactor

src/router/index.js

@@ -7,10 +7,9 @@ import logMiddleware from './middleware/log'
 import authorizeMiddleware from './middleware/authorize'
 import redirectMiddleware from './middleware/redirect'
 import triggerMiddleware from './middleware/trigger'
-import processRoutePath from './utils/processRoutePath'
+import { processRoutePath } from '../utils/routerUtils'
 
 const Router = () => {
-  // remap the top-level routes to include the sub-path
   const mappedRoutes = routes.map((route) => ({ ...route, path: processRoutePath(route.path) }))
 
   const router = createRouter(mappedRoutes, {

src/router/middleware/authorize.js

@@ -3,8 +3,7 @@ import transitionPath from 'router5-transition-path'
 
 import snackbarActions from 'store/modules/snackbar'
 import routerActions from 'store/modules/router'
-import findRoutes from '../utils/findRoutes'
-
+import { findRoutes } from '../../utils/routerUtils'
 /*
 
   run an authorize function on the route if present
@@ -46,3 +45,5 @@ const authorizeRoute = (routes) => (router, dependencies) => (toState, fromState
 }
 
 export default authorizeRoute
+// test past a mock router store contains something to dispatch too did i get done or not
+//

src/router/middleware/log.js

@@ -1,6 +1,6 @@
 import transitionPath from 'router5-transition-path'
 import settings from 'settings'
-import findRoutes from '../utils/findRoutes'
+import { findRoutes } from '../../utils/routerUtils'
 
 // log each route transition in development
 const logRoute = (routes) => () => (toState, fromState, done) => {

src/router/middleware/redirect.js

@@ -1,6 +1,6 @@
 import transitionPath from 'router5-transition-path'
 import routerActions from 'store/modules/router'
-import findRoutes from '../utils/findRoutes'
+import { findRoutes } from '../../utils/routerUtils'
 
 /*
 
@@ -23,14 +23,14 @@ const redirectRoute = (routes) => (router, dependencies) => (toState, fromState,
   let redirectTo = null
 
   // if the redirect is a string - redirect there
-  if (typeof (redirectInfo) === 'string') {
+  if (typeof redirectInfo === 'string') {
     redirectTo = redirectInfo
-  } else if (typeof (redirectInfo) === 'function') {
-  // if it's a function - run the function passing the redux state
-  // the function should return the redirect or falsey value for don't redirect
+  } else if (typeof redirectInfo === 'function') {
+    // if it's a function - run the function passing the redux state
+    // the function should return the redirect or falsey value for don't redirect
     redirectTo = redirectInfo(store.getState())
   } else {
-    return done(`unknown type of redirect info: ${typeof (redirectInfo)}`)
+    return done(`unknown type of redirect info: ${typeof redirectInfo}`)
   }
 
   if (redirectTo && redirectTo !== activeRoute.name) {

src/router/middleware/trigger.js

@@ -1,5 +1,5 @@
 import transitionPath from 'router5-transition-path'
-import findRoutes from '../utils/findRoutes'
+import { findRoutes } from '../../utils/routerUtils'
 
 const runTriggers = ({
   routes,

src/store/index.js

@@ -1,37 +1,29 @@
+/* eslint-disable import/no-import-module-exports */
 /* eslint-disable global-require */
 /* eslint-disable no-underscore-dangle */
 import { applyMiddleware, createStore, compose } from 'redux'
 import createSagaMiddleware from 'redux-saga'
 import thunk from 'redux-thunk'
 import { router5Middleware } from 'redux-router5'
-
 import SagaManager from './sagaManager'
 import reducer from './reducer'
 
 const Store = (router, initialState = {}) => {
   const sagaMiddleware = createSagaMiddleware()
 
-  const middleware = [
-    router5Middleware(router),
-    thunk,
-    sagaMiddleware,
-  ]
+  const middleware = [router5Middleware(router), thunk, sagaMiddleware]
 
-  const storeEnhancers = [
-    applyMiddleware(...middleware),
-  ]
+  const storeEnhancers = [applyMiddleware(...middleware)]
 
   if (window.__REDUX_DEVTOOLS_EXTENSION__) {
-    storeEnhancers.push(window.__REDUX_DEVTOOLS_EXTENSION__({
-      shouldHotReload: false,
-    }))
+    storeEnhancers.push(
+      window.__REDUX_DEVTOOLS_EXTENSION__({
+        shouldHotReload: false,
+      }),
+    )
   }
 
-  const store = createStore(
-    reducer,
-    initialState,
-    compose(...storeEnhancers),
-  )
+  const store = createStore(reducer, initialState, compose(...storeEnhancers))
 
   router.setDependency('store', store)
   SagaManager.startSagas(sagaMiddleware, router)

src/store/rootSagas.js

@@ -12,7 +12,7 @@ import userActions from './modules/user'
 import configActions from './modules/config'
 import networkActions from './modules/network'
 import { sagas as fileUploadSagas } from './modules/fileupload'
-import processRoutePath from '../router/utils/processRoutePath'
+import { processRoutePath } from '../utils/routerUtils'
 import selectors from './selectors'
 
 const errorFilter = (name) => (action) => {

src/store/selectors.js

@@ -2,7 +2,7 @@
 /* eslint-disable import/no-cycle */
 import { createSelector } from 'reselect'
 import routes from 'router/routes'
-import findRoute from 'router/utils/findRoute'
+import { findRoute } from 'utils/routerUtils'
 
 // pluck a single prop from a previous selector
 const prop = (baseSelector, propName) => createSelector(

src/utils/routerUtils.js

@@ -0,0 +1,58 @@
+/*
+
+  given a route structure with children e.g.
+
+  [
+    {
+      name: 'home',
+      path: '/'
+    },
+    {
+      name: 'login',
+      path: '/login',
+      apples: 10,
+      children: [
+        {
+          name: 'test',
+          path: '/test',
+          oranges: 11,
+        },
+      ],
+    },
+  ]
+
+  this will find a route based on the given name e.g.
+
+  login.test will return:
+
+  {
+    name: 'test',
+    path: '/test',
+    oranges: 11,
+  }
+
+*/
+
+export const findRoute = (routes, name) => {
+  if (!name) return null
+  return name.split('.').reduce(
+    (currentRoute, part) => {
+      if (!currentRoute || !currentRoute.children) return null
+      return currentRoute.children.find((route) => route.name === part)
+    },
+    {
+      children: routes,
+    },
+  )
+}
+
+export const findRoutes = (routes, names) => names.map((name) => findRoute(routes, name))
+
+// if we are running under a sub-path then prepend that path
+// to all the frontend routes
+export const processRoutePath = (path) => {
+  // if we are not running under a sub-path then just return the route
+  if (!window.SEXTANT_ROOT_PATH || window.SEXTANT_ROOT_PATH === '/') return path
+  // prepend our sub-path to the route
+  return window.SEXTANT_ROOT_PATH + path
+}