Merge pull request #47 from easeq/master

0.7.5

Author: easeq

demo/src/store.js

@@ -26,7 +26,7 @@ const _prepareReducers = function(reducers) {
 };
 
 const prepareEpics = ( epics ) => {
-    if( isUndefined(epics) || epics.length == 0 ) {
+    if( isUndefined(epics) || epics.length === 0 ) {
         return false;
     }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@flipbyte/redux-datatable",
-    "version": "0.7.4",
+    "version": "0.7.5",
     "description": "React-Redux data table",
     "main": "lib/index.js",
     "module": "es/index.js",

package.json

@@ -17,17 +17,15 @@ export const List = styled.div `
 const ExtendedList = styled(List)(getExtendedStyles());
 
 const NUM_LINKS = 5;
-const fillRange = ( start, end ) => {
-    return Array(end - start + 1).fill().map((item, index) => start + index);
-};
+const fillRange = ( start, end ) => Array(end - start + 1).fill().map((item, index) => start + index);
 
 const getPages = ( currentPage = 1, total = 0 ) => {
     var padding = Math.floor(NUM_LINKS / 2);
     var left = (currentPage - padding < padding) ? 1 : currentPage - padding;
     var right = (left + NUM_LINKS - 1 > total) ? total : left + NUM_LINKS - 1;
 
-    left = (right === total) ?
-        (right - NUM_LINKS < 1) ? 1 : right - NUM_LINKS + 1
+    left = (right === total)
+        ? (right - NUM_LINKS < 1) ? 1 : right - NUM_LINKS + 1
         : left;
 
     return fillRange(left, right);

src/components/Pages.js

@@ -2,6 +2,7 @@ import _ from 'lodash';
 import { normalize } from 'normalizr';
 import { ofType } from 'redux-observable';
 import { Observable, of, pipe } from 'rxjs';
+import objectAssignDeep from 'object-assign-deep';
 import { concatMap, mergeMap, map, takeUntil, filter, catchError } from 'rxjs/operators';
 import { createNotification, NOTIFICATION_TYPE_SUCCESS, NOTIFICATION_TYPE_ERROR } from 'react-redux-notify';
 import {
@@ -42,10 +43,7 @@ export const fetchDataEpic = ( action$, state$, { api }) => action$.pipe(
         const query = _.get(state$.value, [reducerName, name]).query;
 
         return api.get(routes.get.route, {
-            params: {
-                ...routes.get.params,
-                ...query
-            }
+            params: objectAssignDeep({}, routes.get.params, query)
         }).pipe(
             map((response) => {
                 if(entity) {

src/epics.js

@@ -105,13 +105,27 @@ export default function reducer(state = {}, action) {
                 dir: payload.dir
             },
         }),
-        [actions.SET_LIMIT]: () => stateUpdater({
-            isFetching: true,
-            query: {
-                limit: parseInt(payload.limit, 10),
-                offset: (tableState.query.page - 1) * tableState.query.limit
-            },
-        }),
+        [actions.SET_LIMIT]: () => {
+            let maxPage = 1;
+            if (payload.limit > 0) {
+                maxPage = (tableState.query.count / payload.limit) || 1
+            }
+            const currentPage = tableState.query.page > maxPage ? maxPage : tableState.query.page;
+            const offset = (currentPage - 1) * payload.limit;
+
+            let page = 1;
+            if (payload.limit > 0) {
+                page = (offset / payload.limit) + 1;
+            }
+            return stateUpdater({
+                isFetching: true,
+                query: {
+                    limit: parseInt(payload.limit, 10),
+                    page,
+                    offset
+                },
+            })
+        },
         [actions.SET_FILTER]: () => {
             var updatedFilters = {};
             if (!payload.clear) {

src/reducer.js

@@ -71,7 +71,7 @@ export const calculatePaginationProps = _.memoize((
     if (page < 1) {
         page = 1;
     }
-    limit = limit || defaultLimit;
+    limit = isUndefined(limit) !== true ? limit : defaultLimit;
 
     let start = (page - 1) * limit;
     let end = start + limit - 1;