redux-paginator-immutable 17.0.0 → 17.0.4

package/lib/Info.js

@@ -17,7 +17,7 @@ var getNumberForm = function getNumberForm(value, one, all) {
     return "1 " + one;
   }
 
-  return (0, _utility.numberToLocaleForm)(value) + " " + all;
+  return _utility.words.getNumberTense(value) + " " + all;
 };
 
 var Info = function Info(_ref) {
@@ -28,8 +28,8 @@ var Info = function Info(_ref) {
   return _react2.default.createElement(
     "div",
     { className: "text-muted" },
-    "Afișez ",
-    shown === total ? "tot - " : shown + " din",
+    _utility.words.Showing + " ",
+    shown === total ? _utility.words.All + " - " : shown + " " + _utility.words.Of,
     " " + getNumberForm(total, one, all)
   );
 };

package/lib/LoadDataItem.js

@@ -6,18 +6,49 @@ Object.defineProperty(exports, "__esModule", {
 
 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; };
 
+// import {
+//   useLocation,
+//   useNavigate,
+//   useParams,
+// } from "react-router-dom";
+
+// const withRouter = (Component) => {
+//   const ComponentWithRouterProp = (props) => {
+//     const location = useLocation();
+//     const navigate = useNavigate();
+//     const params = useParams();
+
+//     return (
+//       <Component
+//         {...props}
+//         router={{
+//           location,
+//           navigate,
+//           params,
+//         }}
+//       />
+//     );
+//   };
+
+//   return ComponentWithRouterProp;
+// };
+
 var _react = require("react");
 
 var React = _interopRequireWildcard(_react);
 
-var _reactRouterDom = require("react-router-dom");
-
 var _reactRedux = require("react-redux");
 
 var _actions = require("./actions");
 
 var _Messages = require("x25/Messages");
 
+var _words = require("./words");
+
+var _words2 = _interopRequireDefault(_words);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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; } }
 
 var mapStateToProps = function mapStateToProps(state, _ref) {
@@ -59,12 +90,12 @@ var LoadDataItem = function LoadDataItem(props) {
   }, [shouldFetch, isFetching, hasError]);
 
   if (isFetching) {
-    return React.createElement(_Messages.LoadingMessage, { message: "Preiau datele..." });
+    return React.createElement(_Messages.LoadingMessage, { message: _words2.default.LoadingData });
   }
 
   if (hasError) {
     return React.createElement(_Messages.LargeErrorMessage, {
-      message: "Nu am putut stabili conexiunea cu server-ul",
+      message: _words2.default.ThereWasAProblem,
       onRetry: fetchItem
     });
   }
@@ -76,4 +107,4 @@ var LoadDataItem = function LoadDataItem(props) {
   return children;
 };
 
-exports.default = (0, _reactRouterDom.withRouter)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(LoadDataItem));
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(LoadDataItem);

package/lib/LoadPaginator.js

@@ -31,6 +31,10 @@ var _LoadingButton2 = _interopRequireDefault(_LoadingButton);
 
 var _Messages = require("x25/Messages");
 
+var _words = require("./words");
+
+var _words2 = _interopRequireDefault(_words);
+
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -183,12 +187,12 @@ var LoadPaginator = function (_Component) {
           showLoading = total !== items.size;
 
       if (isEmpty && isFetching) {
-        return _react2.default.createElement(_Messages.LoadingMessage, { message: "Preiau datele..." });
+        return _react2.default.createElement(_Messages.LoadingMessage, { message: _words2.default.LoadingData });
       }
 
       if (hasProblems && currentPage === 1) {
         return _react2.default.createElement(_Messages.LargeErrorMessage, {
-          message: "Nu pot prelua datele",
+          message: _words2.default.ThereWasAProblem,
           onRetry: this.handleLoadMoreClick
         });
       }

package/lib/LoadingButton.js

@@ -12,6 +12,10 @@ var _react2 = _interopRequireDefault(_react);
 
 var _Messages = require("x25/Messages");
 
+var _words = require("./words");
+
+var _words2 = _interopRequireDefault(_words);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -51,15 +55,15 @@ var LoadingButton = function (_React$Component) {
       return _react2.default.createElement(
         "div",
         { className: "text-center my-2" },
-        hasProblems ? _react2.default.createElement(_Messages.ErrorMessage, { message: "Nu am putut prelua. \xCEncearc\u0103 \xEEnc\u0103 o dat\u0103..." }) : null,
-        isFetching ? _react2.default.createElement(_Messages.LoadingMessage, { message: "Preiau date...", sm: true }) : _react2.default.createElement(
+        hasProblems ? _react2.default.createElement(_Messages.ErrorMessage, { message: _words2.default.ThereWasAProblem }) : null,
+        isFetching ? _react2.default.createElement(_Messages.LoadingMessage, { message: _words2.default.LoadingData, sm: true }) : _react2.default.createElement(
           "button",
           {
             className: "btn btn-outline-info d-print-none",
             disabled: isFetching,
             onClick: onLoadMoreClick,
             type: "button" },
-          isFetching ? "Încarc..." : "Încarcă mai mule"
+          isFetching ? _words2.default.Loading : _words2.default.LoadMore
         )
       );
     }

package/lib/words.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var words = {
+  ThereWasAProblem: "There was a problem. Try again",
+  Showing: "Showing",
+  All: "all",
+  Of: "of",
+  LoadingData: "Loading data...",
+  LoadMore: "Load more"
+};
+
+exports.default = words;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-paginator-immutable",
-  "version": "17.0.0",
+  "version": "17.0.4",
   "description": "redux-paginator-immutable helps you deal with paginated API by composing your existing reducers",
   "main": "./lib/index.js",
   "babel": {
@@ -103,6 +103,6 @@
     "redux": "^4.1.2",
     "reselect": "^4.1.5",
     "superagent": "^7.1.1",
-    "x25": "^17.0.0"
+    "x25": "^17.0.15"
   }
 }

package/src/Info.jsx

@@ -1,5 +1,6 @@
 // @flow
 
+
 type InfoPropTypes = {
   shown: number;
   total: number;
@@ -8,21 +9,21 @@ type InfoPropTypes = {
 };
 
 import React from "react";
-import { numberToLocaleForm } from "x25/utility";
+import { words } from "x25/utility";
 
 const getNumberForm = (value : number, one : string, all : string) : string => {
   if (value === 1) {
     return `1 ${one}`;
   }
 
-  return `${numberToLocaleForm(value)} ${all}`;
+  return `${words.getNumberTense(value)} ${all}`;
 };
 
 const Info = ({ shown, total, one, all } : InfoPropTypes) => (
   <div className="text-muted">
-    {"Afișez "}
+    {`${words.Showing} `}
     {
-      (shown === total) ? "tot - " : `${shown} din`
+      (shown === total) ? `${words.All} - ` : `${shown} ${words.Of}`
     }
     {` ${getNumberForm(total, one, all)}`}
   </div>

package/src/LoadDataItem.jsx

@@ -25,12 +25,39 @@ type OwnProps = {
   }
 };
 
-import { withRouter } from "react-router-dom";
 import { connect } from "react-redux";
 
+// import {
+//   useLocation,
+//   useNavigate,
+//   useParams,
+// } from "react-router-dom";
+
+// const withRouter = (Component) => {
+//   const ComponentWithRouterProp = (props) => {
+//     const location = useLocation();
+//     const navigate = useNavigate();
+//     const params = useParams();
+
+//     return (
+//       <Component
+//         {...props}
+//         router={{
+//           location,
+//           navigate,
+//           params,
+//         }}
+//       />
+//     );
+//   };
+
+//   return ComponentWithRouterProp;
+// };
+
 import { fetchItem as fetchItemAction } from "./actions";
 
 import { LargeErrorMessage, LoadingMessage } from "x25/Messages";
+import words from "./words";
 
 const
   mapStateToProps = (state : any, { settings : { selectors }, id } : OwnProps) => ({
@@ -64,14 +91,14 @@ const LoadDataItem = (props : LoadDataItemPropTypes) => {
 
   if (isFetching) {
     return (
-      <LoadingMessage message="Preiau datele..." />
+      <LoadingMessage message={words.LoadingData} />
     );
   }
 
   if (hasError) {
     return (
       <LargeErrorMessage
-        message="Nu am putut stabili conexiunea cu server-ul"
+        message={words.ThereWasAProblem}
         onRetry={fetchItem}
       />
     );
@@ -86,4 +113,4 @@ const LoadDataItem = (props : LoadDataItemPropTypes) => {
   );
 };
 
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(LoadDataItem));
+export default connect(mapStateToProps, mapDispatchToProps)(LoadDataItem);

package/src/LoadPaginator.jsx

@@ -47,6 +47,7 @@ import selectors from "./selectors";
 import LoadingButton from "./LoadingButton";
 
 import { LargeErrorMessage, LoadingMessage } from "x25/Messages";
+import words from "./words";
 
 const mapStateToProps = (state, { token, settings } : OwnProps) => {
 
@@ -175,14 +176,14 @@ class LoadPaginator extends Component<LoadPaginatorPropTypes> {
 
     if (isEmpty && isFetching) {
       return (
-        <LoadingMessage message="Preiau datele..." />
+        <LoadingMessage message={words.LoadingData} />
       );
     }
 
     if (hasProblems && currentPage === 1) {
       return (
         <LargeErrorMessage
-          message="Nu pot prelua datele"
+          message={words.ThereWasAProblem}
           onRetry={this.handleLoadMoreClick}
         />
       );

package/src/LoadingButton.jsx

@@ -1,6 +1,7 @@
 // @flow
 
 import React from "react";
+import { ErrorMessage, LoadingMessage } from "x25/Messages";
 
 type LoadingButtonPropTypes = {
   isFetching: bool;
@@ -9,7 +10,7 @@ type LoadingButtonPropTypes = {
   onLoadMoreClick: () => void;
 };
 
-import { ErrorMessage, LoadingMessage } from "x25/Messages";
+import words from "./words";
 
 class LoadingButton extends React.Component<LoadingButtonPropTypes> {
   props: LoadingButtonPropTypes;
@@ -30,19 +31,19 @@ class LoadingButton extends React.Component<LoadingButtonPropTypes> {
       <div className="text-center my-2">
         {
           hasProblems ? (
-            <ErrorMessage message="Nu am putut prelua. Încearcă încă o dată..." />
+            <ErrorMessage message={words.ThereWasAProblem} />
           ) : null
         }
         {
           isFetching ? (
-            <LoadingMessage message="Preiau date..." sm />
+            <LoadingMessage message={words.LoadingData} sm />
           ) : (
             <button
               className="btn btn-outline-info d-print-none"
               disabled={isFetching}
               onClick={onLoadMoreClick}
               type="button">
-              {isFetching ? "Încarc..." : "Încarcă mai mule"}
+              {isFetching ? words.Loading : words.LoadMore}
             </button>
           )
         }

package/src/words.js

@@ -0,0 +1,12 @@
+// @flow
+
+const words = {
+  ThereWasAProblem : "There was a problem. Try again",
+  Showing          : "Showing",
+  All              : "all",
+  Of               : "of",
+  LoadingData      : "Loading data...",
+  LoadMore         : "Load more",
+};
+
+export default words;