@panneau/app 2.0.67 → 2.0.69

package/es/index.js

@@ -1,13 +1,13 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import PropTypes$1 from 'prop-types';
-import React, { useMemo, useCallback, useState, useEffect, Fragment } from 'react';
+import PropTypes from 'prop-types';
+import React, { useCallback, useMemo, useState, useEffect, Fragment } from 'react';
 import { useLocation, useNavigate, useParams, Route, Routes, Navigate, MemoryRouter } from 'react-router';
 import { Link, BrowserRouter } from 'react-router-dom';
 import { useUser, useLogout, useAuth, AuthProvider } from '@panneau/auth';
-import { PropTypes } from '@panneau/core';
-import { useLocales, useFormsComponents, FormProvider, useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useFiltersComponents, useListsComponents, useComponentsManager, useRoutes, usePagesComponentsManager, PanneauProvider, UppyProvider, RoutesProvider, ModalProvider, ComponentsProvider } from '@panneau/core/contexts';
-import { useResourceStore, useResourceUpdate, useResourceDestroy, useResourceItem, useResourceItems, ApiProvider } from '@panneau/data';
+import { PropTypes as PropTypes$1 } from '@panneau/core';
+import { useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useComponentsManager, useFormsComponents, useRoutes, usePagesComponentsManager, PanneauProvider, UppyProvider, RoutesProvider, ModalProvider, ComponentsProvider } from '@panneau/core/contexts';
+import { useResourceItem, ApiProvider } from '@panneau/data';
 import DisplaysProvider from '@panneau/displays';
 import FieldsProvider from '@panneau/fields';
 import FiltersProvider from '@panneau/filters';
@@ -21,11 +21,9 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import isObject from 'lodash/isObject';
 import queryString from 'query-string';
 import { FormattedMessage, defineMessages } from 'react-intl';
-import { useResourceUrlGenerator, useForm } from '@panneau/core/hooks';
-import { getComponentFromName } from '@panneau/core/utils';
+import { useResourceUrlGenerator } from '@panneau/core/hooks';
+import ResourceForm from '@panneau/form-resource';
 import classNames from 'classnames';
-import Button from '@panneau/element-button';
-import Form from '@panneau/element-form';
 import { Modals } from '@panneau/element-modal';
 import isArray from 'lodash/isArray';
 import Menu from '@panneau/element-menu';
@@ -33,291 +31,34 @@ import Navbar from '@panneau/element-navbar';
 import Label from '@panneau/element-label';
 import isString from 'lodash/isString';
 import Alert from '@panneau/element-alert';
+import Button from '@panneau/element-button';
 import Dropdown from '@panneau/element-dropdown';
-import Pagination from '@panneau/element-pagination';
-import _toPropertyKey from '@babel/runtime/helpers/toPropertyKey';
-import { faUndo } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import FormGroup from '@panneau/element-form-group';
-
-var _excluded$6 = ["resource", "action", "previous", "status", "value", "onSubmit", "errors", "generalError", "className"];
-var propTypes$m = {
-  resource: PropTypes.resource.isRequired,
-  action: PropTypes$1.string,
-  previous: PropTypes$1.string,
-  fields: PropTypes.fields.isRequired,
-  value: PropTypes$1.object,
-  // eslint-disable-line react/forbid-prop-types
-  onChange: PropTypes$1.func.isRequired,
-  onSubmit: PropTypes$1.func,
-  status: PropTypes.formStatus,
-  generalError: PropTypes$1.string,
-  errors: PropTypes$1.objectOf(PropTypes$1.arrayOf(PropTypes$1.string)),
-  className: PropTypes$1.string
-};
-var defaultProps$m = {
-  action: null,
-  previous: null,
-  status: null,
-  value: null,
-  onSubmit: null,
-  generalError: null,
-  errors: null,
-  className: null
-};
-var DeleteForm = function DeleteForm(_ref) {
-  var resource = _ref.resource,
-    action = _ref.action,
-    previous = _ref.previous;
-    _ref.status;
-    var value = _ref.value,
-    onSubmit = _ref.onSubmit;
-    _ref.errors;
-    var generalError = _ref.generalError,
-    className = _ref.className,
-    props = _objectWithoutProperties(_ref, _excluded$6);
-  var _ref2 = value || {},
-    _ref2$id = _ref2.id,
-    id = _ref2$id === void 0 ? null : _ref2$id;
-  var resourceValues = useResourceValues(resource, {
-    id: id
-  });
-  // const { text, background } = usePanneauColorScheme();
-
-  return /*#__PURE__*/React.createElement(Form, Object.assign({
-    className: classNames(['form', _defineProperty({
-      'invalid-feedback': generalError !== null
-    }, className, className !== null)]),
-    action: action,
-    onSubmit: onSubmit,
-    withoutActions: true,
-    withoutErrors: true
-  }, props), /*#__PURE__*/React.createElement("div", {
-    className: classNames(['card', _defineProperty({}, className, className !== null)])
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "card-body"
-  }, /*#__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, {
-    id: "y9zauY",
-    defaultMessage: [{
-      "type": 0,
-      "value": "An error occured and we could not delete this item successfully."
-    }]
-  })) : null), /*#__PURE__*/React.createElement("div", {
-    className: "card-body d-flex"
-  }, previous !== null ? /*#__PURE__*/React.createElement(Button, {
-    href: previous,
-    className: "me-2",
-    theme: "secondary",
-    outline: true
-  }, /*#__PURE__*/React.createElement(FormattedMessage, {
-    id: "PyxZY2",
-    defaultMessage: [{
-      "type": 0,
-      "value": "Cancel"
-    }]
-  })) : null, /*#__PURE__*/React.createElement(Button, {
-    type: "submit",
-    className: "ms-auto",
-    theme: "danger"
-  }, /*#__PURE__*/React.createElement(FormattedMessage, {
-    id: "Bhu3B2",
-    defaultMessage: [{
-      "type": 0,
-      "value": "Delete"
-    }]
-  })))));
-};
-DeleteForm.propTypes = propTypes$m;
-DeleteForm.defaultProps = defaultProps$m;
-
-var _excluded$5 = ["component", "resource", "onSuccess", "item", "type", "isDelete"];
-var propTypes$l = {
-  component: PropTypes$1.string,
-  resource: PropTypes.resource.isRequired,
-  item: PropTypes$1.object,
-  // eslint-disable-line react/forbid-prop-types
-  type: PropTypes$1.string,
-  onSuccess: PropTypes$1.func,
-  isDelete: PropTypes$1.bool
-};
-var defaultProps$l = {
-  component: null,
-  item: null,
-  type: null,
-  onSuccess: null,
-  isDelete: false
-};
-var ResourceForm = function ResourceForm(_ref) {
-  var component = _ref.component,
-    resource = _ref.resource,
-    onSuccess = _ref.onSuccess,
-    item = _ref.item,
-    type = _ref.type,
-    isDelete = _ref.isDelete,
-    props = _objectWithoutProperties(_ref, _excluded$5);
-  var locales = useLocales();
-  var FormComponents = useFormsComponents();
-  var _resource$fields = resource.fields,
-    resourceFields = _resource$fields === void 0 ? [] : _resource$fields,
-    _resource$types = resource.types,
-    resourceTypes = _resource$types === void 0 ? [] : _resource$types,
-    forms = resource.forms;
-  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;
-
-  // 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 || {},
-    _ref5$fields = _ref5.fields,
-    formFields = _ref5$fields === void 0 ? null : _ref5$fields,
-    _ref5$component = _ref5.component,
-    formComponent = _ref5$component === void 0 ? null : _ref5$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 !hiddenInForm;
-    });
-  }, [formFields, defaultFields, resourceTypeFields, resourceFields]);
-
-  // Form routes
-  var resourceRoute = useResourceUrlGenerator(resource);
-  var _useResourceStore = useResourceStore(resource),
-    store = _useResourceStore.store;
-  var _useResourceUpdate = useResourceUpdate(resource, item != null ? item.id : null),
-    update = _useResourceUpdate.update;
-  var _useResourceDestroy = useResourceDestroy(resource, item != null ? item.id : null),
-    destroy = _useResourceDestroy.destroy;
-
-  // Post actions
-  var postAction = isCreate ? store : update;
-  var postForm = useCallback(function (action, data) {
-    return isDelete ? destroy() : postAction(data);
-  }, [postAction, isDelete, destroy, 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 defaultValue !== null ? _objectSpread(_objectSpread({}, defaultValues), {}, _defineProperty({}, name, defaultValue)) : defaultValues;
-    }, type !== null ? {
-      type: type
-    } : null);
-  }, [item, type, finalFields]);
-  var _useState = useState(getInitialValue()),
-    _useState2 = _slicedToArray(_useState, 2),
-    value = _useState2[0],
-    setValueState = _useState2[1];
-  var setValue = useCallback(function (newValue) {
-    // console.log('new value in resource form', newValue); // eslint-disable-line
-    setValueState(newValue);
-  }, [setValueState]);
-  var _useForm = useForm({
-      fields: finalFields,
-      value: value,
-      postForm: postForm,
-      setValue: setValue,
-      onComplete: onSuccess,
-      locales: locales
-    }),
-    fields = _useForm.fields,
-    onSubmit = _useForm.onSubmit,
-    status = _useForm.status,
-    generalError = _useForm.generalError,
-    errors = _useForm.errors;
-
-  // Form action
-  var modifyAction = isCreate ? resourceRoute('store') : resourceRoute('update', {
-    id: item.id
-  });
-  var action = isDelete ? resourceRoute('destroy', {
-    id: item.id
-  }) : modifyAction;
-  var defaultFormName = isDelete ? component || formComponent || null : component || formComponent || defaultComponent || 'normal';
+import ResourceList from '@panneau/list-resource-items';
+import { getComponentFromName } from '@panneau/core/utils';
+import Filters from '@panneau/filter-filters';
 
-  // Form component
-  var FormComponent = getComponentFromName(defaultFormName, FormComponents, isDelete ? DeleteForm : component);
+/* eslint-disable react/jsx-props-no-spreading */
 
-  // Lisen to item value change - this is important
-  useEffect(function () {
-    // console.log('get initial value from the top'); // eslint-disable-line
-    setValue(getInitialValue());
-  }, [getInitialValue, setValue]);
-  return /*#__PURE__*/React.createElement(FormProvider, {
-    value: value,
-    setValue: setValue
-  }, /*#__PURE__*/React.createElement(FormComponent, Object.assign({}, props, {
-    status: status,
-    resource: resource,
-    item: item,
-    fields: fields,
-    generalError: generalError,
-    errors: errors,
-    action: action,
-    onSubmit: onSubmit,
-    isCreate: isCreate,
-    value: value,
-    onChange: setValue
-  })));
+// Kept for backward compatibility with exports
+var ResourceFormWrapper = function ResourceFormWrapper(props) {
+  return /*#__PURE__*/React.createElement(ResourceForm, props);
 };
-ResourceForm.propTypes = propTypes$l;
-ResourceForm.defaultProps = defaultProps$l;
 
-var propTypes$k = {
-  className: PropTypes$1.string,
-  itemClassName: PropTypes$1.string,
-  linkClassName: PropTypes$1.string
+var propTypes$j = {
+  withAccountForm: PropTypes.bool,
+  className: PropTypes.string,
+  itemClassName: PropTypes.string,
+  linkClassName: PropTypes.string
 };
-var defaultProps$k = {
+var defaultProps$i = {
+  withAccountForm: false,
   className: null,
   itemClassName: null,
   linkClassName: null
 };
 var AccountMenu = function AccountMenu(_ref) {
-  var className = _ref.className,
+  var withAccountForm = _ref.withAccountForm,
+    className = _ref.className,
     itemClassName = _ref.itemClassName,
     linkClassName = _ref.linkClassName;
   var route = useUrlGenerator();
@@ -338,17 +79,16 @@ var AccountMenu = function AccountMenu(_ref) {
         }]
       }),
       href: route('account'),
-      dropdown: [
-      //   {
-      //       label: (
-      //           <FormattedMessage
-      //               defaultMessage="Update account"
-      //               description="Menu label"
-      //           />
-      //       ),
-      //       href: route('account'),
-      //   },
-      {
+      dropdown: [].concat(_toConsumableArray(withAccountForm ? [{
+        label: /*#__PURE__*/React.createElement(FormattedMessage, {
+          id: "V7Us0a",
+          defaultMessage: [{
+            "type": 0,
+            "value": "Update account"
+          }]
+        }),
+        href: route('account')
+      }] : []), [{
         label: /*#__PURE__*/React.createElement(FormattedMessage, {
           id: "REIcPg",
           defaultMessage: [{
@@ -358,7 +98,7 @@ var AccountMenu = function AccountMenu(_ref) {
         }),
         href: route('auth.logout'),
         onClick: onClickLogout
-      }]
+      }])
     }] : [{
       label: /*#__PURE__*/React.createElement(FormattedMessage, {
         id: "d0g58T",
@@ -369,7 +109,7 @@ var AccountMenu = function AccountMenu(_ref) {
       }),
       href: route('auth.login')
     }];
-  }, [user, route, onClickLogout]);
+  }, [user, route, onClickLogout, withAccountForm]);
   return items !== null ? /*#__PURE__*/React.createElement(Menu, {
     className: className,
     itemClassName: itemClassName,
@@ -378,15 +118,15 @@ var AccountMenu = function AccountMenu(_ref) {
     dropdownAlign: "end"
   }) : null;
 };
-AccountMenu.propTypes = propTypes$k;
-AccountMenu.defaultProps = defaultProps$k;
+AccountMenu.propTypes = propTypes$j;
+AccountMenu.defaultProps = defaultProps$i;
 
-var propTypes$j = {
-  className: PropTypes$1.string,
-  itemClassName: PropTypes$1.string,
-  linkClassName: PropTypes$1.string
+var propTypes$i = {
+  className: PropTypes.string,
+  itemClassName: PropTypes.string,
+  linkClassName: PropTypes.string
 };
-var defaultProps$j = {
+var defaultProps$h = {
   className: null,
   itemClassName: null,
   linkClassName: null
@@ -423,11 +163,11 @@ var ResourcesMenu = function ResourcesMenu(_ref) {
     linkClassName: linkClassName
   });
 };
-ResourcesMenu.propTypes = propTypes$j;
-ResourcesMenu.defaultProps = defaultProps$j;
+ResourcesMenu.propTypes = propTypes$i;
+ResourcesMenu.defaultProps = defaultProps$h;
 
-var propTypes$i = {};
-var defaultProps$i = {};
+var propTypes$h = {};
+var defaultProps$g = {};
 var MainNavbar = function MainNavbar(props) {
   var _usePanneau = usePanneau(),
     name = _usePanneau.name,
@@ -490,16 +230,16 @@ var MainNavbar = function MainNavbar(props) {
     className: "navbar-brand"
   }, name) : null, items);
 };
-MainNavbar.propTypes = propTypes$i;
-MainNavbar.defaultProps = defaultProps$i;
+MainNavbar.propTypes = propTypes$h;
+MainNavbar.defaultProps = defaultProps$g;
 
 var styles$1 = {};
 
-var propTypes$h = {
-  children: PropTypes$1.node.isRequired,
-  fullscreen: PropTypes$1.bool
+var propTypes$g = {
+  children: PropTypes.node.isRequired,
+  fullscreen: PropTypes.bool
 };
-var defaultProps$h = {
+var defaultProps$f = {
   fullscreen: false
 };
 var MainLayout = function MainLayout(_ref) {
@@ -524,17 +264,17 @@ var MainLayout = function MainLayout(_ref) {
     }, _defineProperty(_ref2, "bg-".concat(background), background !== null), _defineProperty(_ref2, "text-".concat(text), text !== null), _ref2)])
   }, children), /*#__PURE__*/React.createElement(Modals, null));
 };
-MainLayout.propTypes = propTypes$h;
-MainLayout.defaultProps = defaultProps$h;
+MainLayout.propTypes = propTypes$g;
+MainLayout.defaultProps = defaultProps$f;
 
-var propTypes$g = {
-  title: PropTypes.label,
-  actions: PropTypes$1.node,
-  small: PropTypes$1.bool,
-  className: PropTypes$1.string,
-  children: PropTypes$1.node
+var propTypes$f = {
+  title: PropTypes$1.label,
+  actions: PropTypes.node,
+  small: PropTypes.bool,
+  className: PropTypes.string,
+  children: PropTypes.node
 };
-var defaultProps$g = {
+var defaultProps$e = {
   title: null,
   actions: null,
   small: false,
@@ -571,13 +311,13 @@ var PageHeader = function PageHeader(_ref) {
     className: "col-12 col-md-8 col-lg-7"
   }, inner)) : inner), children);
 };
-PageHeader.propTypes = propTypes$g;
-PageHeader.defaultProps = defaultProps$g;
+PageHeader.propTypes = propTypes$f;
+PageHeader.defaultProps = defaultProps$e;
 
-var propTypes$f = {
-  resource: PropTypes.resource.isRequired
+var propTypes$e = {
+  resource: PropTypes$1.resource.isRequired
 };
-var defaultProps$f = {};
+var defaultProps$d = {};
 var ResourceCreatePage = function ResourceCreatePage(_ref) {
   var resource = _ref.resource;
   var navigate = useNavigate();
@@ -614,20 +354,20 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     className: "row justify-content-center"
   }, /*#__PURE__*/React.createElement("div", {
     className: "col-12 col-md-8 col-lg-7"
-  }, /*#__PURE__*/React.createElement(ResourceForm, {
+  }, /*#__PURE__*/React.createElement(ResourceFormWrapper, {
     resource: resource,
     type: type,
     onSuccess: onSuccess
   }))))));
 };
-ResourceCreatePage.propTypes = propTypes$f;
-ResourceCreatePage.defaultProps = defaultProps$f;
+ResourceCreatePage.propTypes = propTypes$e;
+ResourceCreatePage.defaultProps = defaultProps$d;
 
 // import PropTypes from 'prop-types';
-var propTypes$e = {
-  resource: PropTypes.resource.isRequired
+var propTypes$d = {
+  resource: PropTypes$1.resource.isRequired
 };
-var defaultProps$e = {};
+var defaultProps$c = {};
 var ResourceDeletePage = function ResourceDeletePage(_ref) {
   var resource = _ref.resource;
   var _useParams = useParams(),
@@ -661,20 +401,20 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
     className: "row justify-content-center"
   }, /*#__PURE__*/React.createElement("div", {
     className: "col-12 col-md-8 col-lg-7"
-  }, item !== null ? /*#__PURE__*/React.createElement(ResourceForm, {
+  }, item !== null ? /*#__PURE__*/React.createElement(ResourceFormWrapper, {
     resource: resource,
     item: item,
     onSuccess: onSuccess,
     isDelete: true
   }) : null)))));
 };
-ResourceDeletePage.propTypes = propTypes$e;
-ResourceDeletePage.defaultProps = defaultProps$e;
+ResourceDeletePage.propTypes = propTypes$d;
+ResourceDeletePage.defaultProps = defaultProps$c;
 
-var propTypes$d = {
-  resource: PropTypes.resource.isRequired
+var propTypes$c = {
+  resource: PropTypes$1.resource.isRequired
 };
-var defaultProps$d = {};
+var defaultProps$b = {};
 var ResourceEditPage = function ResourceEditPage(_ref) {
   var resource = _ref.resource;
   var _useParams = useParams(),
@@ -716,21 +456,21 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
     className: "row justify-content-center"
   }, /*#__PURE__*/React.createElement("div", {
     className: "col-12 col-md-8 col-lg-7"
-  }, editItem !== null ? /*#__PURE__*/React.createElement(ResourceForm, {
+  }, editItem !== null ? /*#__PURE__*/React.createElement(ResourceFormWrapper, {
     resource: resource,
     item: editItem,
     type: type,
     onSuccess: onSuccess
   }) : null)))));
 };
-ResourceEditPage.propTypes = propTypes$d;
-ResourceEditPage.defaultProps = defaultProps$d;
+ResourceEditPage.propTypes = propTypes$c;
+ResourceEditPage.defaultProps = defaultProps$b;
 
-var propTypes$c = {
-  resource: PropTypes.resource.isRequired,
-  className: PropTypes$1.string
+var propTypes$b = {
+  resource: PropTypes$1.resource.isRequired,
+  className: PropTypes.string
 };
-var defaultProps$c = {
+var defaultProps$a = {
   className: null
 };
 var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
@@ -799,232 +539,35 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
     onClickOutside: onDropdownClickOutside
   })) : button;
 };
-ResourceCreateButtom.propTypes = propTypes$c;
-ResourceCreateButtom.defaultProps = defaultProps$c;
+ResourceCreateButtom.propTypes = propTypes$b;
+ResourceCreateButtom.defaultProps = defaultProps$a;
 
-var _excluded$4 = ["component", "name", "groupLabel"];
-var propTypes$b = {
-  filters: PropTypes$1.arrayOf(PropTypes$1.shape({
-    id: PropTypes$1.string,
-    component: PropTypes$1.string.isRequired
-  })),
-  value: PropTypes$1.object,
-  // eslint-disable-line react/forbid-prop-types
-  onChange: PropTypes$1.func,
-  onReset: PropTypes$1.func,
-  withContainer: PropTypes$1.bool,
-  withReset: PropTypes$1.bool,
-  defaultValue: PropTypes$1.objectOf(PropTypes$1.object),
-  // eslint-disable-line react/forbid-prop-types
-  className: PropTypes$1.string
-};
-var defaultProps$b = {
-  filters: [],
-  value: null,
-  onChange: null,
-  onReset: null,
-  withContainer: false,
-  withReset: true,
-  defaultValue: {
-    page: null
-  },
-  className: null
-};
-var ResourceFilters = function ResourceFilters(_ref) {
-  var filters = _ref.filters,
-    value = _ref.value,
-    onChange = _ref.onChange,
-    onReset = _ref.onReset,
-    withContainer = _ref.withContainer,
-    withReset = _ref.withReset,
-    defaultValue = _ref.defaultValue,
-    className = _ref.className;
-  var FilterComponents = useFiltersComponents();
-  var _usePanneauColorSchem = usePanneauColorScheme(),
-    background = _usePanneauColorSchem.background;
-  var currentFilters = filters || [];
-  var onFiltersReset = useCallback(function () {
-    if (onReset !== null) {
-      onReset(null);
-    }
-  }, [onReset]);
-  var hasActiveFilter = (currentFilters || []).reduce(function (isActive, item) {
-    if (value !== null && value[item.name]) {
-      return true;
-    }
-    return isActive;
-  }, false);
-  var onFilterChange = useCallback(function (name, newFilterValue) {
-    if (name !== null && onChange !== null) {
-      onChange(_objectSpread(_objectSpread({}, value), {}, _defineProperty({}, name, newFilterValue), defaultValue));
-    }
-  }, [onChange, value, defaultValue]);
-  var onFilterClear = useCallback(function (name) {
-    if (name !== null && onChange !== null) {
-      var _ref2 = value || {};
-        _ref2[name];
-        var newValue = _objectWithoutProperties(_ref2, [name].map(_toPropertyKey));
-      onChange(_objectSpread(_objectSpread({}, newValue), defaultValue));
-    }
-  }, [onChange, value, defaultValue]);
-  return /*#__PURE__*/React.createElement(Navbar, {
-    className: classNames([_defineProperty({
-      'navbar-expand-md': withContainer
-    }, className, className !== null), 'justify-content-start', 'align-items-start', 'flex-column', 'flex-md-row']),
-    theme: background,
-    withoutCollapse: true
-  }, currentFilters.map(function (_ref4, index) {
-    var component = _ref4.component,
-      name = _ref4.name,
-      groupLabel = _ref4.groupLabel,
-      filterProps = _objectWithoutProperties(_ref4, _excluded$4);
-    var FilterComponent = getComponentFromName(component, FilterComponents, null);
-    var filterValue = value !== null && value[name] ? value[name] : null;
-    return FilterComponent !== null ? /*#__PURE__*/React.createElement(FormGroup, {
-      key: "filter-".concat(name, "-").concat(index + 1),
-      label: groupLabel,
-      className: "mb-3 me-3"
-    }, /*#__PURE__*/React.createElement(FilterComponent, Object.assign({}, filterProps, {
-      value: filterValue,
-      onChange: function onChange(newValue) {
-        return onFilterChange(name, newValue);
-      },
-      onClear: function onClear() {
-        return onFilterClear(name);
-      }
-    }))) : null;
-  }), withReset && hasActiveFilter && currentFilters.length > 0 ? /*#__PURE__*/React.createElement(Button, {
-    theme: "primary",
-    onClick: onFiltersReset
-  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
-    icon: faUndo
-  })) : null);
-};
-ResourceFilters.propTypes = propTypes$b;
-ResourceFilters.defaultProps = defaultProps$b;
-
-var _excluded$3 = ["component", "showPagination", "filters", "actions"],
-  _excluded2$1 = ["page"];
+var _excluded$3 = ["resource"];
 var propTypes$a = {
-  resource: PropTypes.resource.isRequired,
-  query: PropTypes$1.object,
-  // eslint-disable-line react/forbid-prop-types
-  paginated: PropTypes$1.bool,
-  baseUrl: PropTypes$1.string,
-  component: PropTypes$1.oneOfType([PropTypes$1.elementType, PropTypes$1.string]),
-  componentProps: PropTypes$1.object,
-  // eslint-disable-line react/forbid-prop-types
-  onQueryChange: PropTypes$1.func,
-  onQueryReset: PropTypes$1.func,
-  onClickPage: PropTypes$1.func,
-  showFilters: PropTypes$1.bool,
-  listProps: PropTypes$1.shape({})
-};
-var defaultProps$a = {
-  query: null,
-  paginated: true,
-  component: null,
-  baseUrl: null,
-  componentProps: null,
-  onQueryChange: null,
-  onQueryReset: null,
-  onClickPage: null,
-  showFilters: true,
-  listProps: null
+  resource: PropTypes.oneOfType([PropTypes.string, PropTypes.shape({
+    id: PropTypes.string
+  })]).isRequired
 };
+
+// Kept for backward compatibility with exports
 var ResourceItemsList = function ResourceItemsList(_ref) {
   var resource = _ref.resource,
-    query = _ref.query,
-    baseUrl = _ref.baseUrl,
-    onQueryChange = _ref.onQueryChange,
-    onQueryReset = _ref.onQueryReset,
-    onClickPage = _ref.onClickPage,
-    paginated = _ref.paginated,
-    showFilters = _ref.showFilters,
-    customListProps = _ref.listProps;
-  var _resource$index = resource.index,
-    _resource$index2 = _resource$index === void 0 ? {} : _resource$index,
-    _resource$index2$comp = _resource$index2.component,
-    listComponent = _resource$index2$comp === void 0 ? null : _resource$index2$comp,
-    _resource$index2$show = _resource$index2.showPagination,
-    showPagination = _resource$index2$show === void 0 ? true : _resource$index2$show,
-    _resource$index2$filt = _resource$index2.filters,
-    filters = _resource$index2$filt === void 0 ? null : _resource$index2$filt;
-    _resource$index2.actions;
-    var listProps = _objectWithoutProperties(_resource$index2, _excluded$3);
-  var _usePanneauColorSchem = usePanneauColorScheme(),
-    _usePanneauColorSchem2 = _usePanneauColorSchem.background,
-    theme = _usePanneauColorSchem2 === void 0 ? null : _usePanneauColorSchem2;
-  var ListComponents = useListsComponents();
-  var _useMemo = useMemo(function () {
-      var _ref2 = query || {},
-        _ref2$page = _ref2.page,
-        currentPage = _ref2$page === void 0 ? 1 : _ref2$page,
-        rest = _objectWithoutProperties(_ref2, _excluded2$1);
-      return [currentPage, rest];
-    }, [query]),
-    _useMemo2 = _slicedToArray(_useMemo, 2),
-    page = _useMemo2[0],
-    queryWithoutPage = _useMemo2[1];
-  var itemsProps = useResourceItems(resource, queryWithoutPage, paginated ? parseInt(page, 10) : null);
-  var _ref3 = itemsProps || {},
-    _ref3$loaded = _ref3.loaded,
-    loaded = _ref3$loaded === void 0 ? false : _ref3$loaded,
-    _ref3$loading = _ref3.loading,
-    loading = _ref3$loading === void 0 ? false : _ref3$loading,
-    _ref3$lastPage = _ref3.lastPage,
-    lastPage = _ref3$lastPage === void 0 ? 0 : _ref3$lastPage,
-    _ref3$total = _ref3.total,
-    total = _ref3$total === void 0 ? 0 : _ref3$total;
-  var finalEmpty = loaded && !loading && total === 0;
-  var ListComponent = getComponentFromName(listComponent || 'table', ListComponents);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, showFilters && filters !== null ? /*#__PURE__*/React.createElement(ResourceFilters, {
-    filters: filters,
-    value: query,
-    onChange: onQueryChange,
-    onReset: onQueryReset
-  }) : null, paginated && showPagination ? /*#__PURE__*/React.createElement(Pagination, {
-    page: page,
-    lastPage: lastPage,
-    total: total,
-    url: baseUrl,
-    query: query,
-    onClickPage: onClickPage,
-    className: "mt-1 mb-1"
-  }) : null, ListComponent !== null ? /*#__PURE__*/React.createElement(ListComponent, Object.assign({}, itemsProps, listProps, {
-    resource: resource,
-    baseUrl: baseUrl,
-    query: query,
-    onQueryChange: onQueryChange,
-    onQueryReset: onQueryReset,
-    theme: theme,
-    showEmptyLabel: finalEmpty,
-    emptyLabel: /*#__PURE__*/React.createElement("p", {
-      className: "my-2"
-    }, /*#__PURE__*/React.createElement(FormattedMessage, {
-      id: "WgIC2T",
-      defaultMessage: [{
-        "type": 0,
-        "value": "No results found"
-      }]
-    }))
-  }, customListProps)) : null, paginated && showPagination ? /*#__PURE__*/React.createElement(Pagination, {
-    page: page,
-    lastPage: lastPage,
-    total: total,
-    url: baseUrl,
-    query: query,
-    onClickPage: onClickPage,
-    className: "mt-4 mb-1"
-  }) : null);
+    props = _objectWithoutProperties(_ref, _excluded$3);
+  var _ref2 = isObject(resource) ? resource : {
+      id: resource
+    },
+    _ref2$id = _ref2.id,
+    finalResource = _ref2$id === void 0 ? null : _ref2$id;
+  return /*#__PURE__*/React.createElement(ResourceList, Object.assign({
+    resource: finalResource
+  }, props));
 };
 ResourceItemsList.propTypes = propTypes$a;
-ResourceItemsList.defaultProps = defaultProps$a;
 
 var _excluded$2 = ["id", "component"];
 var propTypes$9 = {
-  resource: PropTypes.resource.isRequired,
-  defaultActions: PropTypes$1.arrayOf(PropTypes$1.oneOfType([PropTypes$1.string, PropTypes$1.object])) // eslint-disable-line react/forbid-prop-types
+  resource: PropTypes$1.resource.isRequired,
+  defaultActions: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object])) // eslint-disable-line react/forbid-prop-types
 };
 
 var defaultProps$9 = {
@@ -1157,7 +700,7 @@ ResourceIndexPage.propTypes = propTypes$9;
 ResourceIndexPage.defaultProps = defaultProps$9;
 
 var propTypes$8 = {
-  resource: PropTypes.resource.isRequired
+  resource: PropTypes$1.resource.isRequired
 };
 var defaultProps$8 = {};
 var ResourceShowPage = function ResourceShowPage(_ref) {
@@ -1181,7 +724,7 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
     className: "row justify-content-center"
   }, /*#__PURE__*/React.createElement("div", {
     className: "col-12 col-md-8 col-lg-7"
-  }, /*#__PURE__*/React.createElement(ResourceForm, {
+  }, /*#__PURE__*/React.createElement(ResourceFormWrapper, {
     resource: resource,
     item: item,
     type: type,
@@ -1244,8 +787,8 @@ AccountPage.defaultProps = defaultProps$6;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var propTypes$5 = {
-  className: PropTypes$1.string,
-  onSuccess: PropTypes$1.func
+  className: PropTypes.string,
+  onSuccess: PropTypes.func
 };
 var defaultProps$5 = {
   className: null,
@@ -1284,8 +827,8 @@ LoginForm.defaultProps = defaultProps$5;
 var styles = {};
 
 var propTypes$4 = {
-  children: PropTypes$1.node.isRequired,
-  fullscreen: PropTypes$1.bool
+  children: PropTypes.node.isRequired,
+  fullscreen: PropTypes.bool
 };
 var defaultProps$4 = {
   fullscreen: false
@@ -1448,7 +991,7 @@ var messages = defineMessages({
   }
 });
 var propTypes$2 = {
-  statusCode: PropTypes.statusCode
+  statusCode: PropTypes$1.statusCode
 };
 var defaultProps$2 = {
   statusCode: null
@@ -1577,7 +1120,7 @@ var createResourceRoutes = function createResourceRoutes(resource, _ref) {
 var _excluded = ["home", "login", "account", "error", "index", "show", "create", "edit", "delete"],
   _excluded2 = ["path", "route", "component", "exact"];
 var propTypes$1 = {
-  statusCode: PropTypes.statusCode
+  statusCode: PropTypes$1.statusCode
 };
 var defaultProps$1 = {
   statusCode: null
@@ -1726,13 +1269,13 @@ PanneauRoutes.propTypes = propTypes$1;
 PanneauRoutes.defaultProps = defaultProps$1;
 
 var propTypes = {
-  definition: PropTypes.panneauDefinition.isRequired,
-  components: PropTypes$1.oneOfType([PropTypes$1.objectOf(PropTypes$1.elementType), PropTypes$1.objectOf(PropTypes$1.objectOf(PropTypes$1.elementType))]),
-  user: PropTypes.user,
-  memoryRouter: PropTypes$1.bool,
-  baseUrl: PropTypes$1.string,
-  uppy: PropTypes.uppy,
-  statusCode: PropTypes.statusCode
+  definition: PropTypes$1.panneauDefinition.isRequired,
+  components: PropTypes.oneOfType([PropTypes.objectOf(PropTypes.elementType), PropTypes.objectOf(PropTypes.objectOf(PropTypes.elementType))]),
+  user: PropTypes$1.user,
+  memoryRouter: PropTypes.bool,
+  baseUrl: PropTypes.string,
+  uppy: PropTypes$1.uppy,
+  statusCode: PropTypes$1.statusCode
 };
 var defaultProps = {
   components: null,
@@ -1810,4 +1353,11 @@ var Container = function Container(_ref) {
 Container.propTypes = propTypes;
 Container.defaultProps = defaultProps;
 
-export { GuestLayout, MainLayout, PageHeader, ResourceFilters, ResourceForm, ResourceItemsList, Container as default };
+/* eslint-disable react/jsx-props-no-spreading */
+
+// Kept for backward compatibility with exports
+var ResourceFilters = function ResourceFilters(props) {
+  return /*#__PURE__*/React.createElement(Filters, props);
+};
+
+export { GuestLayout, MainLayout, PageHeader, ResourceFilters, ResourceFormWrapper as ResourceForm, ResourceItemsList, Container as default };