Merge pull request carlosrocha#39 from chhsiao90/fixed-filter-#38

carlosrocha · web-flow · commit 77a4acad44e4 · 2016-10-21T08:30:56.000-05:00
Resolved carlosrocha#38: display data on page 0 after filter
diff --git a/src/__tests__/dataReducer-test.js b/src/__tests__/dataReducer-test.js
@@ -132,4 +132,30 @@ describe('dataReducer', () => {
     expect(dataReducer(state, action)).toEqual(expected);
   });
 
+  it('filters on different page', () => {
+    const data = [ ['carlos', 'r'], [3, 4] ];
+    const state = {
+      data,
+      initialData: data,
+      page: data.slice(0, 1),
+      pageSize: 1,
+      totalPages: 2,
+    };
+    const initState = {
+      ...state,
+      pageNumber: 1,
+    };
+    const action = dataFilter('globalSearch', 'c', filters);
+    const expected = {
+      ...state,
+      pageNumber: 0,
+      filterValues: { globalSearch: 'c' },
+      data: [ ['carlos', 'r'] ],
+      page: [ ['carlos', 'r'] ],
+      totalPages: 1,
+    };
+
+    expect(dataReducer(state, action)).toEqual(expected);
+  });
+
 });
diff --git a/src/dataReducer.js b/src/dataReducer.js
@@ -73,7 +73,7 @@ function dataFilter(state, {value: {key, value, filters}}) {
 
   return {
     ...state,
-    ...calculatePage(data, state.pageSize, state.pageNumber),
+    ...calculatePage(data, state.pageSize, 0),
     data,
     filterValues: newFilterValues,
     pageNumber: 0,
