Merge pull request #15 from eatonphil/billing-dashboard

Patch

Author: na3d

src/api/account.js

@@ -4,9 +4,7 @@ import { actions } from './configs/account';
 
 export function transferPool() {
   return async (dispatch) => {
-    const _transferpool = await dispatch(
-      thunkFetch.get('/account/transfer')
-    );
-    dispatch(actions.one({ _transferpool }, 0));
+    const _transferpool = await dispatch(thunkFetch.get('/account/transfer'));
+    dispatch(actions.one({ _transferpool }));
   };
 }

src/api/apiResultActionReducerGenerator.js

@@ -118,7 +118,7 @@ export function generateDefaultStateOne(config, one) {
 export class ReducerGenerator {
   static one(config, oldStateMany, action) {
     if (config.singular) {
-      return action.resource;
+      return { ...oldStateMany, ...action.resource };
     }
 
     const nonNanActionIds = (action.ids || []).filter(i => !_.isNaN(i));

src/billing/layouts/DashboardPage.js

@@ -8,15 +8,9 @@ import { Table } from 'linode-components/tables';
 import { LinkCell } from 'linode-components/tables/cells';
 
 import { setSource } from '~/actions/source';
-import { account, invoices } from '~/api';
 
 
 export class DashboardPage extends Component {
-  static async preload({ dispatch }) {
-    await dispatch(account.one());
-    await dispatch(invoices.all());
-  }
-
   componentDidMount() {
     const { dispatch } = this.props;
     dispatch(setSource(__filename));

src/billing/layouts/IndexPage.js

@@ -5,9 +5,14 @@ import { push } from 'react-router-redux';
 import { Tabs } from 'linode-components/tabs';
 
 import { setAnalytics, setTitle } from '~/actions';
+import { account, invoices } from '~/api';
 
 
 export class IndexPage extends Component {
+  static async preload({ dispatch }) {
+    await Promise.all([account.one(), invoices.all()].map(r => dispatch(r)));
+  }
+
   componentDidMount() {
     const { dispatch } = this.props;
     dispatch(setTitle('Billing'));