Merge pull request #34 from easeq/master

Improvements

Author: easeq

demo/src/schema/basic.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { MODIFY_DATA } from '../../../src/actions';
+import { MODIFY_DATA, REQUEST_DATA, IS_LOADING } from '../../../src/actions';
 
 export default {
     name: 'posts',
@@ -174,7 +174,13 @@ export default {
             visible: true,
             state: false,
             thunk: ( config ) => ( dispatch, getState ) => {
-                console.log('toolbar button click', config);
+                const tableState = getState()[config.reducerName][config.name];
+                console.log('toolbar button click', config, tableState);
+                config.action(REQUEST_DATA)();
+                config.action(IS_LOADING)({ value: true });
+                setTimeout(function() {
+                    config.action(IS_LOADING)({ value: false });
+                }, 1000);
             }
         }, {
             type: 'resetFilters',

package-lock.json

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

package.json

@@ -25,6 +25,7 @@ const Date = ({
                     modified={ isModified }
                     className={ isModified ? 'modified' : ''}
                     value={ formatDate(value, 'Y-m-d') }
+                    autocomplete="off"
                 />
             </Row>
         )}

src/Renderer/Body/Date.js

@@ -24,6 +24,7 @@ const Text = ({
                     modified={ isModified }
                     className={ isModified ? 'modified' : ''}
                     value={ value }
+                    autocomplete="off"
                 />
             </Row>
         )}

src/Renderer/Body/Text.js

@@ -12,6 +12,7 @@ export const SET_SELECTION = 'SET_SELECTION';
 export const CLEAR_FILTER = 'CLEAR_FILTER';
 export const DELETE_DATA = 'DELETE_DATA';
 export const MODIFY_DATA = 'MODIFY_DATA';
+export const IS_LOADING = 'IS_LOADING';
 
 export const cancelRequest = createActionCreator(REQUEST_DATA_CANCEL);
 export const requestData = createActionCreator(REQUEST_DATA);

src/actions.js

@@ -241,7 +241,7 @@ const renderTable = ({
                                                 isEditing={ isEditing }
                                                 origValue={ origValue }
                                                 modifiedData={ modifiedData }
-                                                isModified={ !!modifiedValue }
+                                                isModified={ _.has(modifiedData, name) }
                                                 modifiedValue={ modifiedValue }
                                                 handleChange={(event) => {
                                                     var newData = { ...modifiedData };

src/createTable.js

@@ -30,25 +30,21 @@ export const setParamsEpic = ( action$, state$ ) => action$.pipe(
 
         return of(
             cancelRequest({ name }),
-            requestData({
-                name, routes, reducerName, entity, payload: { query: _.get(state$.value, [reducerName, name]).query }
-            })
+            requestData({ name, routes, reducerName, entity })
         );
     })
 );
 
 export const fetchDataEpic = ( action$, state$, { api }) => action$.pipe(
     ofType(REQUEST_DATA),
     switchMap((action) => {
-        const {
-            meta: { name, routes, entity },
-            payload
-        } = action;
+        const { name, routes, entity, reducerName } = action.meta;
+        const query = _.get(state$.value, [reducerName, name]).query;
 
         return api.get(routes.get.route, {
             params: {
                 ...routes.get.params,
-                ...payload.query
+                ...query
             }
         }).pipe(
             map((response) => {
@@ -93,10 +89,7 @@ export const deleteDataEpic = ( action$, state$, { api }) => action$.pipe(
                 return of(
                     createNotification({ type: NOTIFICATION_TYPE_SUCCESS, message: response.result }),
                     cancelRequest({ name }),
-                    requestData({
-                        name, routes, reducerName, entity,
-                        payload: { query: _.get(state$.value, [reducerName, name]).query }
-                    })
+                    requestData({ name, routes, reducerName, entity })
                 );
             }),
             catchError((error) => of(

src/epics.js

@@ -50,6 +50,7 @@ export default function reducer(state = {}, action) {
     const tableState = getTableState(name)(state);
     const stateUpdater = updateState(state, name);
     const acceptedActions = {
+        [actions.IS_LOADING]: () => stateUpdater({ isFetching: !!payload.value }),
         [actions.REQUEST_DATA]: () => stateUpdater({ isFetching: true }),
         [actions.REQUEST_DATA_CANCEL]: () => stateUpdater({ isFetching: false }),
         [actions.RECEIVE_DATA]: () => stateUpdater({