@panneau/core 0.4.27 → 0.4.40

package/es/components/Layout.js

@@ -3,7 +3,7 @@ import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutPropert
 import React from 'react';
 import get from 'lodash/get';
 import { connect } from 'react-redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 import { withUrlGenerator } from '@folklore/react-app';
 
 import * as PanneauPropTypes from '../lib/PropTypes';

package/es/components/pages/ResourceCreate.js

@@ -7,7 +7,7 @@ import _inherits from 'babel-runtime/helpers/inherits';
 import React, { Component } from 'react';
 import { defineMessages } from 'react-intl';
 import { withRouter } from 'react-router';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import get from 'lodash/get';

package/es/components/pages/ResourceForm.js

@@ -12,7 +12,7 @@ import { connect } from 'react-redux';
 import get from 'lodash/get';
 import isObject from 'lodash/isObject';
 import classNames from 'classnames';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 import { withUrlGenerator } from '@folklore/react-app';
 import { defineMessages, FormattedMessage } from 'react-intl';
 import { PulseLoader } from 'react-spinners';
@@ -60,7 +60,7 @@ var propTypes = {
     }).isRequired,
     location: PropTypes.shape({
         search: PropTypes.string,
-        state: PropTypes.object
+        state: PropTypes.object // eslint-disable-line
     }).isRequired,
     title: PanneauPropTypes.message,
     action: PropTypes.string,

package/es/components/pages/ResourceIndex.js

@@ -10,7 +10,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router';
 import { Link } from 'react-router-dom';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 import { connect } from 'react-redux';
 import get from 'lodash/get';
 import isString from 'lodash/isString';
@@ -33,7 +33,9 @@ var styles = {
     'listContainer': 'panneau-core-resource-index-listContainer',
     'list': 'panneau-core-resource-index-list',
     'loading': 'panneau-core-resource-index-loading',
-    'middle': 'panneau-core-resource-index-middle'
+    'inner': 'panneau-core-resource-index-inner',
+    'middle': 'panneau-core-resource-index-middle',
+    'alone': 'panneau-core-resource-index-alone'
 };
 
 
@@ -154,7 +156,8 @@ var ResourceIndex = function (_Component) {
 
                 this.setState({
                     items: items,
-                    pagination: pagination
+                    pagination: pagination,
+                    isLoading: false
                 });
                 return;
             }
@@ -467,13 +470,23 @@ var ResourceIndex = function (_Component) {
     }, {
         key: 'renderLoading',
         value: function renderLoading() {
+            var _classNames6;
+
+            var items = this.state.items;
+
             return React.createElement(
                 'div',
-                { className: styles.loading },
+                {
+                    className: classNames((_classNames6 = {}, _defineProperty(_classNames6, styles.loading, true), _defineProperty(_classNames6, styles.alone, items === null), _classNames6))
+                },
                 React.createElement(
                     'div',
-                    { className: styles.middle },
-                    React.createElement(PulseLoader, { loading: true })
+                    { className: styles.inner },
+                    React.createElement(
+                        'div',
+                        { className: styles.middle },
+                        React.createElement(PulseLoader, { loading: true })
+                    )
                 )
             );
         }
@@ -509,7 +522,7 @@ var ResourceIndex = function (_Component) {
                                 ),
                                 isLoading ? this.renderLoading() : null
                             ),
-                            pagination !== null ? this.renderPagination() : null
+                            pagination !== null && pagination.last_page > 1 ? this.renderPagination() : null
                         )
                     )
                 )

package/es/reducers/index.js

@@ -1,9 +1,12 @@
-import { routerReducer } from 'react-router-redux';
+import { connectRouter } from 'connected-react-router';
+import { createBrowserHistory } from 'history';
 import layoutReducer from './LayoutReducer';
 import panneauReducer from './PanneauReducer';
 
+export var history = createBrowserHistory();
+
 export default {
-    routing: routerReducer,
+    router: connectRouter(history),
     layout: layoutReducer,
     panneau: panneauReducer
 };

package/lib/components/Layout.js

@@ -22,7 +22,7 @@ var _get2 = _interopRequireDefault(_get);
 
 var _reactRedux = require('react-redux');
 
-var _reactRouterRedux = require('react-router-redux');
+var _connectedReactRouter = require('connected-react-router');
 
 var _reactApp = require('@folklore/react-app');
 
@@ -72,10 +72,10 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, _ref3) {
     var urlGenerator = _ref3.urlGenerator;
     return {
         gotoHome: function gotoHome() {
-            return dispatch((0, _reactRouterRedux.push)(urlGenerator.route('home')));
+            return dispatch((0, _connectedReactRouter.push)(urlGenerator.route('home')));
         },
         goto: function goto(path) {
-            return dispatch((0, _reactRouterRedux.push)(path));
+            return dispatch((0, _connectedReactRouter.push)(path));
         }
     };
 };

package/lib/components/pages/ResourceCreate.js

@@ -36,7 +36,7 @@ var _reactIntl = require('react-intl');
 
 var _reactRouter = require('react-router');
 
-var _reactRouterRedux = require('react-router-redux');
+var _connectedReactRouter = require('connected-react-router');
 
 var _reactRedux = require('react-redux');
 
@@ -132,7 +132,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, _ref3) {
     var urlGenerator = _ref3.urlGenerator;
     return {
         gotoResourceEdit: function gotoResourceEdit(resource, id) {
-            return dispatch((0, _reactRouterRedux.push)(urlGenerator.route('resource.edit', {
+            return dispatch((0, _connectedReactRouter.push)(urlGenerator.route('resource.edit', {
                 resource: resource.id,
                 id: id
             })));

package/lib/components/pages/ResourceForm.js

@@ -56,7 +56,7 @@ var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _reactRouterRedux = require('react-router-redux');
+var _connectedReactRouter = require('connected-react-router');
 
 var _reactApp = require('@folklore/react-app');
 
@@ -121,7 +121,7 @@ var propTypes = {
     }).isRequired,
     location: _propTypes2.default.shape({
         search: _propTypes2.default.string,
-        state: _propTypes2.default.object
+        state: _propTypes2.default.object // eslint-disable-line
     }).isRequired,
     title: PanneauPropTypes.message,
     action: _propTypes2.default.string,
@@ -565,7 +565,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, _ref3) {
     var urlGenerator = _ref3.urlGenerator;
     return {
         gotoResourceIndex: function gotoResourceIndex(resource) {
-            return dispatch((0, _reactRouterRedux.push)(typeof resource.routes !== 'undefined' ? urlGenerator.route('resource.' + resource.id + '.index') : urlGenerator.route('resource.index', {
+            return dispatch((0, _connectedReactRouter.push)(typeof resource.routes !== 'undefined' ? urlGenerator.route('resource.' + resource.id + '.index') : urlGenerator.route('resource.index', {
                 resource: resource.id
             })));
         }

package/lib/components/pages/ResourceIndex.js

@@ -44,7 +44,7 @@ var _reactRouter = require('react-router');
 
 var _reactRouterDom = require('react-router-dom');
 
-var _reactRouterRedux = require('react-router-redux');
+var _connectedReactRouter = require('connected-react-router');
 
 var _reactRedux = require('react-redux');
 
@@ -96,7 +96,9 @@ var styles = {
     'listContainer': 'panneau-core-resource-index-listContainer',
     'list': 'panneau-core-resource-index-list',
     'loading': 'panneau-core-resource-index-loading',
-    'middle': 'panneau-core-resource-index-middle'
+    'inner': 'panneau-core-resource-index-inner',
+    'middle': 'panneau-core-resource-index-middle',
+    'alone': 'panneau-core-resource-index-alone'
 };
 
 
@@ -220,7 +222,8 @@ var ResourceIndex = function (_Component) {
 
                 this.setState({
                     items: items,
-                    pagination: pagination
+                    pagination: pagination,
+                    isLoading: false
                 });
                 return;
             }
@@ -532,13 +535,23 @@ var ResourceIndex = function (_Component) {
     }, {
         key: 'renderLoading',
         value: function renderLoading() {
+            var _classNames6;
+
+            var items = this.state.items;
+
             return _react2.default.createElement(
                 'div',
-                { className: styles.loading },
+                {
+                    className: (0, _classnames2.default)((_classNames6 = {}, (0, _defineProperty3.default)(_classNames6, styles.loading, true), (0, _defineProperty3.default)(_classNames6, styles.alone, items === null), _classNames6))
+                },
                 _react2.default.createElement(
                     'div',
-                    { className: styles.middle },
-                    _react2.default.createElement(_reactSpinners.PulseLoader, { loading: true })
+                    { className: styles.inner },
+                    _react2.default.createElement(
+                        'div',
+                        { className: styles.middle },
+                        _react2.default.createElement(_reactSpinners.PulseLoader, { loading: true })
+                    )
                 )
             );
         }
@@ -574,7 +587,7 @@ var ResourceIndex = function (_Component) {
                                 ),
                                 isLoading ? this.renderLoading() : null
                             ),
-                            pagination !== null ? this.renderPagination() : null
+                            pagination !== null && pagination.last_page > 1 ? this.renderPagination() : null
                         )
                     )
                 )
@@ -616,7 +629,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, _ref5) {
     return {
         getResourceActionUrl: getResourceActionUrl,
         gotoResourceAction: function gotoResourceAction(resource, action, id) {
-            return dispatch((0, _reactRouterRedux.push)(getResourceActionUrl(resource, action, id)));
+            return dispatch((0, _connectedReactRouter.push)(getResourceActionUrl(resource, action, id)));
         }
     };
 };

package/lib/reducers/index.js

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+exports.history = undefined;
 
-var _reactRouterRedux = require('react-router-redux');
+var _connectedReactRouter = require('connected-react-router');
+
+var _history = require('history');
 
 var _LayoutReducer = require('./LayoutReducer');
 
@@ -16,8 +19,10 @@ var _PanneauReducer2 = _interopRequireDefault(_PanneauReducer);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var history = exports.history = (0, _history.createBrowserHistory)();
+
 exports.default = {
-    routing: _reactRouterRedux.routerReducer,
+    router: (0, _connectedReactRouter.connectRouter)(history),
     layout: _LayoutReducer2.default,
     panneau: _PanneauReducer2.default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "0.4.27",
+    "version": "0.4.40",
     "description": "Core utilities of the Panneau package",
     "keywords": [
         "react",
@@ -59,6 +59,7 @@
         "babel-runtime": "^6.26.0",
         "bootstrap": "^4.1.1",
         "classnames": "^2.2.5",
+        "connected-react-router": "^6.9.1",
         "history": "^4.7.2",
         "hoist-non-react-statics": "^2.3.1",
         "invariant": "^2.2.2",
@@ -71,12 +72,10 @@
         "prop-types": "^15.6.0",
         "query-string": "^6.1.0",
         "react-intl": "^2.4.0",
-        "react-redux": "^5.0.6",
+        "react-redux": "^6.0.0",
         "react-router": "^4.2.0",
         "react-router-dom": "^4.2.2",
-        "react-router-redux": "^5.0.0-alpha.9",
         "react-spinners": "^0.3.2",
-        "redux": "^3.7.2",
         "redux-promise": "^0.5.3",
         "redux-thunk": "^2.2.0",
         "whatwg-fetch": "^2.0.3",
@@ -91,5 +90,6 @@
     "peerDependencies": {
         "react": ">=15.0.0 || ^16.0.0",
         "react-dom": ">=15.0.0 || ^16.0.0"
-    }
+    },
+    "gitHead": "d31ead86486ab8cfc054ec46e61e49377e43f23a"
 }

package/src/components/Layout.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import get from 'lodash/get';
 import { connect } from 'react-redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 import { withUrlGenerator } from '@folklore/react-app';
 
 import * as PanneauPropTypes from '../lib/PropTypes';

package/src/components/pages/ResourceCreate.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { defineMessages } from 'react-intl';
 import { withRouter } from 'react-router';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import get from 'lodash/get';

package/src/components/pages/ResourceForm.jsx

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import get from 'lodash/get';
 import isObject from 'lodash/isObject';
 import classNames from 'classnames';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 import { withUrlGenerator } from '@folklore/react-app';
 import { defineMessages, FormattedMessage } from 'react-intl';
 import { PulseLoader } from 'react-spinners';
@@ -52,7 +52,7 @@ const propTypes = {
     }).isRequired,
     location: PropTypes.shape({
         search: PropTypes.string,
-        state: PropTypes.object,
+        state: PropTypes.object, // eslint-disable-line
     }).isRequired,
     title: PanneauPropTypes.message,
     action: PropTypes.string,

package/src/components/pages/ResourceIndex.jsx

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router';
 import { Link } from 'react-router-dom';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 import { connect } from 'react-redux';
 import get from 'lodash/get';
 import isString from 'lodash/isString';
@@ -127,6 +127,7 @@ class ResourceIndex extends Component {
             this.setState({
                 items,
                 pagination,
+                isLoading: false,
             });
             return;
         }
@@ -204,12 +205,13 @@ class ResourceIndex extends Component {
         const { resource, intl, confirmDeleteMessage } = this.props;
         const { name } = resource;
         const confirmMessage = get(resource, 'messages.confirm_delete', confirmDeleteMessage);
-        const message = isObject(confirmMessage) && typeof confirmMessage.id !== 'undefined'
-            ? intl.formatMessage(confirmMessage, {
-                name,
-                id,
-            })
-            : confirmMessage;
+        const message =
+            isObject(confirmMessage) && typeof confirmMessage.id !== 'undefined'
+                ? intl.formatMessage(confirmMessage, {
+                    name,
+                    id,
+                })
+                : confirmMessage;
         // eslint-disable-next-line no-alert
         if (window.confirm(message)) {
             resource.api.destroy(id).then(this.onItemDeleted);
@@ -396,10 +398,18 @@ class ResourceIndex extends Component {
 
     // eslint-disable-next-line class-methods-use-this
     renderLoading() {
+        const { items } = this.state;
         return (
-            <div className={styles.loading}>
-                <div className={styles.middle}>
-                    <PulseLoader loading />
+            <div
+                className={classNames({
+                    [styles.loading]: true,
+                    [styles.alone]: items === null,
+                })}
+            >
+                <div className={styles.inner}>
+                    <div className={styles.middle}>
+                        <PulseLoader loading />
+                    </div>
                 </div>
             </div>
         );
@@ -422,7 +432,9 @@ class ResourceIndex extends Component {
                                 </div>
                                 {isLoading ? this.renderLoading() : null}
                             </div>
-                            {pagination !== null ? this.renderPagination() : null}
+                            {pagination !== null && pagination.last_page > 1
+                                ? this.renderPagination()
+                                : null}
                         </div>
                     </div>
                 </div>
@@ -475,7 +487,11 @@ const mergeProps = (
     gotoResourceAction: (action, id) => gotoResourceAction(stateProps.resource, action, id),
 });
 
-const WithStateComponent = connect(mapStateToProps, mapDispatchToProps, mergeProps)(ResourceIndex);
+const WithStateComponent = connect(
+    mapStateToProps,
+    mapDispatchToProps,
+    mergeProps,
+)(ResourceIndex);
 const WithRouterContainer = withRouter(WithStateComponent);
 const WithListsCollectionContainer = withListsCollection()(WithRouterContainer);
 const WithUrlGeneratorContainer = withUrlGenerator()(WithListsCollectionContainer);

package/src/reducers/index.js

@@ -1,9 +1,12 @@
-import { routerReducer } from 'react-router-redux';
+import { connectRouter } from 'connected-react-router';
+import { createBrowserHistory } from 'history';
 import layoutReducer from './LayoutReducer';
 import panneauReducer from './PanneauReducer';
 
+export const history = createBrowserHistory();
+
 export default {
-    routing: routerReducer,
+    router: connectRouter(history),
     layout: layoutReducer,
     panneau: panneauReducer,
 };

package/src/styles/pages/resource-index.scss

@@ -19,7 +19,6 @@
 
     .listContainer {
         position: relative;
-        min-height: 50px;
     }
 
     .list {
@@ -28,7 +27,7 @@
     }
 
     .loading {
-        display: table;
+        display: block;
         position: absolute;
         top: 0;
         left: 0;
@@ -37,10 +36,24 @@
         background: rgba(255, 255, 255, .5);
         z-index: 2;
 
+        .inner {
+            display: table;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+        }
+
         .middle {
             display: table-cell;
             text-align: center;
             vertical-align: middle;
         }
+
+        &.alone {
+            position: relative;
+            height: 100px;
+        }
     }
 }