From 7a8bbbf87a710c596b8c73d7a4cb8bfd6db09358 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 14 Dec 2016 17:42:23 +0100 Subject: Add totalCount into redux state for further usage Signed-off-by: Thomas Shawarma Haddad --- .../es6_browserified/journey_patterns/index.js | 3 ++- .../journey_patterns/reducers/index.js | 6 ++++-- .../journey_patterns/reducers/journeyPatterns.js | 24 ++++++++++++++++++++++ .../journey_patterns/reducers/journey_patterns.js | 24 ---------------------- .../journey_patterns/reducers/totalCount.js | 8 ++++++++ 5 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js delete mode 100644 app/assets/javascripts/es6_browserified/journey_patterns/reducers/journey_patterns.js create mode 100644 app/assets/javascripts/es6_browserified/journey_patterns/reducers/totalCount.js (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/index.js index 2c2128ee0..e420cff9f 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/index.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/index.js @@ -13,7 +13,8 @@ var promise = require('redux-promise') var initialState = { journeyPatterns: [], - pagination: 1 + pagination: 1, + totalCount: window.journeyPatternLength } const loggerMiddleware = createLogger() diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js index 9210dfd4d..7e8270868 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js @@ -1,10 +1,12 @@ var combineReducers = require('redux').combineReducers -var journeyPatterns = require('./journey_patterns') +var journeyPatterns = require('./journeyPatterns') var pagination = require('./pagination') +var totalCount = require('./totalCount') const journeyPatternsApp = combineReducers({ journeyPatterns, - pagination + pagination, + totalCount }) module.exports = journeyPatternsApp diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js new file mode 100644 index 000000000..129746575 --- /dev/null +++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js @@ -0,0 +1,24 @@ +var actions = require("../actions") + +const journeyPatterns = (state = {}, action) => { + switch (action.type) { + case 'RECEIVE_JOURNEY_PATTERNS': + return [...action.json] + case 'LOAD_FIRST_PAGE': + actions.fetchJourneyPatterns(action.dispatch) + case 'GO_TO_PREVIOUS_PAGE': + if(action.currentPage > 1){ + actions.fetchJourneyPatterns(action.dispatch, action.currentPage, action.nextPage) + } + return state + case 'GO_TO_NEXT_PAGE': + if (window.journeyPatternLength - (action.currentPage * 12) > 0){ + actions.fetchJourneyPatterns(action.dispatch, action.currentPage, action.nextPage) + } + return state + default: + return state + } +} + +module.exports = journeyPatterns diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journey_patterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journey_patterns.js deleted file mode 100644 index 129746575..000000000 --- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journey_patterns.js +++ /dev/null @@ -1,24 +0,0 @@ -var actions = require("../actions") - -const journeyPatterns = (state = {}, action) => { - switch (action.type) { - case 'RECEIVE_JOURNEY_PATTERNS': - return [...action.json] - case 'LOAD_FIRST_PAGE': - actions.fetchJourneyPatterns(action.dispatch) - case 'GO_TO_PREVIOUS_PAGE': - if(action.currentPage > 1){ - actions.fetchJourneyPatterns(action.dispatch, action.currentPage, action.nextPage) - } - return state - case 'GO_TO_NEXT_PAGE': - if (window.journeyPatternLength - (action.currentPage * 12) > 0){ - actions.fetchJourneyPatterns(action.dispatch, action.currentPage, action.nextPage) - } - return state - default: - return state - } -} - -module.exports = journeyPatterns diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/totalCount.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/totalCount.js new file mode 100644 index 000000000..830de28aa --- /dev/null +++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/totalCount.js @@ -0,0 +1,8 @@ +const totalCount = (state = 0, action) => { + switch (action.type) { + default: + return state + } +} + +module.exports = totalCount -- cgit v1.2.3