Fixed normalized data issue

demo/src/index.js

@@ -12,7 +12,7 @@ import './css/styles.css';
 
 const store = configureStore(config);
 
-const Demo = () =>
+const Demo = () => (
     <div className="d-flex" id="wrapper">
         <div className="bg-light border-right sidenav" id="sidebar-wrapper">
             <div className="sidebar-heading"><strong>redux-datatable</strong></div>
@@ -36,6 +36,7 @@ const Demo = () =>
             </div>
         </div>
     </div>
+);
 
 render(
     <Provider store={ store }>

demo/src/schema/basic.js

@@ -137,7 +137,7 @@ export default {
                 label: 'Delete',
                 indexField: '@id',
                 thunk: ( payload ) => ( dispatch, getState ) => {
-                    confirm("Are your sure you want to delete the selected items?")
+                    confirm('Are your sure you want to delete the selected items?')
                         ? console.log('delete items', getState())
                         : console.log(false);
 
@@ -211,7 +211,7 @@ export default {
                 id: '@id'
             },
             thunk: ( payload ) => ( dispatch, getState ) => {
-                confirm("Are your sure you want to delete this page?")
+                confirm('Are your sure you want to delete this page?')
                     ? console.log('delete', getState())
                     : console.log(false);
 

demo/src/schema/index.js

@@ -2,9 +2,9 @@ import basic from './basic';
 
 export default [
     {
-        title: "Basic Table",
-        id: "basic-table",
-        className: "mb-4",
+        title: 'Basic Table',
+        id: 'basic-table',
+        className: 'mb-4',
         config: basic
     }
 ]

nwb.config.js

@@ -9,4 +9,4 @@ module.exports = {
       }
     }
   }
-}
+};

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flipbyte/redux-datatable",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "React-Redux data table",
     "main": "lib/index.js",
     "module": "es/index.js",
@@ -20,13 +20,13 @@
         "test:watch": "nwb test-react --server"
     },
     "peerDependencies": {
-        "react": "^16.8.4",
-        "react-dom": "^16.8.4",
+        "react": "^16.8.6",
+        "react-dom": "^16.8.6",
         "rxjs": "^6.4.0",
         "prop-types": "^15.6.2",
         "react-redux": "^6.0.1",
         "redux": "^4.0.1",
-        "styled-components": "^4.1.3"
+        "styled-components": "^4.2.0"
     },
     "dependencies": {
         "lodash": ">=4.17.10",
@@ -44,13 +44,13 @@
         "bootstrap": "^4.3.1",
         "nwb": "0.23.x",
         "path-to-regexp": "^3.0.0",
-        "react": "^16.8.4",
-        "react-dom": "^16.8.4",
+        "react": "^16.8.6",
+        "react-dom": "^16.8.6",
         "react-redux": "^6.0.1",
         "redux": "^4.0.1",
         "redux-logger": "^3.0.6",
         "rxjs": "^6.4.0",
-        "styled-components": "^4.1.3"
+        "styled-components": "^4.2.0"
     },
     "author": "",
     "homepage": "",

src/Renderer.js

@@ -50,7 +50,7 @@ const getRenderers = ( ofType ) => renderers[ofType] || {};
 const Renderer = ({ ofType, forItem, ...props }) => {
     const renderers = getRenderers(ofType);
     const Renderer = renderers[forItem] || renderers['default'];
-    return <Renderer { ...props } />
-}
+    return <Renderer { ...props } />;
+};
 
 export default Renderer;

src/Renderer/Body/Actions.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import React, { Component } from 'react';
 import { deleteData } from '../../actions';
 import { withTableConfig } from '../../TableProvider';
-import { paramsResolver, prepareActionPayload } from '../../utils'
+import { paramsResolver, prepareActionPayload } from '../../utils';
 import Button from '../../components/Button';
 
 const Actions = ({

src/Renderer/Body/Date.js

@@ -1,14 +1,13 @@
 import _ from 'lodash';
 import Time from 'react-pure-time';
 import React, { Component } from 'react';
-import { shouldUpdate } from '../../utils';
 
 const Date = ({
     data,
     index,
     colConfig: { name, textAlign, format }
 }) => (
     <Time value={ _.get(data, name, '') } format={ format ? format : 'F j, Y, g:i a' } />
-)
+);
 
 export default Date;

src/Renderer/Body/Image.js

@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import { shouldUpdate } from '../../utils';
 import React, { Fragment, Component } from 'react';
 
 const Image = ({
@@ -8,6 +7,6 @@ const Image = ({
     colConfig: { name, imgWidth, imgHeight }
 }) => (
     <img src={ _.get(data, name, '') } width={ imgWidth } height={ imgHeight } />
-)
+);
 
 export default Image;

src/Renderer/Body/Options.js

@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import Time from 'react-pure-time';
-import { shouldUpdate } from '../../utils';
 import React, { Fragment, Component } from 'react';
 
 const Options = ({
@@ -10,14 +9,14 @@ const Options = ({
     const value = _.get(data, name);
 
     if(!options || !options[value]) {
-        return <Fragment>{ value }</Fragment>
+        return <Fragment>{ value }</Fragment>;
     }
 
     return (
         <span className={ (options[value].badge ? 'badge ' + options[value].badge : '') }>
             { options[value].value }
         </span>
     );
-}
+};
 
 export default Options;

src/Renderer/Body/Selection.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import PropTypes from "prop-types";
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import React, { Component } from 'react';
 import { SET_SELECTION } from '../../actions';
@@ -11,7 +11,7 @@ const handleSelection = ({ data, indexField, action }, event ) => {
     let paramKey = getConfigParam(indexField);
     let key = getParam(indexField, data);
     action(SET_SELECTION)({ paramKey, key, value: event.target.checked });
-}
+};
 
 const Selection = ({
     action,
@@ -31,6 +31,6 @@ const Selection = ({
                 onChange={ handleSelection.bind(this, { data, indexField, action }) } />
         </div>
     );
-}
+};
 
 export default Selection;

src/Renderer/Body/Text.js

@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import { shouldUpdate } from '../../utils';
 import React, { Fragment, Component } from 'react';
 
 const Text = ({

src/Renderer/Filter/Date.js

@@ -9,7 +9,7 @@ var dateTo = null;
 const applyFilter = ( key, filterer, event ) => {
     let filter = {};
 
-    if (key == 0) {
+    if (key === 0) {
         dateFrom = event.target.value;
     } else {
         dateTo = event.target.value;

src/Renderer/Filter/Number.js

@@ -9,7 +9,7 @@ var valTo = null;
 const applyFilter = ( key, filterer, event ) => {
     let filter = {};
 
-    if (key == 0) {
+    if (key === 0) {
         valFrom = event.target.value;
     } else {
         valTo = event.target.value;

src/Renderer/Pagination/Limiter.js

@@ -17,6 +17,6 @@ const Limiter = ({ options, limit, action, style, default: defaultLimit }) => {
             </Field.Select> per page
         </Label>
     );
-}
+};
 
 export default Limiter;

src/Renderer/Pagination/Pages.js

@@ -9,8 +9,8 @@ export const List = styled.div `
     background: ${props => props.background || '#fff'};
     border: ${props => props.border || '1px solid rgba(34,36,38,.15)'};
     border-radius: ${props => props.borderRadius || 'none'};
-    height: ${props => props.height || '40px'}
-`
+    height: ${props => props.height || '40px'};
+`;
 
 const NUM_LINKS = 5;
 
@@ -23,18 +23,18 @@ const getPages = ( currentPage, total ) => {
     var left = (currentPage - padding < padding) ? 1 : currentPage - padding;
     var right = (left + NUM_LINKS - 1 > total) ? total : left + NUM_LINKS - 1;
 
-    left = (right == total) ?
+    left = (right === total) ?
         (right - NUM_LINKS < 1) ? 1 : right - NUM_LINKS + 1
         : left;
 
     return fillRange(left, right);
-}
+};
 
 const Pages = ({ page, total, action, style }) => {
     const setPage = ( page ) =>  action(SET_PAGE)({ page });
     return (
         <List>
-            <Button onClick={ setPage.bind(this, 1) } disabled={ page == 1 }>First</Button>
+            <Button onClick={ setPage.bind(this, 1) } disabled={ page === 1 }>First</Button>
             <Button onClick={ setPage.bind(this, page - 1) } disabled={ page < 2 } >Previous</Button>
             { getPages(page, total).map( (link, index) =>
                 <Button
@@ -44,9 +44,9 @@ const Pages = ({ page, total, action, style }) => {
                 >{ link }</Button>
             ) }
             <Button onClick={ setPage.bind(this, page + 1) } disabled={ page >= total }>Next</Button>
-            <Button onClick={ setPage.bind(this, total) } disabled={ page == total }>Last</Button>
+            <Button onClick={ setPage.bind(this, total) } disabled={ total === 0 || page === total }>Last</Button>
         </List>
     );
-}
+};
 
-export default Pages
+export default Pages;

src/Renderer/Pagination/ResultCount.js

@@ -3,8 +3,9 @@ import React from 'react';
 const lowerLimit = ( page, limit ) => ((page - 1) * limit) + 1;
 const upperLimit = ( page, limit, count ) =>  (page * limit) > count ? count : page * limit;
 
-const ResultCount = ({ page, limit, count }) =>
+const ResultCount = ({ page, limit, count }) => (
     !!count > 0 &&
         <span>Showing { lowerLimit(page, limit) } to { upperLimit(page, limit, count) } of { count } entries</span>
+);
 
-export default ResultCount
+export default ResultCount;