@panneau/app 1.0.0-alpha.259 → 1.0.0-alpha.261

package/es/index.js

@@ -12,15 +12,15 @@ import DisplaysProvider from '@panneau/displays';
 import FieldsProvider from '@panneau/fields';
 import FiltersProvider from '@panneau/filters';
 import FormsProvider from '@panneau/forms';
-import { ResourceMessage, IntlProvider } from '@panneau/intl';
+import { useResourceValues, IntlProvider } from '@panneau/intl';
 import ListsProvider from '@panneau/lists';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { getComponentFromName } from '@panneau/core/utils';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { parse, stringify } from 'query-string';
+import { FormattedMessage, defineMessages } from 'react-intl';
 import { useResourceUrlGenerator, useForm } from '@panneau/core/hooks';
 import classNames from 'classnames';
-import { FormattedMessage, defineMessages } from 'react-intl';
 import Button from '@panneau/element-button';
 import Form from '@panneau/element-form';
 import Navbar from '@panneau/element-navbar';
@@ -73,6 +73,13 @@ var DeleteForm = function DeleteForm(_ref) {
       className = _ref.className,
       props = _objectWithoutProperties(_ref, _excluded$5);
 
+  var _ref2 = value || {},
+      _ref2$id = _ref2.id,
+      id = _ref2$id === void 0 ? null : _ref2$id;
+
+  var resourceValues = useResourceValues(resource, {
+    id: id
+  });
   return /*#__PURE__*/React.createElement(Form, Object.assign({
     className: classNames(['form', _defineProperty({
       'invalid-feedback': generalError !== null
@@ -85,12 +92,25 @@ var DeleteForm = function DeleteForm(_ref) {
     className: "card"
   }, /*#__PURE__*/React.createElement("div", {
     className: "card-body"
-  }, /*#__PURE__*/React.createElement(ResourceMessage, {
-    resource: resource,
-    values: value,
-    id: "resources.confirm_delete",
-    defaultMessage: "Are you sure you want to delete {the_singular} #{id}?",
-    description: "Confirmation message"
+  }, /*#__PURE__*/React.createElement(FormattedMessage, {
+    values: resourceValues,
+    id: "yzfiXJ",
+    defaultMessage: [{
+      "type": 0,
+      "value": "Are you sure you want to delete "
+    }, {
+      "type": 1,
+      "value": "the_singular"
+    }, {
+      "type": 0,
+      "value": " #"
+    }, {
+      "type": 1,
+      "value": "id"
+    }, {
+      "type": 0,
+      "value": "?"
+    }]
   }), generalError ? /*#__PURE__*/React.createElement("p", {
     className: "text-danger"
   }, /*#__PURE__*/React.createElement(FormattedMessage, {
@@ -557,14 +577,20 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
       _useMemo$type = _useMemo.type,
       type = _useMemo$type === void 0 ? null : _useMemo$type;
 
+  var resourceValues = useResourceValues(resource);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
-    title: /*#__PURE__*/React.createElement(ResourceMessage, {
-      resource: resource,
-      id: "resources.create",
-      defaultMessage: "Create {a_singular}",
-      description: "Page title"
+    title: /*#__PURE__*/React.createElement(FormattedMessage, {
+      values: resourceValues,
+      id: "6viUpq",
+      defaultMessage: [{
+        "type": 0,
+        "value": "Create "
+      }, {
+        "type": 1,
+        "value": "a_singular"
+      }]
     }),
     small: true
   }), /*#__PURE__*/React.createElement("div", {
@@ -608,14 +634,20 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
 
   var previousEntry = entries !== null && entries.length > 1 ? entries[entries.length - 2] : null;
   var previous = (previousEntry === null || previousEntry === void 0 ? void 0 : previousEntry.pathname) || null;
+  var resourceValues = useResourceValues(resource);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
-    title: /*#__PURE__*/React.createElement(ResourceMessage, {
-      resource: resource,
-      id: "resources.delete",
-      defaultMessage: "Delete {a_singular}",
-      description: "Page title"
+    title: /*#__PURE__*/React.createElement(FormattedMessage, {
+      values: resourceValues,
+      id: "zN5N/Q",
+      defaultMessage: [{
+        "type": 0,
+        "value": "Delete "
+      }, {
+        "type": 1,
+        "value": "a_singular"
+      }]
     }),
     small: true
   }), /*#__PURE__*/React.createElement("div", {
@@ -665,14 +697,20 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
   useEffect(function () {
     setEditItem(item);
   }, [item, setEditItem]);
+  var resourceValues = useResourceValues(resource);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
-    title: /*#__PURE__*/React.createElement(ResourceMessage, {
-      resource: resource,
-      id: "resources.edit",
-      defaultMessage: "Edit {a_singular}",
-      description: "Page title"
+    title: /*#__PURE__*/React.createElement(FormattedMessage, {
+      values: resourceValues,
+      id: "mCfzkJ",
+      defaultMessage: [{
+        "type": 0,
+        "value": "Edit "
+      }, {
+        "type": 1,
+        "value": "a_singular"
+      }]
     }),
     small: true
   }), /*#__PURE__*/React.createElement("div", {
@@ -704,8 +742,10 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
   var resource = _ref.resource,
       className = _ref.className;
   var _resource$types = resource.types,
-      types = _resource$types === void 0 ? null : _resource$types;
+      types = _resource$types === void 0 ? null : _resource$types; // const intl = useIntl();
+
   var resourceRoute = useResourceUrlGenerator(resource);
+  var resourceValues = useResourceValues(resource);
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -737,11 +777,16 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
       'dropdown-toggle': hasMultipleTypes
     }, className, className !== null)]),
     onClick: hasMultipleTypes ? onClickDropdown : null
-  }, /*#__PURE__*/React.createElement(ResourceMessage, {
-    resource: resource,
-    id: "resources.create_btn",
-    defaultMessage: "Create {a_singular}",
-    description: "Button label"
+  }, /*#__PURE__*/React.createElement(FormattedMessage, {
+    values: resourceValues,
+    id: "l+ddDH",
+    defaultMessage: [{
+      "type": 0,
+      "value": "Create "
+    }, {
+      "type": 1,
+      "value": "a_singular"
+    }]
   }));
   return hasMultipleTypes ? /*#__PURE__*/React.createElement("div", {
     className: classNames(['dropdown', {
@@ -973,7 +1018,8 @@ ResourceItemsList.defaultProps = defaultProps$b;
 var _excluded$1 = ["id", "component"];
 var propTypes$a = {
   resource: PropTypes.resource.isRequired,
-  defaultActions: PropTypes$1.arrayOf(PropTypes$1.object)
+  defaultActions: PropTypes$1.arrayOf(PropTypes$1.object) // eslint-disable-line react/forbid-prop-types
+
 };
 var defaultProps$a = {
   defaultActions: ['create']
@@ -1010,6 +1056,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       } : it;
     });
   }, [canCreate, actions]);
+  var resourceValues = useResourceValues(resource);
   var componentsManager = useComponentsManager();
 
   var _useLocation = useLocation(),
@@ -1075,19 +1122,29 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
   }, created ? /*#__PURE__*/React.createElement(Alert, {
     className: "mb-4",
     onClose: onClickCloseAlert
-  }, /*#__PURE__*/React.createElement(ResourceMessage, {
-    resource: resource,
-    id: "resources.created",
-    defaultMessage: "{The_singular} has been created.",
-    description: "Alert message"
+  }, /*#__PURE__*/React.createElement(FormattedMessage, {
+    values: resourceValues,
+    id: "bfP/d8",
+    defaultMessage: [{
+      "type": 1,
+      "value": "The_singular"
+    }, {
+      "type": 0,
+      "value": " has been created."
+    }]
   })) : null, deleted ? /*#__PURE__*/React.createElement(Alert, {
     className: "mb-4",
     onClose: onClickCloseAlert
-  }, /*#__PURE__*/React.createElement(ResourceMessage, {
-    resource: resource,
-    id: "resources.deleted",
-    defaultMessage: "{The_singular} has been deleted.",
-    description: "Alert message"
+  }, /*#__PURE__*/React.createElement(FormattedMessage, {
+    values: resourceValues,
+    id: "dkRdks",
+    defaultMessage: [{
+      "type": 1,
+      "value": "The_singular"
+    }, {
+      "type": 0,
+      "value": " has been deleted."
+    }]
   })) : null, /*#__PURE__*/React.createElement(ResourceItemsList, {
     resource: resource,
     baseUrl: url,
@@ -1140,17 +1197,23 @@ var HomePage = function HomePage() {
     var _ref2 = resource || {},
         resourceId = _ref2.id;
 
+    var resourceValues = useResourceValues(resource);
     return /*#__PURE__*/React.createElement(Link, {
       className: "d-block my-2",
       key: "resource-link-".concat(resourceId),
       to: route('resources.index', {
         resource: resourceId
       })
-    }, /*#__PURE__*/React.createElement(ResourceMessage, {
-      resource: resource,
-      id: "resources.view",
-      defaultMessage: "View {the_plural}",
-      description: "Button label"
+    }, /*#__PURE__*/React.createElement(FormattedMessage, {
+      values: resourceValues,
+      id: "FntHPK",
+      defaultMessage: [{
+        "type": 0,
+        "value": "View "
+      }, {
+        "type": 1,
+        "value": "the_plural"
+      }]
     }));
   })));
 };

package/lib/index.js

@@ -22,9 +22,9 @@ var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var utils = require('@panneau/core/utils');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var queryString = require('query-string');
+var reactIntl = require('react-intl');
 var hooks = require('@panneau/core/hooks');
 var classNames = require('classnames');
-var reactIntl = require('react-intl');
 var Button = require('@panneau/element-button');
 var Form = require('@panneau/element-form');
 var Navbar = require('@panneau/element-navbar');
@@ -103,6 +103,13 @@ var DeleteForm = function DeleteForm(_ref) {
       className = _ref.className,
       props = _objectWithoutProperties__default["default"](_ref, _excluded$5);
 
+  var _ref2 = value || {},
+      _ref2$id = _ref2.id,
+      id = _ref2$id === void 0 ? null : _ref2$id;
+
+  var resourceValues = intl.useResourceValues(resource, {
+    id: id
+  });
   return /*#__PURE__*/React__default["default"].createElement(Form__default["default"], Object.assign({
     className: classNames__default["default"](['form', _defineProperty__default["default"]({
       'invalid-feedback': generalError !== null
@@ -115,12 +122,25 @@ var DeleteForm = function DeleteForm(_ref) {
     className: "card"
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "card-body"
-  }, /*#__PURE__*/React__default["default"].createElement(intl.ResourceMessage, {
-    resource: resource,
-    values: value,
-    id: "resources.confirm_delete",
-    defaultMessage: "Are you sure you want to delete {the_singular} #{id}?",
-    description: "Confirmation message"
+  }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+    values: resourceValues,
+    id: "yzfiXJ",
+    defaultMessage: [{
+      "type": 0,
+      "value": "Are you sure you want to delete "
+    }, {
+      "type": 1,
+      "value": "the_singular"
+    }, {
+      "type": 0,
+      "value": " #"
+    }, {
+      "type": 1,
+      "value": "id"
+    }, {
+      "type": 0,
+      "value": "?"
+    }]
   }), generalError ? /*#__PURE__*/React__default["default"].createElement("p", {
     className: "text-danger"
   }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
@@ -587,14 +607,20 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
       _useMemo$type = _useMemo.type,
       type = _useMemo$type === void 0 ? null : _useMemo$type;
 
+  var resourceValues = intl.useResourceValues(resource);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
-    title: /*#__PURE__*/React__default["default"].createElement(intl.ResourceMessage, {
-      resource: resource,
-      id: "resources.create",
-      defaultMessage: "Create {a_singular}",
-      description: "Page title"
+    title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+      values: resourceValues,
+      id: "6viUpq",
+      defaultMessage: [{
+        "type": 0,
+        "value": "Create "
+      }, {
+        "type": 1,
+        "value": "a_singular"
+      }]
     }),
     small: true
   }), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -638,14 +664,20 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
 
   var previousEntry = entries !== null && entries.length > 1 ? entries[entries.length - 2] : null;
   var previous = (previousEntry === null || previousEntry === void 0 ? void 0 : previousEntry.pathname) || null;
+  var resourceValues = intl.useResourceValues(resource);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
-    title: /*#__PURE__*/React__default["default"].createElement(intl.ResourceMessage, {
-      resource: resource,
-      id: "resources.delete",
-      defaultMessage: "Delete {a_singular}",
-      description: "Page title"
+    title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+      values: resourceValues,
+      id: "zN5N/Q",
+      defaultMessage: [{
+        "type": 0,
+        "value": "Delete "
+      }, {
+        "type": 1,
+        "value": "a_singular"
+      }]
     }),
     small: true
   }), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -695,14 +727,20 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
   React.useEffect(function () {
     setEditItem(item);
   }, [item, setEditItem]);
+  var resourceValues = intl.useResourceValues(resource);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
-    title: /*#__PURE__*/React__default["default"].createElement(intl.ResourceMessage, {
-      resource: resource,
-      id: "resources.edit",
-      defaultMessage: "Edit {a_singular}",
-      description: "Page title"
+    title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+      values: resourceValues,
+      id: "mCfzkJ",
+      defaultMessage: [{
+        "type": 0,
+        "value": "Edit "
+      }, {
+        "type": 1,
+        "value": "a_singular"
+      }]
     }),
     small: true
   }), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -734,8 +772,10 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
   var resource = _ref.resource,
       className = _ref.className;
   var _resource$types = resource.types,
-      types = _resource$types === void 0 ? null : _resource$types;
+      types = _resource$types === void 0 ? null : _resource$types; // const intl = useIntl();
+
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
+  var resourceValues = intl.useResourceValues(resource);
 
   var _useState = React.useState(false),
       _useState2 = _slicedToArray__default["default"](_useState, 2),
@@ -767,11 +807,16 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
       'dropdown-toggle': hasMultipleTypes
     }, className, className !== null)]),
     onClick: hasMultipleTypes ? onClickDropdown : null
-  }, /*#__PURE__*/React__default["default"].createElement(intl.ResourceMessage, {
-    resource: resource,
-    id: "resources.create_btn",
-    defaultMessage: "Create {a_singular}",
-    description: "Button label"
+  }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+    values: resourceValues,
+    id: "l+ddDH",
+    defaultMessage: [{
+      "type": 0,
+      "value": "Create "
+    }, {
+      "type": 1,
+      "value": "a_singular"
+    }]
   }));
   return hasMultipleTypes ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"](['dropdown', {
@@ -1003,7 +1048,8 @@ ResourceItemsList.defaultProps = defaultProps$b;
 var _excluded$1 = ["id", "component"];
 var propTypes$a = {
   resource: core.PropTypes.resource.isRequired,
-  defaultActions: PropTypes__default["default"].arrayOf(PropTypes__default["default"].object)
+  defaultActions: PropTypes__default["default"].arrayOf(PropTypes__default["default"].object) // eslint-disable-line react/forbid-prop-types
+
 };
 var defaultProps$a = {
   defaultActions: ['create']
@@ -1040,6 +1086,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       } : it;
     });
   }, [canCreate, actions]);
+  var resourceValues = intl.useResourceValues(resource);
   var componentsManager = contexts.useComponentsManager();
 
   var _useLocation = reactRouter.useLocation(),
@@ -1105,19 +1152,29 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
   }, created ? /*#__PURE__*/React__default["default"].createElement(Alert__default["default"], {
     className: "mb-4",
     onClose: onClickCloseAlert
-  }, /*#__PURE__*/React__default["default"].createElement(intl.ResourceMessage, {
-    resource: resource,
-    id: "resources.created",
-    defaultMessage: "{The_singular} has been created.",
-    description: "Alert message"
+  }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+    values: resourceValues,
+    id: "bfP/d8",
+    defaultMessage: [{
+      "type": 1,
+      "value": "The_singular"
+    }, {
+      "type": 0,
+      "value": " has been created."
+    }]
   })) : null, deleted ? /*#__PURE__*/React__default["default"].createElement(Alert__default["default"], {
     className: "mb-4",
     onClose: onClickCloseAlert
-  }, /*#__PURE__*/React__default["default"].createElement(intl.ResourceMessage, {
-    resource: resource,
-    id: "resources.deleted",
-    defaultMessage: "{The_singular} has been deleted.",
-    description: "Alert message"
+  }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+    values: resourceValues,
+    id: "dkRdks",
+    defaultMessage: [{
+      "type": 1,
+      "value": "The_singular"
+    }, {
+      "type": 0,
+      "value": " has been deleted."
+    }]
   })) : null, /*#__PURE__*/React__default["default"].createElement(ResourceItemsList, {
     resource: resource,
     baseUrl: url,
@@ -1170,17 +1227,23 @@ var HomePage = function HomePage() {
     var _ref2 = resource || {},
         resourceId = _ref2.id;
 
+    var resourceValues = intl.useResourceValues(resource);
     return /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
       className: "d-block my-2",
       key: "resource-link-".concat(resourceId),
       to: route('resources.index', {
         resource: resourceId
       })
-    }, /*#__PURE__*/React__default["default"].createElement(intl.ResourceMessage, {
-      resource: resource,
-      id: "resources.view",
-      defaultMessage: "View {the_plural}",
-      description: "Button label"
+    }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+      values: resourceValues,
+      id: "FntHPK",
+      defaultMessage: [{
+        "type": 0,
+        "value": "View "
+      }, {
+        "type": 1,
+        "value": "the_plural"
+      }]
     }));
   })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/app",
-    "version": "1.0.0-alpha.259",
+    "version": "1.0.0-alpha.261",
     "description": "",
     "keywords": [
         "javascript"
@@ -71,20 +71,20 @@
         "@panneau/element-button": "^1.0.0-alpha.258",
         "@panneau/element-buttons": "^1.0.0-alpha.258",
         "@panneau/element-dropdown": "^1.0.0-alpha.258",
-        "@panneau/element-form": "^1.0.0-alpha.258",
+        "@panneau/element-form": "^1.0.0-alpha.260",
         "@panneau/element-form-group": "^1.0.0-alpha.258",
         "@panneau/element-label": "^1.0.0-alpha.256",
         "@panneau/element-link": "^1.0.0-alpha.256",
-        "@panneau/element-loading": "^1.0.0-alpha.256",
+        "@panneau/element-loading": "^1.0.0-alpha.260",
         "@panneau/element-menu": "^1.0.0-alpha.258",
         "@panneau/element-navbar": "^1.0.0-alpha.258",
         "@panneau/element-pagination": "^1.0.0-alpha.256",
         "@panneau/element-radios": "^1.0.0-alpha.256",
-        "@panneau/fields": "^1.0.0-alpha.258",
-        "@panneau/filters": "^1.0.0-alpha.258",
-        "@panneau/forms": "^1.0.0-alpha.258",
-        "@panneau/intl": "^1.0.0-alpha.259",
-        "@panneau/lists": "^1.0.0-alpha.258",
+        "@panneau/fields": "^1.0.0-alpha.260",
+        "@panneau/filters": "^1.0.0-alpha.260",
+        "@panneau/forms": "^1.0.0-alpha.260",
+        "@panneau/intl": "^1.0.0-alpha.261",
+        "@panneau/lists": "^1.0.0-alpha.260",
         "@panneau/modals": "^1.0.0-alpha.258",
         "@panneau/themes": "^1.0.0-alpha.256",
         "classnames": "^2.2.6",
@@ -98,5 +98,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "78f32a7c393511df861665e6a9a9b7195bd619e5"
+    "gitHead": "0f4a2ecdb60a531a51916add9bb08485e5bf275d"
 }