@firecms/collection_editor 3.0.0-beta.2-pre.5 → 3.0.0-beta.2

package/dist/index.es.js

@@ -1,9 +1,9 @@
 import { jsx as e, jsxs as a, Fragment as U } from "react/jsx-runtime";
 import { SearchIconsView as gr, toSnakeCase as Pt, singular as vr, IconForView as ot, ArrayContainer as yr, serializeRegExp as br, useSnackbarController as Ie, resolveEnumValues as Cr, isPropertyBuilder as ne, useCustomizationController as Ae, getFieldConfig as $e, ErrorBoundary as ge, PropertyConfigBadge as Ye, unslugify as ut, useNavigationController as Pe, mergeDeep as W, DEFAULT_FIELD_CONFIGS as Gt, isValidRegExp as Pr, getFieldId as Kt, DeleteConfirmationDialog as lt, useLargeLayout as Nr, makePropertiesEditable as pt, resolveEntityView as xr, useSelectionController as wr, EntityCollectionTable as Tr, slugify as kr, useAuthController as _e, randomString as _t, CircularProgressCenter as Nt, removeUndefined as Ft, ErrorView as Wt, removeInitialAndTrailingSlashes as Or, getDefaultPropertiesOrder as Vr } from "@firecms/core";
 import * as je from "react";
-import Y, { useState as $, useEffect as ce, useMemo as Zt, useCallback as Z, useRef as Le, useDeferredValue as Ir, useContext as Jt } from "react";
+import Y, { useState as $, useEffect as ce, useMemo as Zt, useCallback as Q, useRef as Le, useDeferredValue as Ir, useContext as Jt } from "react";
 import ve from "react-fast-compare";
-import { Typography as k, useAutoComplete as _r, Container as mt, Tooltip as te, IconButton as oe, Chip as st, TextField as Oe, cn as me, DebouncedTextField as J, Autocomplete as Fr, AutocompleteItem as Sr, ExpandablePanel as xt, SettingsIcon as He, Select as be, SelectItem as ee, BooleanSwitchWithLabel as ct, Dialog as Fe, AutoAwesomeIcon as ht, Badge as Er, ListIcon as Ar, Button as z, CircularProgress as De, Paper as Ce, DialogContent as Be, DialogActions as ze, RuleIcon as Dr, FileUploadIcon as Br, MultiSelect as zr, MultiSelectItem as St, Checkbox as Et, cardMixin as Qt, cardClickableMixin as Xt, cardSelectedMixin as er, FunctionsIcon as Mr, RemoveCircleIcon as Rr, defaultBorderMixin as wt, RemoveIcon as Ur, DragHandleIcon as jr, AddIcon as ue, SelectGroup as At, InfoLabel as Lr, DeleteIcon as dt, ContentCopyIcon as qr, CodeIcon as $r, Table as Dt, TableBody as Bt, TableRow as bt, TableCell as Ue, Alert as Yr, Icon as et, Card as tr, coolIconKeys as zt, Tabs as Hr, Tab as Ct, ArrowBackIcon as tt, LoadingButton as Mt, DoneIcon as Gr, UndoIcon as Kr, SaveIcon as Wr, Menu as Zr, MoreVertIcon as Jr, MenuItem as Qr, Collapse as Xr } from "@firecms/ui";
+import { Typography as O, useAutoComplete as _r, Container as mt, Tooltip as te, IconButton as oe, Chip as st, TextField as Oe, cn as me, DebouncedTextField as Z, Autocomplete as Fr, AutocompleteItem as Sr, ExpandablePanel as xt, SettingsIcon as He, Select as be, SelectItem as ee, BooleanSwitchWithLabel as ct, Dialog as Fe, AutoAwesomeIcon as ht, Badge as Er, ListIcon as Ar, Button as z, CircularProgress as De, Paper as Ce, DialogContent as Be, DialogActions as ze, RuleIcon as Dr, FileUploadIcon as Br, MultiSelect as zr, MultiSelectItem as St, Checkbox as Et, cardMixin as Qt, cardClickableMixin as Xt, cardSelectedMixin as er, FunctionsIcon as Mr, RemoveCircleIcon as Rr, defaultBorderMixin as wt, RemoveIcon as Ur, DragHandleIcon as jr, AddIcon as ue, SelectGroup as At, InfoLabel as Lr, DeleteIcon as dt, ContentCopyIcon as qr, CodeIcon as $r, Table as Dt, TableBody as Bt, TableRow as bt, TableCell as Ue, Alert as Yr, Icon as et, Card as tr, coolIconKeys as zt, Tabs as Hr, Tab as Ct, ArrowBackIcon as tt, LoadingButton as Mt, DoneIcon as Gr, UndoIcon as Kr, SaveIcon as Wr, Menu as Zr, MoreVertIcon as Jr, MenuItem as Qr, Collapse as Xr } from "@firecms/ui";
 import * as rt from "yup";
 import { useFormex as K, Field as H, getIn as I, useCreateFormex as Tt, Formex as kt } from "@firecms/formex";
 import { extractEnumFromValues as ei, buildPropertyFromData as ti, buildEntityPropertiesFromData as ri } from "@firecms/schema_inference";
@@ -21,7 +21,7 @@ function X({
   error: t,
   children: r
 }) {
-  return r ? /* @__PURE__ */ e(k, { variant: "caption", color: t ? "error" : "secondary", className: "ml-3.5 mt-0.5", children: r }) : null;
+  return r ? /* @__PURE__ */ e(O, { variant: "caption", color: t ? "error" : "secondary", className: "ml-3.5 mt-0.5", children: r }) : null;
 }
 function yi({
   isNewCollection: t,
@@ -32,29 +32,30 @@ function yi({
   parentCollection: o
 }) {
   const d = Y.useRef(null), {
-    values: p,
-    setFieldValue: u,
+    values: u,
+    setFieldValue: p,
     handleChange: h,
     touched: m,
     errors: c,
     setFieldTouched: g,
     isSubmitting: v,
     submitCount: x
-  } = K(), [y, C] = $(!1), [w, b] = $(!1), P = (s) => {
-    u("name", s), !I(m, "path") && t && s && u("path", Pt(s)), !I(m, "id") && t && s && u("id", Pt(s)), !I(m, "singularName") && t && s && u("singularName", vr(s));
+  } = K(), [y, P] = $(!1), [T, b] = $(!1), C = (s) => {
+    p("name", s), !I(m, "path") && t && s && p("path", Pt(s)), !I(m, "id") && t && s && p("id", Pt(s)), !I(m, "singularName") && t && s && p("singularName", vr(s));
   };
   ce(() => {
     c.id && b(!0);
   }, [c.id]);
-  const O = /* @__PURE__ */ e(ot, { collectionOrView: p }), f = l?.filter((s) => !r?.includes(s)), {
-    inputFocused: N,
+  const N = /* @__PURE__ */ e(ot, { collectionOrView: u }), f = l?.filter((s) => !r?.includes(s)), {
+    inputFocused: w,
     autoCompleteOpen: _,
-    setAutoCompleteOpen: R
+    setAutoCompleteOpen: M
   } = _r({
     ref: d
-  }), M = !!o;
-  let B;
-  const S = x > 0;
+  }), R = !!o;
+  let D;
+  typeof u.customId == "object" ? D = "code_defined" : u.customId === !0 ? D = "true" : u.customId === !1 ? D = "false" : u.customId === "optional" && (D = "optional");
+  const A = x > 0;
   return /* @__PURE__ */ e("div", { className: "overflow-auto my-auto", children: /* @__PURE__ */ a(mt, { maxWidth: "4xl", className: "flex flex-col gap-4 p-8 m-auto", children: [
     /* @__PURE__ */ a("div", { children: [
       /* @__PURE__ */ a(
@@ -62,19 +63,19 @@ function yi({
         {
           className: "flex flex-row py-2 pt-3 items-center",
           children: [
-            /* @__PURE__ */ e(k, { variant: t ? "h4" : "h5", className: "flex-grow", children: t ? "New collection" : `${p?.name} collection` }),
+            /* @__PURE__ */ e(O, { variant: t ? "h4" : "h5", className: "flex-grow", children: t ? "New collection" : `${u?.name} collection` }),
             /* @__PURE__ */ e(te, { title: "Change icon", children: /* @__PURE__ */ e(
               oe,
               {
                 shape: "square",
-                onClick: () => C(!0),
-                children: O
+                onClick: () => P(!0),
+                children: N
               }
             ) })
           ]
         }
       ),
-      o && /* @__PURE__ */ e(st, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(k, { variant: "caption", children: [
+      o && /* @__PURE__ */ e(st, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(O, { variant: "caption", children: [
         "This is a subcollection of ",
         /* @__PURE__ */ e("b", { children: o.name })
       ] }) })
@@ -84,38 +85,38 @@ function yi({
         /* @__PURE__ */ e(
           Oe,
           {
-            value: p.name ?? "",
-            onChange: (s) => P(s.target.value),
+            value: u.name ?? "",
+            onChange: (s) => C(s.target.value),
             label: "Name",
             required: !0,
-            error: S && !!c.name
+            error: A && !!c.name
           }
         ),
         /* @__PURE__ */ e(X, { error: m.name && !!c.name, children: m.name && c.name ? c.name : "Name of in this collection, usually a plural name (e.g. Products)" })
       ] }),
-      /* @__PURE__ */ a("div", { className: me("col-span-12 ", M ? "" : "sm:col-span-8"), children: [
+      /* @__PURE__ */ a("div", { className: me("col-span-12 ", R ? "" : "sm:col-span-8"), children: [
         /* @__PURE__ */ e(
           H,
           {
             name: "path",
-            as: J,
+            as: Z,
             label: "Path",
             disabled: !t,
             required: !0,
-            error: S && !!c.path
+            error: A && !!c.path
           }
         ),
-        /* @__PURE__ */ e(X, { error: m.path && !!c.path, children: m.path && c.path ? c.path : M ? "Relative path to the parent (no need to include the parent path)" : "Path that this collection is stored in, in the database" })
+        /* @__PURE__ */ e(X, { error: m.path && !!c.path, children: m.path && c.path ? c.path : R ? "Relative path to the parent (no need to include the parent path)" : "Path that this collection is stored in, in the database" })
       ] }),
-      !M && /* @__PURE__ */ a("div", { className: "col-span-12 sm:col-span-4 relative", children: [
+      !R && /* @__PURE__ */ a("div", { className: "col-span-12 sm:col-span-4 relative", children: [
         /* @__PURE__ */ e(
           Oe,
           {
-            error: S && !!c.group,
+            error: A && !!c.group,
             disabled: v,
-            value: p.group ?? "",
+            value: u.group ?? "",
             autoComplete: "off",
-            onChange: (s) => u("group", s.target.value),
+            onChange: (s) => p("group", s.target.value),
             name: "group",
             inputRef: d,
             label: "Group"
@@ -125,12 +126,12 @@ function yi({
           Fr,
           {
             open: _ && (f ?? []).length > 0,
-            setOpen: R,
+            setOpen: M,
             children: f?.map((s, V) => /* @__PURE__ */ e(
               Sr,
               {
                 onClick: () => {
-                  R(!1), u("group", s ?? null);
+                  M(!1), p("group", s ?? null);
                 },
                 children: /* @__PURE__ */ e("div", { className: "flex-grow", children: s })
               },
@@ -138,17 +139,17 @@ function yi({
             ))
           }
         ),
-        /* @__PURE__ */ e(X, { children: S && c.group ? c.group : "Group of the collection" })
+        /* @__PURE__ */ e(X, { children: A && c.group ? c.group : "Group of the collection" })
       ] }),
       /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
         xt,
         {
-          expanded: w,
+          expanded: T,
           onExpandedChange: b,
           title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
             /* @__PURE__ */ e(He, {}),
             /* @__PURE__ */ e(
-              k,
+              O,
               {
                 variant: "subtitle2",
                 className: "ml-2",
@@ -163,10 +164,10 @@ function yi({
                 H,
                 {
                   name: "id",
-                  as: J,
+                  as: Z,
                   disabled: !t,
                   label: "Collection id",
-                  error: S && !!c.id
+                  error: A && !!c.id
                 }
               ),
               /* @__PURE__ */ e(X, { error: m.id && !!c.id, children: m.id && c.id ? c.id : "This id identifies this collection" })
@@ -175,23 +176,23 @@ function yi({
               /* @__PURE__ */ e(
                 Oe,
                 {
-                  error: S && !!c.singularName,
-                  id: "singularName",
+                  error: A && !!c.singularName,
+                  name: "singularName",
                   "aria-describedby": "singularName-helper",
                   onChange: (s) => (g("singularName", !0), h(s)),
-                  value: p.singularName ?? "",
+                  value: u.singularName ?? "",
                   label: "Singular name"
                 }
               ),
-              /* @__PURE__ */ e(X, { error: S && !!c.singularName, children: S && c.singularName ? c.singularName : "Optionally define a singular name for your entities" })
+              /* @__PURE__ */ e(X, { error: A && !!c.singularName, children: A && c.singularName ? c.singularName : "Optionally define a singular name for your entities" })
             ] }),
             /* @__PURE__ */ a("div", { className: "col-span-12", children: [
               /* @__PURE__ */ e(
                 Oe,
                 {
-                  error: S && !!c.description,
-                  id: "description",
-                  value: p.description ?? "",
+                  error: A && !!c.description,
+                  name: "description",
+                  value: u.description ?? "",
                   onChange: h,
                   multiline: !0,
                   rows: 2,
@@ -199,7 +200,7 @@ function yi({
                   label: "Description"
                 }
               ),
-              /* @__PURE__ */ e(X, { error: S && !!c.description, children: S && c.description ? c.description : "Description of the collection, you can use markdown" })
+              /* @__PURE__ */ e(X, { error: A && !!c.description, children: A && c.description ? c.description : "Description of the collection, you can use markdown" })
             ] }),
             /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
               be,
@@ -208,7 +209,7 @@ function yi({
                 label: "Default row size",
                 position: "item-aligned",
                 onChange: h,
-                value: p.defaultSize ?? "",
+                value: u.defaultSize ?? "",
                 renderValue: (s) => s.toUpperCase(),
                 children: ["xs", "s", "m", "l", "xl"].map((s) => /* @__PURE__ */ e(
                   ee,
@@ -226,13 +227,13 @@ function yi({
                 name: "customId",
                 label: "Data IDs generation",
                 position: "item-aligned",
-                disabled: B === "code_defined",
+                disabled: D === "code_defined",
                 onValueChange: (s) => {
                   if (s === "code_defined")
                     throw new Error("This should not happen");
-                  s === "true" ? u("customId", !0) : s === "false" ? u("customId", !1) : s === "optional" && u("customId", "optional");
+                  s === "true" ? p("customId", !0) : s === "false" ? p("customId", !1) : s === "optional" && p("customId", "optional");
                 },
-                value: "",
+                value: D ?? "",
                 renderValue: (s) => s === "code_defined" ? "Code defined" : s === "true" ? "Users must define an ID" : s === "optional" ? "Users can define an ID, but it is not required" : "Document ID is generated automatically",
                 children: [
                   /* @__PURE__ */ e(ee, { value: "false", children: "Document ID is generated automatically" }),
@@ -247,8 +248,8 @@ function yi({
                 {
                   position: "start",
                   label: "Collection group",
-                  onValueChange: (s) => u("collectionGroup", s),
-                  value: p.collectionGroup ?? !1
+                  onValueChange: (s) => p("collectionGroup", s),
+                  value: u.collectionGroup ?? !1
                 }
               ),
               /* @__PURE__ */ e(X, { children: "A collection group consists of all collections with the same path. This allows you to query over multiple collections at once." })
@@ -259,8 +260,8 @@ function yi({
                 {
                   position: "start",
                   label: "Enable text search for this collection",
-                  onValueChange: (s) => u("textSearchEnabled", s),
-                  value: p.textSearchEnabled ?? !1
+                  onValueChange: (s) => p("textSearchEnabled", s),
+                  value: u.textSearchEnabled ?? !1
                 }
               ),
               /* @__PURE__ */ e(X, { children: "Allow text search for this collection. If you have not specified a text search delegate, this will use the built-in local text search. This is not recommended for large collections, as it may incur in performance and cost issues." })
@@ -274,15 +275,15 @@ function yi({
       Fe,
       {
         open: y,
-        onOpenChange: C,
+        onOpenChange: P,
         maxWidth: "xl",
         fullWidth: !0,
         children: /* @__PURE__ */ e("div", { className: "p-4 overflow-auto min-h-[200px]", children: /* @__PURE__ */ e(
           gr,
           {
-            selectedIcon: p.icon,
+            selectedIcon: u.icon,
             onIconSelected: (s) => {
-              C(!1), u("icon", s);
+              P(!1), p("icon", s);
             }
           }
         ) })
@@ -315,7 +316,7 @@ function Ci({
   allowDataInference: o,
   getData: d
 }) {
-  const p = Tt({
+  const u = Tt({
     initialValues: { enumValues: t },
     validateOnChange: !0,
     validation: (m) => {
@@ -326,14 +327,14 @@ function Ci({
       const g = !!(c?.enumValues && Object.keys(c?.enumValues).length > 0);
       return n?.(g), c;
     }
-  }), { values: u, errors: h } = p;
+  }), { values: p, errors: h } = u;
   return ce(() => {
-    r && r(u.enumValues);
-  }, [u.enumValues]), /* @__PURE__ */ e(kt, { value: p, children: /* @__PURE__ */ e(
+    r && r(p.enumValues);
+  }, [p.enumValues]), /* @__PURE__ */ e(kt, { value: u, children: /* @__PURE__ */ e(
     Pi,
     {
       enumValuesPath: "enumValues",
-      values: u,
+      values: p,
       errors: h,
       shouldUpdateId: i,
       disabled: l,
@@ -352,29 +353,29 @@ function Pi({
   getData: d
 }) {
   const {
-    setFieldValue: p
-  } = K(), [u, h] = Y.useState(), [m, c] = Y.useState(), [g, v] = Y.useState(!1), y = Y.useRef(/* @__PURE__ */ new Set()).current, C = (b, P) => {
-    const O = u === P, f = r?.enumValues && r?.enumValues[b];
+    setFieldValue: u
+  } = K(), [p, h] = Y.useState(), [m, c] = Y.useState(), [g, v] = Y.useState(!1), y = Y.useRef(/* @__PURE__ */ new Set()).current, P = (b, C) => {
+    const N = p === C, f = r?.enumValues && r?.enumValues[b];
     return /* @__PURE__ */ e(
       Ni,
       {
         index: b,
         disabled: n,
         enumValuesPath: i,
-        autoFocus: O,
+        autoFocus: N,
         entryError: f,
-        shouldUpdateId: l || O,
+        shouldUpdateId: l || N,
         onDialogOpen: () => c(b),
         inferredEntry: y.has(t.enumValues[b]?.id)
       },
-      `${P}`
+      `${C}`
     );
   };
   return /* @__PURE__ */ a("div", { className: "col-span-12", children: [
     /* @__PURE__ */ a("div", { className: "ml-3.5 flex flex-row items-center", children: [
       /* @__PURE__ */ e(Ar, {}),
       /* @__PURE__ */ e(
-        k,
+        O,
         {
           variant: "subtitle2",
           className: "ml-2 grow",
@@ -392,10 +393,10 @@ function Pi({
             d && (v(!0), d?.().then((b) => {
               if (!b)
                 return;
-              const P = b.flat(), O = Array.from(new Set(P)), f = t.enumValues, _ = ei(O).filter((R) => !f?.some((M) => M.id === R.id));
-              _.forEach((R) => {
-                y.add(R.id);
-              }), p(i, [..._, ...f], !0);
+              const C = b.flat(), N = Array.from(new Set(C)), f = t.enumValues, _ = ei(N).filter((M) => !f?.some((R) => R.id === M.id));
+              _.forEach((M) => {
+                y.add(M.id);
+              }), u(i, [..._, ...f], !0);
             }).catch((b) => {
               console.error(b);
             }).finally(() => v(!1)));
@@ -416,10 +417,10 @@ function Pi({
           value: t.enumValues,
           disabled: n,
           size: "small",
-          buildEntry: C,
+          buildEntry: P,
           onInternalIdAdded: h,
           includeAddButton: !0,
-          onValueChange: (b) => p(i, b),
+          onValueChange: (b) => u(i, b),
           newDefaultEntry: { id: "", label: "" }
         }
       ),
@@ -443,8 +444,8 @@ const Ni = Y.memo(
     autoFocus: l,
     onDialogOpen: o,
     disabled: d,
-    inferredEntry: p,
-    entryError: u
+    inferredEntry: u,
+    entryError: p
   }) {
     const {
       values: h,
@@ -452,27 +453,27 @@ const Ni = Y.memo(
       errors: c,
       setFieldValue: g,
       touched: v
-    } = K(), x = Y.useRef(!I(h, `${i}[${r}].id`)), y = n || x.current, C = I(h, `${i}[${r}].id`), w = I(h, `${i}[${r}].label`), b = Y.useRef(w);
+    } = K(), x = Y.useRef(!I(h, `${i}[${r}].id`)), y = n || x.current, P = I(h, `${i}[${r}].id`), T = I(h, `${i}[${r}].label`), b = Y.useRef(T);
     return Y.useEffect(() => {
-      (b.current === C || !C) && y && g(`${i}[${r}].id`, w), b.current = w;
-    }, [w]), /* @__PURE__ */ a(U, { children: [
+      (b.current === P || !P) && y && g(`${i}[${r}].id`, T), b.current = T;
+    }, [T]), /* @__PURE__ */ a(U, { children: [
       /* @__PURE__ */ a("div", { className: "flex w-full align-center justify-center", children: [
         /* @__PURE__ */ e(
           H,
           {
             name: `${i}[${r}].label`,
-            as: J,
+            as: Z,
             className: "flex-grow",
             required: !0,
             disabled: d,
             size: "small",
             autoFocus: l,
             autoComplete: "off",
-            endAdornment: p && /* @__PURE__ */ e(ht, { size: "small" }),
-            error: !!u?.label
+            endAdornment: u && /* @__PURE__ */ e(ht, { size: "small" }),
+            error: !!p?.label
           }
         ),
-        !d && /* @__PURE__ */ e(Er, { color: "error", invisible: !u?.id, children: /* @__PURE__ */ e(
+        !d && /* @__PURE__ */ e(Er, { color: "error", invisible: !p?.id, children: /* @__PURE__ */ e(
           oe,
           {
             size: "small",
@@ -483,20 +484,20 @@ const Ni = Y.memo(
           }
         ) })
       ] }),
-      u?.label && /* @__PURE__ */ e(
-        k,
+      p?.label && /* @__PURE__ */ e(
+        O,
         {
           variant: "caption",
           className: "ml-3.5 text-red-500 dark:text-red-500",
-          children: u?.label
+          children: p?.label
         }
       ),
-      u?.id && /* @__PURE__ */ e(
-        k,
+      p?.id && /* @__PURE__ */ e(
+        O,
         {
           variant: "caption",
           className: "ml-3.5 text-red-500 dark:text-red-500",
-          children: u?.id
+          children: p?.id
         }
       )
     ] });
@@ -527,7 +528,7 @@ function xi({
             H,
             {
               name: `${i}[${t}].id`,
-              as: J,
+              as: Z,
               required: !0,
               label: "ID",
               size: "small",
@@ -560,7 +561,7 @@ function se({
   size: o = "small",
   allowIndeterminate: d
 }) {
-  const p = /* @__PURE__ */ e(
+  const u = /* @__PURE__ */ e(
     ct,
     {
       label: n,
@@ -569,16 +570,16 @@ function se({
       value: t.value,
       disabled: l,
       allowIndeterminate: d,
-      onValueChange: (u) => r.setFieldValue(t.name, u)
+      onValueChange: (p) => r.setFieldValue(t.name, p)
     }
   );
   return i ? /* @__PURE__ */ e(
     te,
     {
       title: i,
-      children: p
+      children: u
     }
-  ) : p;
+  ) : u;
 }
 function Se({ disabled: t }) {
   const { values: r, handleChange: n } = K(), i = "validation.required", l = "validation.requiredMessage";
@@ -588,13 +589,13 @@ function Se({ disabled: t }) {
       {
         name: i,
         type: "checkbox",
-        children: ({ field: d, form: p }) => /* @__PURE__ */ e(
+        children: ({ field: d, form: u }) => /* @__PURE__ */ e(
           se,
           {
             disabled: t,
             label: "Required",
             tooltip: "You won't be able to save this entity if this value is not set",
-            form: p,
+            form: u,
             field: d
           }
         )
@@ -605,20 +606,20 @@ function Se({ disabled: t }) {
       {
         name: "validation.unique",
         type: "checkbox",
-        children: ({ field: d, form: p }) => /* @__PURE__ */ e(
+        children: ({ field: d, form: u }) => /* @__PURE__ */ e(
           se,
           {
             disabled: t,
             label: "Unique",
             tooltip: "There cannot be multiple entities with the same value",
-            form: p,
+            form: u,
             field: d
           }
         )
       }
     ) }),
     I(r, i) && /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         disabled: t,
         value: I(r, l),
@@ -638,29 +639,29 @@ function Ee({
   min: l,
   trim: o,
   uppercase: d,
-  disabled: p,
-  showErrors: u
+  disabled: u,
+  showErrors: p
 }) {
   const {
     values: h,
     handleChange: m,
     errors: c
-  } = K(), g = "validation.length", v = "validation.min", x = "validation.max", y = "validation.trim", C = "validation.matches", w = "validation.lowercase", b = "validation.uppercase", P = I(c, C), O = I(h, C), f = typeof O == "string" ? O : br(O);
+  } = K(), g = "validation.length", v = "validation.min", x = "validation.max", y = "validation.trim", P = "validation.matches", T = "validation.lowercase", b = "validation.uppercase", C = I(c, P), N = I(h, P), f = typeof N == "string" ? N : br(N);
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
-    /* @__PURE__ */ e(Se, { disabled: p }),
+    /* @__PURE__ */ e(Se, { disabled: u }),
     /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2 col-span-12", children: [
       r && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
         H,
         {
-          name: w,
+          name: T,
           type: "checkbox",
-          children: ({ field: N, form: _ }) => /* @__PURE__ */ e(
+          children: ({ field: w, form: _ }) => /* @__PURE__ */ e(
             se,
             {
               label: "Lowercase",
-              disabled: p,
+              disabled: u,
               form: _,
-              field: N
+              field: w
             }
           )
         }
@@ -670,13 +671,13 @@ function Ee({
         {
           name: b,
           type: "checkbox",
-          children: ({ field: N, form: _ }) => /* @__PURE__ */ e(
+          children: ({ field: w, form: _ }) => /* @__PURE__ */ e(
             se,
             {
               label: "Uppercase",
-              disabled: p,
+              disabled: u,
               form: _,
-              field: N
+              field: w
             }
           )
         }
@@ -686,13 +687,13 @@ function Ee({
         {
           name: y,
           type: "checkbox",
-          children: ({ field: N, form: _ }) => /* @__PURE__ */ e(
+          children: ({ field: w, form: _ }) => /* @__PURE__ */ e(
             se,
             {
               label: "Trim",
-              disabled: p,
+              disabled: u,
               form: _,
-              field: N
+              field: w
             }
           )
         }
@@ -700,38 +701,38 @@ function Ee({
     ] }),
     /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2 col-span-12", children: [
       t && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
-        J,
+        Z,
         {
           value: I(h, g),
           label: "Exact length",
           name: g,
           type: "number",
           size: "small",
-          disabled: p,
+          disabled: u,
           onChange: m
         }
       ) }),
       l && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
-        J,
+        Z,
         {
           value: I(h, v),
           label: "Min length",
           name: v,
           type: "number",
           size: "small",
-          disabled: p,
+          disabled: u,
           onChange: m
         }
       ) }),
       i && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
-        J,
+        Z,
         {
           value: I(h, x),
           label: "Max length",
           name: x,
           type: "number",
           size: "small",
-          disabled: p,
+          disabled: u,
           onChange: m
         }
       ) })
@@ -740,16 +741,16 @@ function Ee({
       /* @__PURE__ */ e(
         H,
         {
-          name: C,
-          as: J,
+          name: P,
+          as: Z,
           label: "Matches regex",
           size: "small",
-          disabled: p,
+          disabled: u,
           value: f,
-          error: !!P
+          error: !!C
         }
       ),
-      /* @__PURE__ */ e(X, { error: !!P, children: P ? "Not a valid regexp" : "e.g. /^\\d+$/ for digits only" })
+      /* @__PURE__ */ e(X, { error: !!C, children: C ? "Not a valid regexp" : "e.g. /^\\d+$/ for digits only" })
     ] })
   ] });
 }
@@ -765,7 +766,7 @@ function Ot({
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
     /* @__PURE__ */ e(Se, { disabled: n }),
     r && /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(i, o),
         disabled: n,
@@ -777,7 +778,7 @@ function Ot({
       }
     ) }),
     t && /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(i, d),
         disabled: n,
@@ -802,7 +803,7 @@ function Ne({
       title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
         /* @__PURE__ */ e(Dr, {}),
         /* @__PURE__ */ e(
-          k,
+          O,
           {
             variant: "subtitle2",
             className: "ml-2",
@@ -824,8 +825,8 @@ function Rt({
 }) {
   const {
     values: d,
-    setFieldError: p,
-    setFieldValue: u
+    setFieldError: u,
+    setFieldValue: p
   } = K(), h = Ie(), m = t ? "of.enumValues" : "enumValues", c = I(d, "defaultValue"), g = I(d, m), v = Zt(() => !g || typeof g == "boolean" ? [] : Cr(g) ?? [], [g]);
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
@@ -836,13 +837,13 @@ function Rt({
         disabled: n,
         allowDataInference: l,
         onError: (y) => {
-          p(m, y ? "This enum property is missing some values" : void 0);
+          u(m, y ? "This enum property is missing some values" : void 0);
         },
-        getData: o ? () => o().then((y) => y.map((C) => d.id && I(C, d.id)).filter(Boolean)) : void 0,
+        getData: o ? () => o().then((y) => y.map((P) => d.id && I(P, d.id)).filter(Boolean)) : void 0,
         onValuesChanged: (y) => {
-          if (d && (u(m, y), !t)) {
-            const C = y.filter((w) => !!w?.id).map((w) => w.id);
-            c && !C.includes(c) && (u("defaultValue", void 0), h.open({
+          if (d && (p(m, y), !t)) {
+            const P = y.filter((T) => !!T?.id).map((T) => T.id);
+            c && !P.includes(c) && (p("defaultValue", void 0), h.open({
               type: "warning",
               message: "Default value was cleared"
             }));
@@ -866,7 +867,7 @@ function Rt({
         disabled: n,
         position: "item-aligned",
         onValueChange: (y) => {
-          u("defaultValue", y);
+          p("defaultValue", y);
         },
         label: "Default value",
         value: c ?? "",
@@ -897,9 +898,9 @@ function Ut({
   const {
     values: i,
     setFieldValue: l
-  } = K(), o = t ? "of.storage" : "storage", d = `${o}.acceptedFiles`, p = `${o}.fileName`, u = `${o}.storagePath`, h = `${o}.storeUrl`, m = I(i, p) ?? "{rand}_{file}", c = I(i, u) ?? "/", g = I(i, d), v = Array.isArray(g) ? g : void 0, x = !v || v.length === 0, y = (b) => {
-    b ? b.includes("all") || b.length >= Object.keys(it).length ? l(d, void 0) : x ? l(d, Object.keys(it).filter((P) => !b.includes(P))) : l(d, b) : l(d, void 0);
-  }, C = typeof m == "function", w = typeof c == "function";
+  } = K(), o = t ? "of.storage" : "storage", d = `${o}.acceptedFiles`, u = `${o}.fileName`, p = `${o}.storagePath`, h = `${o}.storeUrl`, m = I(i, u) ?? "{rand}_{file}", c = I(i, p) ?? "/", g = I(i, d), v = Array.isArray(g) ? g : void 0, x = !v || v.length === 0, y = (b) => {
+    b ? b.includes("all") || b.length >= Object.keys(it).length ? l(d, void 0) : x ? l(d, Object.keys(it).filter((C) => !b.includes(C))) : l(d, b) : l(d, void 0);
+  }, P = typeof m == "function", T = typeof c == "function";
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       xt,
@@ -907,7 +908,7 @@ function Ut({
         title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
           /* @__PURE__ */ e(Br, {}),
           /* @__PURE__ */ e(
-            k,
+            O,
             {
               variant: "subtitle2",
               className: "ml-2",
@@ -924,7 +925,7 @@ function Ut({
               value: v ?? [],
               onMultiValueChange: y,
               label: x ? void 0 : "Allowed file types",
-              renderValues: (b) => !b || b.length === 0 ? "All file types allowed" : b.map((P) => it[P]).filter((P) => !!P).join(", "),
+              renderValues: (b) => !b || b.length === 0 ? "All file types allowed" : b.map((C) => it[C]).filter((C) => !!C).join(", "),
               children: [
                 /* @__PURE__ */ a(St, { value: "all", className: "flex items-center gap-2", children: [
                   /* @__PURE__ */ e(
@@ -935,20 +936,20 @@ function Ut({
                   ),
                   "All"
                 ] }, "all"),
-                Object.entries(it).map(([b, P]) => /* @__PURE__ */ a(St, { value: b, className: "flex items-center gap-2", children: [
+                Object.entries(it).map(([b, C]) => /* @__PURE__ */ a(St, { value: b, className: "flex items-center gap-2", children: [
                   /* @__PURE__ */ e(
                     Et,
                     {
                       checked: x || v.indexOf(b) > -1
                     }
                   ),
-                  /* @__PURE__ */ e("div", { className: "flex-grow", children: P }),
+                  /* @__PURE__ */ e("div", { className: "flex-grow", children: C }),
                   /* @__PURE__ */ e(
                     z,
                     {
                       size: "small",
                       variant: "outlined",
-                      onClick: (O) => (O.preventDefault(), O.stopPropagation(), l(d, [b])),
+                      onClick: (N) => (N.preventDefault(), N.stopPropagation(), l(d, [b])),
                       children: "Only"
                     }
                   )
@@ -959,27 +960,27 @@ function Ut({
           /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
             H,
             {
-              name: p,
-              as: J,
+              name: u,
+              as: Z,
               label: "File name",
               size: "small",
-              disabled: C || n,
-              value: C ? "-" : m
+              disabled: P || n,
+              value: P ? "-" : m
             }
           ) }),
           /* @__PURE__ */ a("div", { className: "col-span-12", children: [
             /* @__PURE__ */ e(
               H,
               {
-                name: u,
-                as: J,
+                name: p,
+                as: Z,
                 label: "Storage path",
-                disabled: w || n,
+                disabled: T || n,
                 size: "small",
-                value: w ? "-" : c
+                value: T ? "-" : c
               }
             ),
-            /* @__PURE__ */ a(k, { variant: "caption", className: "ml-3.5 mt-1 mb-2", children: [
+            /* @__PURE__ */ a(O, { variant: "caption", className: "ml-3.5 mt-1 mb-2", children: [
               /* @__PURE__ */ e("p", { children: "You can use the following placeholders in the file name and storage path values:" }),
               /* @__PURE__ */ a("ul", { children: [
                 /* @__PURE__ */ e("li", { children: "{file} - Full name of the uploaded file" }),
@@ -996,18 +997,18 @@ function Ut({
               {
                 name: h,
                 type: "checkbox",
-                children: ({ field: b, form: P }) => /* @__PURE__ */ e(
+                children: ({ field: b, form: C }) => /* @__PURE__ */ e(
                   se,
                   {
                     label: "Save URL instead of storage path",
                     disabled: r || n,
-                    form: P,
+                    form: C,
                     field: b
                   }
                 )
               }
             ),
-            /* @__PURE__ */ e(k, { variant: "caption", className: "ml-3.5 mt-1 mb-2", children: "Turn this setting on, if you prefer to save the download URL of the uploaded file instead of the storage path. You can only change this prop upon creation." })
+            /* @__PURE__ */ e(O, { variant: "caption", className: "ml-3.5 mt-1 mb-2", children: "Turn this setting on, if you prefer to save the download URL of the uploaded file instead of the storage path. You can only change this prop upon creation." })
           ] })
         ] })
       }
@@ -1046,16 +1047,16 @@ function nr({
   includeEditButton: l,
   selected: o
 }) {
-  const { propertyConfigs: d } = Ae(), p = $e(t, d);
+  const { propertyConfigs: d } = Ae(), u = $e(t, d);
   qe(t);
-  const u = n ? "border-red-500 dark:border-red-500 border-opacity-100 dark:border-opacity-100 ring-0 dark:ring-0" : o ? "border-primary" : "border-transparent";
+  const p = n ? "border-red-500 dark:border-red-500 border-opacity-100 dark:border-opacity-100 ring-0 dark:ring-0" : o ? "border-primary" : "border-transparent";
   return n && console.log("PropertyFieldPreview", t), /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ a(
     "div",
     {
       onClick: r,
       className: "flex flex-row w-full cursor-pointer",
       children: [
-        /* @__PURE__ */ e("div", { className: "m-4", children: /* @__PURE__ */ e(Ye, { propertyConfig: p }) }),
+        /* @__PURE__ */ e("div", { className: "m-4", children: /* @__PURE__ */ e(Ye, { propertyConfig: u }) }),
         /* @__PURE__ */ a(
           Ce,
           {
@@ -1066,12 +1067,12 @@ function nr({
               r ? Xt : "",
               o ? er : "",
               "flex-grow p-4 border transition-colors duration-200",
-              u
+              p
             ),
             children: [
               /* @__PURE__ */ a("div", { className: "w-full flex flex-col", children: [
                 i && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
-                  k,
+                  O,
                   {
                     variant: "body1",
                     component: "span",
@@ -1081,17 +1082,17 @@ function nr({
                 ) }),
                 /* @__PURE__ */ a("div", { className: "flex flex-row items-center", children: [
                   /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
-                    k,
+                    O,
                     {
                       className: "flex-grow pr-2",
                       variant: i ? "body2" : "subtitle1",
                       component: "span",
                       color: "secondary",
-                      children: p?.name
+                      children: u?.name
                     }
                   ) }),
                   /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
-                    k,
+                    O,
                     {
                       variant: "body2",
                       component: "span",
@@ -1101,7 +1102,7 @@ function nr({
                   ) })
                 ] })
               ] }),
-              l && /* @__PURE__ */ e(k, { variant: "button", children: "EDIT" })
+              l && /* @__PURE__ */ e(O, { variant: "button", children: "EDIT" })
             ]
           }
         )
@@ -1146,7 +1147,7 @@ function Ti({
             ),
             children: /* @__PURE__ */ a("div", { className: "w-full flex flex-col", children: [
               /* @__PURE__ */ e(
-                k,
+                O,
                 {
                   variant: "body1",
                   component: "span",
@@ -1156,7 +1157,7 @@ function Ti({
               ),
               /* @__PURE__ */ a("div", { className: "flex flex-row items-center", children: [
                 o && /* @__PURE__ */ e(
-                  k,
+                  O,
                   {
                     className: "flex-grow pr-2",
                     variant: "body2",
@@ -1166,7 +1167,7 @@ function Ti({
                   }
                 ),
                 i && !ne(i) && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
-                  k,
+                  O,
                   {
                     variant: "body2",
                     component: "span",
@@ -1175,7 +1176,7 @@ function Ti({
                   }
                 ) }),
                 i && ne(i) && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
-                  k,
+                  O,
                   {
                     variant: "body2",
                     component: "span",
@@ -1184,7 +1185,7 @@ function Ti({
                   }
                 ) }),
                 !i && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
-                  k,
+                  O,
                   {
                     variant: "body2",
                     component: "span",
@@ -1208,52 +1209,52 @@ const ft = Y.memo(
     properties: l,
     propertiesOrder: o,
     additionalFields: d,
-    errors: p,
-    onPropertyMove: u,
+    errors: u,
+    onPropertyMove: p,
     onPropertyRemove: h,
     className: m,
     inferredPropertyKeys: c,
     collectionEditable: g
   }) {
-    const v = o ?? Object.keys(l), x = Z((y) => {
+    const v = o ?? Object.keys(l), x = Q((y) => {
       if (!y.destination)
         return;
-      const C = y.source.index, w = y.destination.index, b = Array.from(v), [P] = b.splice(C, 1);
-      b.splice(w, 0, P), u && u(b, r);
-    }, [r, u, v]);
-    return /* @__PURE__ */ e(U, { children: /* @__PURE__ */ e(ii, { onDragEnd: x, children: /* @__PURE__ */ e(ni, { droppableId: `droppable_${r}`, children: (y, C) => /* @__PURE__ */ a(
+      const P = y.source.index, T = y.destination.index, b = Array.from(v), [C] = b.splice(P, 1);
+      b.splice(T, 0, C), p && p(b, r);
+    }, [r, p, v]);
+    return /* @__PURE__ */ e(U, { children: /* @__PURE__ */ e(ii, { onDragEnd: x, children: /* @__PURE__ */ e(ni, { droppableId: `droppable_${r}`, children: (y, P) => /* @__PURE__ */ a(
       "div",
       {
         ...y.droppableProps,
         ref: y.innerRef,
         className: m,
         children: [
-          v && v.map((w, b) => {
-            const P = l[w], O = d?.find((f) => f.key === w);
-            return !P && !O ? (console.warn(`Property ${w} not found in properties or additionalFields`), null) : /* @__PURE__ */ e(
+          v && v.map((T, b) => {
+            const C = l[T], N = d?.find((f) => f.key === T);
+            return !C && !N ? (console.warn(`Property ${T} not found in properties or additionalFields`), null) : /* @__PURE__ */ e(
               ai,
               {
-                draggableId: `array_field_${r}_${w}}`,
+                draggableId: `array_field_${r}_${T}}`,
                 index: b,
-                children: (f, N) => /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                children: (f, w) => /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
                   ki,
                   {
-                    propertyKey: w,
-                    propertyOrBuilder: P,
-                    additionalField: O,
+                    propertyKey: T,
+                    propertyOrBuilder: C,
+                    additionalField: N,
                     provided: f,
-                    errors: p,
+                    errors: u,
                     namespace: r,
                     inferredPropertyKeys: c,
-                    onPropertyMove: u,
+                    onPropertyMove: p,
                     onPropertyRemove: h,
-                    onPropertyClick: N.isDragging ? void 0 : i,
+                    onPropertyClick: w.isDragging ? void 0 : i,
                     selectedPropertyKey: n,
                     collectionEditable: g
                   }
                 ) })
               },
-              `array_field_${r}_${w}}`
+              `array_field_${r}_${T}}`
             );
           }).filter(Boolean),
           y.placeholder
@@ -1276,32 +1277,32 @@ function ki({
   provided: l,
   selectedPropertyKey: o,
   errors: d,
-  onPropertyClick: p,
-  onPropertyMove: u,
+  onPropertyClick: u,
+  onPropertyMove: p,
   onPropertyRemove: h,
   inferredPropertyKeys: m,
   collectionEditable: c
 }) {
   const g = m?.includes(r ? `${r}.${t}` : t), v = ae(t, r), y = ir(t, r) in d;
-  let C;
+  let P;
   if (typeof n == "object") {
-    const P = n;
-    P.dataType === "map" && P.properties && (C = /* @__PURE__ */ e(
+    const C = n;
+    C.dataType === "map" && C.properties && (P = /* @__PURE__ */ e(
       ft,
       {
         selectedPropertyKey: o,
         namespace: v,
-        properties: P.properties,
-        propertiesOrder: P.propertiesOrder,
+        properties: C.properties,
+        propertiesOrder: C.propertiesOrder,
         errors: d,
-        onPropertyClick: p,
-        onPropertyMove: u,
+        onPropertyClick: u,
+        onPropertyMove: p,
         onPropertyRemove: h,
         collectionEditable: c
       }
     ));
   }
-  const w = o === v, b = n && (c && !ne(n) || qe(n));
+  const T = o === v, b = n && (c && !ne(n) || qe(n));
   return /* @__PURE__ */ a(
     "div",
     {
@@ -1310,7 +1311,7 @@ function ki({
       ...l.dragHandleProps,
       className: "relative -ml-8",
       children: [
-        C && /* @__PURE__ */ e(
+        P && /* @__PURE__ */ e(
           "div",
           {
             className: "absolute border-l " + wt,
@@ -1325,9 +1326,9 @@ function ki({
           nr,
           {
             property: n,
-            onClick: p ? () => p(t, r) : void 0,
+            onClick: u ? () => u(t, r) : void 0,
             includeName: !0,
-            selected: w,
+            selected: T,
             hasError: y
           }
         ) : /* @__PURE__ */ e(
@@ -1335,8 +1336,8 @@ function ki({
           {
             name: t,
             property: n,
-            onClick: p ? () => p(t, r) : void 0,
-            selected: w
+            onClick: u ? () => u(t, r) : void 0,
+            selected: T
           }
         ),
         /* @__PURE__ */ a("div", { className: "absolute top-2 right-2 flex flex-row ", children: [
@@ -1350,7 +1351,7 @@ function ki({
               children: /* @__PURE__ */ e(Ur, { size: "small" })
             }
           ) }),
-          u && /* @__PURE__ */ e(te, { title: "Move", children: /* @__PURE__ */ e(
+          p && /* @__PURE__ */ e(te, { title: "Move", children: /* @__PURE__ */ e(
             oe,
             {
               component: "span",
@@ -1359,7 +1360,7 @@ function ki({
             }
           ) })
         ] }),
-        C && /* @__PURE__ */ e("div", { className: "ml-16", children: C })
+        P && /* @__PURE__ */ e("div", { className: "ml-16", children: P })
       ]
     }
   );
@@ -1368,42 +1369,44 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
   const {
     values: o,
     setFieldValue: d
-  } = K(), [p, u] = $(!1), [h, m] = $(), [c, g] = $(), v = o.propertiesOrder ?? Object.keys(o.properties ?? {}), x = Z(({
-    id: f,
-    property: N
+  } = K(), [u, p] = $(!1), [h, m] = $(), [c, g] = $(), v = o.propertiesOrder ?? Object.keys(o.properties ?? {}), x = ({
+    id: N,
+    property: f
   }) => {
-    if (!f)
+    if (!N)
       throw Error();
     d("properties", {
       ...o.properties ?? {},
-      [f]: N
-    }, !1), d("propertiesOrder", [...v, f], !1), u(!1);
-  }, [o.properties, v]), y = Z((f, N) => {
-    const _ = f ? ae(f, N) : void 0;
-    if (!_)
+      [N]: f
+    }, !1);
+    const w = o.propertiesOrder ?? Object.keys(o.properties ?? {}), _ = w.includes(N) ? w : [...w, N];
+    d("propertiesOrder", _, !1), p(!1);
+  }, y = Q((N, f) => {
+    const w = N ? ae(N, f) : void 0;
+    if (!w)
       throw Error("collection editor miss config");
-    const R = pe(_), M = ye(N), B = I(o, M) ?? Object.keys(I(o, bi(N)));
-    d(R, void 0, !1), d(M, B.filter((S) => S !== f), !1), u(!1), m(void 0), g(void 0);
-  }, [d, o]), C = h ? ae(h, c) : void 0, w = C ? I(o.properties, C.replaceAll(".", ".properties.")) : void 0, b = /* @__PURE__ */ a(
-    z,
-    {
-      color: "primary",
-      variant: "outlined",
-      onClick: () => u(!0),
-      startIcon: /* @__PURE__ */ e(ue, {}),
-      children: [
-        "Add property to ",
-        o.name ?? "this group"
-      ]
-    }
-  ), P = !v || v.length < 1, O = Z((f, N) => {
-    d(ye(N), f, !1);
+    const _ = pe(w), M = ye(f), R = I(o, M) ?? Object.keys(I(o, bi(f)));
+    d(_, void 0, !1), d(M, R.filter((D) => D !== N), !1), p(!1), m(void 0), g(void 0);
+  }, [d, o]), P = h ? ae(h, c) : void 0, T = P ? I(o.properties, P.replaceAll(".", ".properties.")) : void 0, b = !v || v.length < 1, C = Q((N, f) => {
+    d(ye(f), N, !1);
   }, []);
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
       /* @__PURE__ */ a("div", { className: "flex justify-between items-end my-4", children: [
-        /* @__PURE__ */ e(k, { variant: "subtitle2", children: "Properties in this group" }),
-        b
+        /* @__PURE__ */ e(O, { variant: "subtitle2", children: "Properties in this group" }),
+        /* @__PURE__ */ a(
+          z,
+          {
+            color: "primary",
+            variant: "outlined",
+            onClick: () => p(!0),
+            startIcon: /* @__PURE__ */ e(ue, {}),
+            children: [
+              "Add property to ",
+              o.name ?? "this group"
+            ]
+          }
+        )
       ] }),
       /* @__PURE__ */ a(Ce, { className: "p-2 pl-8", children: [
         /* @__PURE__ */ e(
@@ -1413,14 +1416,14 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
             propertiesOrder: v,
             errors: {},
             collectionEditable: l,
-            onPropertyClick: (f, N) => {
-              m(f), g(N), u(!0);
+            onPropertyClick: (N, f) => {
+              m(N), g(f), p(!0);
             },
-            onPropertyMove: O
+            onPropertyMove: C
           }
         ),
-        P && /* @__PURE__ */ e(
-          k,
+        b && /* @__PURE__ */ e(
+          O,
           {
             variant: "label",
             className: "h-full flex items-center justify-center p-4",
@@ -1436,7 +1439,7 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
           position: "start",
           size: "small",
           label: "Spread children as columns",
-          onValueChange: (f) => d("spreadChildren", f),
+          onValueChange: (N) => d("spreadChildren", N),
           value: o.spreadChildren ?? !1
         }
       ),
@@ -1447,20 +1450,20 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
       {
         inArray: !1,
         forceShowErrors: !1,
-        open: p,
+        open: u,
         allowDataInference: n,
         collectionEditable: l,
         onCancel: () => {
-          u(!1), m(void 0), g(void 0);
+          p(!1), m(void 0), g(void 0);
         },
         onOkClicked: () => {
-          u(!1), m(void 0), g(void 0);
+          p(!1), m(void 0), g(void 0);
         },
         getData: r,
         onDelete: y,
         propertyKey: h,
         propertyNamespace: c,
-        property: w,
+        property: T,
         existingProperty: !!h,
         autoUpdateId: !h,
         autoOpenTypeSelect: !h,
@@ -1481,17 +1484,17 @@ function Vi({
   collectionEditable: d
 }) {
   const {
-    values: p,
-    handleChange: u,
+    values: u,
+    handleChange: p,
     errors: h,
     setFieldValue: m,
     touched: c
-  } = K(), [g, v] = $(!1), x = I(p, "of"), y = I(c, "of") && I(h, "of"), C = ({ id: b, property: P, namespace: O }) => {
-    console.log("onPropertyChanged", b, P, O), m("of", P);
-  }, w = x && $e(x, o);
+  } = K(), [g, v] = $(!1), x = I(u, "of"), y = I(c, "of") && I(h, "of"), P = ({ id: b, property: C, namespace: N }) => {
+    console.log("onPropertyChanged", b, C, N), m("of", C);
+  }, T = x && $e(x, o);
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
-      /* @__PURE__ */ e(k, { variant: "subtitle2", children: "Repeat component" }),
+      /* @__PURE__ */ e(O, { variant: "subtitle2", children: "Repeat component" }),
       /* @__PURE__ */ e(
         H,
         {
@@ -1518,7 +1521,7 @@ function Vi({
                 onClick: () => v(!0),
                 children: [
                   "Edit ",
-                  `${w ? w.name : "repeat component"}`
+                  `${T ? T.name : "repeat component"}`
                 ]
               }
             ),
@@ -1535,7 +1538,7 @@ function Vi({
                 allowDataInference: l,
                 property: x,
                 includeIdAndName: !1,
-                onPropertyChanged: C,
+                onPropertyChanged: P,
                 forceShowErrors: t,
                 propertyConfigs: o,
                 collectionEditable: d
@@ -1557,13 +1560,13 @@ const Ii = Y.forwardRef(
     isNewProperty: o
   }, d) {
     const {
-      errors: p,
-      values: u,
+      errors: u,
+      values: p,
       setFieldValue: h,
       setFieldTouched: m,
       touched: c,
       validate: g
-    } = K(), v = "name", x = r && I(p, v), y = "id", C = r && I(p, y), w = "description", b = r && I(p, w);
+    } = K(), v = "name", x = r && I(u, v), y = "id", P = r && I(u, y), T = "description", b = r && I(u, T);
     return /* @__PURE__ */ a("div", { className: "flex flex-col gap-2 col-span-12", children: [
       /* @__PURE__ */ a("div", { children: [
         /* @__PURE__ */ e(
@@ -1571,11 +1574,11 @@ const Ii = Y.forwardRef(
           {
             name: v,
             inputRef: d,
-            as: J,
-            value: u[v],
-            onChange: (P) => {
-              const O = P.target.value;
-              !I(c, y) && l && h(y, O ? Pt(O) : "", !1), h(v, O, !0), m(v, !0);
+            as: Z,
+            value: p[v],
+            onChange: (C) => {
+              const N = C.target.value;
+              !I(c, y) && l && h(y, N ? Pt(N) : "", !1), h(v, N, !0), m(v, !0);
             },
             style: { fontSize: 20 },
             placeholder: "Field name",
@@ -1591,27 +1594,27 @@ const Ii = Y.forwardRef(
           H,
           {
             name: y,
-            as: J,
+            as: Z,
             label: "ID",
-            value: u[y],
-            onChange: (P) => {
-              const O = P.target.value;
-              !I(c, v) && l && h(v, O ? ut(O) : ""), h(y, O, !0), m(y, !0);
+            value: p[y],
+            onChange: (C) => {
+              const N = C.target.value;
+              !I(c, v) && l && h(v, N ? ut(N) : ""), h(y, N, !0), m(y, !0);
             },
             disabled: n || i,
             required: !0,
             size: "small",
-            error: !!C
+            error: !!P
           }
         ),
-        /* @__PURE__ */ e(X, { error: !!C, children: C })
+        /* @__PURE__ */ e(X, { error: !!P, children: P })
       ] }),
       /* @__PURE__ */ a("div", { children: [
         /* @__PURE__ */ e(
           H,
           {
-            name: w,
-            as: J,
+            name: T,
+            as: Z,
             label: "Description",
             disabled: i,
             error: !!b
@@ -1721,43 +1724,45 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
   const {
     values: o,
     setFieldValue: d
-  } = K(), [p, u] = $(!1), [h, m] = $(), [c, g] = $(), v = Z(({
-    id: P,
-    property: O
+  } = K(), [u, p] = $(!1), [h, m] = $(), [c, g] = $(), v = ({
+    id: C,
+    property: N
   }) => {
-    if (!P)
+    if (!C)
       throw Error();
     d("oneOf.properties", {
       ...o.oneOf?.properties ?? {},
-      [P]: O
-    }, !1), d("oneOf.propertiesOrder", [...o.oneOf?.propertiesOrder ?? Object.keys(o.oneOf?.properties ?? {}), P], !1), u(!1);
-  }, [o.oneOf?.properties, o.oneOf?.propertiesOrder]), x = h ? ae(h, c) : void 0, y = x ? I(o.oneOf?.properties, x.replaceAll(".", ".properties.")) : void 0, C = Z((P, O) => {
-    const f = P ? ae(P, O) : void 0;
+      [C]: N
+    }, !1);
+    const f = o.oneOf?.propertiesOrder ?? Object.keys(o.oneOf?.properties ?? {}), w = f.includes(C) ? f : [...f, C];
+    d("oneOf.propertiesOrder", w, !1), p(!1);
+  }, x = h ? ae(h, c) : void 0, y = x ? I(o.oneOf?.properties, x.replaceAll(".", ".properties.")) : void 0, P = Q((C, N) => {
+    const f = C ? ae(C, N) : void 0;
     if (!f)
       throw Error("collection editor miss config");
     d(`oneOf.${pe(f)}`, void 0, !1);
-    const N = `oneOf.${ye(O)}`, _ = I(o, N);
-    d(N, _.filter((R) => R !== P), !1), u(!1), m(void 0), g(void 0);
-  }, [d, o]), w = /* @__PURE__ */ a(
+    const w = `oneOf.${ye(N)}`, _ = I(o, w);
+    d(w, _.filter((M) => M !== C), !1), p(!1), m(void 0), g(void 0);
+  }, [d, o]), T = /* @__PURE__ */ a(
     z,
     {
       autoFocus: !0,
       color: "primary",
-      onClick: () => u(!0),
+      onClick: () => p(!0),
       startIcon: /* @__PURE__ */ e(ue, {}),
       children: [
         "Add property to ",
         o.name ?? "this block"
       ]
     }
-  ), b = Z((P, O) => {
-    d(`oneOf.${ye(O)}`, P, !1);
+  ), b = Q((C, N) => {
+    d(`oneOf.${ye(N)}`, C, !1);
   }, []);
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
       /* @__PURE__ */ a("div", { className: "flex justify-between items-end mt-8 mb-4", children: [
-        /* @__PURE__ */ e(k, { variant: "subtitle2", children: "Properties in this block" }),
-        w
+        /* @__PURE__ */ e(O, { variant: "subtitle2", children: "Properties in this block" }),
+        T
       ] }),
       /* @__PURE__ */ a(Ce, { className: "p-2 pl-8", children: [
         /* @__PURE__ */ e(
@@ -1767,8 +1772,8 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
             propertiesOrder: o.oneOf?.propertiesOrder,
             errors: {},
             collectionEditable: l,
-            onPropertyClick: t ? void 0 : (P, O) => {
-              m(P), g(O), u(!0);
+            onPropertyClick: t ? void 0 : (C, N) => {
+              m(C), g(N), p(!0);
             },
             onPropertyMove: t ? void 0 : b
           }
@@ -1781,17 +1786,17 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
       {
         inArray: !1,
         forceShowErrors: !1,
-        open: p,
+        open: u,
         getData: r,
         allowDataInference: n,
         onCancel: () => {
-          u(!1), m(void 0), g(void 0);
+          p(!1), m(void 0), g(void 0);
         },
         onOkClicked: () => {
-          u(!1), m(void 0), g(void 0);
+          p(!1), m(void 0), g(void 0);
         },
         collectionEditable: l,
-        onDelete: C,
+        onDelete: P,
         propertyKey: h,
         propertyNamespace: c,
         property: y,
@@ -1813,7 +1818,7 @@ function Ei({ disabled: t }) {
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
     /* @__PURE__ */ e(Se, { disabled: t }),
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(r, i),
         label: "Min value",
@@ -1825,7 +1830,7 @@ function Ei({ disabled: t }) {
       }
     ) }),
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(r, l),
         label: "Max value",
@@ -1837,7 +1842,7 @@ function Ei({ disabled: t }) {
       }
     ) }),
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(r, o),
         label: "Less than",
@@ -1849,7 +1854,7 @@ function Ei({ disabled: t }) {
       }
     ) }),
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(r, d),
         label: "More than",
@@ -1942,12 +1947,12 @@ function jt({
   } = K();
   if (!Pe())
     return /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(De, {}) });
-  const u = r ? "of.path" : "path", h = I(l, u), m = i && I(d, u);
+  const p = r ? "of.path" : "path", h = I(l, p), m = i && I(d, p);
   return /* @__PURE__ */ e(U, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
     H,
     {
-      name: u,
-      pathPath: u,
+      name: p,
+      pathPath: p,
       type: "select",
       disabled: t || n,
       value: h,
@@ -1968,9 +1973,9 @@ function Di({
   const d = Pe();
   if (!d)
     return /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(De, {}) });
-  const p = d?.collections ?? [], u = Array.from(new Set(
-    Object.values(p).map((m) => m.group).filter(Boolean)
-  ).values()), h = p.filter((m) => !m.group);
+  const u = d?.collections ?? [], p = Array.from(new Set(
+    Object.values(u).map((m) => m.group).filter(Boolean)
+  ).values()), h = u.filter((m) => !m.group);
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ a(
       be,
@@ -1983,11 +1988,11 @@ function Di({
         onChange: i,
         label: "Target collection",
         renderValue: (m) => {
-          const c = p.find((g) => g.id === m || g.path === m);
+          const c = u.find((g) => g.id === m || g.path === m);
           return c ? /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
             /* @__PURE__ */ e(ot, { collectionOrView: c }),
             /* @__PURE__ */ e(
-              k,
+              O,
               {
                 variant: "subtitle2",
                 className: "font-medium ml-4",
@@ -1998,18 +2003,18 @@ function Di({
         },
         ...o,
         children: [
-          u.flatMap((m) => /* @__PURE__ */ e(
+          p.flatMap((m) => /* @__PURE__ */ e(
             At,
             {
               label: m || "Views",
-              children: p.filter((c) => c.group === m).map((c) => /* @__PURE__ */ e(
+              children: u.filter((c) => c.group === m).map((c) => /* @__PURE__ */ e(
                 ee,
                 {
                   value: c.id ?? c.path,
                   children: /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
                     /* @__PURE__ */ e(ot, { collectionOrView: c }),
                     /* @__PURE__ */ e(
-                      k,
+                      O,
                       {
                         variant: "subtitle2",
                         className: "font-medium ml-4",
@@ -2030,7 +2035,7 @@ function Di({
               children: /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
                 /* @__PURE__ */ e(ot, { collectionOrView: m }),
                 /* @__PURE__ */ e(
-                  k,
+                  O,
                   {
                     variant: "subtitle2",
                     className: "font-medium ml-4",
@@ -2053,7 +2058,7 @@ function Bi({ disabled: t }) {
     errors: n,
     touched: i,
     setFieldValue: l
-  } = K(), o = "mode", d = I(r, o), p = I(i, o) && I(n, o), u = "autoValue", h = I(r, u), m = I(i, u) && I(n, u);
+  } = K(), o = "mode", d = I(r, o), u = I(i, o) && I(n, o), p = "autoValue", h = I(r, p), m = I(i, p) && I(n, p);
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ a("div", { className: "flex flex-col col-span-12", children: [
       /* @__PURE__ */ a(
@@ -2061,7 +2066,7 @@ function Bi({ disabled: t }) {
         {
           name: o,
           value: d ?? "date",
-          error: !!p,
+          error: !!u,
           onValueChange: (c) => l(o, c),
           label: "Mode",
           renderValue: (c) => {
@@ -2081,14 +2086,14 @@ function Bi({ disabled: t }) {
           ]
         }
       ),
-      /* @__PURE__ */ e(X, { error: !!p, children: p }),
+      /* @__PURE__ */ e(X, { error: !!u, children: u }),
       /* @__PURE__ */ a(
         be,
         {
-          name: u,
+          name: p,
           disabled: t,
           value: h ?? "",
-          onValueChange: (c) => l(u, c),
+          onValueChange: (c) => l(p, c),
           renderValue: (c) => {
             switch (c) {
               case "on_create":
@@ -2378,7 +2383,7 @@ function or({ value: t, optionDisabled: r, propertyConfig: n, existing: i }) {
             /* @__PURE__ */ a("div", { children: [
               /* @__PURE__ */ e("div", { children: n.name }),
               /* @__PURE__ */ e(
-                k,
+                O,
                 {
                   variant: "caption",
                   color: "disabled",
@@ -2482,8 +2487,8 @@ const Ui = [
       existingProperty: l,
       autoUpdateId: o,
       inArray: d,
-      propertyKey: p,
-      existingPropertyKeys: u,
+      propertyKey: u,
+      existingPropertyKeys: p,
       propertyNamespace: h,
       property: m,
       onPropertyChanged: c,
@@ -2491,88 +2496,88 @@ const Ui = [
       onDelete: v,
       onError: x,
       initialErrors: y,
-      forceShowErrors: C,
-      allowDataInference: w,
+      forceShowErrors: P,
+      allowDataInference: T,
       getController: b,
-      getData: P,
-      propertyConfigs: O,
+      getData: C,
+      propertyConfigs: N,
       collectionEditable: f
-    } = r, N = {
+    } = r, w = {
       id: "",
       name: ""
-    }, _ = !!(m && !qe(m)) && !f, R = Le(m ? {
-      id: p,
-      previousId: p,
+    }, _ = !!(m && !qe(m)) && !f, M = Le(m ? {
+      id: u,
+      previousId: u,
       property: m
-    } : void 0), M = ({
-      id: S,
+    } : void 0), R = ({
+      id: A,
       property: s
     }) => {
       const V = {
-        id: S,
-        previousId: R.current?.id,
+        id: A,
+        previousId: M.current?.id,
         property: s,
         namespace: h
       };
-      R.current = V, c?.(V);
-    }, B = Tt({
-      initialValues: m ? { id: p, ...m } : N,
+      M.current = V, c?.(V);
+    }, D = Tt({
+      initialValues: m ? { id: u, ...m } : w,
       initialErrors: y,
       validateOnChange: !0,
       validateOnInitialRender: !0,
-      onSubmit: (S, s) => {
-        console.debug("onSubmit", S);
+      onSubmit: (A, s) => {
+        console.debug("onSubmit", A);
         const {
           id: V,
           ...G
-        } = S;
-        M({
+        } = A;
+        R({
           id: V,
           property: { ...G, editable: G.editable ?? !0 }
-        }), l || s.resetForm({ values: N });
+        }), l || s.resetForm({ values: w });
       },
-      validation: (S) => {
+      validation: (A) => {
         const s = {};
         if (n) {
-          if (!S.name)
+          if (!A.name)
             s.name = "Required";
           else {
-            const V = $i(S.name);
+            const V = $i(A.name);
             V && (s.name = V);
           }
-          if (!S.id)
+          if (!A.id)
             s.id = "Required";
           else {
-            const V = qi(S.id, u);
+            const V = qi(A.id, p);
             V && (s.id = V);
           }
         }
-        return S.dataType === "string" && S.validation?.matches && !Pr(S.validation?.matches.toString()) && (s.validation = {
+        return A.dataType === "string" && A.validation?.matches && !Pr(A.validation?.matches.toString()) && (s.validation = {
           matches: "Invalid regular expression"
-        }), S.dataType === "reference" && !S.path && (s.path = "You must specify a target collection for the field"), S.propertyConfig === "repeat" && (S.of || (s.of = "You need to specify a repeat field")), S.propertyConfig === "block" && (S.oneOf || (s.oneOf = "You need to specify the properties of this block")), s;
+        }), A.dataType === "reference" && !A.path && (s.path = "You must specify a target collection for the field"), A.propertyConfig === "repeat" && (A.of || (s.of = "You need to specify a repeat field")), A.propertyConfig === "block" && (A.oneOf || (s.oneOf = "You need to specify the properties of this block")), s;
       }
     });
     return ce(() => {
-      b?.(B);
-    }, [B, b]), /* @__PURE__ */ e(kt, { value: B, children: /* @__PURE__ */ e(
+      b?.(D);
+    }, [D, b]), /* @__PURE__ */ e(kt, { value: D, children: /* @__PURE__ */ e(
       ji,
       {
-        onPropertyChanged: g ? M : void 0,
+        onPropertyChanged: g ? R : void 0,
         onDelete: v,
         includeIdAndTitle: n,
         propertyNamespace: h,
         onError: x,
-        showErrors: C || B.submitCount > 0,
+        showErrors: P || D.submitCount > 0,
         existing: l,
         autoUpdateId: o,
         inArray: d,
         autoOpenTypeSelect: i,
         disabled: _,
-        getData: P,
-        allowDataInference: w,
-        propertyConfigs: O,
+        getData: C,
+        allowDataInference: T,
+        propertyConfigs: N,
         collectionEditable: f,
-        ...B
+        ...D
       }
     ) });
   },
@@ -2587,7 +2592,7 @@ function Ve({
   collectionEditable: o,
   ...d
 }) {
-  const p = Le();
+  const u = Le();
   return /* @__PURE__ */ e(
     Fe,
     {
@@ -2600,7 +2605,7 @@ function Ve({
           noValidate: !0,
           autoComplete: "off",
           onSubmit: (h) => {
-            h.preventDefault(), h.stopPropagation(), p.current?.handleSubmit(h);
+            h.preventDefault(), h.stopPropagation(), u.current?.handleSubmit(h);
           },
           children: [
             /* @__PURE__ */ e(Be, { children: /* @__PURE__ */ e(
@@ -2613,7 +2618,7 @@ function Ve({
                 collectionEditable: o,
                 onPropertyChangedImmediate: !1,
                 getController: (h) => {
-                  p.current = h;
+                  u.current = h;
                 },
                 getData: l
               }
@@ -2624,7 +2629,7 @@ function Ve({
                 {
                   variant: "text",
                   onClick: () => {
-                    r(), p.current?.resetForm();
+                    r(), u.current?.resetForm();
                   },
                   children: "Cancel"
                 }
@@ -2653,8 +2658,8 @@ function ji({
   autoUpdateId: l = !1,
   autoOpenTypeSelect: o,
   includeIdAndTitle: d,
-  onPropertyChanged: p,
-  onDelete: u,
+  onPropertyChanged: u,
+  onDelete: p,
   propertyNamespace: h,
   onError: m,
   showErrors: c,
@@ -2662,45 +2667,45 @@ function ji({
   inArray: v,
   getData: x,
   allowDataInference: y,
-  propertyConfigs: C,
-  collectionEditable: w
+  propertyConfigs: P,
+  collectionEditable: T
 }) {
-  const [b, P] = $(o), [O, f] = $(!1), [N, _] = $(t?.dataType ? Kt(t) : void 0), R = Object.entries(lr).concat(Object.entries(C)), M = v ? R.filter(([q, L]) => !ne(L.property) && L.property?.dataType !== "array") : R, B = Ir(t), S = Le(null), s = Le(t), V = c && I(r, "selectedWidget");
+  const [b, C] = $(o), [N, f] = $(!1), [w, _] = $(t?.dataType ? Kt(t) : void 0), M = Object.entries(lr).concat(Object.entries(P)), R = v ? M.filter(([q, L]) => !ne(L.property) && L.property?.dataType !== "array") : M, D = Ir(t), A = Le(null), s = Le(t), V = c && I(r, "selectedWidget");
   ce(() => {
-    if (p && (!d || B.id)) {
+    if (u && (!d || D.id)) {
       const {
         id: q,
         ...L
-      } = B;
-      ve(B, s.current) || (p({
+      } = D;
+      ve(D, s.current) || (u({
         id: q,
         property: L,
         namespace: h
-      }), s.current = B);
+      }), s.current = D);
     }
-  }, [B, d, p, h]), ce(() => {
+  }, [D, d, u, h]), ce(() => {
     t?.id && m && m(t?.id, h, r);
   }, [r, m, h, t?.id]);
   const G = (q) => {
-    _(q), n(ar(t, q, C)), setTimeout(() => {
-      S.current?.focus();
+    _(q), n(ar(t, q, P)), setTimeout(() => {
+      A.current?.focus();
     }, 0);
   };
-  let D;
-  return N === "text_field" || N === "multiline" || N === "markdown" || N === "email" ? D = /* @__PURE__ */ e(
+  let B;
+  return w === "text_field" || w === "multiline" || w === "markdown" || w === "email" ? B = /* @__PURE__ */ e(
     _i,
     {
-      widgetId: N,
+      widgetId: w,
       disabled: g,
       showErrors: c
     }
-  ) : N === "url" ? D = /* @__PURE__ */ e(
+  ) : w === "url" ? B = /* @__PURE__ */ e(
     Ri,
     {
       disabled: g,
       showErrors: c
     }
-  ) : N === "select" || N === "number_select" ? D = /* @__PURE__ */ e(
+  ) : w === "select" || w === "number_select" ? B = /* @__PURE__ */ e(
     Rt,
     {
       multiselect: !1,
@@ -2710,7 +2715,7 @@ function ji({
       getData: x,
       showErrors: c
     }
-  ) : N === "multi_select" || N === "multi_number_select" ? D = /* @__PURE__ */ e(
+  ) : w === "multi_select" || w === "multi_number_select" ? B = /* @__PURE__ */ e(
     Rt,
     {
       multiselect: !0,
@@ -2720,39 +2725,39 @@ function ji({
       getData: x,
       showErrors: c
     }
-  ) : N === "file_upload" ? D = /* @__PURE__ */ e(
+  ) : w === "file_upload" ? B = /* @__PURE__ */ e(
     Ut,
     {
       existing: i,
       multiple: !1,
       disabled: g
     }
-  ) : N === "multi_file_upload" ? D = /* @__PURE__ */ e(
+  ) : w === "multi_file_upload" ? B = /* @__PURE__ */ e(
     Ut,
     {
       existing: i,
       multiple: !0,
       disabled: g
     }
-  ) : N === "switch" ? D = /* @__PURE__ */ e(Fi, { disabled: g }) : N === "number_input" ? D = /* @__PURE__ */ e(Ai, { disabled: g }) : N === "group" ? D = /* @__PURE__ */ e(
+  ) : w === "switch" ? B = /* @__PURE__ */ e(Fi, { disabled: g }) : w === "number_input" ? B = /* @__PURE__ */ e(Ai, { disabled: g }) : w === "group" ? B = /* @__PURE__ */ e(
     Oi,
     {
       disabled: g,
       getData: x,
       allowDataInference: y,
-      collectionEditable: w,
-      propertyConfigs: C
+      collectionEditable: T,
+      propertyConfigs: P
     }
-  ) : N === "block" ? D = /* @__PURE__ */ e(
+  ) : w === "block" ? B = /* @__PURE__ */ e(
     Si,
     {
       disabled: g,
       getData: x,
       allowDataInference: y,
-      collectionEditable: w,
-      propertyConfigs: C
+      collectionEditable: T,
+      propertyConfigs: P
     }
-  ) : N === "reference" ? D = /* @__PURE__ */ e(
+  ) : w === "reference" ? B = /* @__PURE__ */ e(
     jt,
     {
       showErrors: c,
@@ -2760,7 +2765,7 @@ function ji({
       multiple: !1,
       disabled: g
     }
-  ) : N === "date_time" ? D = /* @__PURE__ */ e(Bi, { disabled: g }) : N === "multi_references" ? D = /* @__PURE__ */ e(
+  ) : w === "date_time" ? B = /* @__PURE__ */ e(Bi, { disabled: g }) : w === "multi_references" ? B = /* @__PURE__ */ e(
     jt,
     {
       showErrors: c,
@@ -2768,7 +2773,7 @@ function ji({
       multiple: !0,
       disabled: g
     }
-  ) : N === "repeat" ? D = /* @__PURE__ */ e(
+  ) : w === "repeat" ? B = /* @__PURE__ */ e(
     Vi,
     {
       showErrors: c,
@@ -2776,13 +2781,13 @@ function ji({
       getData: x,
       allowDataInference: y,
       disabled: g,
-      collectionEditable: w,
-      propertyConfigs: C
+      collectionEditable: T,
+      propertyConfigs: P
     }
-  ) : N === "key_value" ? D = /* @__PURE__ */ e(Mi, { disabled: g }) : D = null, /* @__PURE__ */ a(U, { children: [
+  ) : w === "key_value" ? B = /* @__PURE__ */ e(Mi, { disabled: g }) : B = null, /* @__PURE__ */ a(U, { children: [
     g && /* @__PURE__ */ a(Lr, { mode: "warn", children: [
-      /* @__PURE__ */ e(k, { children: "This property can't be edited" }),
-      /* @__PURE__ */ a(k, { variant: "caption", children: [
+      /* @__PURE__ */ e(O, { children: "This property can't be edited" }),
+      /* @__PURE__ */ a(O, { variant: "caption", children: [
         "You may not have permission to edit it or it is defined in code with no ",
         /* @__PURE__ */ e("code", { children: "editable" }),
         " flag"
@@ -2794,16 +2799,16 @@ function ji({
           be,
           {
             error: !!V,
-            value: N ?? "",
+            value: w ?? "",
             placeholder: "Select a property widget",
             open: b,
-            onOpenChange: P,
+            onOpenChange: C,
             position: "item-aligned",
             disabled: g,
             renderValue: (q) => {
               if (!q)
                 return /* @__PURE__ */ e("em", { children: "Select a property widget" });
-              const L = q, Q = Gt[L] ?? C[L], le = Q.property, Me = le && !ne(le) ? $e(le, C) : void 0, we = ne(le) || i && le.dataType !== t?.dataType, de = Me ? W(Me, Q) : Q;
+              const L = q, J = Gt[L] ?? P[L], le = J.property, Me = le && !ne(le) ? $e(le, P) : void 0, we = ne(le) || i && le.dataType !== t?.dataType, de = Me ? W(Me, J) : J;
               return /* @__PURE__ */ a(
                 "div",
                 {
@@ -2819,7 +2824,7 @@ function ji({
                     /* @__PURE__ */ a("div", { className: "flex flex-col items-start text-base text-left", children: [
                       /* @__PURE__ */ e("div", { children: de.name }),
                       /* @__PURE__ */ e(
-                        k,
+                        O,
                         {
                           variant: "caption",
                           color: "disabled",
@@ -2834,8 +2839,8 @@ function ji({
             onValueChange: (q) => {
               G(q);
             },
-            children: M.map(([q, L]) => {
-              const Q = L.property, le = i && !ne(Q) && Q.dataType !== t?.dataType;
+            children: R.map(([q, L]) => {
+              const J = L.property, le = i && !ne(J) && J.dataType !== t?.dataType;
               return /* @__PURE__ */ e(
                 or,
                 {
@@ -2850,7 +2855,7 @@ function ji({
           }
         ),
         V && /* @__PURE__ */ e(
-          k,
+          O,
           {
             variant: "caption",
             className: "ml-3.5",
@@ -2859,7 +2864,7 @@ function ji({
           }
         )
       ] }),
-      u && t?.id && /* @__PURE__ */ e(
+      p && t?.id && /* @__PURE__ */ e(
         oe,
         {
           variant: "ghost",
@@ -2879,17 +2884,17 @@ function ji({
           isNewProperty: !i,
           disabled: g,
           autoUpdateId: l,
-          ref: S
+          ref: A
         }
       ),
-      D,
+      B,
       /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(zi, { disabled: g }) })
     ] }),
-    u && /* @__PURE__ */ e(
+    p && /* @__PURE__ */ e(
       lt,
       {
-        open: O,
-        onAccept: () => u(t?.id, h),
+        open: N,
+        onAccept: () => p(t?.id, h),
         onCancel: () => f(!1),
         title: /* @__PURE__ */ e("div", { children: "Delete this property?" }),
         body: /* @__PURE__ */ a("div", { children: [
@@ -2925,11 +2930,11 @@ const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.s
       maxWidth: "4xl",
       children: [
         /* @__PURE__ */ a(Be, { children: [
-          /* @__PURE__ */ a(k, { variant: "h6", className: "my-4", children: [
+          /* @__PURE__ */ a(O, { variant: "h6", className: "my-4", children: [
             "Code for ",
             t.name
           ] }),
-          /* @__PURE__ */ a(k, { variant: "body2", className: "my-4 mb-8", children: [
+          /* @__PURE__ */ a(O, { variant: "body2", className: "my-4 mb-8", children: [
             "If you want to customise the collection in code, you can add this collection code to your CMS app configuration. More info in the ",
             /* @__PURE__ */ e(
               "a",
@@ -2947,7 +2952,7 @@ const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.s
               theme: si.vsDark,
               code: l,
               language: "typescript",
-              children: ({ className: o, style: d, tokens: p, getLineProps: u, getTokenProps: h }) => /* @__PURE__ */ e("pre", { style: d, className: "p-4 rounded text-sm", children: p.map((m, c) => /* @__PURE__ */ e("div", { ...u({ line: m }), children: m.map((g, v) => /* @__PURE__ */ e("span", { ...h({ token: g }) }, v)) }, c)) })
+              children: ({ className: o, style: d, tokens: u, getLineProps: p, getTokenProps: h }) => /* @__PURE__ */ e("pre", { style: d, className: "p-4 rounded text-sm", children: u.map((m, c) => /* @__PURE__ */ e("div", { ...p({ line: m }), children: m.map((g, v) => /* @__PURE__ */ e("span", { ...h({ token: g }) }, v)) }, c)) })
             }
           )
         ] }),
@@ -3010,8 +3015,8 @@ function Gi({
   setDirty: l,
   reservedGroups: o,
   extraIcon: d,
-  getUser: p,
-  getData: u,
+  getUser: u,
+  getData: p,
   doCollectionInference: h,
   propertyConfigs: m,
   collectionEditable: c
@@ -3021,12 +3026,12 @@ function Gi({
     setFieldValue: v,
     setFieldError: x,
     setFieldTouched: y,
-    errors: C,
-    dirty: w
-  } = K(), b = Ie(), P = Nr(), O = !P, [f, N] = $(), [_, R] = $(), [M, B] = $(), S = _ ? ae(_, M) : void 0, s = S ? I(g.properties, S.replaceAll(".", ".properties.")) : void 0, [V, G] = $(!1), [D, q] = $(!1), [L, Q] = $(!1), [le, Me] = $([]), we = Y.useRef(g.propertiesOrder ? { "": g.propertiesOrder } : {});
+    errors: P,
+    dirty: T
+  } = K(), b = Ie(), C = Nr(), N = !C, [f, w] = $(), [_, M] = $(), [R, D] = $(), A = _ ? ae(_, R) : void 0, s = A ? I(g.properties, A.replaceAll(".", ".properties.")) : void 0, [V, G] = $(!1), [B, q] = $(!1), [L, J] = $(!1), [le, Me] = $([]), we = Y.useRef(g.propertiesOrder ? { "": g.propertiesOrder } : {});
   ce(() => {
-    l && l(w);
-  }, [w]);
+    l && l(T);
+  }, [T]);
   const de = h ? () => {
     h && (q(!0), h(g).then((F) => {
       if (F && pt(F.properties), !F) {
@@ -3036,7 +3041,7 @@ function Gi({
         });
         return;
       }
-      const j = (F.properties ? Object.keys(F.properties) : []).filter((A) => !g.properties[A]);
+      const j = (F.properties ? Object.keys(F.properties) : []).filter((E) => !g.properties[E]);
       if (j.length === 0) {
         b.open({
           type: "info",
@@ -3044,27 +3049,27 @@ function Gi({
         });
         return;
       }
-      const T = {
-        ...j.reduce((A, ie) => (A[ie] = (F.properties ?? {})[ie], A), {}),
+      const k = {
+        ...j.reduce((E, ie) => (E[ie] = (F.properties ?? {})[ie], E), {}),
         ...g.properties
-      }, E = [
+      }, S = [
         ...j,
         ...g.propertiesOrder ?? []
       ];
-      v("properties", T, !1), he(E), Me(j);
+      v("properties", k, !1), he(S), Me(j);
     }).finally(() => {
       q(!1);
     }));
-  } : void 0, re = Z((F) => F ? we.current[F] ?? I(g, ye(F)) : we.current[""], [g]), he = Z((F, j) => {
-    const T = ye(j);
-    v(T, F, !1), we.current[j ?? ""] = F;
-  }, [v]), Te = Z((F, j) => {
-    const T = F ? ae(F, j) : void 0;
-    if (!T)
+  } : void 0, re = Q((F) => F ? we.current[F] ?? I(g, ye(F)) : we.current[""], [g]), he = Q((F, j) => {
+    const k = ye(j);
+    v(k, F, !1), we.current[j ?? ""] = F;
+  }, [v]), Te = Q((F, j) => {
+    const k = F ? ae(F, j) : void 0;
+    if (!k)
       throw Error("collection editor miss config");
-    v(pe(T), void 0, !1);
-    const A = re(j).filter((ie) => ie !== F);
-    he(A, j), Q(!1), N(void 0), R(void 0), B(void 0);
+    v(pe(k), void 0, !1);
+    const E = re(j).filter((ie) => ie !== F);
+    he(E, j), J(!1), w(void 0), M(void 0), D(void 0);
   }, [re, v, he]), Ge = (F, j) => {
     v(ye(j), F, !1);
   }, gt = ({
@@ -3077,49 +3082,49 @@ function Gi({
       ...g.properties ?? {},
       [F]: j
     }, !1);
-    const T = [...g.propertiesOrder ?? Object.keys(g.properties), F];
-    he(T), Q(!1), P && (N(T.indexOf(F)), R(F)), B(void 0);
+    const k = [...g.propertiesOrder ?? Object.keys(g.properties), F];
+    he(k), J(!1), C && (w(k.indexOf(F)), M(F)), D(void 0);
   }, fe = ({
     id: F,
     property: j,
-    previousId: T,
-    namespace: E
+    previousId: k,
+    namespace: S
   }) => {
-    const A = F ? ae(F, E) : void 0, ie = A ? pe(A) : void 0;
-    if (T && T !== F) {
-      const ke = ae(T, E), Vt = pe(ke), It = re(E).map((Xe) => Xe === T ? F : Xe).filter((Xe) => Xe !== void 0);
-      he(It, E), F && (N(It.indexOf(F)), R(F)), v(Vt, void 0, !1), y(Vt, !1, !1);
+    const E = F ? ae(F, S) : void 0, ie = E ? pe(E) : void 0;
+    if (k && k !== F) {
+      const ke = ae(k, S), Vt = pe(ke), It = re(S).map((Xe) => Xe === k ? F : Xe).filter((Xe) => Xe !== void 0);
+      he(It, S), F && (w(It.indexOf(F)), M(F)), v(Vt, void 0, !1), y(Vt, !1, !1);
     }
     console.debug("onPropertyChanged", {
       id: F,
       property: j,
-      previousId: T,
-      namespace: E,
+      previousId: k,
+      namespace: S,
       propertyPath: ie
     }), ie && (v(ie, j, !1), y(ie, !0, !1));
-  }, Ke = Z((F, j, T) => {
-    const E = F ? ae(F, j) : void 0;
+  }, Ke = Q((F, j, k) => {
+    const S = F ? ae(F, j) : void 0;
     if (console.debug("onPropertyErrorInternal", {
       id: F,
       namespace: j,
-      error: T,
-      propertyPath: E
-    }), E) {
-      const A = T && Object.keys(T).length > 0;
-      i(F, j, A ? T : void 0), x(pe(E), A ? "Property error" : void 0);
+      error: k,
+      propertyPath: S
+    }), S) {
+      const E = k && Object.keys(k).length > 0;
+      i(F, j, E ? k : void 0), x(pe(S), E ? "Property error" : void 0);
     }
   }, []), We = () => {
-    N(void 0), R(void 0);
-  }, Ze = _ && n?.current?.properties ? n.current.properties[_] : void 0, Je = g?.propertiesOrder === void 0 || g.propertiesOrder.length === 0, Re = g.propertiesOrder ? g.propertiesOrder : Object.keys(g.properties), Qe = Zt(() => p(g.ownerId), [p, g.ownerId]), vt = Z((F, j) => {
+    w(void 0), M(void 0);
+  }, Ze = _ && n?.current?.properties ? n.current.properties[_] : void 0, Je = g?.propertiesOrder === void 0 || g.propertiesOrder.length === 0, Re = g.propertiesOrder ? g.propertiesOrder : Object.keys(g.properties), Qe = Zt(() => u(g.ownerId), [u, g.ownerId]), vt = Q((F, j) => {
     console.debug("CollectionEditor: onPropertyClick", {
       propertyKey: F,
       namespace: j
-    }), N(Re.indexOf(F)), R(F), B(j);
+    }), w(Re.indexOf(F)), M(F), D(j);
   }, [Re]), yt = /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2 h-full bg-gray-50 dark:bg-gray-900", children: [
     /* @__PURE__ */ a("div", { className: me(
       "p-4 md:p-8 pb-20 md:pb-20",
       "col-span-12 lg:col-span-5 h-full overflow-auto",
-      !O && "border-r " + wt
+      !N && "border-r " + wt
     ), children: [
       /* @__PURE__ */ a("div", { className: "flex my-2", children: [
         /* @__PURE__ */ a("div", { className: "flex-grow mb-4", children: [
@@ -3127,18 +3132,18 @@ function Gi({
             H,
             {
               name: "name",
-              as: J,
+              as: Z,
               invisible: !0,
               className: "-ml-1",
               inputClassName: "text-2xl font-headers",
               placeholder: "Collection name",
               size: "small",
               required: !0,
-              error: !!C?.name
+              error: !!P?.name
             }
           ),
           Qe && /* @__PURE__ */ a(
-            k,
+            O,
             {
               variant: "body2",
               className: "ml-2",
@@ -3156,7 +3161,7 @@ function Gi({
             oe,
             {
               variant: "filled",
-              disabled: D,
+              disabled: B,
               onClick: () => G(!0),
               children: /* @__PURE__ */ e($r, {})
             }
@@ -3165,16 +3170,16 @@ function Gi({
             oe,
             {
               variant: "filled",
-              disabled: D,
+              disabled: B,
               onClick: de,
-              children: D ? /* @__PURE__ */ e(De, { size: "small" }) : /* @__PURE__ */ e(ht, {})
+              children: B ? /* @__PURE__ */ e(De, { size: "small" }) : /* @__PURE__ */ e(ht, {})
             }
           ) }),
           /* @__PURE__ */ e(te, { title: "Add new property", children: /* @__PURE__ */ e(
             z,
             {
               variant: "outlined",
-              onClick: () => Q(!0),
+              onClick: () => J(!0),
               children: /* @__PURE__ */ e(ue, {})
             }
           ) })
@@ -3185,7 +3190,7 @@ function Gi({
         {
           className: "pl-8",
           inferredPropertyKeys: le,
-          selectedPropertyKey: _ ? ae(_, M) : void 0,
+          selectedPropertyKey: _ ? ae(_, R) : void 0,
           properties: g.properties,
           additionalFields: g.additionalFields,
           propertiesOrder: Re,
@@ -3193,7 +3198,7 @@ function Gi({
           onPropertyMove: Ge,
           onPropertyRemove: r ? Te : void 0,
           collectionEditable: c,
-          errors: C
+          errors: P
         }
       ) }),
       /* @__PURE__ */ e(
@@ -3203,18 +3208,18 @@ function Gi({
           color: "primary",
           variant: "outlined",
           size: "large",
-          onClick: () => Q(!0),
+          onClick: () => J(!0),
           startIcon: /* @__PURE__ */ e(ue, {}),
           children: "Add new property"
         }
       )
     ] }),
-    !O && /* @__PURE__ */ e("div", { className: "col-span-12 lg:col-span-7 p-4 md:py-8 md:px-4 h-full overflow-auto pb-20 md:pb-20", children: /* @__PURE__ */ a(
+    !N && /* @__PURE__ */ e("div", { className: "col-span-12 lg:col-span-7 p-4 md:py-8 md:px-4 h-full overflow-auto pb-20 md:pb-20", children: /* @__PURE__ */ a(
       Ce,
       {
         className: "sticky top-8 p-4 min-h-full border border-transparent w-full flex flex-col justify-center ",
         children: [
-          S && s && !ne(s) && /* @__PURE__ */ e(
+          A && s && !ne(s) && /* @__PURE__ */ e(
             sr,
             {
               inArray: !1,
@@ -3223,25 +3228,25 @@ function Gi({
               allowDataInference: !r,
               autoOpenTypeSelect: !1,
               propertyKey: _,
-              propertyNamespace: M,
+              propertyNamespace: R,
               property: s,
               onPropertyChanged: fe,
               onDelete: Te,
               onError: Ke,
               forceShowErrors: t,
               initialErrors: Ze,
-              getData: u,
+              getData: p,
               propertyConfigs: m,
               collectionEditable: c
             },
             `edit_view_${f}`
           ),
-          !s && /* @__PURE__ */ e(k, { variant: "label", className: "flex items-center justify-center h-full", children: Je ? "Now you can add your first property" : "Select a property to edit it" }),
-          s && ne(s) && /* @__PURE__ */ e(k, { variant: "label", className: "flex items-center justify-center", children: "This property is defined as a property builder in code" })
+          !s && /* @__PURE__ */ e(O, { variant: "label", className: "flex items-center justify-center h-full", children: Je ? "Now you can add your first property" : "Select a property to edit it" }),
+          s && ne(s) && /* @__PURE__ */ e(O, { variant: "label", className: "flex items-center justify-center", children: "This property is defined as a property builder in code" })
         ]
       }
     ) }),
-    O && /* @__PURE__ */ e(
+    N && /* @__PURE__ */ e(
       Ve,
       {
         inArray: !1,
@@ -3251,17 +3256,17 @@ function Gi({
         existingProperty: !0,
         autoOpenTypeSelect: !1,
         propertyKey: _,
-        propertyNamespace: M,
+        propertyNamespace: R,
         property: s,
         onPropertyChanged: fe,
         onDelete: Te,
         onError: Ke,
         forceShowErrors: t,
         initialErrors: Ze,
-        getData: u,
+        getData: p,
         propertyConfigs: m,
         collectionEditable: c,
-        onOkClicked: O ? We : void 0
+        onOkClicked: N ? We : void 0
       },
       `edit_view_${f}`
     )
@@ -3277,9 +3282,9 @@ function Gi({
         autoUpdateId: !0,
         forceShowErrors: t,
         open: L,
-        onCancel: () => Q(!1),
+        onCancel: () => J(!1),
         onPropertyChanged: gt,
-        getData: u,
+        getData: p,
         allowDataInference: !r,
         propertyConfigs: m,
         collectionEditable: c,
@@ -3312,9 +3317,9 @@ function Ki({
       "aria-describedby": "alert-dialog-description",
       children: [
         /* @__PURE__ */ a(Be, { children: [
-          /* @__PURE__ */ e(k, { variant: "h6", children: l ?? "Unsaved changes" }),
-          i && /* @__PURE__ */ e(k, { children: i }),
-          /* @__PURE__ */ e(k, { children: "Are you sure?" })
+          /* @__PURE__ */ e(O, { variant: "h6", children: l ?? "Unsaved changes" }),
+          i && /* @__PURE__ */ e(O, { children: i }),
+          /* @__PURE__ */ e(O, { children: "Are you sure?" })
         ] }),
         /* @__PURE__ */ a(ze, { children: [
           /* @__PURE__ */ e(z, { variant: "text", onClick: n, autoFocus: !0, children: " Cancel " }),
@@ -3335,7 +3340,7 @@ function Wi({ open: t, onClose: r }) {
       open: t,
       children: [
         /* @__PURE__ */ a(Be, { className: "flex flex-col gap-4", children: [
-          /* @__PURE__ */ e(k, { variant: "h6", children: "Select view" }),
+          /* @__PURE__ */ e(O, { variant: "h6", children: "Select view" }),
           n?.map((i) => /* @__PURE__ */ a(
             z,
             {
@@ -3351,7 +3356,7 @@ function Wi({ open: t, onClose: r }) {
             },
             i.key
           )),
-          (n ?? []).length === 0 && /* @__PURE__ */ e(k, { variant: "body2", children: "No custom views defined" })
+          (n ?? []).length === 0 && /* @__PURE__ */ e(O, { variant: "body2", children: "No custom views defined" })
         ] }),
         /* @__PURE__ */ e(ze, { children: /* @__PURE__ */ e(z, { variant: "outlined", onClick: () => r(), children: "Cancel" }) })
       ]
@@ -3366,30 +3371,91 @@ function Zi({
   getUser: l,
   parentCollectionIds: o
 }) {
-  const { entityViews: d } = Ae(), [p, u] = Y.useState(), [h, m] = Y.useState(!1), [c, g] = Y.useState(), [v, x] = Y.useState(), {
+  const { entityViews: d } = Ae(), [u, p] = Y.useState(), [h, m] = Y.useState(!1), [c, g] = Y.useState(), [v, x] = Y.useState(), {
     values: y,
-    setFieldValue: C
-  } = K(), w = t.subcollections ?? [], b = y.entityViews?.filter((f) => typeof f == "string").map((f) => xr(f, d)).filter(Boolean) ?? [], P = t.entityViews?.filter((f) => typeof f != "string") ?? [], O = b.length + P.length;
+    setFieldValue: P
+  } = K(), T = t.subcollections ?? [], b = y.entityViews?.filter((f) => typeof f == "string").map((f) => xr(f, d)).filter(Boolean) ?? [], C = t.entityViews?.filter((f) => typeof f != "string") ?? [], N = b.length + C.length;
   return /* @__PURE__ */ a("div", { className: "overflow-auto my-auto", children: [
     /* @__PURE__ */ e(mt, { maxWidth: "2xl", className: "flex flex-col gap-4 p-8 m-auto", children: /* @__PURE__ */ a("div", { className: "flex  flex-col gap-16", children: [
       /* @__PURE__ */ a("div", { className: "flex-grow flex flex-col gap-4 items-start", children: [
-        /* @__PURE__ */ a(k, { variant: "h5", children: [
+        /* @__PURE__ */ a(O, { variant: "h5", children: [
           "Subcollections of ",
           y.name
         ] }),
-        w && w.length > 0 && /* @__PURE__ */ e(Ce, { className: "flex flex-col gap-4 p-2 w-full", children: /* @__PURE__ */ e(Dt, { children: /* @__PURE__ */ e(Bt, { children: w.map((f) => /* @__PURE__ */ a(
-          bt,
+        /* @__PURE__ */ a(Ce, { className: "flex flex-col gap-4 p-2 w-full", children: [
+          T && T.length > 0 && /* @__PURE__ */ e(Dt, { children: /* @__PURE__ */ e(Bt, { children: T.map((f) => /* @__PURE__ */ a(
+            bt,
+            {
+              onClick: () => x({
+                isNewCollection: !1,
+                editedCollectionId: f.id
+              }),
+              children: [
+                /* @__PURE__ */ e(
+                  Ue,
+                  {
+                    align: "left",
+                    children: /* @__PURE__ */ e(O, { variant: "subtitle2", className: "flex-grow", children: f.name })
+                  }
+                ),
+                /* @__PURE__ */ e(
+                  Ue,
+                  {
+                    align: "right",
+                    children: /* @__PURE__ */ e(te, { title: "Remove", children: /* @__PURE__ */ e(
+                      oe,
+                      {
+                        size: "small",
+                        onClick: (w) => {
+                          w.preventDefault(), w.stopPropagation(), p(f.id);
+                        },
+                        color: "inherit",
+                        children: /* @__PURE__ */ e(dt, { size: "small" })
+                      }
+                    ) })
+                  }
+                )
+              ]
+            },
+            f.path
+          )) }) }),
+          /* @__PURE__ */ e(
+            z,
+            {
+              onClick: () => {
+                x({
+                  isNewCollection: !0
+                });
+              },
+              variant: "text",
+              startIcon: /* @__PURE__ */ e(ue, {}),
+              children: "Add subcollection"
+            }
+          )
+        ] })
+      ] }),
+      /* @__PURE__ */ a("div", { className: "flex-grow  flex flex-col gap-4 items-start", children: [
+        /* @__PURE__ */ e(O, { variant: "h5", children: "Custom views" }),
+        N === 0 && /* @__PURE__ */ e(Yr, { action: /* @__PURE__ */ e(
+          z,
           {
-            onClick: () => x({
-              isNewCollection: !1,
-              editedCollectionPath: f.path
-            }),
-            children: [
+            variant: "text",
+            size: "small",
+            href: "https://firecms.co/docs/customization_quickstart",
+            component: "a",
+            rel: "noopener noreferrer",
+            target: "_blank",
+            children: "More info"
+          }
+        ), children: "Define your own custom views by uploading it with the CLI." }),
+        /* @__PURE__ */ e(U, { children: /* @__PURE__ */ a(Ce, { className: "flex flex-col gap-4 p-2 w-full", children: [
+          /* @__PURE__ */ e(Dt, { children: /* @__PURE__ */ a(Bt, { children: [
+            b.map((f) => /* @__PURE__ */ a(bt, { children: [
               /* @__PURE__ */ e(
                 Ue,
                 {
                   align: "left",
-                  children: /* @__PURE__ */ e(k, { variant: "subtitle2", className: "flex-grow", children: f.name })
+                  children: /* @__PURE__ */ e(O, { variant: "subtitle2", className: "flex-grow", children: f.name })
                 }
               ),
               /* @__PURE__ */ e(
@@ -3400,8 +3466,8 @@ function Zi({
                     oe,
                     {
                       size: "small",
-                      onClick: (N) => {
-                        N.preventDefault(), N.stopPropagation(), u(f.id);
+                      onClick: (w) => {
+                        w.preventDefault(), w.stopPropagation(), g(f.key);
                       },
                       color: "inherit",
                       children: /* @__PURE__ */ e(dt, { size: "small" })
@@ -3409,105 +3475,48 @@ function Zi({
                   ) })
                 }
               )
-            ]
-          },
-          f.path
-        )) }) }) }),
-        /* @__PURE__ */ e(
-          z,
-          {
-            onClick: () => {
-              x({
-                isNewCollection: !0
-              });
-            },
-            variant: "outlined",
-            startIcon: /* @__PURE__ */ e(ue, {}),
-            children: "Add subcollection"
-          }
-        )
-      ] }),
-      /* @__PURE__ */ a("div", { className: "flex-grow  flex flex-col gap-4 items-start", children: [
-        /* @__PURE__ */ e(k, { variant: "h5", children: "Custom views" }),
-        O > 0 && /* @__PURE__ */ e(U, { children: /* @__PURE__ */ e(Ce, { className: "flex flex-col gap-4 p-2 w-full", children: /* @__PURE__ */ e(Dt, { children: /* @__PURE__ */ a(Bt, { children: [
-          b.map((f) => /* @__PURE__ */ a(bt, { children: [
-            /* @__PURE__ */ e(
+            ] }, f.key)),
+            C.map((f) => /* @__PURE__ */ e(bt, { children: /* @__PURE__ */ a(
               Ue,
               {
                 align: "left",
-                children: /* @__PURE__ */ e(k, { variant: "subtitle2", className: "flex-grow", children: f.name })
-              }
-            ),
-            /* @__PURE__ */ e(
-              Ue,
-              {
-                align: "right",
-                children: /* @__PURE__ */ e(te, { title: "Remove", children: /* @__PURE__ */ e(
-                  oe,
-                  {
-                    size: "small",
-                    onClick: (N) => {
-                      N.preventDefault(), N.stopPropagation(), g(f.key);
-                    },
-                    color: "inherit",
-                    children: /* @__PURE__ */ e(dt, { size: "small" })
-                  }
-                ) })
+                children: [
+                  /* @__PURE__ */ e(O, { variant: "subtitle2", className: "flex-grow", children: f.name }),
+                  /* @__PURE__ */ a(O, { variant: "caption", className: "flex-grow", children: [
+                    "This view is defined in code with key ",
+                    /* @__PURE__ */ e("code", { children: f.key })
+                  ] })
+                ]
               }
-            )
-          ] }, f.key)),
-          P.map((f) => /* @__PURE__ */ e(bt, { children: /* @__PURE__ */ a(
-            Ue,
+            ) }, f.key))
+          ] }) }),
+          /* @__PURE__ */ e(
+            z,
             {
-              align: "left",
-              children: [
-                /* @__PURE__ */ e(k, { variant: "subtitle2", className: "flex-grow", children: f.name }),
-                /* @__PURE__ */ a(k, { variant: "caption", className: "flex-grow", children: [
-                  "This view is defined in code with key ",
-                  /* @__PURE__ */ e("code", { children: f.key })
-                ] })
-              ]
+              onClick: () => {
+                m(!0);
+              },
+              variant: "text",
+              startIcon: /* @__PURE__ */ e(ue, {}),
+              children: "Add custom entity view"
             }
-          ) }, f.key))
-        ] }) }) }) }),
-        O === 0 && /* @__PURE__ */ e(Yr, { action: /* @__PURE__ */ e(
-          z,
-          {
-            variant: "text",
-            size: "small",
-            href: "https://firecms.co/docs/customization_quickstart",
-            component: "a",
-            rel: "noopener noreferrer",
-            target: "_blank",
-            children: "More info"
-          }
-        ), children: "Define your own custom views by uploading it with the CLI." }),
-        /* @__PURE__ */ e(
-          z,
-          {
-            onClick: () => {
-              m(!0);
-            },
-            variant: "outlined",
-            startIcon: /* @__PURE__ */ e(ue, {}),
-            children: "Add custom entity view"
-          }
-        )
+          )
+        ] }) })
       ] })
     ] }) }),
     /* @__PURE__ */ e("div", { style: { height: "52px" } }),
-    p && /* @__PURE__ */ e(
+    u && /* @__PURE__ */ e(
       lt,
       {
-        open: !!p,
+        open: !!u,
         onAccept: () => {
           const f = {
-            id: p,
+            id: u,
             parentCollectionIds: [...o ?? [], t.id]
           };
-          console.debug("Deleting subcollection", f), n.deleteCollection(f), u(void 0);
+          console.debug("Deleting subcollection", f), n.deleteCollection(f), p(void 0);
         },
-        onCancel: () => u(void 0),
+        onCancel: () => p(void 0),
         title: /* @__PURE__ */ e(U, { children: "Delete this subcollection?" }),
         body: /* @__PURE__ */ a(U, { children: [
           " This will ",
@@ -3521,7 +3530,7 @@ function Zi({
       {
         open: !!c,
         onAccept: () => {
-          C("entityViews", y.entityViews?.filter((f) => f !== c)), g(void 0);
+          P("entityViews", y.entityViews?.filter((f) => f !== c)), g(void 0);
         },
         onCancel: () => g(void 0),
         title: /* @__PURE__ */ e(U, { children: "Remove this view?" }),
@@ -3553,7 +3562,7 @@ function Zi({
       {
         open: h,
         onClose: (f) => {
-          f && C("entityViews", [...y.entityViews ?? [], f]), m(!1);
+          f && P("entityViews", [...y.entityViews ?? [], f]), m(!1);
         }
       }
     )
@@ -3988,11 +3997,11 @@ function Ji({
   onContinue: i,
   existingCollectionPaths: l
 }) {
-  const [o, d] = $(!1), [p, u] = $();
+  const [o, d] = $(!1), [u, p] = $();
   ce(() => {
     r && l && (d(!0), r(t).then((v) => {
-      const x = v.filter((y) => !(l ?? []).find((C) => C.trim().toLowerCase() === y.trim().toLowerCase()));
-      u(x);
+      const x = v.filter((y) => !(l ?? []).find((P) => P.trim().toLowerCase() === y.trim().toLowerCase()));
+      p(x);
     }).finally(() => d(!1)));
   }, [l, t, r]);
   const {
@@ -4006,16 +4015,16 @@ function Ji({
       "div",
       {
         className: "flex flex-row py-2 pt-3 items-center",
-        children: /* @__PURE__ */ e(k, { variant: "h4", className: "flex-grow", children: "New collection" })
+        children: /* @__PURE__ */ e(O, { variant: "h4", className: "flex-grow", children: "New collection" })
       }
     ),
-    n && /* @__PURE__ */ e(st, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(k, { variant: "caption", children: [
+    n && /* @__PURE__ */ e(st, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(O, { variant: "caption", children: [
       "This is a subcollection of ",
       /* @__PURE__ */ e("b", { children: n.name })
     ] }) }),
     /* @__PURE__ */ a("div", { className: "my-2", children: [
       /* @__PURE__ */ e(
-        k,
+        O,
         {
           variant: "caption",
           color: "secondary",
@@ -4023,8 +4032,8 @@ function Ji({
         }
       ),
       /* @__PURE__ */ a("div", { className: "flex flex-wrap gap-x-2 gap-y-1 items-center my-2 min-h-7", children: [
-        o && !p && /* @__PURE__ */ e(De, { size: "small" }),
-        p?.map((v, x) => /* @__PURE__ */ e(
+        o && !u && /* @__PURE__ */ e(De, { size: "small" }),
+        u?.map((v, x) => /* @__PURE__ */ e(
           st,
           {
             colorScheme: "cyanLighter",
@@ -4036,12 +4045,12 @@ function Ji({
           },
           v
         )),
-        !o && (p ?? [])?.length === 0 && /* @__PURE__ */ e(k, { variant: "caption", children: "No suggestions" })
+        !o && (u ?? [])?.length === 0 && /* @__PURE__ */ e(O, { variant: "caption", children: "No suggestions" })
       ] })
     ] }),
     /* @__PURE__ */ a("div", { className: "my-2", children: [
       /* @__PURE__ */ e(
-        k,
+        O,
         {
           variant: "caption",
           color: "secondary",
@@ -4097,7 +4106,7 @@ function Ji({
     ] }),
     !n && /* @__PURE__ */ a("div", { children: [
       /* @__PURE__ */ e(
-        k,
+        O,
         {
           variant: "caption",
           color: "secondary",
@@ -4128,7 +4137,7 @@ function nt({
       ),
       children: [
         n,
-        /* @__PURE__ */ e("div", { className: "flex flex-col items-start", children: /* @__PURE__ */ e(k, { variant: "subtitle1", children: t }) })
+        /* @__PURE__ */ e("div", { className: "flex flex-col items-start", children: /* @__PURE__ */ e(O, { variant: "subtitle1", children: t }) })
       ]
     }
   ) });
@@ -4142,40 +4151,40 @@ function Qi({
     setFieldValue: i,
     setFieldTouched: l,
     values: o
-  } = K(), [d, p] = $(void 0), u = Y.useRef(o.propertiesOrder ? { "": o.propertiesOrder } : {}), h = d ? d.id : void 0, m = d || void 0, c = ({
+  } = K(), [d, u] = $(void 0), p = Y.useRef(o.propertiesOrder ? { "": o.propertiesOrder } : {}), h = d ? d.id : void 0, m = d || void 0, c = ({
     id: v,
     property: x,
     previousId: y,
-    namespace: C
+    namespace: P
   }) => {
-    const w = v ? ae(v, C) : void 0, b = w ? pe(w) : void 0, P = (f) => f ? u.current[f] ?? I(o, ye(f)) : u.current[""], O = (f, N) => {
-      const _ = ye(N);
-      i(_, f, !1), u.current[N ?? ""] = f;
+    const T = v ? ae(v, P) : void 0, b = T ? pe(T) : void 0, C = (f) => f ? p.current[f] ?? I(o, ye(f)) : p.current[""], N = (f, w) => {
+      const _ = ye(w);
+      i(_, f, !1), p.current[w ?? ""] = f;
     };
     if (y && y !== v) {
-      const f = ae(y, C), N = pe(f), R = P(C).map((B) => B === y ? v : B).filter((B) => B !== void 0);
-      O(R, C);
-      const M = { ...t.headersMapping };
-      Object.keys(M).forEach((B) => {
-        M[B] === y && (M[B] = v ?? "");
-      }), t.setHeadersMapping(M), i(N, void 0, !1), l(N, !1, !1);
+      const f = ae(y, P), w = pe(f), M = C(P).map((D) => D === y ? v : D).filter((D) => D !== void 0);
+      N(M, P);
+      const R = { ...t.headersMapping };
+      Object.keys(R).forEach((D) => {
+        R[D] === y && (R[D] = v ?? "");
+      }), t.setHeadersMapping(R), i(w, void 0, !1), l(w, !1, !1);
     }
     b && (i(b, x, !1), l(b, !0, !1));
   }, g = async ({
     id: v,
     importKey: x,
     property: y,
-    namespace: C
+    namespace: P
   }) => {
-    const w = v ? ae(v, C) : void 0, b = w ? pe(w) : void 0, P = t.importData.map((f) => I(f, x)), O = {
-      ...ti(P, y, rr),
+    const T = v ? ae(v, P) : void 0, b = T ? pe(T) : void 0, C = t.importData.map((f) => I(f, x)), N = {
+      ...ti(C, y, rr),
       editable: !0
     };
-    b && (O ? i(b, O, !1) : i(b, y, !1), l(b, !0, !1));
+    b && (N ? i(b, N, !1) : i(b, y, !1), l(b, !0, !1));
   };
   return /* @__PURE__ */ a("div", { className: "overflow-auto my-auto", children: [
     /* @__PURE__ */ a(mt, { maxWidth: "6xl", className: "flex flex-col gap-4 p-8 m-auto", children: [
-      /* @__PURE__ */ e(k, { variant: "h6", className: "mt-4", children: "Data property mapping" }),
+      /* @__PURE__ */ e(O, { variant: "h6", className: "mt-4", children: "Data property mapping" }),
       /* @__PURE__ */ e(
         di,
         {
@@ -4193,9 +4202,9 @@ function Qi({
             {
               property: v,
               propertyKey: x,
-              onPropertyNameChanged: (C, w) => i(`properties.${C}.name`, w, !1),
+              onPropertyNameChanged: (P, T) => i(`properties.${P}.name`, T, !1),
               onEditClick: () => {
-                !x || !v || p({
+                !x || !v || u({
                   ...v,
                   id: x,
                   editable: !0
@@ -4206,8 +4215,8 @@ function Qi({
                 {
                   property: v,
                   disabled: !1,
-                  onPropertyChanged: (C) => g({
-                    ...C,
+                  onPropertyChanged: (P) => g({
+                    ...P,
                     importKey: y
                   }),
                   propertyKey: x,
@@ -4231,10 +4240,10 @@ function Qi({
         allowDataInference: !1,
         collectionEditable: n,
         onOkClicked: () => {
-          p(void 0);
+          u(void 0);
         },
         onCancel: () => {
-          p(void 0);
+          u(void 0);
         },
         autoOpenTypeSelect: !1,
         existingProperty: !1,
@@ -4251,17 +4260,17 @@ function Xi({
   propertyConfigs: i,
   disabled: l
 }) {
-  const o = t ? Kt(t) : null, d = t ? $e(t, i) : null, [p, u] = $(!1);
+  const o = t ? Kt(t) : null, d = t ? $e(t, i) : null, [u, p] = $(!1);
   return /* @__PURE__ */ e(
     te,
     {
       title: t && d ? `${d?.name} - ${t.dataType}` : void 0,
-      open: p ? !1 : void 0,
+      open: u ? !1 : void 0,
       children: /* @__PURE__ */ e(
         be,
         {
-          open: p,
-          onOpenChange: u,
+          open: u,
+          onOpenChange: p,
           invisible: !0,
           className: "w-full",
           disabled: l,
@@ -4304,8 +4313,8 @@ function en({ importConfig: t, properties: r, propertiesOrder: n }) {
     Tr,
     {
       title: /* @__PURE__ */ a("div", { children: [
-        /* @__PURE__ */ e(k, { variant: "subtitle2", children: "Imported data preview" }),
-        /* @__PURE__ */ e(k, { variant: "caption", children: "Entities with the same id will be overwritten" })
+        /* @__PURE__ */ e(O, { variant: "subtitle2", children: "Imported data preview" }),
+        /* @__PURE__ */ e(O, { variant: "caption", children: "Entities with the same id will be overwritten" })
       ] }),
       tableController: {
         data: t.entities,
@@ -4323,15 +4332,15 @@ function en({ importConfig: t, properties: r, propertiesOrder: n }) {
 }
 function dr(t, r = "") {
   const n = Object.keys(t).reduce((o, d) => {
-    const p = t[d], u = kr(d), h = r ? `${r}.${u}` : u;
-    if (p.dataType === "map" && p.properties) {
-      const g = dr(p.properties, h);
+    const u = t[d], p = kr(d), h = r ? `${r}.${p}` : p;
+    if (u.dataType === "map" && u.properties) {
+      const g = dr(u.properties, h);
       return {
         headersMapping: { ...o.headersMapping, [d]: h },
         properties: {
           ...o.properties,
-          [u]: {
-            ...p,
+          [p]: {
+            ...u,
             properties: g.properties,
             propertiesOrder: Object.keys(g.properties)
           }
@@ -4340,7 +4349,7 @@ function dr(t, r = "") {
     }
     const m = {
       ...o.properties,
-      [u]: p
+      [p]: u
     };
     return {
       headersMapping: { ...o.headersMapping, [d]: h },
@@ -4354,7 +4363,7 @@ function dr(t, r = "") {
   };
 }
 function ur(t) {
-  const r = t.open, [n, i] = je.useState(!1), [l, o] = je.useState(!1), d = Z(() => {
+  const r = t.open, [n, i] = je.useState(!1), [l, o] = je.useState(!1), d = Q(() => {
     n ? o(!0) : t.handleClose(void 0);
   }, [n, t.handleClose]);
   return ce(() => {
@@ -4367,7 +4376,7 @@ function ur(t) {
       fullHeight: !0,
       scrollable: !1,
       maxWidth: "7xl",
-      onOpenChange: (p) => p ? void 0 : d(),
+      onOpenChange: (u) => u ? void 0 : d(),
       children: [
         r && /* @__PURE__ */ e(
           tn,
@@ -4394,7 +4403,7 @@ function tn(t) {
   const { propertyConfigs: r } = Ae(), n = Pe(), i = _e(), {
     topLevelNavigation: l,
     collections: o
-  } = n, d = t.initialValues, p = !d?.path && (t.parentCollectionIds ?? []).length === 0, u = (t.parentCollection ? t.parentCollection.subcollections : o) ?? [], h = u.map((b) => b.path.trim().toLowerCase()), m = u.map((b) => b.id?.trim().toLowerCase()).filter(Boolean), [c, g] = je.useState(), [v, x] = je.useState(!1);
+  } = n, d = t.initialValues, u = !d?.path && (t.parentCollectionIds ?? []).length === 0, p = (t.parentCollection ? t.parentCollection.subcollections : o) ?? [], h = p.map((b) => b.path.trim().toLowerCase()), m = p.map((b) => b.id?.trim().toLowerCase()).filter(Boolean), [c, g] = je.useState(), [v, x] = je.useState(!1);
   if (ce(() => {
     try {
       n.initialised && (t.editedCollectionId ? g(n.getCollectionFromPaths([...t.parentCollectionIds ?? [], t.editedCollectionId])) : g(void 0), x(!0));
@@ -4405,10 +4414,10 @@ function tn(t) {
     throw Error("Internal: Navigation not ready in collection editor");
   const {
     groups: y
-  } = l, C = c ? {
+  } = l, P = c ? {
     ...c,
     id: c.id ?? c.path ?? _t(16)
-  } : void 0, w = C ? nn(C, r) : {
+  } : void 0, T = P ? nn(P, r) : {
     id: d?.path ?? _t(16),
     path: d?.path ?? "",
     name: d?.name ?? "",
@@ -4422,10 +4431,10 @@ function tn(t) {
     rn,
     {
       ...t,
-      initialValues: w,
+      initialValues: T,
       existingPaths: h,
       existingIds: m,
-      includeTemplates: p,
+      includeTemplates: u,
       collection: c,
       setCollection: g,
       groups: y,
@@ -4441,8 +4450,8 @@ function rn({
   fullPath: l,
   collectionInference: o,
   handleClose: d,
-  reservedGroups: p,
-  extraView: u,
+  reservedGroups: u,
+  extraView: p,
   handleCancel: h,
   setFormDirty: m,
   pathSuggestions: c,
@@ -4450,67 +4459,65 @@ function rn({
   parentCollection: v,
   getData: x,
   existingPaths: y,
-  existingIds: C,
-  includeTemplates: w,
+  existingIds: P,
+  includeTemplates: T,
   collection: b,
-  setCollection: P,
-  initialValues: O,
+  setCollection: C,
+  initialValues: N,
   propertyConfigs: f,
-  groups: N
+  groups: w
 }) {
-  const _ = hi(), R = Pe(), M = Ie();
-  console.log({ importConfig: _ });
-  const B = Le({}), S = t ? w ? "welcome" : "details" : "properties", [s, V] = $(S), [G, D] = je.useState(), q = (T) => {
-    const E = T.id || T.path;
+  const _ = hi(), M = Pe(), R = Ie(), D = Le({}), A = t ? T ? "welcome" : "details" : "properties", [s, V] = $(A), [G, B] = je.useState(), q = (k) => {
+    const S = k.id || k.path;
     return r.saveCollection({
-      id: E,
-      collectionData: T,
+      id: S,
+      collectionData: k,
       previousId: n,
       parentCollectionIds: i
-    }).then(() => (D(void 0), !0)).catch((A) => (D(A), console.error(A), M.open({
+    }).then(() => (B(void 0), !0)).catch((E) => (B(E), console.error(E), R.open({
       type: "error",
-      message: "Error persisting collection: " + (A.message ?? "Details in the console")
+      message: "Error persisting collection: " + (E.message ?? "Details in the console")
     }), !1));
-  }, L = Z(() => {
-    s === "details" ? _.inUse ? V("import_data_saving") : V(u ? "extra_view" : "properties") : V(s === "welcome" ? "details" : s === "import_data_mapping" ? "import_data_preview" : s === "import_data_preview" ? "details" : s === "extra_view" ? "properties" : "details");
-  }, [s, _.inUse, u]), Q = Z((T) => {
+  }, L = Q(() => {
+    s === "details" ? _.inUse ? V("import_data_saving") : V(p ? "extra_view" : "properties") : V(s === "welcome" ? "details" : s === "import_data_mapping" ? "import_data_preview" : s === "import_data_preview" ? "details" : s === "extra_view" ? "properties" : "details");
+  }, [s, _.inUse, p]), J = Q((k) => {
     if (o)
-      return o?.(T.path, T.collectionGroup ?? !1, i ?? []);
-  }, [o, i]), le = Z(async (T) => {
+      return o?.(k.path, k.collectionGroup ?? !1, i ?? []);
+  }, [o, i]), le = Q(async (k) => {
     try {
-      if (!Q)
-        return P(T), Promise.resolve(T);
+      if (!J)
+        return C(k), Promise.resolve(k);
       V("loading");
-      const E = await Q?.(T);
-      if (!E)
-        return P(T), Promise.resolve(T);
-      const A = {
-        ...T ?? {}
+      const S = await J?.(k);
+      if (!S)
+        return C(k), Promise.resolve(k);
+      const E = {
+        ...k ?? {}
       };
-      return Object.keys(E.properties ?? {}).length > 0 && (A.properties = E.properties, A.propertiesOrder = E.propertiesOrder), A.propertiesOrder ? (P(A), console.debug("Inferred collection", {
-        newCollection: T ?? {},
-        values: A
-      }), A) : (A.propertiesOrder = Object.keys(A.properties), A);
-    } catch (E) {
-      return console.error(E), M.open({
+      return Object.keys(S.properties ?? {}).length > 0 && (E.properties = S.properties, E.propertiesOrder = S.propertiesOrder), E.propertiesOrder ? (C(E), console.debug("Inferred collection", {
+        newCollection: k ?? {},
+        values: E
+      }), E) : (E.propertiesOrder = Object.keys(E.properties), E);
+    } catch (S) {
+      return console.error(S), R.open({
         type: "error",
-        message: "Error inferring collection: " + (E.message ?? "Details in the console")
-      }), T;
+        message: "Error inferring collection: " + (S.message ?? "Details in the console")
+      }), k;
     }
-  }, [i, Q]), de = Tt({
-    initialValues: O,
-    onSubmit: (T, E) => {
-      console.log("Submitting collection", T);
+  }, [i, J]), de = Tt({
+    initialValues: N,
+    onSubmit: (k, S) => {
+      console.log("Submitting collection", k);
       try {
         if (!t) {
-          q(T).then(() => {
-            E.resetForm({ values: O }), d(T);
+          q(k).then(() => {
+            S.resetForm({ values: N }), d(k);
           });
           return;
         }
-        s === "welcome" ? (L(), E.resetForm({ values: T })) : s === "details" ? u || _.inUse ? (E.resetForm({ values: T }), L()) : t ? le(T).then((A) => {
-          E.resetForm({
-            values: A ?? T,
+        s === "welcome" ? (L(), S.resetForm({ values: k })) : s === "details" ? p || _.inUse ? (S.resetForm({ values: k }), L()) : t ? le(k).then((E) => {
+          S.resetForm({
+            values: E ?? k,
             touched: {
               path: !0,
               name: !0
@@ -4518,34 +4525,34 @@ function rn({
           });
         }).finally(() => {
           L();
-        }) : (E.resetForm({ values: T }), L()) : s === "extra_view" ? (L(), E.resetForm({ values: T })) : s === "import_data_mapping" || s === "import_data_preview" ? L() : s === "properties" ? q(T).then(() => {
-          E.resetForm({ values: O }), L(), d(T);
-        }) : (L(), E.resetForm({ values: T }));
-      } catch (A) {
-        M.open({
+        }) : (S.resetForm({ values: k }), L()) : s === "extra_view" ? (L(), S.resetForm({ values: k })) : s === "import_data_mapping" || s === "import_data_preview" ? L() : s === "properties" ? q(k).then(() => {
+          S.resetForm({ values: N }), L(), d(k);
+        }) : (L(), S.resetForm({ values: k }));
+      } catch (E) {
+        R.open({
           type: "error",
-          message: "Error persisting collection: " + (A.message ?? "Details in the console")
-        }), console.error(A), E.resetForm({ values: T });
+          message: "Error persisting collection: " + (E.message ?? "Details in the console")
+        }), console.error(E), S.resetForm({ values: k });
       }
     },
-    validation: (T) => {
-      let E = {};
-      const A = (s === "properties" || s === "subcollections" || s === "details") && vi;
-      if (A)
+    validation: (k) => {
+      let S = {};
+      const E = (s === "properties" || s === "subcollections" || s === "details") && vi;
+      if (E)
         try {
-          A.validateSync(T, { abortEarly: !1 });
+          E.validateSync(k, { abortEarly: !1 });
         } catch (ie) {
           ie.inner.forEach((ke) => {
-            E[ke.path] = ke.message;
+            S[ke.path] = ke.message;
           });
         }
-      if (s === "properties" && (E = { ...E, ...B.current }), s === "details") {
-        const ie = Ht(T.path, t, y, T.id);
-        ie && (E.path = ie);
-        const ke = an(T.id, t, y, C);
-        ke && (E.id = ke);
+      if (s === "properties" && (S = { ...S, ...D.current }), s === "details") {
+        const ie = Ht(k.path, t, y, k.id);
+        ie && (S.path = ie);
+        const ke = an(k.id, t, y, P);
+        ke && (S.id = ke);
       }
-      return E;
+      return S;
     }
   }), {
     values: re,
@@ -4553,19 +4560,19 @@ function rn({
     isSubmitting: Te,
     dirty: Ge,
     submitCount: gt
-  } = de, fe = re.path ?? n, Ke = l?.includes("/") ? l?.split("/").slice(0, -1).join("/") + "/" + fe : fe, We = Ht(fe, t, y, re.id), Ze = !We && i ? R.convertIdsToPaths(i) : void 0, Je = We ? void 0 : R.resolveAliasesFrom(Ke), Re = Je && x ? () => x(Je, Ze ?? []) : void 0;
+  } = de, fe = re.path ?? n, Ke = l?.includes("/") ? l?.split("/").slice(0, -1).join("/") + "/" + fe : fe, We = Ht(fe, t, y, re.id), Ze = !We && i ? M.convertIdsToPaths(i) : void 0, Je = We ? void 0 : M.resolveAliasesFrom(Ke), Re = Je && x ? () => x(Je, Ze ?? []) : void 0;
   ce(() => {
     m(Ge);
   }, [Ge]);
-  function Qe(T) {
-    _.setInUse(!0), ri(T, rr).then((E) => {
-      const A = dr(E);
-      he("properties", A.properties), he("propertiesOrder", Object.keys(A.properties)), _.setIdColumn(A.idColumn), _.setImportData(T), _.setHeadersMapping(A.headersMapping), _.setOriginProperties(A.properties);
+  function Qe(k) {
+    _.setInUse(!0), ri(k, rr).then((S) => {
+      const E = dr(S);
+      he("properties", E.properties), he("propertiesOrder", Object.keys(E.properties)), _.setIdColumn(E.idColumn), _.setImportData(k), _.setHeadersMapping(E.headersMapping), _.setOriginProperties(E.properties);
     });
   }
   const vt = !!re.name && !!re.id, yt = () => {
-    const T = { ...re.properties };
-    _.idColumn && delete T[_.idColumn], he("properties", T), L();
+    const k = { ...re.properties };
+    _.idColumn && delete k[_.idColumn], he("properties", k), L();
   }, j = b?.editable === void 0 || b?.editable === !0 || t;
   return /* @__PURE__ */ e(Be, { fullHeight: !0, children: /* @__PURE__ */ e(kt, { value: de, children: /* @__PURE__ */ a(U, { children: [
     !t && /* @__PURE__ */ a(
@@ -4573,7 +4580,7 @@ function rn({
       {
         value: s,
         className: me(wt, "justify-end bg-gray-50 dark:bg-gray-950 border-b"),
-        onValueChange: (T) => V(T),
+        onValueChange: (k) => V(k),
         children: [
           /* @__PURE__ */ e(Ct, { value: "details", children: "Details" }),
           /* @__PURE__ */ e(Ct, { value: "properties", children: "Properties" }),
@@ -4592,13 +4599,13 @@ function rn({
         ),
         children: [
           s === "loading" && /* @__PURE__ */ e(Nt, {}),
-          s === "extra_view" && fe && u?.View && /* @__PURE__ */ e(u.View, { path: fe }),
+          s === "extra_view" && fe && p?.View && /* @__PURE__ */ e(p.View, { path: fe }),
           s === "welcome" && /* @__PURE__ */ e(
             Ji,
             {
               path: fe,
-              onContinue: (T) => {
-                T ? (Qe(T), V("import_data_mapping")) : V("details");
+              onContinue: (k) => {
+                k ? (Qe(k), V("import_data_mapping")) : V("details");
               },
               existingCollectionPaths: y,
               parentCollection: v,
@@ -4626,11 +4633,11 @@ function rn({
             {
               importConfig: _,
               collection: re,
-              onImportSuccess: async (T) => {
-                M.open({
+              onImportSuccess: async (k) => {
+                R.open({
                   type: "info",
                   message: "Data imported successfully"
-                }), await q(re), d(T);
+                }), await q(re), d(k);
               }
             }
           ),
@@ -4638,8 +4645,8 @@ function rn({
             yi,
             {
               existingPaths: y,
-              existingIds: C,
-              groups: N,
+              existingIds: P,
+              groups: w,
               parentCollectionIds: i,
               parentCollection: v,
               isNewCollection: t
@@ -4661,25 +4668,25 @@ function rn({
             {
               showErrors: gt > 0,
               isNewCollection: t,
-              reservedGroups: p,
-              onPropertyError: (T, E, A) => {
+              reservedGroups: u,
+              onPropertyError: (k, S, E) => {
                 const ie = Ft({
-                  ...B.current,
-                  [ir(T, E)]: Ft(A, !0)
+                  ...D.current,
+                  [ir(k, S)]: Ft(E, !0)
                 }, !0);
-                B.current = ie, de.validate();
+                D.current = ie, de.validate();
               },
               getUser: g,
               getData: Re,
-              doCollectionInference: Q,
+              doCollectionInference: J,
               propertyConfigs: f,
               collectionEditable: j,
-              extraIcon: u?.icon && /* @__PURE__ */ e(
+              extraIcon: p?.icon && /* @__PURE__ */ e(
                 oe,
                 {
                   color: "primary",
                   onClick: () => V("extra_view"),
-                  children: u.icon
+                  children: p.icon
                 }
               )
             }
@@ -4690,7 +4697,7 @@ function rn({
               position: "absolute",
               children: [
                 G && /* @__PURE__ */ e(Wt, { error: G }),
-                t && w && s === "import_data_mapping" && /* @__PURE__ */ a(
+                t && T && s === "import_data_mapping" && /* @__PURE__ */ a(
                   z,
                   {
                     variant: "text",
@@ -4702,7 +4709,7 @@ function rn({
                     ]
                   }
                 ),
-                t && w && s === "import_data_preview" && /* @__PURE__ */ a(
+                t && T && s === "import_data_preview" && /* @__PURE__ */ a(
                   z,
                   {
                     variant: "text",
@@ -4716,7 +4723,7 @@ function rn({
                     ]
                   }
                 ),
-                t && w && s === "details" && /* @__PURE__ */ a(
+                t && T && s === "details" && /* @__PURE__ */ a(
                   z,
                   {
                     variant: "text",
@@ -4840,102 +4847,102 @@ const Ht = (t, r, n, i) => {
     reservedGroups: l,
     collectionInference: o,
     extraView: d,
-    pathSuggestions: p,
-    getUser: u,
+    pathSuggestions: u,
+    getUser: p,
     getData: h,
     onAnalyticsEvent: m
   }) {
     const c = Pe(), g = gi(), v = Ie(), { propertyConfigs: x } = Ae(), {
       collections: y
-    } = c, C = (y ?? []).map((s) => s.path.trim().toLowerCase()), [w, b] = Y.useState();
+    } = c, P = (y ?? []).map((s) => s.path.trim().toLowerCase()), [T, b] = Y.useState();
     ce(() => {
-      p && p().then((s) => {
-        b(s.filter((V) => !C.includes(V.trim().toLowerCase())));
+      u && u().then((s) => {
+        b(s.filter((V) => !P.includes(V.trim().toLowerCase())));
       });
-    }, [p]);
-    const [P, O] = Y.useState(), [f, N] = Y.useState(), _ = Z(() => ({
+    }, [u]);
+    const [C, N] = Y.useState(), [f, w] = Y.useState(), _ = Q(() => ({
       createCollections: !0,
       editCollections: !0,
       deleteCollections: !0
-    }), []), R = Z(({
+    }), []), M = Q(({
       id: s,
       fullPath: V,
       parentCollectionIds: G,
-      parentCollection: D
+      parentCollection: B
     }) => {
-      console.debug("Edit collection", s, V, G, D), m?.("edit_collection", { id: s, fullPath: V }), O({
+      console.debug("Edit collection", s, V, G, B), m?.("edit_collection", { id: s, fullPath: V }), N({
         editedCollectionId: s,
         fullPath: V,
         parentCollectionIds: G,
         isNewCollection: !1,
-        parentCollection: D,
+        parentCollection: B,
         redirect: !1
       });
-    }, []), M = Z(({
+    }, []), R = Q(({
       propertyKey: s,
       property: V,
       editedCollectionId: G,
-      currentPropertiesOrder: D,
+      currentPropertiesOrder: B,
       parentCollectionIds: q,
       collection: L
     }) => {
-      console.debug("edit property", s, V, G, D, q, L), m?.("edit_property", { propertyKey: s, editedCollectionId: G });
-      const Q = s && s.includes(".") ? s.substring(0, s.lastIndexOf(".")) : void 0, le = s && s.includes(".") ? s.substring(s.lastIndexOf(".") + 1) : s;
-      N({
+      console.debug("edit property", s, V, G, B, q, L), m?.("edit_property", { propertyKey: s, editedCollectionId: G });
+      const J = s && s.includes(".") ? s.substring(0, s.lastIndexOf(".")) : void 0, le = s && s.includes(".") ? s.substring(s.lastIndexOf(".") + 1) : s;
+      w({
         propertyKey: le,
         property: V,
-        namespace: Q,
-        currentPropertiesOrder: D,
+        namespace: J,
+        currentPropertiesOrder: B,
         editedCollectionId: G,
         parentCollectionIds: q,
         collectionEditable: L?.editable ?? !1
       });
-    }, []), B = Y.useCallback(({
+    }, []), D = Y.useCallback(({
       parentCollectionIds: s,
       parentCollection: V,
       initialValues: G,
-      redirect: D,
+      redirect: B,
       sourceClick: q
     }) => {
-      console.debug("Create collection", { parentCollectionIds: s, parentCollection: V, initialValues: G, redirect: D, sourceClick: q }), m?.("create_collection", { parentCollectionIds: s, parentCollection: V, initialValues: G, redirect: D, sourceClick: q }), O({
+      console.debug("Create collection", { parentCollectionIds: s, parentCollection: V, initialValues: G, redirect: B, sourceClick: q }), m?.("create_collection", { parentCollectionIds: s, parentCollection: V, initialValues: G, redirect: B, sourceClick: q }), N({
         isNewCollection: !0,
         parentCollectionIds: s,
         parentCollection: V,
         initialValues: G,
-        redirect: D
+        redirect: B
       });
-    }, []), S = p ? (s) => !s && w ? Promise.resolve(w) : p?.(s) : void 0;
+    }, []), A = u ? (s) => !s && T ? Promise.resolve(T) : u?.(s) : void 0;
     return /* @__PURE__ */ e(mr.Provider, { value: n, children: /* @__PURE__ */ a(
       hr.Provider,
       {
         value: {
-          editCollection: R,
-          createCollection: B,
-          editProperty: M,
+          editCollection: M,
+          createCollection: D,
+          editProperty: R,
           configPermissions: i ?? _,
-          rootPathSuggestions: w
+          rootPathSuggestions: T
         },
         children: [
           r,
           /* @__PURE__ */ e(
             ur,
             {
-              open: !!P,
+              open: !!C,
               configController: n,
               isNewCollection: !1,
               collectionInference: o,
-              ...P,
+              ...C,
               getData: h,
               reservedGroups: l,
               extraView: d,
-              pathSuggestions: S,
-              getUser: u,
+              pathSuggestions: A,
+              getUser: p,
               handleClose: (s) => {
-                if (P?.redirect && s && P?.isNewCollection && !P.parentCollectionIds.length) {
+                if (C?.redirect && s && C?.isNewCollection && !C.parentCollectionIds.length) {
                   const V = c.buildUrlCollectionPath(s.id ?? s.path);
                   g(V);
                 }
-                O(void 0);
+                N(void 0);
               }
             }
           ),
@@ -4968,9 +4975,9 @@ const Ht = (t, r, n, i) => {
                   newPropertiesOrder: G && f.currentPropertiesOrder ? [...f.currentPropertiesOrder, s] : void 0,
                   namespace: f.namespace,
                   parentCollectionIds: f.parentCollectionIds
-                }).catch((D) => (console.error(D), v.open({
+                }).catch((B) => (console.error(B), v.open({
                   type: "error",
-                  message: "Error persisting property: " + (D.message ?? "Details in the console")
+                  message: "Error persisting property: " + (B.message ?? "Details in the console")
                 }), !1));
               },
               onPropertyChangedImmediate: !1,
@@ -4985,7 +4992,7 @@ const Ht = (t, r, n, i) => {
                   newPropertiesOrder: s,
                   parentCollectionIds: f?.parentCollectionIds
                 }).then(() => {
-                  N(void 0);
+                  w(void 0);
                 }).catch((V) => (console.error(V), v.open({
                   type: "error",
                   message: "Error deleting property: " + (V.message ?? "Details in the console")
@@ -4994,10 +5001,10 @@ const Ht = (t, r, n, i) => {
               onError: () => {
               },
               onOkClicked: () => {
-                N(void 0);
+                w(void 0);
               },
               onCancel: () => {
-                N(void 0);
+                w(void 0);
               },
               initialErrors: {},
               forceShowErrors: !1,
@@ -5020,7 +5027,7 @@ function ln({
   collection: n,
   tableController: i
 }) {
-  const l = _e(), o = Pe(), d = xe(), p = fr(), u = Ie(), h = o.getCollectionFromIds(r), m = d.configPermissions ? d.configPermissions({
+  const l = _e(), o = Pe(), d = xe(), u = fr(), p = Ie(), h = o.getCollectionFromIds(r), m = d.configPermissions ? d.configPermissions({
     user: l.user,
     collection: n
   }).editCollections : !0;
@@ -5054,7 +5061,7 @@ function ln({
             color: "primary",
             size: "small",
             variant: "outlined",
-            onClick: () => p?.saveCollection({
+            onClick: () => u?.saveCollection({
               id: n.id,
               parentCollectionIds: r,
               collectionData: W(
@@ -5065,7 +5072,7 @@ function ln({
                 }
               )
             }).then(() => {
-              u.open({
+              p.open({
                 type: "success",
                 message: "Default config saved"
               });
@@ -5104,9 +5111,9 @@ function sn({
   const n = Ie(), i = _e(), l = fr(), o = xe(), d = o.configPermissions({
     user: i.user,
     collection: r
-  }), p = Z(() => {
+  }), u = Q(() => {
     o?.editCollection({ id: r.id, parentCollectionIds: [] });
-  }, [o, t]), [u, h] = $(!1), m = Z(() => {
+  }, [o, t]), [p, h] = $(!1), m = Q(() => {
     l?.deleteCollection({ id: r.id }).then(() => {
       h(!1), n.open({
         message: "Collection deleted",
@@ -5132,7 +5139,7 @@ function sn({
         oe,
         {
           onClick: (c) => {
-            p();
+            u();
           },
           children: /* @__PURE__ */ e(He, { size: "small" })
         }
@@ -5141,7 +5148,7 @@ function sn({
     /* @__PURE__ */ e(
       lt,
       {
-        open: u,
+        open: p,
         onAccept: m,
         onCancel: () => h(!1),
         title: /* @__PURE__ */ e(U, { children: "Delete this collection?" }),
@@ -5180,7 +5187,7 @@ function cn({
           children: [
             /* @__PURE__ */ e(ue, { color: "primary", size: "large" }),
             /* @__PURE__ */ e(
-              k,
+              O,
               {
                 color: "primary",
                 variant: "caption",
@@ -5188,7 +5195,7 @@ function cn({
                 children: "Add new collection".toUpperCase()
               }
             ),
-            !l && /* @__PURE__ */ e(k, { variant: "caption", children: "You don't have permissions to create collections" })
+            !l && /* @__PURE__ */ e(O, { variant: "caption", children: "You don't have permissions to create collections" })
           ]
         }
       )
@@ -5208,8 +5215,12 @@ function dn({ introMode: t }) {
         {
           className: "flex flex-col gap-1 p-2 my-4",
           children: [
-            !t && /* @__PURE__ */ e(k, { variant: "body2", color: "secondary", children: "Create a collection from your data:" }),
-            t === "existing_project" && /* @__PURE__ */ a(k, { children: [
+            !t && /* @__PURE__ */ a(O, { variant: "body2", color: "secondary", children: [
+              "Create a collection ",
+              /* @__PURE__ */ e("b", { children: "automatically" }),
+              " from your data:"
+            ] }),
+            t === "existing_project" && /* @__PURE__ */ a(O, { children: [
               "You will see your ",
               /* @__PURE__ */ e("b", { children: "database collections" }),
               " here, a few seconds after project creation"
@@ -5219,23 +5230,23 @@ function dn({ introMode: t }) {
               {
                 className: "flex flex-row gap-1 overflow-scroll no-scrollbar ",
                 children: [
-                  (o ?? []).map((u) => /* @__PURE__ */ e("div", { children: /* @__PURE__ */ e(
+                  (o ?? []).map((p) => /* @__PURE__ */ e("div", { children: /* @__PURE__ */ e(
                     st,
                     {
                       icon: /* @__PURE__ */ e(ue, { size: "small" }),
                       colorScheme: "cyanLighter",
                       onClick: i && l ? () => i.createCollection({
-                        initialValues: { path: u, name: ut(u) },
+                        initialValues: { path: p, name: ut(p) },
                         parentCollectionIds: [],
                         redirect: !0,
                         sourceClick: "root_collection_suggestion"
                       }) : void 0,
                       size: "small",
-                      children: u
+                      children: p
                     }
-                  ) }, u)),
+                  ) }, p)),
                   o === void 0 && /* @__PURE__ */ e(De, { size: "small" }),
-                  o?.length === 0 && /* @__PURE__ */ e(k, { variant: "caption", children: "No suggestions" })
+                  o?.length === 0 && /* @__PURE__ */ e(O, { variant: "caption", children: "No suggestions" })
                 ]
               }
             )
@@ -5324,8 +5335,8 @@ function In({
   extraView: l,
   pathSuggestions: o,
   getUser: d,
-  collectionInference: p,
-  getData: u,
+  collectionInference: u,
+  getData: p,
   onAnalyticsEvent: h
 }) {
   return {
@@ -5339,12 +5350,12 @@ function In({
       props: {
         collectionConfigController: t,
         configPermissions: n,
-        collectionInference: p,
+        collectionInference: u,
         reservedGroups: i,
         extraView: l,
         pathSuggestions: o,
         getUser: d,
-        getData: u,
+        getData: p,
         onAnalyticsEvent: h
       }
     },
@@ -5368,9 +5379,9 @@ function hn({ introMode: t }) {
     user: n.user
   }).createCollections : !0;
   return /* @__PURE__ */ a("div", { className: "mt-8 flex flex-col mt-8 p-2", children: [
-    /* @__PURE__ */ e(k, { variant: "h4", className: "mb-4", children: "Welcome" }),
-    /* @__PURE__ */ e(k, { paragraph: !0, children: "Your admin panel is ready ✌️" }),
-    /* @__PURE__ */ e(k, { paragraph: !0, children: "Start building collections in FireCMS easily. Map them to your existing database data, import from files, or use our templates. Simplify your data management process now." }),
+    /* @__PURE__ */ e(O, { variant: "h4", className: "mb-4", children: "Welcome" }),
+    /* @__PURE__ */ e(O, { paragraph: !0, children: "Your admin panel is ready ✌️" }),
+    /* @__PURE__ */ e(O, { paragraph: !0, children: "Start building collections in FireCMS easily. Map them to your existing database data, import from files, or use our templates. Simplify your data management process now." }),
     l && /* @__PURE__ */ a(
       z,
       {