Destructure params for fetchEditionList

js/actions/edition_list_actions.js

@@ -17,7 +17,7 @@ class EditionListActions {
         );
     }
 
-    fetchEditionList(pieceId, page, pageSize, orderBy, orderAsc, filterBy) {
+    fetchEditionList({pieceId, page, pageSize, orderBy, orderAsc, filterBy}) {
         if((!orderBy && typeof orderAsc === 'undefined') || !orderAsc) {
             orderBy = 'edition_number';
             orderAsc = true;
@@ -31,7 +31,7 @@ class EditionListActions {
 
         return Q.Promise((resolve, reject) => {
             EditionListFetcher
-                .fetch(pieceId, page, pageSize, orderBy, orderAsc, filterBy)
+                .fetch({pieceId, page, pageSize, orderBy, orderAsc, filterBy})
                 .then((res) => {
                     if(res && !res.editions) {
                         throw new Error('Piece has no editions to fetch.');
@@ -54,7 +54,6 @@ class EditionListActions {
                     reject(err);
                 });
         });
-        
     }
 }
 

js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js

@@ -50,14 +50,15 @@ let AccordionListItemEditionWidget = React.createClass({
      * Calls the store to either show or hide the editionListTable
      */
     toggleTable() {
-        let pieceId = this.props.piece.id;
+        const { piece: { id: pieceId } } = this.props;
-        let isEditionListOpen = this.state.isEditionListOpenForPieceId[pieceId] ? this.state.isEditionListOpenForPieceId[pieceId].show : false;
+        const { filterBy, isEditionListOpenForPieceId } = this.state;
-        
+        const isEditionListOpen = isEditionListOpenForPieceId[pieceId] ? isEditionListOpenForPieceId[pieceId].show : false;
+
         if(isEditionListOpen) {
             EditionListActions.toggleEditionList(pieceId);
         } else {
             EditionListActions.toggleEditionList(pieceId);
-            EditionListActions.fetchEditionList(pieceId, null, null, null, null, this.state.filterBy);
+            EditionListActions.fetchEditionList({pieceId, filterBy});
         }
     },
 
@@ -68,7 +69,7 @@ let AccordionListItemEditionWidget = React.createClass({
     getGlyphicon() {
         let pieceId = this.props.piece.id;
         let isEditionListOpen = this.state.isEditionListOpenForPieceId[pieceId] ? this.state.isEditionListOpenForPieceId[pieceId].show : false;
-        
+
         if(isEditionListOpen) {
             // this is the loading feedback for the editions
             // button.

js/components/ascribe_accordion_list/accordion_list_item_table_editions.js

@@ -66,20 +66,28 @@ let AccordionListItemTableEditions = React.createClass({
     },
 
     filterSelectedEditions() {
-        let selectedEditions = this.state.editionList[this.props.parentId]
+        return this.state
-            .filter((edition) => edition.selected);
+                   .editionList[this.props.parentId]
-        return selectedEditions;
+                   .filter((edition) => edition.selected);
     },
 
     loadFurtherEditions() {
+        const { parentId: pieceId } = this.props;
+        const { page, pageSize, orderBy, orderAsc, filterBy } = this.state.editionList[pieceId];
+
         // trigger loading animation
         this.setState({
             showMoreLoading: true
         });
 
-        let editionList = this.state.editionList[this.props.parentId];
+        EditionListActions.fetchEditionList({
-        EditionListActions.fetchEditionList(this.props.parentId, editionList.page + 1, editionList.pageSize,
+            pieceId,
-                                            editionList.orderBy, editionList.orderAsc, editionList.filterBy);
+            page: page + 1,
+            pageSize,
+            orderBy,
+            orderAsc,
+            filterBy
+        });
     },
     render() {
         let selectedEditionsCount = 0;

js/components/ascribe_buttons/create_editions_button.js

@@ -49,16 +49,18 @@ let CreateEditionsButton = React.createClass({
 
             // requests, will try to merge the filterBy parameter with other parameters (mergeOptions).
             // Therefore it can't but null but instead has to be an empty object
-            EditionListActions.fetchEditionList(this.props.piece.id, null, null, null, null, {})
+            EditionListActions
-            .then((res) => {
+                .fetchEditionList({
-
+                    pieceId: this.props.piece.id,
-                clearInterval(this.state.pollingIntervalIndex);
+                    filterBy: {}
-                this.props.onPollingSuccess(this.props.piece.id, res.editions[0].num_editions);
+                })
-
+                .then((res) => {
-            })
+                    clearInterval(this.state.pollingIntervalIndex);
-            .catch((err) => {
+                    this.props.onPollingSuccess(this.props.piece.id, res.editions[0].num_editions);
-                /* Ignore and keep going */
+                })
-            });
+                .catch((err) => {
+                    /* Ignore and keep going */
+                });
         }, 5000);
 
         this.setState({

js/fetchers/edition_list_fetcher.js

@@ -9,7 +9,7 @@ let EditionListFetcher = {
     /**
      * Fetches a list of editions from the API.
      */
-    fetch(pieceId, page, pageSize, orderBy, orderAsc, filterBy) {
+    fetch({pieceId, page, pageSize, orderBy, orderAsc, filterBy}) {
         let ordering = generateOrderingQueryParams(orderBy, orderAsc);
 
         let queryParams = mergeOptions(

js/stores/edition_list_store.js

@@ -32,7 +32,7 @@ class EditionListStore {
             // page
             let storeEditionIndex = (page - 1) * pageSize + i;
             let editionsForPieces = this.editionList[pieceId];
-            
+
             // if edition already exists, just merge
             if(editionsForPieces[storeEditionIndex]) {
                 editionsForPieces[storeEditionIndex] = React.addons.update(editionsForPieces[storeEditionIndex], {$merge: editionListOfPiece[i]});
@@ -88,10 +88,15 @@ class EditionListStore {
         this.editionList[pieceId].length = 0;
 
         // refetch editions with adjusted page size
-        EditionsListActions.fetchEditionList(pieceId, 1, prevEditionListLength,
+        EditionsListActions
-                                             this.editionList[pieceId].orderBy,
+            .fetchEditionList({
-                                             this.editionList[pieceId].orderAsc,
+                pieceId,
-                                             filterBy)
+                page: 1,
+                pageSize: prevEditionListLength,
+                orderBy: this.editionList[pieceId].orderBy,
+                orderAsc: this.editionList[pieceId].orderAsc,
+                filterBy
+            })
             .then(() => {
                 // reset back to the normal pageSize and page
                 this.editionList[pieceId].page = prevEditionListPage;
@@ -144,7 +149,7 @@ class EditionListStore {
         if(!this.isEditionListOpenForPieceId[pieceId].show) {
             // to clear an array, david walsh recommends to just set it's length to zero
             // http://davidwalsh.name/empty-array
-            
+
             this.editionList[pieceId].length = 0;
         }
     }