redux-paginator-immutable 2.7.8 → 17.0.0

package/lib/LoadDataItem.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 var _react = require("react");
@@ -22,12 +20,6 @@ var _Messages = require("x25/Messages");
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
 var mapStateToProps = function mapStateToProps(state, _ref) {
   var selectors = _ref.settings.selectors,
       id = _ref.id;
@@ -51,78 +43,37 @@ var mapStateToProps = function mapStateToProps(state, _ref) {
   };
 };
 
-var LoadDataItem = function (_React$Component) {
-  _inherits(LoadDataItem, _React$Component);
-
-  function LoadDataItem() {
-    _classCallCheck(this, LoadDataItem);
-
-    return _possibleConstructorReturn(this, (LoadDataItem.__proto__ || Object.getPrototypeOf(LoadDataItem)).apply(this, arguments));
-  }
-
-  _createClass(LoadDataItem, [{
-    key: "UNSAFE_componentWillMount",
-    value: function UNSAFE_componentWillMount() {
-      var _props = this.props,
-          shouldFetch = _props.shouldFetch,
-          fetchItem = _props.fetchItem;
+var LoadDataItem = function LoadDataItem(props) {
+  var children = props.children,
+      data = props.data,
+      isFetching = props.isFetching,
+      shouldFetch = props.shouldFetch,
+      hasError = props.hasError,
+      fetchItem = props.fetchItem;
 
 
-      if (shouldFetch) {
-        fetchItem();
-      }
+  React.useEffect(function () {
+    if (shouldFetch) {
+      fetchItem();
     }
-  }, {
-    key: "shouldComponentUpdate",
-    value: function shouldComponentUpdate(nextProps) {
-      return this.props.data !== nextProps.data || this.props.hasError !== nextProps.hasError || this.props.fetched !== nextProps.fetched || this.props.isFetching !== nextProps.isFetching || this.props.shouldFetch !== nextProps.shouldFetch || this.props.id !== nextProps.id;
-    }
-  }, {
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      var shouldFetch = nextProps.shouldFetch,
-          fetchItem = nextProps.fetchItem;
+  }, [shouldFetch, isFetching, hasError]);
 
+  if (isFetching) {
+    return React.createElement(_Messages.LoadingMessage, { message: "Preiau datele..." });
+  }
 
-      if (shouldFetch) {
-        fetchItem();
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _props2 = this.props,
-          children = _props2.children,
-          data = _props2.data,
-          isFetching = _props2.isFetching,
-          hasError = _props2.hasError,
-          fetchItem = _props2.fetchItem;
-
-
-      if (isFetching) {
-        return React.createElement(_Messages.LoadingMessage, { message: "Preiau datele..." });
-      }
-
-      if (hasError) {
-        return React.createElement(_Messages.LargeErrorMessage, {
-          message: "Ceva nu a mers bine",
-          onRetry: fetchItem
-        });
-      }
-
-      if (data.size === 0) {
-        return null;
-      }
-
-      return React.createElement(
-        React.Fragment,
-        null,
-        children
-      );
-    }
-  }]);
+  if (hasError) {
+    return React.createElement(_Messages.LargeErrorMessage, {
+      message: "Nu am putut stabili conexiunea cu server-ul",
+      onRetry: fetchItem
+    });
+  }
+
+  if (data.size === 0) {
+    return null;
+  }
 
-  return LoadDataItem;
-}(React.Component);
+  return children;
+};
 
 exports.default = (0, _reactRouterDom.withRouter)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(LoadDataItem));

package/lib/LoadPaginator.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-// /* eslint-disable no-unused-vars */
+/* eslint-disable  */
 
 var _react = require("react");
 

package/lib/createDataReducer.js

@@ -63,8 +63,8 @@ var createDataReducer = function createDataReducer(_ref) {
 
     return data.get("fetched");
   }),
-      getShouldFetchItemInfo = (0, _reselect.createSelector)(getIsFetchingItemInfo, getItemIsFetched, function (isFetching, isFetched) {
-    return !isFetched && !isFetching;
+      getShouldFetchItemInfo = (0, _reselect.createSelector)(getIsFetchingItemInfo, getItemIsFetched, getItemHasError, function (isFetching, isFetched, hasError) {
+    return !isFetched && !isFetching && !hasError;
   });
 
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-paginator-immutable",
-  "version": "2.7.8",
+  "version": "17.0.0",
   "description": "redux-paginator-immutable helps you deal with paginated API by composing your existing reducers",
   "main": "./lib/index.js",
   "babel": {
@@ -37,9 +37,8 @@
     "build": "npm run build:lib",
     "clean": "rimraf dist lib",
     "check": "npm-check -u -i babel-jest -i jest --specials=bin,eslint,babel,webpack",
-    "flow": "flow check --color=always",
-    "eslint": "eslint src --fix",
-    "prepublish": "npm run test && npm run eslint && npm run flow && npm run clean && npm run build",
+    "eslint": "eslint --ext .jsx,.js src --fix",
+    "load": "npm run test && npm run eslint && npm run clean && npm run build && npm publish",
     "test": "mocha --require babel-core/register --recursive --recursive \"src/**/__tests__/*\" --require src/__tests__/setup.js",
     "test:watch": "npm test -- --watch",
     "test:cov": "babel-node ./node_modules/isparta/bin/isparta cover ./node_modules/mocha/bin/_mocha -- --recursive \"src/**/__tests__/*\" --require src/__tests__/setup.js",
@@ -72,65 +71,38 @@
   "homepage": "https://github.com/cristian-sima/redux-paginator-immutable#readme",
   "devDependencies": {
     "babel-cli": "^6.26.0",
-    "babel-eslint": "^10.0.2",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-check-es2015-constants": "^6.22.0",
-    "babel-plugin-flow-react-proptypes": "^25.1.0",
-    "babel-plugin-syntax-flow": "^6.18.0",
-    "babel-plugin-syntax-jsx": "^6.18.0",
+    "babel-eslint": "^10.1.0",
     "babel-plugin-transform-decorators-legacy": "^1.3.5",
-    "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-    "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-    "babel-plugin-transform-es2015-block-scoping": "^6.26.0",
-    "babel-plugin-transform-es2015-classes": "^6.24.1",
-    "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
-    "babel-plugin-transform-es2015-destructuring": "^6.23.0",
-    "babel-plugin-transform-es2015-for-of": "^6.23.0",
-    "babel-plugin-transform-es2015-function-name": "^6.24.1",
-    "babel-plugin-transform-es2015-literals": "^6.22.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
-    "babel-plugin-transform-es2015-object-super": "^6.24.1",
-    "babel-plugin-transform-es2015-parameters": "^6.24.1",
-    "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-    "babel-plugin-transform-es2015-spread": "^6.22.0",
-    "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-transform-react-display-name": "^6.25.0",
-    "babel-plugin-transform-react-jsx": "^6.24.1",
-    "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.7.0",
-    "babel-preset-flow": "^6.23.0",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
-    "babel-register": "^6.26.0",
-    "chai": "^4.2.0",
+    "chai": "^4.3.4",
     "chai-immutable": "^2.1.0",
-    "codecov": "^3.5.0",
-    "cross-env": "^5.2.0",
+    "codecov": "^3.8.1",
+    "cross-env": "^6.0.3",
     "es3ify": "^0.2.2",
-    "eslint": "^6.1.0",
-    "eslint-plugin-react": "^7.14.3",
-    "expect": "^24.8.0",
-    "flow-bin": "^0.104.0",
-    "flow-status-webpack-plugin": "^0.1.7",
-    "flux-standard-action": "^2.1.0",
-    "glob": "^7.1.4",
+    "eslint": "^6.7.0",
+    "eslint-plugin-react": "^7.23.1",
+    "expect": "^24.9.0",
+    "flow-bin": "^0.148.0",
+    "flux-standard-action": "^2.1.1",
+    "glob": "^7.1.6",
     "isparta": "^4.1.1",
-    "mocha": "^6.2.0",
-    "npm-check": "^5.9.0",
-    "rimraf": "^2.6.3",
-    "webpack": "^4.39.1"
+    "mocha": "^6.2.2",
+    "npm-check": "^5.9.2",
+    "rimraf": "^3.0.2",
+    "webpack": "^4.41.2"
   },
-  "peerDependencies": {},
   "dependencies": {
-    "immutable": "^4.0.0-rc.12",
-    "query-string": "^6.8.2",
-    "react": "^16.9.0",
-    "redux": "^4.0.4",
-    "reselect": "^4.0.0",
-    "superagent": "^5.1.0",
-    "x25": "^2.7.7"
+    "depcheck": "^1.4.3",
+    "immutable": "*",
+    "query-string": "^7.1.0",
+    "react": "^17.0.2",
+    "redux": "^4.1.2",
+    "reselect": "^4.1.5",
+    "superagent": "^7.1.1",
+    "x25": "^17.0.0"
   }
 }

package/src/LoadDataItem.jsx

@@ -49,65 +49,41 @@ const
     },
   });
 
-class LoadDataItem extends React.Component<LoadDataItemPropTypes> {
-  props: LoadDataItemPropTypes;
-
-  UNSAFE_componentWillMount () {
-    const { shouldFetch, fetchItem } = this.props;
+const LoadDataItem = (props : LoadDataItemPropTypes) => {
+  const { children, data, isFetching, shouldFetch, hasError, fetchItem } = props;
 
+  React.useEffect(() => {
     if (shouldFetch) {
       fetchItem();
     }
-  }
+  }, [
+    shouldFetch,
+    isFetching,
+    hasError,
+  ]);
 
-  shouldComponentUpdate (nextProps : LoadDataItemPropTypes) {
+  if (isFetching) {
     return (
-      this.props.data !== nextProps.data ||
-      this.props.hasError !== nextProps.hasError ||
-      this.props.fetched !== nextProps.fetched ||
-      this.props.isFetching !== nextProps.isFetching ||
-      this.props.shouldFetch !== nextProps.shouldFetch ||
-      this.props.id !== nextProps.id
+      <LoadingMessage message="Preiau datele..." />
     );
   }
 
-  UNSAFE_componentWillReceiveProps (nextProps) {
-    const { shouldFetch, fetchItem } = nextProps;
-
-    if (shouldFetch) {
-      fetchItem();
-    }
-  }
-
-  render () {
-    const { children, data, isFetching, hasError, fetchItem } = this.props;
-
-    if (isFetching) {
-      return (
-        <LoadingMessage message="Preiau datele..." />
-      );
-    }
-
-    if (hasError) {
-      return (
-        <LargeErrorMessage
-          message="Ceva nu a mers bine"
-          onRetry={fetchItem}
-        />
-      );
-    }
-
-    if (data.size === 0) {
-      return null;
-    }
-
+  if (hasError) {
     return (
-      <React.Fragment>
-        {children}
-      </React.Fragment>
+      <LargeErrorMessage
+        message="Nu am putut stabili conexiunea cu server-ul"
+        onRetry={fetchItem}
+      />
     );
   }
-}
 
+  if (data.size === 0) {
+    return null;
+  }
+
+  return (
+    children
+  );
+};
 
 export default withRouter(connect(mapStateToProps, mapDispatchToProps)(LoadDataItem));

package/src/LoadPaginator.jsx

@@ -1,5 +1,5 @@
 // @flow
-// /* eslint-disable no-unused-vars */
+/* eslint-disable  */
 
 type Settings = {
   key: string;

package/src/createDataReducer.js

@@ -73,8 +73,9 @@ const createDataReducer = ({ key } : PaginatorSettings) => {
     getShouldFetchItemInfo = createSelector(
       getIsFetchingItemInfo,
       getItemIsFetched,
-      (isFetching, isFetched) => (
-        !isFetched && !isFetching
+      getItemHasError,
+      (isFetching, isFetched, hasError) => (
+        !isFetched && !isFetching && !hasError
       )
     );
 

package/src/reducerItemData.jsx

@@ -40,7 +40,9 @@ const
       }));
     })
   ),
-  fetchItemDataFulFilled = (state : any, { payload : { Data }, meta : { id } } : FetchItemDataFulFilledProps) => (
+  fetchItemDataFulFilled = (state : any,
+    { payload : { Data }, meta : { id } } : FetchItemDataFulFilledProps
+  ) => (
     state.update((id), (current) => {
       if (typeof current === "undefined") {
         return current;