Merge pull request #45 from easeq/master

easeq · web-flow · commit 41cad0e0caff · 2019-06-29T11:01:20.000+05:30
Minor fixes and changes
diff --git a/README.md b/README.md
@@ -344,7 +344,7 @@ Please check the example table config object above.
 
 #### Entity array
 
-All the fields are required when entity is defined. However, entity key itself is optional in the table config.
+All the fields are required when entity is defined (data normalized). However, entity key itself is optional in the table config.
 
 | Key            | Type   | Required | Default | Description                                                                             |
 | -------------- | ------ | -------- | ------- | --------------------------------------------------------------------------------------- |
diff --git a/demo/src/schema/normalized.js b/demo/src/schema/normalized.js
@@ -14,7 +14,7 @@ const tableSchema = ( entityName, idAttributeName, definition = {}) => {
     return {
         rowSchema,
         responseSchema
-    }
+    };
 };
 
 const pageSelector = (id) => createSelector(
diff --git a/demo/src/store.js b/demo/src/store.js
@@ -34,7 +34,7 @@ const prepareEpics = ( epics ) => {
     let dependencies = { ...requestHandlers };
 
     return { rootEpic, dependencies };
-}
+};
 
 const configureStore = ( config ) => {
     const { reducers = {} } = config;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flipbyte/redux-datatable",
-    "version": "0.7.2",
+    "version": "0.7.3",
     "description": "React-Redux data table",
     "main": "lib/index.js",
     "module": "es/index.js",
diff --git a/src/components/Body.js b/src/components/Body.js
@@ -5,7 +5,7 @@ import { Tbody, Tr, Td, Div } from '../styled-components';
 import { Body as Renderers } from './Renderer';
 import { getStyles, getRenderer } from '../utils';
 import { MODIFY_DATA, SET_BODY_INNER_WIDTH } from '../actions';
-import withScrollSpy from '../hoc/withScrollSpy';
+import { withScrollSpy } from '../hoc';
 import ConfigContext from '../context';
 import { createSelector } from 'reselect';
 
diff --git a/src/components/Columns.js b/src/components/Columns.js
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import { useSelector } from 'react-redux';
-import withDropdown from '../hoc/withDropdown';
+import { withDropdown } from '../hoc';
 import { Button, Dropdown } from '../styled-components';
 import ConfigContext from '../context';
 import { SET_VISIBLE_COLUMN_IDS } from '../actions';
diff --git a/src/components/Filters.js b/src/components/Filters.js
@@ -5,7 +5,7 @@ import { Tr, Td, Thead, Div } from '../styled-components';
 import { getStyles, getRenderer } from '../utils';
 import { Filters as Renderers } from './Renderer';
 import { SET_FILTER } from '../actions';
-import withScrollSpy from '../hoc/withScrollSpy';
+import { withScrollSpy } from '../hoc';
 import ConfigContext from '../context';
 
 const Filters = React.forwardRef(({ children }, ref) => {
@@ -14,7 +14,7 @@ const Filters = React.forwardRef(({ children }, ref) => {
         action,
         config: {
             components: {
-                Table: { styles }
+                Table: { styles = {} }
             }
         },
         getData
diff --git a/src/components/Header.js b/src/components/Header.js
@@ -4,7 +4,7 @@ import { Tr, Th, Thead } from '../styled-components';
 import { getStyles, getRenderer } from '../utils';
 import { Header as Renderers } from './Renderer';
 import { SET_SORT } from '../actions';
-import withScrollSpy from '../hoc/withScrollSpy';
+import { withScrollSpy } from '../hoc';
 import ConfigContext from '../context';
 
 const changeSortOrder = ( query, colName, sorter ) => {
@@ -32,7 +32,7 @@ const Header = React.forwardRef(({ children }, ref) => {
         config: {
             primaryKey,
             components: {
-                Table: { styles }
+                Table: { styles = {} }
             }
         },
         getData
diff --git a/src/components/MassActions.js b/src/components/MassActions.js
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import withDropdown from '../hoc/withDropdown';
+import { withDropdown } from '../hoc';
 import { Button, Dropdown } from '../styled-components';
 import ConfigContext from '../context';
 
diff --git a/src/components/Renderer/Body/Actions.js b/src/components/Renderer/Body/Actions.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
-import { isUndefined } from '../../../utils';
 import { Button } from '../../../styled-components';
-import withData from '../../../hoc/withData';
+import { withData } from '../../../hoc';
 
 const Actions = ({
     thunk,
@@ -18,8 +17,8 @@ const Actions = ({
                     onClick={ cb && thunk.bind(this, cb, { item, value }) }
                     styles={ styles }
                 >
-                    { !isUndefined(icon) && <i className={ icon } /> }
-                    { !isUndefined(label) && label }
+                    { !!icon && <i className={ icon } /> }
+                    { !!label && label }
                 </Button>
             );
         })}
diff --git a/src/components/Renderer/Body/Date.js b/src/components/Renderer/Body/Date.js
@@ -1,7 +1,7 @@
 import Time, { format as formatDate } from 'react-pure-time';
 import React, { Fragment } from 'react';
 import { Field, Row } from '../../../styled-components';
-import withData from '../../../hoc/withData';
+import { withData } from '../../../hoc';
 
 const Date = ({
     isEditing,
diff --git a/src/components/Renderer/Body/Image.js b/src/components/Renderer/Body/Image.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import withData from '../../../hoc/withData';
+import { withData } from '../../../hoc';
 
 const Image = ({
     value,
diff --git a/src/components/Renderer/Body/Options.js b/src/components/Renderer/Body/Options.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import Time from 'react-pure-time';
 import React, { Fragment } from 'react';
 import { Field, Row } from '../../../styled-components';
-import withData from '../../../hoc/withData';
+import { withData } from '../../../hoc';
 
 const Options = ({
     isEditing,
diff --git a/src/components/Renderer/Body/Selection.js b/src/components/Renderer/Body/Selection.js
@@ -4,7 +4,7 @@ import { SET_SELECTION } from '../../../actions';
 import { Field } from '../../../styled-components';
 import ConfigContext from '../../../context';
 import { useSelector } from 'react-redux';
-import withData from '../../../hoc/withData';
+import { withData } from '../../../hoc';
 
 const handleSelection = ({ key, primaryKey, action }, event ) => {
     action(SET_SELECTION)({ paramKey: primaryKey, key, value: event.target.checked });
diff --git a/src/components/Renderer/Body/Text.js b/src/components/Renderer/Body/Text.js
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import { Field, Row } from '../../../styled-components';
-import withData from '../../../hoc/withData';
+import { withData } from '../../../hoc';
 
 const Text = ({
     isEditing,
diff --git a/src/components/Table.js b/src/components/Table.js
@@ -3,13 +3,8 @@ import { Table as StyledTable } from '../styled-components';
 import ConfigContext from '../context';
 
 const Table = ({ children }) => {
-    const {
-        config: {
-            components: {
-                Table: { styles }
-            }
-        }
-    } = useContext(ConfigContext);
+    const { config } = useContext(ConfigContext);
+    const { styles = {} } = config.components.Table;
     return (
         <StyledTable styles={ styles.table }>
             { children }
diff --git a/src/containers/Print.js b/src/containers/Print.js
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import PrintButton from '../styled-components/Print';
-import withModal from '../hoc/withModal';
+import { withModal } from '../hoc';
 import { SET_IS_PRINTING } from '../actions';
 
 const Print = ({ action, children, ...rest }) => {
diff --git a/src/hoc/index.js b/src/hoc/index.js
@@ -0,0 +1,4 @@
+export withData from './withData';
+export withDropdown from './withDropdown';
+export withModal from './withModal';
+export withScrollSpy from './withScrollSpy';
diff --git a/src/hoc/withScrollSpy.js b/src/hoc/withScrollSpy.js
@@ -36,7 +36,7 @@ const withScrollSpy = WrappedComponent => (props) => {
             } else {
                 delete scrollerMap[id];
             }
-        }
+        };
     }, [ handleScroll ]);
 
     return <WrappedComponent ref={ ref } { ...scrollData } { ...props } />;
diff --git a/src/index.js b/src/index.js
@@ -2,4 +2,5 @@ export reducer from './reducer';
 export * as epics from './epics';
 export * as utils from './utils';
 export * as actions from './actions';
+export * as hoc from './hoc';
 export { default } from './createTable';
diff --git a/src/reducer.js b/src/reducer.js
@@ -40,7 +40,7 @@ const calculateTableWidth = (columnWidths, clientWidth ) => {
     return {
         width: totalColWidth * widthAdjustment,
         widthAdjustment
-    }
+    };
 };
 
 const updateState = ( state, tableName ) => ( newState ) => {
@@ -137,7 +137,8 @@ export default function reducer(state = {}, action) {
         },
         [actions.SET_SELECTION]: () => {
             let selection = _.get(tableState, 'selection', {});
-            if (payload.type === SELECT_ALL) {
+
+            if (payload.type === SELECT_ALL || tableState.items.length === 1) {
                 selection.all = payload.value;
                 selection.selected = {};
             } else {
@@ -225,4 +226,4 @@ export default function reducer(state = {}, action) {
     }
 
     return state;
-};
+}
diff --git a/src/styled-components/Print.js b/src/styled-components/Print.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { getExtendedStyles } from '../utils';
-import withModal from '../hoc/withModal';
+import { withModal } from '../hoc';
 
 const Print = styled.div `
     position: absolute;
diff --git a/src/utils.js b/src/utils.js
@@ -68,8 +68,10 @@ export const calculatePaginationProps = _.memoize((
     defaultLimit = 10
 ) => {
     let { page, limit = 0, count = 0 } = query;
-    page = page > 1 ? page : 1;
-    limit = isUndefined(limit) !== true ? limit : defaultLimit;
+    if (page < 1) {
+        page = 1;
+    }
+    limit = limit || defaultLimit;
 
     let start = (page - 1) * limit;
     let end = start + limit - 1;
@@ -100,7 +102,7 @@ export const getRenderer = ( config, Renderers ) => {
 
     if (config.type) {
         const pcaseType = toPascalCase(config.type);
-        return !isUndefined(Renderers[pcaseType]) ? Renderers[pcaseType] : Renderers.default;
+        return Renderers[pcaseType] || Renderers.default;
     }
 
     return Renderers.default;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@flipbyte/redux-datatable",`
`3`		`- "version": "0.7.2",`
	`3`	`+ "version": "0.7.3",`
`4`	`4`	`"description": "React-Redux data table",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"module": "es/index.js",`