@panneau/form-resource 3.0.283 → 3.0.285

package/es/index.js

@@ -8,7 +8,7 @@ import { PropTypes } from '@panneau/core';
 import { useLocales, useFormsComponents, FormProvider } from '@panneau/core/contexts';
 import { useResourceUrlGenerator, useForm } from '@panneau/core/hooks';
 import { getComponentFromName } from '@panneau/core/utils';
-import { useResourceStore, useResourceUpdate, useResourceDestroy } from '@panneau/data';
+import { useResourceStore, useResourceUpdate, useResourceDestroy, useResourceClone } from '@panneau/data';
 import classNames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 import Button from '@panneau/element-button';
@@ -267,6 +267,9 @@ var ResourceForm = function ResourceForm(_ref) {
     props = _objectWithoutProperties(_ref, _excluded);
   var locales = useLocales();
   var FormComponents = useFormsComponents();
+  var _ref2 = item || {},
+    _ref2$id = _ref2.id,
+    itemId = _ref2$id === void 0 ? null : _ref2$id;
   var _resource$fields = resource.fields,
     resourceFields = _resource$fields === void 0 ? [] : _resource$fields,
     _resource$types = resource.types,
@@ -275,37 +278,37 @@ var ResourceForm = function ResourceForm(_ref) {
   var resourceType = type !== null ? resourceTypes.find(function (it) {
     return it.id === type;
   }) || null : null;
-  var _ref2 = resourceType || {},
-    _ref2$fields = _ref2.fields,
-    resourceTypeFields = _ref2$fields === void 0 ? null : _ref2$fields;
-  var isCreate = item === null || !item.id;
+  var _ref3 = resourceType || {},
+    _ref3$fields = _ref3.fields,
+    resourceTypeFields = _ref3$fields === void 0 ? null : _ref3$fields;
+  var isCreate = item === null || !itemId;
 
   // Pick fields from resource root or form
-  var _ref3 = forms || {},
-    _ref3$default = _ref3["default"],
-    defaultForm = _ref3$default === void 0 ? null : _ref3$default,
-    _ref3$create = _ref3.create,
-    createForm = _ref3$create === void 0 ? null : _ref3$create,
-    _ref3$edit = _ref3.edit,
-    editForm = _ref3$edit === void 0 ? null : _ref3$edit,
-    _ref3$delete = _ref3["delete"],
-    deleteForm = _ref3$delete === void 0 ? null : _ref3$delete;
-  var _ref4 = defaultForm || {},
-    _ref4$fields = _ref4.fields,
-    defaultFields = _ref4$fields === void 0 ? null : _ref4$fields,
-    defaultComponent = _ref4.component;
-  var createOrEditSource = isCreate ? createForm || {} : editForm || {};
-  var _ref5 = isDelete ? deleteForm || {} : createOrEditSource || {},
+  var _ref4 = forms || {},
+    _ref4$default = _ref4["default"],
+    defaultForm = _ref4$default === void 0 ? null : _ref4$default,
+    _ref4$create = _ref4.create,
+    createForm = _ref4$create === void 0 ? null : _ref4$create,
+    _ref4$edit = _ref4.edit,
+    editForm = _ref4$edit === void 0 ? null : _ref4$edit,
+    _ref4$delete = _ref4["delete"],
+    deleteForm = _ref4$delete === void 0 ? null : _ref4$delete;
+  var _ref5 = defaultForm || {},
     _ref5$fields = _ref5.fields,
-    formFields = _ref5$fields === void 0 ? null : _ref5$fields,
-    _ref5$component = _ref5.component,
-    formComponent = _ref5$component === void 0 ? null : _ref5$component;
+    defaultFields = _ref5$fields === void 0 ? null : _ref5$fields,
+    defaultComponent = _ref5.component;
+  var createOrEditSource = isCreate ? createForm || {} : editForm || {};
+  var _ref6 = isDelete ? deleteForm || {} : createOrEditSource || {},
+    _ref6$fields = _ref6.fields,
+    formFields = _ref6$fields === void 0 ? null : _ref6$fields,
+    _ref6$component = _ref6.component,
+    formComponent = _ref6$component === void 0 ? null : _ref6$component;
   var finalFields = useMemo(function () {
-    return (formFields || defaultFields || resourceTypeFields || resourceFields).filter(function (_ref6) {
-      var _ref6$settings = _ref6.settings,
-        _ref6$settings2 = _ref6$settings === void 0 ? {} : _ref6$settings,
-        _ref6$settings2$hidde = _ref6$settings2.hiddenInForm,
-        hiddenInForm = _ref6$settings2$hidde === void 0 ? false : _ref6$settings2$hidde;
+    return (formFields || defaultFields || resourceTypeFields || resourceFields).filter(function (_ref7) {
+      var _ref7$settings = _ref7.settings,
+        _ref7$settings2 = _ref7$settings === void 0 ? {} : _ref7$settings,
+        _ref7$settings2$hidde = _ref7$settings2.hiddenInForm,
+        hiddenInForm = _ref7$settings2$hidde === void 0 ? false : _ref7$settings2$hidde;
       return !hiddenInForm;
     });
   }, [formFields, defaultFields, resourceTypeFields, resourceFields]);
@@ -314,23 +317,33 @@ var ResourceForm = function ResourceForm(_ref) {
   var resourceRoute = useResourceUrlGenerator(resource);
   var _useResourceStore = useResourceStore(resource),
     store = _useResourceStore.store;
-  var _useResourceUpdate = useResourceUpdate(resource, item != null ? item.id : null),
+  var _useResourceUpdate = useResourceUpdate(resource, item !== null ? itemId : null),
     update = _useResourceUpdate.update;
-  var _useResourceDestroy = useResourceDestroy(resource, item != null ? item.id : null),
+  var _useResourceDestroy = useResourceDestroy(resource, item !== null ? itemId : null),
     destroy = _useResourceDestroy.destroy;
+  var _useResourceClone = useResourceClone(resource, item !== null ? itemId : null),
+    clone = _useResourceClone.clone;
 
   // Post actions
-  var postAction = isCreate ? store : update;
   var postForm = useCallback(function (action, data) {
-    return isDelete ? destroy() : postAction(data);
-  }, [postAction, isDelete, destroy, store, update]);
+    if (isDelete) {
+      return destroy();
+    }
+    if (isDuplicate) {
+      return clone();
+    }
+    if (isCreate) {
+      return store(data);
+    }
+    return update(data);
+  }, [itemId, isCreate, isDelete, isDuplicate, destroy, clone, store, update]);
 
   // Form state
   var getInitialValue = useCallback(function () {
-    return item !== null ? item : finalFields.reduce(function (defaultValues, _ref7) {
-      var name = _ref7.name,
-        _ref7$defaultValue = _ref7.defaultValue,
-        defaultValue = _ref7$defaultValue === void 0 ? null : _ref7$defaultValue;
+    return item !== null ? item : finalFields.reduce(function (defaultValues, _ref8) {
+      var name = _ref8.name,
+        _ref8$defaultValue = _ref8.defaultValue,
+        defaultValue = _ref8$defaultValue === void 0 ? null : _ref8$defaultValue;
       return defaultValue !== null ? _objectSpread(_objectSpread({}, defaultValues), {}, _defineProperty({}, name, defaultValue)) : defaultValues;
     }, type !== null ? {
       type: type
@@ -346,13 +359,13 @@ var ResourceForm = function ResourceForm(_ref) {
 
   // Form action
   var action = isCreate ? resourceRoute('store') : resourceRoute('update', {
-    id: item.id
+    id: itemId
   });
   action = isDelete ? resourceRoute('destroy', {
-    id: item.id
+    id: itemId
   }) : action;
   action = isDuplicate ? resourceRoute('clone', {
-    id: item.id
+    id: itemId
   }) : action;
   var _useForm = useForm({
       action: action,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/form-resource",
-    "version": "3.0.283",
+    "version": "3.0.285",
     "description": "Default resource forms",
     "keywords": [
         "javascript"
@@ -50,11 +50,11 @@
     "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@panneau/core": "^3.0.283",
-        "@panneau/data": "^3.0.283",
+        "@panneau/data": "^3.0.285",
         "@panneau/element-button": "^3.0.283",
         "@panneau/element-form": "^3.0.283",
         "@panneau/field-fields": "^3.0.283",
-        "@panneau/intl": "^3.0.283",
+        "@panneau/intl": "^3.0.284",
         "@panneau/themes": "^3.0.283",
         "classnames": "^2.5.1",
         "lodash-es": "^4.17.21",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "7295ec0fa362a586252e5ff6fa3a01717c84e2d1"
+    "gitHead": "81e9321c9caae2004bcaae0c35fcd61fe0fa0fb7"
 }