diff --git a/js/actions/piece_list_actions.js b/js/actions/piece_list_actions.js index 2ff3b0cf..4d2514b6 100644 --- a/js/actions/piece_list_actions.js +++ b/js/actions/piece_list_actions.js @@ -10,7 +10,7 @@ class PieceListActions { ); } - fetchList(page, pageSize, search, orderBy, orderAsc) { + fetchPieceList(page, pageSize, search, orderBy, orderAsc) { PieceListFetcher .fetch(page, pageSize, search, orderBy, orderAsc) .then((res) => { @@ -20,7 +20,7 @@ class PieceListActions { search, orderBy, orderAsc, - 'itemList': res.pieces + 'pieceList': res.pieces }); }) .catch((err) => { diff --git a/js/components/ascribe_table/table.js b/js/components/ascribe_table/table.js index c1f8f650..6ea5f07e 100644 --- a/js/components/ascribe_table/table.js +++ b/js/components/ascribe_table/table.js @@ -12,8 +12,6 @@ let Table = React.createClass({ }, render() { - console.log(this.props); - if(this.props.itemList && this.props.itemList.length > 0) { return (
diff --git a/js/components/piece_list.js b/js/components/piece_list.js index 8b145a53..22f0ee3e 100644 --- a/js/components/piece_list.js +++ b/js/components/piece_list.js @@ -22,7 +22,7 @@ let PieceList = React.createClass({ componentDidMount() { let page = this.props.query.page || this.state.page; - PieceListActions.fetchList(page, this.state.pageSize, this.state.search, + PieceListActions.fetchPieceList(page, this.state.pageSize, this.state.search, this.state.orderBy, this.state.orderAsc); }, @@ -37,9 +37,16 @@ let PieceList = React.createClass({ { - console.log('@@@@@@@', x); - return { a: 1, b: 2 }; + transform={(props) => { + return { + 'itemList': props.pieceList, + 'fetchList': props.fetchPieceList, + 'orderBy': props.orderBy, + 'orderAsc': props.orderAsc, + 'search': props.search, + 'page': props.page, + 'pageSize': props.pageSize + } }}> diff --git a/js/stores/piece_list_store.js b/js/stores/piece_list_store.js index 47c55bd5..4b0a32e0 100644 --- a/js/stores/piece_list_store.js +++ b/js/stores/piece_list_store.js @@ -4,7 +4,7 @@ import PieceListActions from '../actions/piece_list_actions'; class PieceListStore { constructor() { - this.itemList = []; // rename this to pieceList after figuring out AltContainer transform + this.pieceList = []; // rename this to pieceList after figuring out AltContainer transform this.page = 1; this.pageSize = 10; this.search = ""; @@ -13,13 +13,13 @@ class PieceListStore { this.bindActions(PieceListActions); } - onUpdatePieceList({ page, pageSize, search, itemList, orderBy, orderAsc }) { + onUpdatePieceList({ page, pageSize, search, pieceList, orderBy, orderAsc }) { this.page = page; this.pageSize = pageSize; this.search = search; this.orderAsc = orderAsc; this.orderBy = orderBy; - this.itemList = itemList; + this.pieceList = pieceList; } };