On change on last page from lower limit value to higher limit value - issue fixed

Author: easeq

src/components/Pages.js

@@ -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/reducer.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) {