aclindsa/moneygo
1
0
Fork 0
mirror of https://github.com/aclindsa/moneygo.git synced 2025-06-13 13:39:23 -04:00
Code Issues Releases Wiki Activity

reports: Move flattening tabulations into reducer

Browse Source 
This removes some circular control dependencies
This commit is contained in:
Aaron Lindsay
2017-06-17 14:24:02 -04:00
parent 9844785b8d
commit 6d4fdafc02
4 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
js/reducers/ReportReducer.js
View File

@ -3,6 +3,9 @@ var assign = require('object-assign');
var ReportConstants = require('../constants/ReportConstants');
var UserConstants = require('../constants/UserConstants');
var models = require('../models.js');
var Tabulation = models.Tabulation;
const initialState = {
map: {},
tabulations: {},
@ -12,6 +15,40 @@ const initialState = {
seriesTraversal: []
};
function getFlattenedTabulation(tabulation, seriesTraversal) {
// Descend the tree to the right series to flatten
var series = tabulation;
for (var i=0; i < seriesTraversal.length; i++) {
if (!series.Series.hasOwnProperty(seriesTraversal[i])) {
dispatch(ErrorActions.clientError("Invalid series"));
return;
}
series = series.Series[seriesTraversal[i]];
}
// Actually flatten the data
var flattenedSeries = series.mapReduceChildren(null,
function(accumulator, currentValue, currentIndex, array) {
return accumulator + currentValue;
}
);
// Add back in any values from the current level
if (series.hasOwnProperty('Values'))
flattenedSeries[Tabulation.topLevelSeriesName()] = series.Values;
var flattenedTabulation = new Tabulation();
flattenedTabulation.ReportId = tabulation.ReportId;
flattenedTabulation.Title = tabulation.Title;
flattenedTabulation.Subtitle = tabulation.Subtitle;
flattenedTabulation.Units = tabulation.Units;
flattenedTabulation.Labels = tabulation.Labels.slice();
flattenedTabulation.FlattenedSeries = flattenedSeries;
return flattenedTabulation;
}
module.exports = function(state = initialState, action) {
switch (action.type) {
case ReportConstants.REPORTS_FETCHED:
@ -33,6 +70,13 @@ module.exports = function(state = initialState, action) {
});
case ReportConstants.REPORT_CREATED:
case ReportConstants.REPORT_UPDATED:
var selectedTabulation = state.selectedTabulation;
var seriesTraversal = state.seriesTraversal;
if (state.selected == action.report.ReportId) {
selectedTabulation = initialState.selectedTabulation;
seriesTraversal = initialState.seriesTraversal;
}
var report = action.report;
var reports = assign({}, state.map, {
[report.ReportId]: report
@ -45,7 +89,9 @@ module.exports = function(state = initialState, action) {
}
return assign({}, state, {
map: reports,
list: list
list: list,
selectedTabulation: selectedTabulation,
seriesTraversal: seriesTraversal
});
case ReportConstants.REPORT_REMOVED:
var selected = state.selected;
@ -58,22 +104,34 @@ module.exports = function(state = initialState, action) {
selected: selected
});
case ReportConstants.REPORT_SELECTED:
var selectedTabulation = null;
if (state.tabulations.hasOwnProperty(action.report.ReportId)) {
selectedTabulation = getFlattenedTabulation(state.tabulations[action.report.ReportId], initialState.seriesTraversal)
}
return assign({}, state, {
selected: action.report.ReportId,
selectedTabulation: null,
seriesTraversal: []
selectedTabulation: selectedTabulation,
seriesTraversal: initialState.seriesTraversal
});
case ReportConstants.REPORT_TABULATED:
var tabulation = action.tabulation;
var tabulations = assign({}, state.tabulations, {
[tabulation.ReportId]: tabulation
});
var selectedTabulation = state.selectedTabulation;
var seriesTraversal = state.seriesTraversal;
if (tabulation.ReportId == state.selected) {
selectedTabulation = getFlattenedTabulation(tabulation, initialState.seriesTraversal)
seriesTraversal = initialState.seriesTraversal;
}
return assign({}, state, {
tabulations: tabulations
tabulations: tabulations,
selectedTabulation: selectedTabulation,
seriesTraversal: seriesTraversal
});
case ReportConstants.SERIES_SELECTED:
return assign({}, state, {
selectedTabulation: action.tabulation,
selectedTabulation: getFlattenedTabulation(state.tabulations[state.selected], action.seriesTraversal),
seriesTraversal: action.seriesTraversal
});
case UserConstants.USER_LOGGEDOUT: