bike/workstand
1
0
Fork 0
mirror of https://github.com/fspc/workstand.git synced 2025-02-23 17:23:24 -05:00
Code Issues Projects Releases Wiki Activity

Tidy up reducer.

Browse Source
This commit is contained in:
Drew Larson 2017-03-04 22:06:12 -06:00
parent 8f9d1c3663
commit f702233063
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bikeshop_project/assets/js/bikes/actions.js
View File

@ -4,4 +4,3 @@ export const fetchBikes = createAction('fetch bikes');
export const setBikes = createAction('set bikes'); export const setBikes = createAction('set bikes');
export const setBikesIsFetching = createAction('set bikes.isFetching'); export const setBikesIsFetching = createAction('set bikes.isFetching');
export const setBikesFetched = createAction('set bikes.fetched'); export const setBikesFetched = createAction('set bikes.fetched');
export const setBike = createAction('set bike');

4
bikeshop_project/assets/js/bikes/components/BikeTable/index.jsx
View File

@ -68,7 +68,7 @@ class BikeTableComponent extends React.Component {
render() { render() {
if (this.props.bikes.fetched) { if (this.props.bikes.fetched) {
const bikeRows = renderBikes(Object.values(this.props.bikes.entities['bikes'] || [])); const bikeRows = renderBikes(Object.values(this.props.bikes.entities));
return ( return (
<div className="mdl-grid"> <div className="mdl-grid">
<div className="mdl-cell mdl-cell--12-col"> <div className="mdl-cell mdl-cell--12-col">
@ -107,7 +107,7 @@ class BikeTableComponent extends React.Component {
} }
const mapStateToProps = state => ({ const mapStateToProps = state => ({
bikes: state.bikes.bikes, bikes: state.bikes,
}); });
const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({

20
bikeshop_project/assets/js/bikes/reducers.js
View File

@ -1,27 +1,17 @@
import { setBike, setBikes, setBikesIsFetching, setBikesFetched } from './actions'; import { setBikes, setBikesFetched, setBikesIsFetching } from './actions';
import { handleActions } from 'redux-actions'; import { handleActions } from 'redux-actions';
export default handleActions({ export default handleActions({
[setBikes]: (state, action) => ({ [setBikes]: (state, action) => ({
...state, ...state,
bikes: action.payload, entities: action.payload.entities.bikes,
}), }),
[setBikesIsFetching]: (state, action) => ({ [setBikesIsFetching]: (state, action) => ({
...state, ...state,
bikes: { isFetching: action.payload,
...state.bikes,
isFetching: action.payload,
},
}), }),
[setBikesFetched]: (state, action) => ({ [setBikesFetched]: (state, action) => ({
...state, ...state,
bikes: { fetched: action.payload,
...state.bikes,
fetched: action.payload
}
}), }),
[setBike]: (state, action) => ({ }, { entities: {}, isFetching: false, fetched: false });
...state,
...action.payload,
}),
}, { bikes: [], bike: undefined });

2
bikeshop_project/assets/js/bikes/sagas.js
View File

@ -11,7 +11,7 @@ function* fetchBikes(action) {
yield put({ type: setBikesIsFetching.toString(), payload: true }); yield put({ type: setBikesIsFetching.toString(), payload: true });
const bikes = yield call(Api.fetchBikes); const bikes = yield call(Api.fetchBikes);
yield put({ type: setBikes.toString(), payload: normalize(bikes, schema.bikes) }); yield put({ type: setBikes.toString(), payload: normalize(bikes, schema.bikes) });
yield put({ type: setBikesFetched, payload: true }); yield put({ type: setBikesFetched.toString(), payload: true });
} catch (e) { } catch (e) {
yield put({ type: 'BIKES_FETCH_FAILED', message: e.message }); yield put({ type: 'BIKES_FETCH_FAILED', message: e.message });
throw e; throw e;