Move to localize non ui data

common/app/create-reducer.js

@@ -2,6 +2,7 @@ import { combineReducers } from 'redux';
 import { reducer as formReducer } from 'redux-form';
 
 import { reducer as app } from './redux';
+import entitieReducer from './redux/entities-reducer';
 import { reducer as hikesApp } from './routes/Hikes/redux';
 import { reducer as challengesApp } from './routes/challenges/redux';
 import {
@@ -12,6 +13,7 @@ import {
 export default function createReducer(sideReducers = {}) {
   return combineReducers({
     ...sideReducers,
+    entities: entitieReducer,
     app,
     hikesApp,
     jobsApp,

common/app/redux/actions.js

@@ -33,3 +33,9 @@ export const hardGoTo = createAction(types.hardGoTo);
 
 export const updateWindowHeight = createAction(types.updateWindowHeight);
 export const updateNavHeight = createAction(types.updateNavHeight);
+
+
+// data
+export const updateChallengesData = createAction(types.updateChallengesData);
+export const updateJobsData = createAction(types.updateJobsData);
+export const updateHikesData = createAction(types.updateHikesData);

common/app/redux/entities-reducer.js

@@ -0,0 +1,15 @@
+const initialState = {
+  hike: {},
+  challenge: {},
+  job: {}
+};
+
+export default function dataReducer(state = initialState, action) {
+  if (action.meta && action.meta.entities) {
+    return {
+      ...state,
+      ...action.meta.entities
+    };
+  }
+  return state;
+}

common/app/redux/types.js

@@ -13,5 +13,10 @@ export default createTypes([
   'hardGoTo',
 
   'updateWindowHeight',
-  'updateNavHeight'
+  'updateNavHeight',
+
+  // data handling
+  'updateChallengesData',
+  'updateJobsData',
+  'updateHikesData'
 ], 'app');

common/app/routes/Hikes/components/Hikes.jsx

@@ -13,9 +13,9 @@ import contain from '../../../utils/professor-x';
 // const log = debug('fcc:hikes');
 
 const mapStateToProps = createSelector(
-  state => state.hikesApp.hikes.entities,
+  state => state.entities.hike,
-  state => state.hikesApp.hikes.results,
+  state => state.hikesApp.hikes,
-  (hikesMap, hikesByDashedName)=> {
+  (hikesMap, hikesByDashedName) => {
     if (!hikesMap || !hikesByDashedName) {
       return { hikes: [] };
     }

common/app/routes/Hikes/components/Lecture.jsx

@@ -42,7 +42,7 @@ export class Lecture extends React.Component {
 
   componentWillMount() {
     if (!this.props.id) {
-      this.props.hardGoTo('/map');
+      // this.props.hardGoTo('/map');
     }
   }
 

common/app/routes/Hikes/redux/actions.js

@@ -13,7 +13,8 @@ export const fetchHikes = createAction(types.fetchHikes);
 // called within fetchHikesSaga
 export const fetchHikesCompleted = createAction(
   types.fetchHikesCompleted,
-  (hikes, currentHike) => ({ hikes, currentHike })
+  (entities, hikes, currentHike) => ({ hikes, currentHike }),
+  entities => ({ entities })
 );
 
 export const resetHike = createAction(types.resetHike);

common/app/routes/Hikes/redux/fetch-hikes-saga.js

@@ -25,14 +25,9 @@ export default ({ services }) => ({ dispatch }) => next => {
           { hikes: arrayOf(hike) }
         );
 
-        hikes = {
+        const currentHike = findCurrentHike(result.hikes, dashedName);
-          entities: entities.hike,
-          results: result.hikes
-        };
 
-        const currentHike = findCurrentHike(hikes, dashedName);
+        return fetchHikesCompleted(entities, result.hikes, currentHike);
-
-        return fetchHikesCompleted(hikes, currentHike);
       })
       .catch(error => {
         return Observable.just({

common/app/routes/Hikes/redux/reducer.js

@@ -3,10 +3,7 @@ import types from './types';
 import { findNextHikeName } from './utils';
 
 const initialState = {
-  hikes: {
+  hikes: [],
-    results: [],
-    entities: {}
-  },
   // ui
   // hike dashedName
   currentHike: '',
@@ -91,7 +88,6 @@ export default handleActions(
 
     [types.fetchHikesCompleted]: (state, { payload }) => {
       const { hikes, currentHike } = payload;
-
       return {
         ...state,
         hikes,

common/app/routes/Hikes/redux/selectors.js

@@ -2,7 +2,7 @@
 import { createSelector } from 'reselect';
 
 export const getCurrentHike = createSelector(
-  state => state.hikesApp.hikes.entities,
+  state => state.entities.hike,
   state => state.hikesApp.currentHike,
   (hikesMap, currentHikeDashedName) => (hikesMap[currentHikeDashedName] || {})
 );

common/app/routes/Hikes/redux/utils.js

@@ -4,7 +4,7 @@ import _ from 'lodash';
 const log = debug('fcc:hikes:utils');
 
 function getFirstHike(hikes) {
-  return hikes.results[0];
+  return hikes[0];
 }
 
 // interface Hikes {
@@ -26,7 +26,6 @@ export function findCurrentHike(hikes, dashedName) {
   const filterRegex = new RegExp(dashedName, 'i');
 
   return hikes
-    .results
     .filter(dashedName => {
       return filterRegex.test(dashedName);
     })
@@ -43,23 +42,23 @@ export function getCurrentHike(hikes = {}, dashedName) {
 }
 
 // findNextHikeName(
-//   hikes: { results: String[] },
+//   hikes: String[],
 //   dashedName: String
 // ) => String
-export function findNextHikeName({ results }, dashedName) {
+export function findNextHikeName(hikes, dashedName) {
   if (!dashedName) {
-    log('find next hike no id provided');
+    log('find next hike no dashedName provided');
-    return results[0];
+    return hikes[0];
   }
   const currentIndex = _.findIndex(
-    results,
+    hikes,
     _dashedName => _dashedName === dashedName
   );
 
-  if (currentIndex >= results.length) {
+  if (currentIndex >= hikes.length) {
     return '';
   }
-  return results[currentIndex + 1];
+  return hikes[currentIndex + 1];
 }
 
 

common/app/routes/Jobs/components/Jobs.jsx

@@ -16,12 +16,11 @@ import {
 } from '../redux/actions';
 
 const mapStateToProps = createSelector(
-  state => state.jobsApp.jobs.entities,
+  state => state.entities.job,
-  state => state.jobsApp.jobs.results,
+  state => state.jobsApp.jobs,
-  state => state.jobsApp,
+  (jobsMap, jobsById) => ({
-  (jobsMap, jobsById) => {
+    jobs: jobsById.map(id => jobsMap[id])
-    return { jobs: jobsById.map(id => jobsMap[id]) };
+  })
-  }
 );
 
 const bindableActions = {

common/app/routes/Jobs/components/Show.jsx

@@ -60,12 +60,12 @@ function generateMessage(
 const mapStateToProps = createSelector(
   state => state.app,
   state => state.jobsApp.currentJob,
-  state => state.jobsApp.jobs.entities,
+  state => state.entities.job,
-  ({ username, isFrontEndCert, isBackEndCert }, currentJob, jobs) => ({
+  ({ username, isFrontEndCert, isBackEndCert }, currentJob, jobMap) => ({
     username,
     isFrontEndCert,
     isBackEndCert,
-    job: jobs[currentJob] || {}
+    job: jobMap[currentJob] || {}
   })
 );
 

common/app/routes/Jobs/redux/actions.js

@@ -5,7 +5,8 @@ import types from './types';
 export const fetchJobs = createAction(types.fetchJobs);
 export const fetchJobsCompleted = createAction(
   types.fetchJobsCompleted,
-  (currentJob, jobs) => ({ currentJob, jobs })
+  (_, currentJob, jobs) => ({ currentJob, jobs }),
+  entities => ({ entities })
 );
 
 export const findJob = createAction(types.findJob);

common/app/routes/Jobs/redux/fetch-jobs-saga.js

@@ -32,11 +32,9 @@ export default ({ services }) => ({ dispatch }) => next => {
 
 
         return fetchJobsCompleted(
+          entities,
           result.jobs[0],
-          {
+          result.jobs
-            entities: entities.job,
-            results: result.jobs
-          }
         );
       })
       .catch(error => {

common/app/routes/Jobs/redux/reducer.js

@@ -13,21 +13,15 @@ const initialState = {
   initialValues: {},
   currentJob: '',
   newJob: {},
-  jobs: {
+  jobs: []
-    entities: {},
-    results: []
-  }
 };
 
 export default handleActions(
   {
     [types.findJob]: (state, { payload: id }) => {
-      const currentJob = state.jobs.entities[id];
       return {
         ...state,
-        currentJob: currentJob && currentJob.id ?
+        currentJob: id
-          currentJob.id :
-          state.currentJob
       };
     },
     [types.fetchJobsCompleted]: (state, { payload: { jobs, currentJob } }) => ({