@panneau/app 4.0.74 → 4.0.75

package/dist/index.d.ts

@@ -1,9 +1,11 @@
 import * as react from 'react';
 import { ElementType, ReactNode } from 'react';
-import { PanneauDefinition, User, Uppy, StatusCode, Label } from '@panneau/core';
+import { PanneauDefinition, FormDefinition, FieldDefinition, User, Uppy, StatusCode, Label } from '@panneau/core';
 
 interface ContainerProps {
     definition: PanneauDefinition;
+    forms: FormDefinition[];
+    fields: FieldDefinition[];
     components?: Record<string, ElementType> | Record<string, Record<string, ElementType>> | null;
     user?: User | null;
     memoryRouter?: boolean;
@@ -11,7 +13,7 @@ interface ContainerProps {
     uppy?: Uppy | null;
     statusCode?: StatusCode | null;
 }
-declare function Container({ definition, components, user, memoryRouter, baseUrl, uppy, statusCode, }: ContainerProps): react.JSX.Element;
+declare function Container({ definition, forms: providedForms, fields: providedFields, components, user, memoryRouter, baseUrl, uppy, statusCode, }: ContainerProps): react.JSX.Element;
 
 interface MainLayoutProps {
     children?: ReactNode;

package/dist/index.js

@@ -1,9 +1,8 @@
 import { useMemoryRouter, createPathToRegexpParser } from '@folklore/routes';
-import { useState, useEffect, Fragment as Fragment$1, useMemo, useCallback } from 'react';
 import { useLocation, useSearch, Route, Redirect, Switch, Router } from 'wouter';
 import ActionsProvider from '@panneau/actions';
 import { useUser, useLogout, useAuth, AuthProvider } from '@panneau/auth';
-import { useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useActionsComponentsManager, useFormsComponents, useRoutes, usePagesComponentsManager, PanneauProvider, RoutesProvider, ModalProvider, ComponentsProvider } from '@panneau/core/contexts';
+import { useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useActionsComponentsManager, useRoutes, usePagesComponentsManager, PanneauProvider, RoutesProvider, ModalProvider, ComponentsProvider } from '@panneau/core/contexts';
 import { useResourceItem, DataProvider } from '@panneau/data';
 import DisplaysProvider from '@panneau/displays';
 import FieldsProvider from '@panneau/fields';
@@ -15,6 +14,7 @@ import ModalsProvider from '@panneau/modals';
 import { UppyProvider } from '@panneau/uppy';
 import { c } from 'react/compiler-runtime';
 import isObject from 'lodash-es/isObject';
+import { useState, useEffect } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import classNames from 'classnames';
 import isString from 'lodash-es/isString';
@@ -33,7 +33,7 @@ import LabelComponent from '@panneau/element-label';
 import ResourceList from '@panneau/list-resource-items';
 import Loading from '@panneau/element-loading';
 import ResourceForm from '@panneau/form-resource';
-import { getComponentFromName } from '@panneau/core/utils';
+import Form from '@panneau/form';
 import Filters from '@panneau/filter-filters';
 
 function ResourceFormWrapper(props) {
@@ -325,6 +325,7 @@ function MainNavbar(t0) {
     t10 = name !== null ? /*#__PURE__*/jsx(Link, {
       href: route("home"),
       className: "navbar-brand",
+      withoutTheme: true,
       children: /*#__PURE__*/jsx("span", {
         className: classNames([{
           "text-opacity-75": loading,
@@ -1671,7 +1672,7 @@ function AccountPage() {
 }
 
 function LoginForm(t0) {
-  const $ = c(10);
+  const $ = c(9);
   const {
     className: t1,
     onComplete: t2
@@ -1697,35 +1698,30 @@ function LoginForm(t0) {
     t3 = $[1];
   }
   const postForm = t3;
-  const FormComponents = useFormsComponents();
   let t4;
-  if ($[2] !== FormComponents) {
-    t4 = getComponentFromName("login", FormComponents);
-    $[2] = FormComponents;
+  if ($[2] !== url) {
+    t4 = url("auth.login");
+    $[2] = url;
     $[3] = t4;
   } else {
     t4 = $[3];
   }
-  const FormComponent = t4;
   let t5;
-  if ($[4] !== FormComponent || $[5] !== className || $[6] !== onComplete || $[7] !== postForm || $[8] !== url) {
-    t5 = FormComponent !== null ? /*#__PURE__*/jsx(FormComponent, {
-      action: url("auth.login"),
+  if ($[4] !== className || $[5] !== onComplete || $[6] !== postForm || $[7] !== t4) {
+    t5 = /*#__PURE__*/jsx(Form, {
+      type: "login",
+      action: t4,
       postForm: postForm,
       onComplete: onComplete,
-      className: className,
-      submitButtonLabel: /*#__PURE__*/jsx(FormattedMessage, {
-        id: "g6qbbX"
-      })
-    }) : null;
-    $[4] = FormComponent;
-    $[5] = className;
-    $[6] = onComplete;
-    $[7] = postForm;
-    $[8] = url;
-    $[9] = t5;
+      className: className
+    });
+    $[4] = className;
+    $[5] = onComplete;
+    $[6] = postForm;
+    $[7] = t4;
+    $[8] = t5;
   } else {
-    t5 = $[9];
+    t5 = $[8];
   }
   return t5;
 }
@@ -2020,35 +2016,16 @@ function createResourceRoutes(resource, {
     pages: resourcePages = {},
     extraRoutes = []
   } = resource;
-
-  // Load custom pages from resource
-  const {
-    index: indexPage = null,
-    show: showPage = null,
-    create: createPage = null,
-    edit: editPage = null,
-    delete: deletePage = null,
-    duplicate: duplicatePage = null
-  } = pages || {};
-  const {
-    index: resourceIndexPage = null,
-    show: resourceShowPage = null,
-    create: resourceCreatePage = null,
-    edit: resourceEditPage = null,
-    delete: resourceDeletePage = null,
-    duplicate: resourceDuplicatePage = null
-  } = resourcePages || {};
-  const ResourceIndexComponent = componentsManager.getComponent(resourceIndexPage?.component) || componentsManager.getComponent(indexPage?.component) || ResourceIndexPage;
-  const ResourceShowComponent = componentsManager.getComponent(resourceShowPage?.component) || componentsManager.getComponent(showPage?.component) || ResourceShowPage;
-  const ResourceCreateComponent = componentsManager.getComponent(resourceCreatePage?.component) || componentsManager.getComponent(createPage?.component) || ResourceCreatePage;
-  const ResourceEditComponent = componentsManager.getComponent(resourceEditPage?.component) || componentsManager.getComponent(editPage?.component) || ResourceEditPage;
-  const ResourceDeleteComponent = componentsManager.getComponent(resourceDeletePage?.component) || componentsManager.getComponent(deletePage?.component) || ResourceDeletePage;
-  const ResourceDuplicateComponent = componentsManager.getComponent(resourceDuplicatePage?.component) || componentsManager.getComponent(duplicatePage?.component) || ResourceDuplicatePage;
+  const ResourceIndexComponent = componentsManager.getComponent(resourcePages?.resourceIndexPage?.component) || componentsManager.getComponent(pages?.indexPage?.component) || ResourceIndexPage;
+  const ResourceShowComponent = componentsManager.getComponent(resourcePages?.resourceShowPage?.component) || componentsManager.getComponent(pages?.showPage?.component) || ResourceShowPage;
+  const ResourceCreateComponent = componentsManager.getComponent(resourcePages?.resourceCreatePage?.component) || componentsManager.getComponent(pages?.createPage?.component) || ResourceCreatePage;
+  const ResourceEditComponent = componentsManager.getComponent(resourcePages?.resourceEditPage?.component) || componentsManager.getComponent(pages?.editPage?.component) || ResourceEditPage;
+  const ResourceDeleteComponent = componentsManager.getComponent(resourcePages?.resourceDeletePage?.component) || componentsManager.getComponent(pages?.deletePage?.component) || ResourceDeletePage;
+  const ResourceDuplicateComponent = componentsManager.getComponent(resourcePages?.resourceDuplicatePage?.component) || componentsManager.getComponent(pages?.duplicatePage?.component) || ResourceDuplicatePage;
   return [/*#__PURE__*/jsx(Route, {
     path: route('resources.create', {
       resource: resourceId
     }),
-    exact: true,
     children: () => /*#__PURE__*/jsx(ResourceCreateComponent, {
       resource: resource
     })
@@ -2120,7 +2097,7 @@ function createResourceRoutes(resource, {
 }
 
 function PanneauRoutes(t0) {
-  const $ = c(103);
+  const $ = c(91);
   const {
     statusCode: t1
   } = t0;
@@ -2139,19 +2116,19 @@ function PanneauRoutes(t0) {
   } else {
     t2 = $[2];
   }
-  const [t3, setInitialRequest] = useState(t2);
+  const [initialRequest, setInitialRequest] = useState(t2);
   const {
     statusCode,
     pathname: lastPathname
-  } = t3;
+  } = initialRequest;
   const user = useUser();
   const route = useUrlGenerator();
   const resources = usePanneauResources();
   const componentsManager = usePagesComponentsManager();
+  let t3;
   let t4;
-  let t5;
   if ($[3] !== lastPathname || $[4] !== pathname) {
-    t4 = () => {
+    t3 = () => {
       if (pathname !== lastPathname) {
         setInitialRequest({
           pathname,
@@ -2159,400 +2136,346 @@ function PanneauRoutes(t0) {
         });
       }
     };
-    t5 = [pathname, lastPathname];
+    t4 = [pathname, lastPathname];
     $[3] = lastPathname;
     $[4] = pathname;
-    $[5] = t4;
-    $[6] = t5;
+    $[5] = t3;
+    $[6] = t4;
   } else {
-    t4 = $[5];
-    t5 = $[6];
+    t3 = $[5];
+    t4 = $[6];
   }
-  useEffect(t4, t5);
+  useEffect(t3, t4);
   const {
-    pages: t6,
+    pages: t5,
     routes: routesDefinition
   } = usePanneau();
-  const pages = t6 === undefined ? null : t6;
-  let t7;
-  if ($[7] !== pages) {
-    t7 = pages || {};
-    $[7] = pages;
-    $[8] = t7;
+  const pages = t5 === undefined ? null : t5;
+  let t6;
+  if ($[7] === Symbol.for("react.memo_cache_sentinel")) {
+    t6 = ["home", "login", "account", "error", "index", "show", "create", "edit", "delete", "duplicate"];
+    $[7] = t6;
   } else {
-    t7 = $[8];
+    t6 = $[7];
   }
-  let otherPages;
+  const builtinPages = t6;
+  let ErrorComponent;
+  let HomeComponent;
+  let T0;
+  let homePage;
   let t10;
   let t11;
-  let t12;
-  let t13;
-  let t14;
-  let t15;
-  let t16;
-  let t17;
+  let t7;
   let t8;
   let t9;
-  if ($[9] !== t7) {
-    ({
-      home: t8,
-      login: t9,
-      account: t10,
-      error: t11,
-      index: t12,
-      show: t13,
-      create: t14,
-      edit: t15,
-      delete: t16,
-      duplicate: t17,
-      ...otherPages
-    } = t7);
-    $[9] = t7;
-    $[10] = otherPages;
-    $[11] = t10;
-    $[12] = t11;
-    $[13] = t12;
-    $[14] = t13;
-    $[15] = t14;
-    $[16] = t15;
-    $[17] = t16;
-    $[18] = t17;
-    $[19] = t8;
-    $[20] = t9;
-  } else {
-    otherPages = $[10];
-    t10 = $[11];
-    t11 = $[12];
-    t12 = $[13];
-    t13 = $[14];
-    t14 = $[15];
-    t15 = $[16];
-    t16 = $[17];
-    t17 = $[18];
-    t8 = $[19];
-    t9 = $[20];
-  }
-  const homePage = t8 === undefined ? null : t8;
-  const loginPage = t9 === undefined ? null : t9;
-  const accountPage = t10 === undefined ? null : t10;
-  const errorPage = t11 === undefined ? null : t11;
-  let t18;
-  if ($[21] !== routesDefinition) {
-    t18 = Object.keys(routesDefinition).filter(_temp);
-    $[21] = routesDefinition;
-    $[22] = t18;
-  } else {
-    t18 = $[22];
-  }
-  let t19;
-  if ($[23] !== routesDefinition || $[24] !== t18) {
-    t19 = t18.filter(key_0 => {
-      const routeDef = routesDefinition[key_0];
-      return isObject(routeDef) && typeof routeDef.component !== "undefined" && typeof routeDef.path !== "undefined";
-    });
-    $[23] = routesDefinition;
-    $[24] = t18;
-    $[25] = t19;
-  } else {
-    t19 = $[25];
-  }
-  let t20;
-  if ($[26] !== routesDefinition || $[27] !== t19) {
-    t20 = t19.map(key_1 => routesDefinition[key_1]);
-    $[26] = routesDefinition;
-    $[27] = t19;
-    $[28] = t20;
-  } else {
-    t20 = $[28];
-  }
-  let t21;
-  if ($[29] !== otherPages) {
-    t21 = Object.keys(otherPages);
-    $[29] = otherPages;
-    $[30] = t21;
-  } else {
-    t21 = $[30];
-  }
-  let t22;
-  if ($[31] !== otherPages || $[32] !== t21) {
-    t22 = t21.map(key_2 => otherPages[key_2]).filter(_temp2);
-    $[31] = otherPages;
-    $[32] = t21;
-    $[33] = t22;
-  } else {
-    t22 = $[33];
-  }
-  let t23;
-  if ($[34] !== t20 || $[35] !== t22) {
-    t23 = [...t20, ...t22];
-    $[34] = t20;
-    $[35] = t22;
-    $[36] = t23;
-  } else {
-    t23 = $[36];
-  }
-  const customRoutes = t23;
-  let t24;
-  if ($[37] !== componentsManager || $[38] !== homePage?.component) {
-    t24 = componentsManager.getComponent(homePage?.component) || HomePage;
-    $[37] = componentsManager;
-    $[38] = homePage?.component;
-    $[39] = t24;
-  } else {
-    t24 = $[39];
-  }
-  const HomeComponent = t24;
-  let t25;
-  if ($[40] !== componentsManager || $[41] !== loginPage?.component) {
-    t25 = componentsManager.getComponent(loginPage?.component) || LoginPage;
-    $[40] = componentsManager;
-    $[41] = loginPage?.component;
-    $[42] = t25;
-  } else {
-    t25 = $[42];
-  }
-  const LoginComponent = t25;
-  let t26;
-  if ($[43] !== accountPage?.component || $[44] !== componentsManager) {
-    t26 = componentsManager.getComponent(accountPage?.component) || AccountPage;
-    $[43] = accountPage?.component;
-    $[44] = componentsManager;
-    $[45] = t26;
-  } else {
-    t26 = $[45];
-  }
-  const AccountComponent = t26;
-  let t27;
-  if ($[46] !== componentsManager || $[47] !== errorPage?.component) {
-    t27 = componentsManager.getComponent(errorPage?.component) || ErrorPage;
-    $[46] = componentsManager;
-    $[47] = errorPage?.component;
-    $[48] = t27;
-  } else {
-    t27 = $[48];
-  }
-  const ErrorComponent = t27;
-  if (statusCode !== null) {
-    let t28;
-    if ($[49] !== ErrorComponent || $[50] !== errorPage || $[51] !== statusCode) {
-      t28 = /*#__PURE__*/jsx(ErrorComponent, {
-        statusCode: statusCode,
-        ...errorPage
-      });
-      $[49] = ErrorComponent;
-      $[50] = errorPage;
-      $[51] = statusCode;
-      $[52] = t28;
-    } else {
-      t28 = $[52];
-    }
-    return t28;
-  }
-  if (user === null) {
-    const t28 = routes["auth.login"];
-    let t29;
-    if ($[53] !== LoginComponent || $[54] !== loginPage) {
-      t29 = /*#__PURE__*/jsx(LoginComponent, {
-        ...loginPage
-      });
-      $[53] = LoginComponent;
-      $[54] = loginPage;
-      $[55] = t29;
-    } else {
-      t29 = $[55];
-    }
-    let t30;
-    if ($[56] !== t28 || $[57] !== t29) {
-      t30 = /*#__PURE__*/jsx(Route, {
-        path: t28,
-        children: t29
-      });
-      $[56] = t28;
-      $[57] = t29;
-      $[58] = t30;
-    } else {
-      t30 = $[58];
-    }
-    let t31;
-    if ($[59] !== route) {
-      t31 = route("auth.login");
-      $[59] = route;
-      $[60] = t31;
-    } else {
-      t31 = $[60];
-    }
-    const t32 = `${t31}?next=${encodeURIComponent(pathname)}`;
-    let t33;
-    if ($[61] !== t32) {
-      t33 = /*#__PURE__*/jsx(Route, {
-        children: /*#__PURE__*/jsx(Redirect, {
-          to: t32
-        })
-      });
-      $[61] = t32;
-      $[62] = t33;
-    } else {
-      t33 = $[62];
-    }
-    let t34;
-    if ($[63] !== t30 || $[64] !== t33) {
-      t34 = /*#__PURE__*/jsxs(Switch, {
-        children: [t30, t33]
-      });
-      $[63] = t30;
-      $[64] = t33;
-      $[65] = t34;
-    } else {
-      t34 = $[65];
-    }
-    return t34;
-  }
-  let t28;
-  if ($[66] !== routes || $[67] !== user) {
-    t28 = user !== null ? /*#__PURE__*/jsx(Route, {
-      path: routes["auth.login"],
-      children: /*#__PURE__*/jsx(Redirect, {
-        to: routes.home,
-        replace: true
-      })
-    }) : null;
-    $[66] = routes;
-    $[67] = user;
-    $[68] = t28;
-  } else {
-    t28 = $[68];
-  }
-  let t29;
-  if ($[69] !== componentsManager || $[70] !== pages || $[71] !== resources || $[72] !== route) {
-    let t30;
-    if ($[74] !== componentsManager || $[75] !== pages || $[76] !== route) {
-      t30 = resource => {
-        const {
-          id: resourceId
-        } = resource || {};
-        return /*#__PURE__*/jsx(Fragment$1, {
-          children: createResourceRoutes(resource, {
+  if ($[8] !== componentsManager || $[9] !== pages || $[10] !== pathname || $[11] !== resources || $[12] !== route || $[13] !== routes || $[14] !== routesDefinition || $[15] !== statusCode || $[16] !== user) {
+    t11 = Symbol.for("react.early_return_sentinel");
+    bb0: {
+      const otherPages = Object.keys(pages || {}).filter(key => builtinPages.indexOf(key) === -1).reduce((acc, key_0) => ({
+        ...acc,
+        [key_0]: pages[key_0]
+      }), {});
+      let t12;
+      if ($[26] !== pages) {
+        t12 = pages || {};
+        $[26] = pages;
+        $[27] = t12;
+      } else {
+        t12 = $[27];
+      }
+      const {
+        home: t13,
+        login: t14,
+        account: t15,
+        error: t16
+      } = t12;
+      homePage = t13 === undefined ? null : t13;
+      const loginPage = t14 === undefined ? null : t14;
+      const accountPage = t15 === undefined ? null : t15;
+      const errorPage = t16 === undefined ? null : t16;
+      const customRoutes = [...Object.keys(routesDefinition).filter(_temp).filter(key_2 => {
+        const routeDef = routesDefinition[key_2];
+        return isObject(routeDef) && typeof routeDef.component !== "undefined" && typeof routeDef.path !== "undefined";
+      }).map(key_3 => routesDefinition[key_3]), ...Object.keys(otherPages).map(key_4 => otherPages[key_4]).filter(_temp2)];
+      let t17;
+      if ($[28] !== componentsManager || $[29] !== homePage?.component) {
+        t17 = componentsManager.getComponent(homePage?.component) || HomePage;
+        $[28] = componentsManager;
+        $[29] = homePage?.component;
+        $[30] = t17;
+      } else {
+        t17 = $[30];
+      }
+      HomeComponent = t17;
+      let t18;
+      if ($[31] !== componentsManager || $[32] !== loginPage?.component) {
+        t18 = componentsManager.getComponent(loginPage?.component) || LoginPage;
+        $[31] = componentsManager;
+        $[32] = loginPage?.component;
+        $[33] = t18;
+      } else {
+        t18 = $[33];
+      }
+      const LoginComponent = t18;
+      let t19;
+      if ($[34] !== accountPage?.component || $[35] !== componentsManager) {
+        t19 = componentsManager.getComponent(accountPage?.component) || AccountPage;
+        $[34] = accountPage?.component;
+        $[35] = componentsManager;
+        $[36] = t19;
+      } else {
+        t19 = $[36];
+      }
+      const AccountComponent = t19;
+      let t20;
+      if ($[37] !== componentsManager || $[38] !== errorPage?.component) {
+        t20 = componentsManager.getComponent(errorPage?.component) || ErrorPage;
+        $[37] = componentsManager;
+        $[38] = errorPage?.component;
+        $[39] = t20;
+      } else {
+        t20 = $[39];
+      }
+      ErrorComponent = t20;
+      if (statusCode !== null) {
+        let t21;
+        if ($[40] !== ErrorComponent || $[41] !== errorPage || $[42] !== statusCode) {
+          t21 = /*#__PURE__*/jsx(ErrorComponent, {
+            statusCode: statusCode,
+            ...errorPage
+          });
+          $[40] = ErrorComponent;
+          $[41] = errorPage;
+          $[42] = statusCode;
+          $[43] = t21;
+        } else {
+          t21 = $[43];
+        }
+        t11 = t21;
+        break bb0;
+      }
+      if (user === null) {
+        const t21 = routes["auth.login"];
+        let t22;
+        if ($[44] !== LoginComponent || $[45] !== loginPage) {
+          t22 = /*#__PURE__*/jsx(LoginComponent, {
+            ...loginPage
+          });
+          $[44] = LoginComponent;
+          $[45] = loginPage;
+          $[46] = t22;
+        } else {
+          t22 = $[46];
+        }
+        let t23;
+        if ($[47] !== t21 || $[48] !== t22) {
+          t23 = /*#__PURE__*/jsx(Route, {
+            path: t21,
+            children: t22
+          });
+          $[47] = t21;
+          $[48] = t22;
+          $[49] = t23;
+        } else {
+          t23 = $[49];
+        }
+        let t24;
+        if ($[50] !== route) {
+          t24 = route("auth.login");
+          $[50] = route;
+          $[51] = t24;
+        } else {
+          t24 = $[51];
+        }
+        const t25 = `${t24}?next=${encodeURIComponent(pathname)}`;
+        let t26;
+        if ($[52] !== t25) {
+          t26 = /*#__PURE__*/jsx(Route, {
+            children: /*#__PURE__*/jsx(Redirect, {
+              to: t25
+            })
+          });
+          $[52] = t25;
+          $[53] = t26;
+        } else {
+          t26 = $[53];
+        }
+        let t27;
+        if ($[54] !== t23 || $[55] !== t26) {
+          t27 = /*#__PURE__*/jsxs(Switch, {
+            children: [t23, t26]
+          });
+          $[54] = t23;
+          $[55] = t26;
+          $[56] = t27;
+        } else {
+          t27 = $[56];
+        }
+        t11 = t27;
+        break bb0;
+      }
+      T0 = Switch;
+      if ($[57] !== routes || $[58] !== user) {
+        t7 = user !== null ? /*#__PURE__*/jsx(Route, {
+          path: routes["auth.login"],
+          children: /*#__PURE__*/jsx(Redirect, {
+            to: routes.home,
+            replace: true
+          })
+        }) : null;
+        $[57] = routes;
+        $[58] = user;
+        $[59] = t7;
+      } else {
+        t7 = $[59];
+      }
+      if ($[60] !== componentsManager || $[61] !== pages || $[62] !== resources || $[63] !== route) {
+        let t21;
+        if ($[65] !== componentsManager || $[66] !== pages || $[67] !== route) {
+          t21 = (acc_0, resource) => [...acc_0, ...createResourceRoutes(resource, {
             route,
             componentsManager,
             pages
+          })];
+          $[65] = componentsManager;
+          $[66] = pages;
+          $[67] = route;
+          $[68] = t21;
+        } else {
+          t21 = $[68];
+        }
+        t8 = resources.reduce(t21, []);
+        $[60] = componentsManager;
+        $[61] = pages;
+        $[62] = resources;
+        $[63] = route;
+        $[64] = t8;
+      } else {
+        t8 = $[64];
+      }
+      let t21;
+      if ($[69] !== AccountComponent || $[70] !== accountPage) {
+        t21 = /*#__PURE__*/jsx(AccountComponent, {
+          ...accountPage
+        });
+        $[69] = AccountComponent;
+        $[70] = accountPage;
+        $[71] = t21;
+      } else {
+        t21 = $[71];
+      }
+      if ($[72] !== routes.account || $[73] !== t21) {
+        t9 = /*#__PURE__*/jsx(Route, {
+          path: routes.account,
+          children: t21
+        });
+        $[72] = routes.account;
+        $[73] = t21;
+        $[74] = t9;
+      } else {
+        t9 = $[74];
+      }
+      t10 = customRoutes.map(t22 => {
+        const {
+          path: t23,
+          route: t24,
+          component,
+          ...props
+        } = t22;
+        const path_0 = t23 === undefined ? null : t23;
+        const pageRoute_0 = t24 === undefined ? null : t24;
+        const PageComponent = componentsManager.getComponent(component);
+        const finalPath = path_0 || routes[pageRoute_0];
+        return PageComponent !== null ? /*#__PURE__*/jsx(Route, {
+          path: path_0 || routes[pageRoute_0],
+          children: /*#__PURE__*/jsx(PageComponent, {
+            ...props
           })
-        }, `resource-${resourceId}`);
-      };
-      $[74] = componentsManager;
-      $[75] = pages;
-      $[76] = route;
-      $[77] = t30;
-    } else {
-      t30 = $[77];
+        }, `custom-route-${finalPath}`) : null;
+      });
     }
-    t29 = resources.map(t30);
-    $[69] = componentsManager;
-    $[70] = pages;
-    $[71] = resources;
-    $[72] = route;
-    $[73] = t29;
-  } else {
-    t29 = $[73];
-  }
-  let t30;
-  if ($[78] !== AccountComponent || $[79] !== accountPage) {
-    t30 = /*#__PURE__*/jsx(AccountComponent, {
-      ...accountPage
-    });
-    $[78] = AccountComponent;
-    $[79] = accountPage;
-    $[80] = t30;
-  } else {
-    t30 = $[80];
+    $[8] = componentsManager;
+    $[9] = pages;
+    $[10] = pathname;
+    $[11] = resources;
+    $[12] = route;
+    $[13] = routes;
+    $[14] = routesDefinition;
+    $[15] = statusCode;
+    $[16] = user;
+    $[17] = ErrorComponent;
+    $[18] = HomeComponent;
+    $[19] = T0;
+    $[20] = homePage;
+    $[21] = t10;
+    $[22] = t11;
+    $[23] = t7;
+    $[24] = t8;
+    $[25] = t9;
+  } else {
+    ErrorComponent = $[17];
+    HomeComponent = $[18];
+    T0 = $[19];
+    homePage = $[20];
+    t10 = $[21];
+    t11 = $[22];
+    t7 = $[23];
+    t8 = $[24];
+    t9 = $[25];
+  }
+  if (t11 !== Symbol.for("react.early_return_sentinel")) {
+    return t11;
   }
-  let t31;
-  if ($[81] !== routes.account || $[82] !== t30) {
-    t31 = /*#__PURE__*/jsx(Route, {
-      path: routes.account,
-      children: t30
-    });
-    $[81] = routes.account;
-    $[82] = t30;
-    $[83] = t31;
-  } else {
-    t31 = $[83];
-  }
-  let t32;
-  if ($[84] !== componentsManager || $[85] !== customRoutes || $[86] !== routes) {
-    t32 = customRoutes.map(t33 => {
-      const {
-        path: t34,
-        route: t35,
-        component,
-        ...props
-      } = t33;
-      const path_0 = t34 === undefined ? null : t34;
-      const pageRoute_0 = t35 === undefined ? null : t35;
-      const PageComponent = componentsManager.getComponent(component);
-      const finalPath = path_0 || routes[pageRoute_0];
-      return PageComponent !== null ? /*#__PURE__*/jsx(Route, {
-        path: path_0 || routes[pageRoute_0],
-        children: /*#__PURE__*/jsx(PageComponent, {
-          ...props
-        })
-      }, `custom-route-${finalPath}`) : null;
-    });
-    $[84] = componentsManager;
-    $[85] = customRoutes;
-    $[86] = routes;
-    $[87] = t32;
-  } else {
-    t32 = $[87];
-  }
-  let t33;
-  if ($[88] !== HomeComponent || $[89] !== homePage) {
-    t33 = /*#__PURE__*/jsx(HomeComponent, {
+  let t12;
+  if ($[75] !== HomeComponent || $[76] !== homePage) {
+    t12 = /*#__PURE__*/jsx(HomeComponent, {
       ...homePage
     });
-    $[88] = HomeComponent;
-    $[89] = homePage;
-    $[90] = t33;
+    $[75] = HomeComponent;
+    $[76] = homePage;
+    $[77] = t12;
   } else {
-    t33 = $[90];
+    t12 = $[77];
   }
-  let t34;
-  if ($[91] !== routes.home || $[92] !== t33) {
-    t34 = /*#__PURE__*/jsx(Route, {
+  let t13;
+  if ($[78] !== routes.home || $[79] !== t12) {
+    t13 = /*#__PURE__*/jsx(Route, {
       path: routes.home,
-      children: t33
+      children: t12
     });
-    $[91] = routes.home;
-    $[92] = t33;
-    $[93] = t34;
+    $[78] = routes.home;
+    $[79] = t12;
+    $[80] = t13;
   } else {
-    t34 = $[93];
+    t13 = $[80];
   }
-  let t35;
-  if ($[94] !== ErrorComponent) {
-    t35 = /*#__PURE__*/jsx(Route, {
+  let t14;
+  if ($[81] !== ErrorComponent) {
+    t14 = /*#__PURE__*/jsx(Route, {
       children: /*#__PURE__*/jsx(ErrorComponent, {})
     });
-    $[94] = ErrorComponent;
-    $[95] = t35;
+    $[81] = ErrorComponent;
+    $[82] = t14;
   } else {
-    t35 = $[95];
+    t14 = $[82];
   }
-  let t36;
-  if ($[96] !== t28 || $[97] !== t29 || $[98] !== t31 || $[99] !== t32 || $[100] !== t34 || $[101] !== t35) {
-    t36 = /*#__PURE__*/jsxs(Switch, {
-      children: [t28, t29, t31, t32, t34, t35]
+  let t15;
+  if ($[83] !== T0 || $[84] !== t10 || $[85] !== t13 || $[86] !== t14 || $[87] !== t7 || $[88] !== t8 || $[89] !== t9) {
+    t15 = /*#__PURE__*/jsxs(T0, {
+      children: [t7, t8, t9, t10, t13, t14]
     });
-    $[96] = t28;
-    $[97] = t29;
-    $[98] = t31;
-    $[99] = t32;
-    $[100] = t34;
-    $[101] = t35;
-    $[102] = t36;
-  } else {
-    t36 = $[102];
-  }
-  return t36;
+    $[83] = T0;
+    $[84] = t10;
+    $[85] = t13;
+    $[86] = t14;
+    $[87] = t7;
+    $[88] = t8;
+    $[89] = t9;
+    $[90] = t15;
+  } else {
+    t15 = $[90];
+  }
+  return t15;
 }
 function _temp2(t0) {
   const {
@@ -2563,8 +2486,8 @@ function _temp2(t0) {
   const pageRoute = t2 === undefined ? null : t2;
   return path !== null || pageRoute !== null;
 }
-function _temp(key) {
-  return key.match(/^(resources\.|auth\.)/) === null && key !== "home" && key !== "account";
+function _temp(key_1) {
+  return key_1.match(/^(resources\.|auth\.)/) === null && key_1 !== "home" && key_1 !== "account";
 }
 
 const pathToRegexpParser = createPathToRegexpParser();
@@ -2572,6 +2495,8 @@ const DEFAULT_ROUTES = {};
 const DEFAULT_LOCALES = [];
 function Container({
   definition,
+  forms: providedForms = null,
+  fields: providedFields = null,
   components = null,
   user = null,
   memoryRouter = false,
@@ -2582,43 +2507,39 @@ function Container({
   const {
     intl: {
       locale = 'en',
-      locales = DEFAULT_LOCALES
+      locales = DEFAULT_LOCALES,
+      messages
     } = {},
     routes = DEFAULT_ROUTES,
+    resources = [],
     settings: {
       memoryRouter: usesMemoryRouter = false
-    } = {}
+    } = {},
+    forms,
+    fields
   } = definition || {};
   const isMemoryRouter = memoryRouter || usesMemoryRouter || false;
-  const extraMessages = useMemo(() => {
-    const {
+  const extraMessages = {
+    ...messages,
+    ...resources.reduce((allMessages, {
+      id,
       intl: {
-        messages = null
-      } = {},
-      resources = []
-    } = definition;
-    return {
-      ...messages,
-      ...resources.reduce((allMessages, {
-        id,
-        intl: {
-          messages: resourceMessages = {}
-        } = {}
-      }) => ({
-        ...allMessages,
-        ...Object.keys(resourceMessages).reduce((allResourceMessages, key) => ({
-          ...allResourceMessages,
-          [`resources.${id}.${key}`]: resourceMessages[key]
-        }), {})
+        messages: resourceMessages = {}
+      } = {}
+    }) => ({
+      ...allMessages,
+      ...Object.keys(resourceMessages).reduce((allResourceMessages, key) => ({
+        ...allResourceMessages,
+        [`resources.${id}.${key}`]: resourceMessages[key]
       }), {})
-    };
-  }, [definition]);
-  const onUnauthorized = useCallback(() => {
+    }), {})
+  };
+  const onUnauthorized = () => {
     window.location.href = baseUrl || '/';
-  }, [baseUrl]);
-  const onLogout = useCallback(() => {
+  };
+  const onLogout = () => {
     window.location.reload();
-  }, []);
+  };
   const {
     hook: memoryLocationHook,
     searchHook: memorySearchHook
@@ -2638,7 +2559,9 @@ function Container({
           children: /*#__PURE__*/jsx(RoutesProvider, {
             routes: routes,
             children: /*#__PURE__*/jsx(FieldsProvider, {
+              definitions: [...(fields || []), ...(providedFields || [])],
               children: /*#__PURE__*/jsx(FormsProvider, {
+                definitions: [...(forms || []), ...(providedForms || [])],
                 children: /*#__PURE__*/jsx(ListsProvider, {
                   children: /*#__PURE__*/jsx(DisplaysProvider, {
                     children: /*#__PURE__*/jsx(FiltersProvider, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/app",
-    "version": "4.0.74",
+    "version": "4.0.75",
     "description": "",
     "keywords": [
         "javascript"
@@ -67,45 +67,45 @@
         "@fortawesome/fontawesome-svg-core": "^6.5.1",
         "@fortawesome/free-solid-svg-icons": "^6.5.1",
         "@fortawesome/react-fontawesome": "^0.2.0",
-        "@panneau/actions": "^4.0.74",
-        "@panneau/auth": "^4.0.74",
-        "@panneau/core": "^4.0.74",
-        "@panneau/data": "^4.0.74",
-        "@panneau/displays": "^4.0.74",
-        "@panneau/element-accordion": "^4.0.74",
-        "@panneau/element-alert": "^4.0.74",
-        "@panneau/element-avatar": "^4.0.74",
-        "@panneau/element-breadcrumbs": "^4.0.74",
-        "@panneau/element-button": "^4.0.74",
-        "@panneau/element-buttons": "^4.0.74",
-        "@panneau/element-dropdown": "^4.0.74",
-        "@panneau/element-form": "^4.0.74",
-        "@panneau/element-form-group": "^4.0.74",
-        "@panneau/element-grid": "^4.0.74",
-        "@panneau/element-icon": "^4.0.74",
-        "@panneau/element-label": "^4.0.74",
-        "@panneau/element-link": "^4.0.74",
-        "@panneau/element-loading": "^4.0.74",
-        "@panneau/element-media-card": "^4.0.74",
-        "@panneau/element-media-player": "^4.0.74",
-        "@panneau/element-menu": "^4.0.74",
-        "@panneau/element-modal": "^4.0.74",
-        "@panneau/element-navbar": "^4.0.74",
-        "@panneau/element-pagination": "^4.0.74",
-        "@panneau/element-radios": "^4.0.74",
-        "@panneau/element-range": "^4.0.74",
-        "@panneau/element-resource-card": "^4.0.74",
-        "@panneau/fields": "^4.0.74",
-        "@panneau/filter-filters": "^4.0.74",
-        "@panneau/filters": "^4.0.74",
-        "@panneau/form-resource": "^4.0.74",
-        "@panneau/forms": "^4.0.74",
-        "@panneau/intl": "^4.0.74",
-        "@panneau/list-resource-items": "^4.0.74",
-        "@panneau/lists": "^4.0.74",
-        "@panneau/modals": "^4.0.74",
-        "@panneau/themes": "^4.0.74",
-        "@panneau/uppy": "^4.0.74",
+        "@panneau/actions": "^4.0.75",
+        "@panneau/auth": "^4.0.75",
+        "@panneau/core": "^4.0.75",
+        "@panneau/data": "^4.0.75",
+        "@panneau/displays": "^4.0.75",
+        "@panneau/element-accordion": "^4.0.75",
+        "@panneau/element-alert": "^4.0.75",
+        "@panneau/element-avatar": "^4.0.75",
+        "@panneau/element-breadcrumbs": "^4.0.75",
+        "@panneau/element-button": "^4.0.75",
+        "@panneau/element-buttons": "^4.0.75",
+        "@panneau/element-dropdown": "^4.0.75",
+        "@panneau/element-form": "^4.0.75",
+        "@panneau/element-form-group": "^4.0.75",
+        "@panneau/element-grid": "^4.0.75",
+        "@panneau/element-icon": "^4.0.75",
+        "@panneau/element-label": "^4.0.75",
+        "@panneau/element-link": "^4.0.75",
+        "@panneau/element-loading": "^4.0.75",
+        "@panneau/element-media-card": "^4.0.75",
+        "@panneau/element-media-player": "^4.0.75",
+        "@panneau/element-menu": "^4.0.75",
+        "@panneau/element-modal": "^4.0.75",
+        "@panneau/element-navbar": "^4.0.75",
+        "@panneau/element-pagination": "^4.0.75",
+        "@panneau/element-radios": "^4.0.75",
+        "@panneau/element-range": "^4.0.75",
+        "@panneau/element-resource-card": "^4.0.75",
+        "@panneau/fields": "^4.0.75",
+        "@panneau/filter-filters": "^4.0.75",
+        "@panneau/filters": "^4.0.75",
+        "@panneau/form-resource": "^4.0.75",
+        "@panneau/forms": "^4.0.75",
+        "@panneau/intl": "^4.0.75",
+        "@panneau/list-resource-items": "^4.0.75",
+        "@panneau/lists": "^4.0.75",
+        "@panneau/modals": "^4.0.75",
+        "@panneau/themes": "^4.0.75",
+        "@panneau/uppy": "^4.0.75",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",
         "query-string": "^9.0.0",
@@ -123,5 +123,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "122cadcf8ea5faacc035e7fe911fbdfb9fb87d26"
+    "gitHead": "2eb608f88ad5041b3fa9c472e97a68680e281766"
 }