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

package/dist/index.es.js

@@ -1,16 +1,16 @@
 import { jsx as e, jsxs as a, Fragment as U } from "react/jsx-runtime";
-import * as Ue from "react";
-import Y, { useState as j, useEffect as de, useMemo as Gt, useCallback as Z, useRef as qe, useDeferredValue as gr, useContext as Kt } from "react";
-import ge from "react-fast-compare";
-import { SearchIconsView as vr, toSnakeCase as Pt, singular as yr, IconForView as ot, ArrayContainer as br, serializeRegExp as Cr, useSnackbarController as Ie, resolveEnumValues as Pr, isPropertyBuilder as ne, useCustomizationController as Ee, getFieldConfig as $e, ErrorBoundary as ve, PropertyConfigBadge as je, unslugify as ut, useNavigationController as xe, mergeDeep as W, DEFAULT_FIELD_CONFIGS as Wt, isValidRegExp as Nr, getFieldId as Zt, DeleteConfirmationDialog as lt, useLargeLayout as xr, makePropertiesEditable as pt, resolveEntityView as wr, useSelectionController as Tr, EntityCollectionTable as kr, slugify as Or, useAuthController as Ae, randomString as _t, CircularProgressCenter as Nt, removeUndefined as Ft, ErrorView as Jt, removeInitialAndTrailingSlashes as Vr, getDefaultPropertiesOrder as Ir } from "@firecms/core";
-import { Typography as V, useAutoComplete as _r, Container as mt, Tooltip as te, IconButton as oe, Chip as st, TextField as Oe, cn as pe, DebouncedTextField as J, Autocomplete as Fr, AutocompleteItem as Sr, ExpandablePanel as xt, SettingsIcon as Ye, Select as be, SelectItem as ee, BooleanSwitchWithLabel as dt, Dialog as _e, AutoAwesomeIcon as ht, Badge as Er, ListIcon as Ar, Button as z, CircularProgress as He, Paper as Ce, DialogContent as De, DialogActions as Be, 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 qr, AddIcon as me, SelectGroup as At, InfoLabel as Lr, DeleteIcon as ct, ContentCopyIcon as $r, CodeIcon as jr, Table as Dt, TableBody as Bt, TableRow as bt, TableCell as Re, 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 { 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 Q, useRef as Le, useDeferredValue as Ir, useContext as Jt } from "react";
+import ve from "react-fast-compare";
+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";
 import { DragDropContext as ii, Droppable as ni, Draggable as ai } from "@hello-pangea/dnd";
 import oi from "json5";
 import { Highlight as li, themes as si } from "prism-react-renderer";
-import { ImportFileUpload as di, DataNewPropertiesMapping as ci, ImportNewPropertyFieldPreview as ui, getInferenceType as rr, getPropertiesMapping as pi, convertDataToEntity as mi, useImportConfig as hi, ImportSaveInProgress as fi } from "@firecms/data_import_export";
+import { ImportFileUpload as ci, DataNewPropertiesMapping as di, ImportNewPropertyFieldPreview as ui, getInferenceType as rr, getPropertiesMapping as pi, convertDataToEntity as mi, useImportConfig as hi, ImportSaveInProgress as fi } from "@firecms/data_import_export";
 import { useNavigate as gi } from "react-router";
 const vi = rt.object().shape({
   id: rt.string().required("Required"),
@@ -21,7 +21,7 @@ function X({
   error: t,
   children: r
 }) {
-  return r ? /* @__PURE__ */ e(V, { 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,
@@ -34,26 +34,28 @@ function yi({
   const d = Y.useRef(null), {
     values: u,
     setFieldValue: p,
-    handleChange: m,
-    touched: c,
-    errors: s,
-    setFieldTouched: f,
+    handleChange: h,
+    touched: m,
+    errors: c,
+    setFieldTouched: g,
     isSubmitting: v,
-    submitCount: w
-  } = K(), [y, C] = j(!1), [T, b] = j(!1), P = (x) => {
-    p("name", x), !I(c, "path") && t && x && p("path", Pt(x)), !I(c, "id") && t && x && p("id", Pt(x)), !I(c, "singularName") && t && x && p("singularName", yr(x));
+    submitCount: x
+  } = 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));
   };
-  de(() => {
-    s.id && b(!0);
-  }, [s.id]);
-  const O = /* @__PURE__ */ e(ot, { collectionOrView: u }), h = l?.filter((x) => !r?.includes(x)), {
-    inputFocused: N,
-    autoCompleteOpen: F,
-    setAutoCompleteOpen: R
+  ce(() => {
+    c.id && b(!0);
+  }, [c.id]);
+  const N = /* @__PURE__ */ e(ot, { collectionOrView: u }), f = l?.filter((s) => !r?.includes(s)), {
+    inputFocused: w,
+    autoCompleteOpen: _,
+    setAutoCompleteOpen: M
   } = _r({
     ref: d
-  }), M = !!o;
-  let B;
+  }), 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(
@@ -61,19 +63,19 @@ function yi({
         {
           className: "flex flex-row py-2 pt-3 items-center",
           children: [
-            /* @__PURE__ */ e(V, { variant: t ? "h4" : "h5", className: "flex-grow", children: t ? "New collection" : `${u?.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(V, { 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,37 +86,37 @@ function yi({
           Oe,
           {
             value: u.name ?? "",
-            onChange: (x) => P(x.target.value),
+            onChange: (s) => C(s.target.value),
             label: "Name",
             required: !0,
-            error: c.name && !!s.name
+            error: A && !!c.name
           }
         ),
-        /* @__PURE__ */ e(X, { error: c.name && !!s.name, children: c.name && s.name ? s.name : "Name of in this collection, usually a plural name (e.g. Products)" })
+        /* @__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: pe("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: c.path && !!s.path
+            error: A && !!c.path
           }
         ),
-        /* @__PURE__ */ e(X, { error: c.path && !!s.path, children: c.path && s.path ? s.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: c.group && !!s.group,
+            error: A && !!c.group,
             disabled: v,
             value: u.group ?? "",
             autoComplete: "off",
-            onChange: (x) => p("group", x.target.value),
+            onChange: (s) => p("group", s.target.value),
             name: "group",
             inputRef: d,
             label: "Group"
@@ -123,21 +125,21 @@ function yi({
         /* @__PURE__ */ e(
           Fr,
           {
-            open: F && (h ?? []).length > 0,
-            setOpen: R,
-            children: h?.map((x, g) => /* @__PURE__ */ e(
+            open: _ && (f ?? []).length > 0,
+            setOpen: M,
+            children: f?.map((s, V) => /* @__PURE__ */ e(
               Sr,
               {
                 onClick: () => {
-                  R(!1), p("group", x ?? null);
+                  M(!1), p("group", s ?? null);
                 },
-                children: /* @__PURE__ */ e("div", { className: "flex-grow", children: x })
+                children: /* @__PURE__ */ e("div", { className: "flex-grow", children: s })
               },
-              g + "_" + x
+              V + "_" + s
             ))
           }
         ),
-        /* @__PURE__ */ e(X, { children: c.group && s.group ? s.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,
@@ -145,9 +147,9 @@ function yi({
           expanded: T,
           onExpandedChange: b,
           title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
-            /* @__PURE__ */ e(Ye, {}),
+            /* @__PURE__ */ e(He, {}),
             /* @__PURE__ */ e(
-              V,
+              O,
               {
                 variant: "subtitle2",
                 className: "ml-2",
@@ -162,43 +164,43 @@ function yi({
                 H,
                 {
                   name: "id",
-                  as: J,
+                  as: Z,
                   disabled: !t,
                   label: "Collection id",
-                  error: c.id && !!s.id
+                  error: A && !!c.id
                 }
               ),
-              /* @__PURE__ */ e(X, { error: c.id && !!s.id, children: c.id && s.id ? s.id : "This id identifies this collection" })
+              /* @__PURE__ */ e(X, { error: m.id && !!c.id, children: m.id && c.id ? c.id : "This id identifies this collection" })
             ] }),
             /* @__PURE__ */ a("div", { className: "col-span-12", children: [
               /* @__PURE__ */ e(
                 Oe,
                 {
-                  error: c.singularName && !!s.singularName,
-                  id: "singularName",
+                  error: A && !!c.singularName,
+                  name: "singularName",
                   "aria-describedby": "singularName-helper",
-                  onChange: (x) => (f("singularName", !0), m(x)),
+                  onChange: (s) => (g("singularName", !0), h(s)),
                   value: u.singularName ?? "",
                   label: "Singular name"
                 }
               ),
-              /* @__PURE__ */ e(X, { error: c.singularName && !!s.singularName, children: c.singularName && s.singularName ? s.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: c.description && !!s.description,
-                  id: "description",
+                  error: A && !!c.description,
+                  name: "description",
                   value: u.description ?? "",
-                  onChange: m,
+                  onChange: h,
                   multiline: !0,
                   rows: 2,
                   "aria-describedby": "description-helper-text",
                   label: "Description"
                 }
               ),
-              /* @__PURE__ */ e(X, { error: c.description && !!s.description, children: c.description && s.description ? s.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,
@@ -206,16 +208,16 @@ function yi({
                 name: "defaultSize",
                 label: "Default row size",
                 position: "item-aligned",
-                onChange: m,
+                onChange: h,
                 value: u.defaultSize ?? "",
-                renderValue: (x) => x.toUpperCase(),
-                children: ["xs", "s", "m", "l", "xl"].map((x) => /* @__PURE__ */ e(
+                renderValue: (s) => s.toUpperCase(),
+                children: ["xs", "s", "m", "l", "xl"].map((s) => /* @__PURE__ */ e(
                   ee,
                   {
-                    value: x,
-                    children: x.toUpperCase()
+                    value: s,
+                    children: s.toUpperCase()
                   },
-                  `size-select-${x}`
+                  `size-select-${s}`
                 ))
               }
             ) }),
@@ -225,14 +227,14 @@ function yi({
                 name: "customId",
                 label: "Data IDs generation",
                 position: "item-aligned",
-                disabled: B === "code_defined",
-                onValueChange: (x) => {
-                  if (x === "code_defined")
+                disabled: D === "code_defined",
+                onValueChange: (s) => {
+                  if (s === "code_defined")
                     throw new Error("This should not happen");
-                  x === "true" ? p("customId", !0) : x === "false" ? p("customId", !1) : x === "optional" && p("customId", "optional");
+                  s === "true" ? p("customId", !0) : s === "false" ? p("customId", !1) : s === "optional" && p("customId", "optional");
                 },
-                value: "",
-                renderValue: (x) => x === "code_defined" ? "Code defined" : x === "true" ? "Users must define an ID" : x === "optional" ? "Users can define an ID, but it is not required" : "Document ID is generated automatically",
+                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" }),
                   /* @__PURE__ */ e(ee, { value: "true", children: "Users must define an ID" }),
@@ -242,11 +244,11 @@ function yi({
             ) }),
             /* @__PURE__ */ a("div", { className: "col-span-12", children: [
               /* @__PURE__ */ e(
-                dt,
+                ct,
                 {
                   position: "start",
                   label: "Collection group",
-                  onValueChange: (x) => p("collectionGroup", x),
+                  onValueChange: (s) => p("collectionGroup", s),
                   value: u.collectionGroup ?? !1
                 }
               ),
@@ -254,11 +256,11 @@ function yi({
             ] }),
             /* @__PURE__ */ a("div", { className: "col-span-12", children: [
               /* @__PURE__ */ e(
-                dt,
+                ct,
                 {
                   position: "start",
                   label: "Enable text search for this collection",
-                  onValueChange: (x) => p("textSearchEnabled", x),
+                  onValueChange: (s) => p("textSearchEnabled", s),
                   value: u.textSearchEnabled ?? !1
                 }
               ),
@@ -270,18 +272,18 @@ function yi({
     ] }),
     /* @__PURE__ */ e("div", { style: { height: "52px" } }),
     /* @__PURE__ */ e(
-      _e,
+      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(
-          vr,
+          gr,
           {
             selectedIcon: u.icon,
-            onIconSelected: (x) => {
-              C(!1), p("icon", x);
+            onIconSelected: (s) => {
+              P(!1), p("icon", s);
             }
           }
         ) })
@@ -289,7 +291,7 @@ function yi({
     )
   ] }) });
 }
-function ue(t) {
+function pe(t) {
   return "properties." + t.replaceAll(".", ".properties.");
 }
 function bi(t) {
@@ -303,7 +305,7 @@ function ae(t, r) {
 }
 function ir(t, r) {
   const n = r ? `${r}.${t}` : t;
-  return ue(n);
+  return pe(n);
 }
 function Ci({
   enumValues: t,
@@ -317,23 +319,23 @@ function Ci({
   const u = Tt({
     initialValues: { enumValues: t },
     validateOnChange: !0,
-    validation: (c) => {
-      const s = {};
-      c.enumValues && c.enumValues.forEach((v, w) => {
-        v?.label || (s.enumValues = s.enumValues ?? [], s.enumValues[w] = s.enumValues[w] ?? {}, s.enumValues[w].label = "You must specify a label for this enum value entry"), v?.id || (s.enumValues = s.enumValues ?? [], s.enumValues[w] = s.enumValues[w] ?? {}, s.enumValues[w].id = "You must specify an ID for this enum value entry");
+    validation: (m) => {
+      const c = {};
+      m.enumValues && m.enumValues.forEach((v, x) => {
+        v?.label || (c.enumValues = c.enumValues ?? [], c.enumValues[x] = c.enumValues[x] ?? {}, c.enumValues[x].label = "You must specify a label for this enum value entry"), v?.id || (c.enumValues = c.enumValues ?? [], c.enumValues[x] = c.enumValues[x] ?? {}, c.enumValues[x].id = "You must specify an ID for this enum value entry");
       });
-      const f = !!(s?.enumValues && Object.keys(s?.enumValues).length > 0);
-      return n?.(f), s;
+      const g = !!(c?.enumValues && Object.keys(c?.enumValues).length > 0);
+      return n?.(g), c;
     }
-  }), { values: p, errors: m } = u;
-  return de(() => {
+  }), { values: p, errors: h } = u;
+  return ce(() => {
     r && r(p.enumValues);
   }, [p.enumValues]), /* @__PURE__ */ e(kt, { value: u, children: /* @__PURE__ */ e(
     Pi,
     {
       enumValuesPath: "enumValues",
       values: p,
-      errors: m,
+      errors: h,
       shouldUpdateId: i,
       disabled: l,
       allowDataInference: o,
@@ -352,28 +354,28 @@ function Pi({
 }) {
   const {
     setFieldValue: u
-  } = K(), [p, m] = Y.useState(), [c, s] = Y.useState(), [f, v] = Y.useState(!1), y = Y.useRef(/* @__PURE__ */ new Set()).current, C = (b, P) => {
-    const O = p === P, h = r?.enumValues && r?.enumValues[b];
+  } = 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,
-        entryError: h,
-        shouldUpdateId: l || O,
-        onDialogOpen: () => s(b),
+        autoFocus: N,
+        entryError: f,
+        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(
-        V,
+        O,
         {
           variant: "subtitle2",
           className: "ml-2 grow",
@@ -383,24 +385,24 @@ function Pi({
       o && /* @__PURE__ */ a(
         z,
         {
-          loading: f,
-          disabled: n || f,
+          loading: g,
+          disabled: n || g,
           variant: "text",
           size: "small",
           onClick: async () => {
             d && (v(!0), d?.().then((b) => {
               if (!b)
                 return;
-              const P = b.flat(), O = Array.from(new Set(P)), h = t.enumValues, F = ei(O).filter((R) => !h?.some((M) => M.id === R.id));
-              F.forEach((R) => {
-                y.add(R.id);
-              }), u(i, [...F, ...h], !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)));
           },
           children: [
-            f ? /* @__PURE__ */ e(He, { size: "small" }) : /* @__PURE__ */ e(ht, {}),
+            g ? /* @__PURE__ */ e(De, { size: "small" }) : /* @__PURE__ */ e(ht, {}),
             "Infer values from data"
           ]
         }
@@ -408,15 +410,15 @@ function Pi({
     ] }),
     /* @__PURE__ */ a(Ce, { className: "p-4 m-1", children: [
       /* @__PURE__ */ e(
-        br,
+        yr,
         {
           droppableId: i,
           addLabel: "Add enum value",
           value: t.enumValues,
           disabled: n,
           size: "small",
-          buildEntry: C,
-          onInternalIdAdded: m,
+          buildEntry: P,
+          onInternalIdAdded: h,
           includeAddButton: !0,
           onValueChange: (b) => u(i, b),
           newDefaultEntry: { id: "", label: "" }
@@ -425,10 +427,10 @@ function Pi({
       /* @__PURE__ */ e(
         xi,
         {
-          index: c,
-          open: c !== void 0,
+          index: m,
+          open: m !== void 0,
           enumValuesPath: i,
-          onClose: () => s(void 0)
+          onClose: () => c(void 0)
         }
       )
     ] })
@@ -446,21 +448,21 @@ const Ni = Y.memo(
     entryError: p
   }) {
     const {
-      values: m,
-      handleChange: c,
-      errors: s,
-      setFieldValue: f,
+      values: h,
+      handleChange: m,
+      errors: c,
+      setFieldValue: g,
       touched: v
-    } = K(), w = Y.useRef(!I(m, `${i}[${r}].id`)), y = n || w.current, C = I(m, `${i}[${r}].id`), T = I(m, `${i}[${r}].label`), b = Y.useRef(T);
+    } = 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 && f(`${i}[${r}].id`, T), b.current = T;
+      (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,
@@ -478,12 +480,12 @@ const Ni = Y.memo(
             "aria-label": "edit",
             className: "m-1",
             onClick: () => o(),
-            children: /* @__PURE__ */ e(Ye, { size: "small" })
+            children: /* @__PURE__ */ e(He, { size: "small" })
           }
         ) })
       ] }),
       p?.label && /* @__PURE__ */ e(
-        V,
+        O,
         {
           variant: "caption",
           className: "ml-3.5 text-red-500 dark:text-red-500",
@@ -491,7 +493,7 @@ const Ni = Y.memo(
         }
       ),
       p?.id && /* @__PURE__ */ e(
-        V,
+        O,
         {
           variant: "caption",
           className: "ml-3.5 text-red-500 dark:text-red-500",
@@ -501,7 +503,7 @@ const Ni = Y.memo(
     ] });
   },
   function(r, n) {
-    return r.index === n.index && r.enumValuesPath === n.enumValuesPath && r.shouldUpdateId === n.shouldUpdateId && r.inferredEntry === n.inferredEntry && ge(r.entryError, n.entryError) && r.autoFocus === n.autoFocus;
+    return r.index === n.index && r.enumValuesPath === n.enumValuesPath && r.shouldUpdateId === n.shouldUpdateId && r.inferredEntry === n.inferredEntry && ve(r.entryError, n.entryError) && r.autoFocus === n.autoFocus;
   }
 );
 function xi({
@@ -514,19 +516,19 @@ function xi({
     errors: l
   } = K(), o = t !== void 0 ? I(l, `${i}[${t}].id`) : void 0;
   return /* @__PURE__ */ a(
-    _e,
+    Fe,
     {
       maxWidth: "md",
       "aria-labelledby": "enum-edit-dialog",
       open: r,
       onOpenChange: (d) => d ? void 0 : n(),
       children: [
-        /* @__PURE__ */ e(De, { children: t !== void 0 && /* @__PURE__ */ a("div", { children: [
+        /* @__PURE__ */ e(Be, { children: t !== void 0 && /* @__PURE__ */ a("div", { children: [
           /* @__PURE__ */ e(
             H,
             {
               name: `${i}[${t}].id`,
-              as: J,
+              as: Z,
               required: !0,
               label: "ID",
               size: "small",
@@ -536,7 +538,7 @@ function xi({
           ),
           /* @__PURE__ */ e(X, { error: !!o, children: o ?? "Value saved in the data source" })
         ] }) }),
-        /* @__PURE__ */ e(Be, { children: /* @__PURE__ */ e(
+        /* @__PURE__ */ e(ze, { children: /* @__PURE__ */ e(
           z,
           {
             autoFocus: !0,
@@ -560,7 +562,7 @@ function se({
   allowIndeterminate: d
 }) {
   const u = /* @__PURE__ */ e(
-    dt,
+    ct,
     {
       label: n,
       size: o,
@@ -579,7 +581,7 @@ function se({
     }
   ) : u;
 }
-function Fe({ disabled: t }) {
+function Se({ disabled: t }) {
   const { values: r, handleChange: n } = K(), i = "validation.required", l = "validation.requiredMessage";
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
@@ -617,7 +619,7 @@ function Fe({ disabled: t }) {
       }
     ) }),
     I(r, i) && /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         disabled: t,
         value: I(r, l),
@@ -629,7 +631,7 @@ function Fe({ disabled: t }) {
     ) })
   ] });
 }
-function Se({
+function Ee({
   length: t,
   lowercase: r,
   matches: n,
@@ -641,25 +643,25 @@ function Se({
   showErrors: p
 }) {
   const {
-    values: m,
-    handleChange: c,
-    errors: s
-  } = K(), f = "validation.length", v = "validation.min", w = "validation.max", y = "validation.trim", C = "validation.matches", T = "validation.lowercase", b = "validation.uppercase", P = I(s, C), O = I(m, C), h = typeof O == "string" ? O : Cr(O);
+    values: h,
+    handleChange: m,
+    errors: c
+  } = 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(Fe, { disabled: u }),
+    /* @__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: T,
           type: "checkbox",
-          children: ({ field: N, form: F }) => /* @__PURE__ */ e(
+          children: ({ field: w, form: _ }) => /* @__PURE__ */ e(
             se,
             {
               label: "Lowercase",
               disabled: u,
-              form: F,
-              field: N
+              form: _,
+              field: w
             }
           )
         }
@@ -669,13 +671,13 @@ function Se({
         {
           name: b,
           type: "checkbox",
-          children: ({ field: N, form: F }) => /* @__PURE__ */ e(
+          children: ({ field: w, form: _ }) => /* @__PURE__ */ e(
             se,
             {
               label: "Uppercase",
               disabled: u,
-              form: F,
-              field: N
+              form: _,
+              field: w
             }
           )
         }
@@ -685,13 +687,13 @@ function Se({
         {
           name: y,
           type: "checkbox",
-          children: ({ field: N, form: F }) => /* @__PURE__ */ e(
+          children: ({ field: w, form: _ }) => /* @__PURE__ */ e(
             se,
             {
               label: "Trim",
               disabled: u,
-              form: F,
-              field: N
+              form: _,
+              field: w
             }
           )
         }
@@ -699,39 +701,39 @@ function Se({
     ] }),
     /* @__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(m, f),
+          value: I(h, g),
           label: "Exact length",
-          name: f,
+          name: g,
           type: "number",
           size: "small",
           disabled: u,
-          onChange: c
+          onChange: m
         }
       ) }),
       l && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
-        J,
+        Z,
         {
-          value: I(m, v),
+          value: I(h, v),
           label: "Min length",
           name: v,
           type: "number",
           size: "small",
           disabled: u,
-          onChange: c
+          onChange: m
         }
       ) }),
       i && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
-        J,
+        Z,
         {
-          value: I(m, w),
+          value: I(h, x),
           label: "Max length",
-          name: w,
+          name: x,
           type: "number",
           size: "small",
           disabled: u,
-          onChange: c
+          onChange: m
         }
       ) })
     ] }),
@@ -739,16 +741,16 @@ function Se({
       /* @__PURE__ */ e(
         H,
         {
-          name: C,
-          as: J,
+          name: P,
+          as: Z,
           label: "Matches regex",
           size: "small",
           disabled: u,
-          value: h,
-          error: !!P
+          value: f,
+          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" })
     ] })
   ] });
 }
@@ -762,9 +764,9 @@ function Ot({
     handleChange: l
   } = K(), o = "validation.min", d = "validation.max";
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
-    /* @__PURE__ */ e(Fe, { disabled: n }),
+    /* @__PURE__ */ e(Se, { disabled: n }),
     r && /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(i, o),
         disabled: n,
@@ -776,7 +778,7 @@ function Ot({
       }
     ) }),
     t && /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(i, d),
         disabled: n,
@@ -789,7 +791,7 @@ function Ot({
     ) })
   ] });
 }
-function Pe({
+function Ne({
   children: t
 }) {
   return /* @__PURE__ */ e(
@@ -801,7 +803,7 @@ function Pe({
       title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
         /* @__PURE__ */ e(Dr, {}),
         /* @__PURE__ */ e(
-          V,
+          O,
           {
             variant: "subtitle2",
             className: "ml-2",
@@ -825,7 +827,7 @@ function Rt({
     values: d,
     setFieldError: u,
     setFieldValue: p
-  } = K(), m = Ie(), c = t ? "of.enumValues" : "enumValues", s = I(d, "defaultValue"), f = I(d, c), v = Gt(() => !f || typeof f == "boolean" ? [] : Pr(f) ?? [], [f]);
+  } = 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(
       Ci,
@@ -835,13 +837,13 @@ function Rt({
         disabled: n,
         allowDataInference: l,
         onError: (y) => {
-          u(c, 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 && (p(c, y), !t)) {
-            const C = y.filter((T) => !!T?.id).map((T) => T.id);
-            s && !C.includes(s) && (p("defaultValue", void 0), m.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"
             }));
@@ -849,9 +851,9 @@ function Rt({
         }
       }
     ) }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Pe, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Ne, { children: [
       !t && /* @__PURE__ */ e(
-        Se,
+        Ee,
         {
           disabled: n,
           showErrors: i
@@ -868,7 +870,7 @@ function Rt({
           p("defaultValue", y);
         },
         label: "Default value",
-        value: s ?? "",
+        value: c ?? "",
         children: v.filter((y) => !!y?.id).map((y) => /* @__PURE__ */ e(
           ee,
           {
@@ -896,9 +898,9 @@ function Ut({
   const {
     values: i,
     setFieldValue: l
-  } = K(), o = t ? "of.storage" : "storage", d = `${o}.acceptedFiles`, u = `${o}.fileName`, p = `${o}.storagePath`, m = `${o}.storeUrl`, c = I(i, u) ?? "{rand}_{file}", s = I(i, p) ?? "/", f = I(i, d), v = Array.isArray(f) ? f : void 0, w = !v || v.length === 0, y = (b) => {
-    b ? b.includes("all") || b.length >= Object.keys(it).length ? l(d, void 0) : w ? l(d, Object.keys(it).filter((P) => !b.includes(P))) : l(d, b) : l(d, void 0);
-  }, C = typeof c == "function", T = typeof s == "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,
@@ -906,7 +908,7 @@ function Ut({
         title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
           /* @__PURE__ */ e(Br, {}),
           /* @__PURE__ */ e(
-            V,
+            O,
             {
               variant: "subtitle2",
               className: "ml-2",
@@ -922,8 +924,8 @@ function Ut({
               name: d,
               value: v ?? [],
               onMultiValueChange: y,
-              label: w ? void 0 : "Allowed file types",
-              renderValues: (b) => !b || b.length === 0 ? "All file types allowed" : b.map((P) => it[P]).filter((P) => !!P).join(", "),
+              label: x ? void 0 : "Allowed file types",
+              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(
@@ -934,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: w || v.indexOf(b) > -1
+                      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,11 +961,11 @@ function Ut({
             H,
             {
               name: u,
-              as: J,
+              as: Z,
               label: "File name",
               size: "small",
-              disabled: C || n,
-              value: C ? "-" : c
+              disabled: P || n,
+              value: P ? "-" : m
             }
           ) }),
           /* @__PURE__ */ a("div", { className: "col-span-12", children: [
@@ -971,14 +973,14 @@ function Ut({
               H,
               {
                 name: p,
-                as: J,
+                as: Z,
                 label: "Storage path",
                 disabled: T || n,
                 size: "small",
-                value: T ? "-" : s
+                value: T ? "-" : c
               }
             ),
-            /* @__PURE__ */ a(V, { 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" }),
@@ -993,31 +995,31 @@ function Ut({
             /* @__PURE__ */ e(
               H,
               {
-                name: m,
+                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(V, { 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." })
           ] })
         ] })
       }
     ) }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Pe, { children: [
-      !t && /* @__PURE__ */ e("div", { className: "grid grid-cols-12 gap-2", children: /* @__PURE__ */ e(Fe, { disabled: n }) }),
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Ne, { children: [
+      !t && /* @__PURE__ */ e("div", { className: "grid grid-cols-12 gap-2", children: /* @__PURE__ */ e(Se, { disabled: n }) }),
       t && /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ot, { disabled: n }) })
     ] }) })
   ] });
 }
-function Le(t) {
+function qe(t) {
   if (ne(t) || ne(t))
     return !1;
   {
@@ -1026,9 +1028,9 @@ function Le(t) {
   }
 }
 function wi(t) {
-  return Object.entries(t).filter(([r, n]) => Le(n)).map(([r, n]) => {
+  return Object.entries(t).filter(([r, n]) => qe(n)).map(([r, n]) => {
     const i = n;
-    if (Le(i))
+    if (qe(i))
       return i.dataType === "map" && i.properties ? {
         [r]: {
           ...i,
@@ -1045,20 +1047,20 @@ function nr({
   includeEditButton: l,
   selected: o
 }) {
-  const { propertyConfigs: d } = Ee(), u = $e(t, d);
-  Le(t);
+  const { propertyConfigs: d } = Ae(), u = $e(t, d);
+  qe(t);
   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(ve, { children: /* @__PURE__ */ a(
+  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(je, { propertyConfig: u }) }),
+        /* @__PURE__ */ e("div", { className: "m-4", children: /* @__PURE__ */ e(Ye, { propertyConfig: u }) }),
         /* @__PURE__ */ a(
           Ce,
           {
-            className: pe(
+            className: me(
               "border",
               "pl-2 w-full flex flex-row gap-4 items-center",
               Qt,
@@ -1069,8 +1071,8 @@ function nr({
             ),
             children: [
               /* @__PURE__ */ a("div", { className: "w-full flex flex-col", children: [
-                i && /* @__PURE__ */ e(ve, { children: /* @__PURE__ */ e(
-                  V,
+                i && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                  O,
                   {
                     variant: "body1",
                     component: "span",
@@ -1079,8 +1081,8 @@ function nr({
                   }
                 ) }),
                 /* @__PURE__ */ a("div", { className: "flex flex-row items-center", children: [
-                  /* @__PURE__ */ e(ve, { children: /* @__PURE__ */ e(
-                    V,
+                  /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                    O,
                     {
                       className: "flex-grow pr-2",
                       variant: i ? "body2" : "subtitle1",
@@ -1089,8 +1091,8 @@ function nr({
                       children: u?.name
                     }
                   ) }),
-                  /* @__PURE__ */ e(ve, { children: /* @__PURE__ */ e(
-                    V,
+                  /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                    O,
                     {
                       variant: "body2",
                       component: "span",
@@ -1100,7 +1102,7 @@ function nr({
                   ) })
                 ] })
               ] }),
-              l && /* @__PURE__ */ e(V, { variant: "button", children: "EDIT" })
+              l && /* @__PURE__ */ e(O, { variant: "button", children: "EDIT" })
             ]
           }
         )
@@ -1114,7 +1116,7 @@ function Ti({
   onClick: n,
   property: i
 }) {
-  const { propertyConfigs: l } = Ee(), o = !ne(i) && i ? $e(i, l) : void 0;
+  const { propertyConfigs: l } = Ae(), o = !ne(i) && i ? $e(i, l) : void 0;
   return /* @__PURE__ */ a(
     "div",
     {
@@ -1122,7 +1124,7 @@ function Ti({
       className: "flex flex-row w-full cursor-pointer",
       children: [
         /* @__PURE__ */ a("div", { className: "relative m-4", children: [
-          o && /* @__PURE__ */ e(je, { propertyConfig: o }),
+          o && /* @__PURE__ */ e(Ye, { propertyConfig: o }),
           !o && /* @__PURE__ */ e(
             "div",
             {
@@ -1135,7 +1137,7 @@ function Ti({
         /* @__PURE__ */ e(
           Ce,
           {
-            className: pe(
+            className: me(
               "pl-2 w-full flex flex-row gap-4 items-center",
               Qt,
               n ? Xt : "",
@@ -1145,7 +1147,7 @@ function Ti({
             ),
             children: /* @__PURE__ */ a("div", { className: "w-full flex flex-col", children: [
               /* @__PURE__ */ e(
-                V,
+                O,
                 {
                   variant: "body1",
                   component: "span",
@@ -1155,7 +1157,7 @@ function Ti({
               ),
               /* @__PURE__ */ a("div", { className: "flex flex-row items-center", children: [
                 o && /* @__PURE__ */ e(
-                  V,
+                  O,
                   {
                     className: "flex-grow pr-2",
                     variant: "body2",
@@ -1164,8 +1166,8 @@ function Ti({
                     children: o?.name
                   }
                 ),
-                i && !ne(i) && /* @__PURE__ */ e(ve, { children: /* @__PURE__ */ e(
-                  V,
+                i && !ne(i) && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                  O,
                   {
                     variant: "body2",
                     component: "span",
@@ -1173,8 +1175,8 @@ function Ti({
                     children: i.dataType
                   }
                 ) }),
-                i && ne(i) && /* @__PURE__ */ e(ve, { children: /* @__PURE__ */ e(
-                  V,
+                i && ne(i) && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                  O,
                   {
                     variant: "body2",
                     component: "span",
@@ -1182,8 +1184,8 @@ function Ti({
                     children: "This property is defined as a property builder in code"
                   }
                 ) }),
-                !i && /* @__PURE__ */ e(ve, { children: /* @__PURE__ */ e(
-                  V,
+                !i && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                  O,
                   {
                     variant: "body2",
                     component: "span",
@@ -1209,46 +1211,46 @@ const ft = Y.memo(
     additionalFields: d,
     errors: u,
     onPropertyMove: p,
-    onPropertyRemove: m,
-    className: c,
-    inferredPropertyKeys: s,
-    collectionEditable: f
+    onPropertyRemove: h,
+    className: m,
+    inferredPropertyKeys: c,
+    collectionEditable: g
   }) {
-    const v = o ?? Object.keys(l), w = Z((y) => {
+    const v = o ?? Object.keys(l), x = Q((y) => {
       if (!y.destination)
         return;
-      const C = y.source.index, T = y.destination.index, b = Array.from(v), [P] = b.splice(C, 1);
-      b.splice(T, 0, P), p && p(b, r);
+      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: w, children: /* @__PURE__ */ e(ni, { droppableId: `droppable_${r}`, children: (y, C) => /* @__PURE__ */ a(
+    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: c,
+        className: m,
         children: [
           v && v.map((T, b) => {
-            const P = l[T], O = d?.find((h) => h.key === T);
-            return !P && !O ? (console.warn(`Property ${T} not found in properties or additionalFields`), null) : /* @__PURE__ */ e(
+            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}_${T}}`,
                 index: b,
-                children: (h, N) => /* @__PURE__ */ e(ve, { children: /* @__PURE__ */ e(
+                children: (f, w) => /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
                   ki,
                   {
                     propertyKey: T,
-                    propertyOrBuilder: P,
-                    additionalField: O,
-                    provided: h,
+                    propertyOrBuilder: C,
+                    additionalField: N,
+                    provided: f,
                     errors: u,
                     namespace: r,
-                    inferredPropertyKeys: s,
+                    inferredPropertyKeys: c,
                     onPropertyMove: p,
-                    onPropertyRemove: m,
-                    onPropertyClick: N.isDragging ? void 0 : i,
+                    onPropertyRemove: h,
+                    onPropertyClick: w.isDragging ? void 0 : i,
                     selectedPropertyKey: n,
-                    collectionEditable: f
+                    collectionEditable: g
                   }
                 ) })
               },
@@ -1262,7 +1264,7 @@ const ft = Y.memo(
   },
   (t, r) => {
     const n = r.selectedPropertyKey?.startsWith(r.namespace ?? ""), i = t.selectedPropertyKey?.startsWith(t.namespace ?? "");
-    return n || i ? !1 : ge(t.properties, r.properties) && t.propertiesOrder === r.propertiesOrder && ge(t.additionalFields, r.additionalFields) && ge(t.errors, r.errors) && ge(t.onPropertyClick, r.onPropertyClick) && // equal(prevProps.onPropertyMove, nextProps.onPropertyMove) &&
+    return n || i ? !1 : ve(t.properties, r.properties) && t.propertiesOrder === r.propertiesOrder && ve(t.additionalFields, r.additionalFields) && ve(t.errors, r.errors) && ve(t.onPropertyClick, r.onPropertyClick) && // equal(prevProps.onPropertyMove, nextProps.onPropertyMove) &&
     // equal(prevProps.onPropertyRemove, nextProps.onPropertyRemove) &&
     t.namespace === r.namespace && t.collectionEditable === r.collectionEditable;
   }
@@ -1277,30 +1279,30 @@ function ki({
   errors: d,
   onPropertyClick: u,
   onPropertyMove: p,
-  onPropertyRemove: m,
-  inferredPropertyKeys: c,
-  collectionEditable: s
+  onPropertyRemove: h,
+  inferredPropertyKeys: m,
+  collectionEditable: c
 }) {
-  const f = c?.includes(r ? `${r}.${t}` : t), v = ae(t, r), y = ir(t, r) in d;
-  let C;
+  const g = m?.includes(r ? `${r}.${t}` : t), v = ae(t, r), y = ir(t, r) in d;
+  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: u,
         onPropertyMove: p,
-        onPropertyRemove: m,
-        collectionEditable: s
+        onPropertyRemove: h,
+        collectionEditable: c
       }
     ));
   }
-  const T = o === v, b = n && (s && !ne(n) || Le(n));
+  const T = o === v, b = n && (c && !ne(n) || qe(n));
   return /* @__PURE__ */ a(
     "div",
     {
@@ -1309,7 +1311,7 @@ function ki({
       ...l.dragHandleProps,
       className: "relative -ml-8",
       children: [
-        C && /* @__PURE__ */ e(
+        P && /* @__PURE__ */ e(
           "div",
           {
             className: "absolute border-l " + wt,
@@ -1339,13 +1341,13 @@ function ki({
           }
         ),
         /* @__PURE__ */ a("div", { className: "absolute top-2 right-2 flex flex-row ", children: [
-          f && /* @__PURE__ */ e(te, { title: "Inferred property", children: /* @__PURE__ */ e(ht, { size: "small", className: "p-2" }) }),
-          m && /* @__PURE__ */ e(te, { title: "Remove", children: /* @__PURE__ */ e(
+          g && /* @__PURE__ */ e(te, { title: "Inferred property", children: /* @__PURE__ */ e(ht, { size: "small", className: "p-2" }) }),
+          h && /* @__PURE__ */ e(te, { title: "Remove", children: /* @__PURE__ */ e(
             oe,
             {
               size: "small",
               color: "inherit",
-              onClick: () => m(t, r),
+              onClick: () => h(t, r),
               children: /* @__PURE__ */ e(Ur, { size: "small" })
             }
           ) }),
@@ -1354,11 +1356,11 @@ function ki({
             {
               component: "span",
               size: "small",
-              children: /* @__PURE__ */ e(qr, { size: "small" })
+              children: /* @__PURE__ */ e(jr, { size: "small" })
             }
           ) })
         ] }),
-        C && /* @__PURE__ */ e("div", { className: "ml-16", children: C })
+        P && /* @__PURE__ */ e("div", { className: "ml-16", children: P })
       ]
     }
   );
@@ -1367,42 +1369,44 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
   const {
     values: o,
     setFieldValue: d
-  } = K(), [u, p] = j(!1), [m, c] = j(), [s, f] = j(), v = o.propertiesOrder ?? Object.keys(o.properties ?? {}), w = Z(({
-    id: h,
-    property: N
+  } = K(), [u, p] = $(!1), [h, m] = $(), [c, g] = $(), v = o.propertiesOrder ?? Object.keys(o.properties ?? {}), x = ({
+    id: N,
+    property: f
   }) => {
-    if (!h)
+    if (!N)
       throw Error();
     d("properties", {
       ...o.properties ?? {},
-      [h]: N
-    }, !1), d("propertiesOrder", [...v, h], !1), p(!1);
-  }, [o.properties, v]), y = Z((h, N) => {
-    const F = h ? ae(h, N) : void 0;
-    if (!F)
+      [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 = ue(F), M = ye(N), B = I(o, M) ?? Object.keys(I(o, bi(N)));
-    d(R, void 0, !1), d(M, B.filter((x) => x !== h), !1), p(!1), c(void 0), f(void 0);
-  }, [d, o]), C = m ? ae(m, s) : void 0, T = C ? I(o.properties, C.replaceAll(".", ".properties.")) : void 0, b = /* @__PURE__ */ a(
-    z,
-    {
-      color: "primary",
-      variant: "outlined",
-      onClick: () => p(!0),
-      startIcon: /* @__PURE__ */ e(me, {}),
-      children: [
-        "Add property to ",
-        o.name ?? "this group"
-      ]
-    }
-  ), P = !v || v.length < 1, O = Z((h, N) => {
-    d(ye(N), h, !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(V, { 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(
@@ -1412,14 +1416,14 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
             propertiesOrder: v,
             errors: {},
             collectionEditable: l,
-            onPropertyClick: (h, N) => {
-              c(h), f(N), p(!0);
+            onPropertyClick: (N, f) => {
+              m(N), g(f), p(!0);
             },
-            onPropertyMove: O
+            onPropertyMove: C
           }
         ),
-        P && /* @__PURE__ */ e(
-          V,
+        b && /* @__PURE__ */ e(
+          O,
           {
             variant: "label",
             className: "h-full flex items-center justify-center p-4",
@@ -1430,12 +1434,12 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
     ] }),
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
       /* @__PURE__ */ e(
-        dt,
+        ct,
         {
           position: "start",
           size: "small",
           label: "Spread children as columns",
-          onValueChange: (h) => d("spreadChildren", h),
+          onValueChange: (N) => d("spreadChildren", N),
           value: o.spreadChildren ?? !1
         }
       ),
@@ -1450,21 +1454,21 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
         allowDataInference: n,
         collectionEditable: l,
         onCancel: () => {
-          p(!1), c(void 0), f(void 0);
+          p(!1), m(void 0), g(void 0);
         },
         onOkClicked: () => {
-          p(!1), c(void 0), f(void 0);
+          p(!1), m(void 0), g(void 0);
         },
         getData: r,
         onDelete: y,
-        propertyKey: m,
-        propertyNamespace: s,
+        propertyKey: h,
+        propertyNamespace: c,
         property: T,
-        existingProperty: !!m,
-        autoUpdateId: !m,
-        autoOpenTypeSelect: !m,
-        onPropertyChanged: w,
-        existingPropertyKeys: m ? void 0 : v,
+        existingProperty: !!h,
+        autoUpdateId: !h,
+        autoOpenTypeSelect: !h,
+        onPropertyChanged: x,
+        existingPropertyKeys: h ? void 0 : v,
         propertyConfigs: i
       }
     )
@@ -1482,25 +1486,25 @@ function Vi({
   const {
     values: u,
     handleChange: p,
-    errors: m,
-    setFieldValue: c,
-    touched: s
-  } = K(), [f, v] = j(!1), w = I(u, "of"), y = I(s, "of") && I(m, "of"), C = ({ id: b, property: P, namespace: O }) => {
-    console.log("onPropertyChanged", b, P, O), c("of", P);
-  }, T = w && $e(w, o);
+    errors: h,
+    setFieldValue: m,
+    touched: c
+  } = 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(V, { variant: "subtitle2", children: "Repeat component" }),
+      /* @__PURE__ */ e(O, { variant: "subtitle2", children: "Repeat component" }),
       /* @__PURE__ */ e(
         H,
         {
           name: "of",
-          value: w,
+          value: x,
           children: ({}) => /* @__PURE__ */ a(Ce, { className: "p-2 mt-4", children: [
-            w && /* @__PURE__ */ e(
+            x && /* @__PURE__ */ e(
               nr,
               {
-                property: w,
+                property: x,
                 onClick: n ? void 0 : () => v(!0),
                 includeName: !1,
                 includeEditButton: !0,
@@ -1508,7 +1512,7 @@ function Vi({
                 hasError: !1
               }
             ),
-            !n && !w && /* @__PURE__ */ a(
+            !n && !x && /* @__PURE__ */ a(
               z,
               {
                 variant: "text",
@@ -1525,16 +1529,16 @@ function Vi({
               Ve,
               {
                 inArray: !0,
-                open: f,
+                open: g,
                 existingProperty: r,
                 getData: i,
                 autoUpdateId: !r,
                 autoOpenTypeSelect: !r,
                 onOkClicked: () => v(!1),
                 allowDataInference: l,
-                property: w,
+                property: x,
                 includeIdAndName: !1,
-                onPropertyChanged: C,
+                onPropertyChanged: P,
                 forceShowErrors: t,
                 propertyConfigs: o,
                 collectionEditable: d
@@ -1544,7 +1548,7 @@ function Vi({
         }
       )
     ] }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Ot, { disabled: n }) }) })
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Ot, { disabled: n }) }) })
   ] });
 }
 const Ii = Y.forwardRef(
@@ -1558,11 +1562,11 @@ const Ii = Y.forwardRef(
     const {
       errors: u,
       values: p,
-      setFieldValue: m,
-      setFieldTouched: c,
-      touched: s,
-      validate: f
-    } = K(), v = "name", w = r && I(u, v), y = "id", C = r && I(u, y), T = "description", b = r && I(u, T);
+      setFieldValue: h,
+      setFieldTouched: m,
+      touched: c,
+      validate: g
+    } = 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(
@@ -1570,47 +1574,47 @@ const Ii = Y.forwardRef(
           {
             name: v,
             inputRef: d,
-            as: J,
+            as: Z,
             value: p[v],
-            onChange: (P) => {
-              const O = P.target.value;
-              !I(s, y) && l && m(y, O ? Pt(O) : "", !1), m(v, O, !0), c(v, !0);
+            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",
             required: !0,
             disabled: i,
-            error: !!w
+            error: !!x
           }
         ),
-        /* @__PURE__ */ e(X, { error: !!w, children: w })
+        /* @__PURE__ */ e(X, { error: !!x, children: x })
       ] }),
       /* @__PURE__ */ a("div", { children: [
         /* @__PURE__ */ e(
           H,
           {
             name: y,
-            as: J,
+            as: Z,
             label: "ID",
             value: p[y],
-            onChange: (P) => {
-              const O = P.target.value;
-              !I(s, v) && l && m(v, O ? ut(O) : ""), m(y, O, !0), c(y, !0);
+            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: T,
-            as: J,
+            as: Z,
             label: "Description",
             disabled: i,
             error: !!b
@@ -1628,9 +1632,9 @@ function _i({
 }) {
   const { values: i, setFieldValue: l } = K();
   return /* @__PURE__ */ a(U, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Pe, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Ne, { children: [
       t === "text_field" && /* @__PURE__ */ e(
-        Se,
+        Ee,
         {
           disabled: r,
           length: !0,
@@ -1644,7 +1648,7 @@ function _i({
         }
       ),
       t === "multiline" && /* @__PURE__ */ e(
-        Se,
+        Ee,
         {
           disabled: r,
           length: !0,
@@ -1657,7 +1661,7 @@ function _i({
         }
       ),
       t === "markdown" && /* @__PURE__ */ e(
-        Se,
+        Ee,
         {
           disabled: r,
           length: !0,
@@ -1670,7 +1674,7 @@ function _i({
         }
       ),
       t === "email" && /* @__PURE__ */ e(
-        Se,
+        Ee,
         {
           disabled: r,
           max: !0,
@@ -1697,7 +1701,7 @@ function _i({
 function Fi({ disabled: t }) {
   const { values: r } = K(), n = I(r, "defaultValue");
   return /* @__PURE__ */ a(U, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Fe, { disabled: t }) }) }),
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Se, { disabled: t }) }) }),
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       H,
       {
@@ -1720,42 +1724,44 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
   const {
     values: o,
     setFieldValue: d
-  } = K(), [u, p] = j(!1), [m, c] = j(), [s, f] = j(), 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), p(!1);
-  }, [o.oneOf?.properties, o.oneOf?.propertiesOrder]), w = m ? ae(m, s) : void 0, y = w ? I(o.oneOf?.properties, w.replaceAll(".", ".properties.")) : void 0, C = Z((P, O) => {
-    const h = P ? ae(P, O) : void 0;
-    if (!h)
+      [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.${ue(h)}`, void 0, !1);
-    const N = `oneOf.${ye(O)}`, F = I(o, N);
-    d(N, F.filter((R) => R !== P), !1), p(!1), c(void 0), f(void 0);
+    d(`oneOf.${pe(f)}`, void 0, !1);
+    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: () => p(!0),
-      startIcon: /* @__PURE__ */ e(me, {}),
+      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(V, { variant: "subtitle2", children: "Properties in this block" }),
+        /* @__PURE__ */ e(O, { variant: "subtitle2", children: "Properties in this block" }),
         T
       ] }),
       /* @__PURE__ */ a(Ce, { className: "p-2 pl-8", children: [
@@ -1766,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) => {
-              c(P), f(O), p(!0);
+            onPropertyClick: t ? void 0 : (C, N) => {
+              m(C), g(N), p(!0);
             },
             onPropertyMove: t ? void 0 : b
           }
@@ -1784,21 +1790,21 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
         getData: r,
         allowDataInference: n,
         onCancel: () => {
-          p(!1), c(void 0), f(void 0);
+          p(!1), m(void 0), g(void 0);
         },
         onOkClicked: () => {
-          p(!1), c(void 0), f(void 0);
+          p(!1), m(void 0), g(void 0);
         },
         collectionEditable: l,
-        onDelete: C,
-        propertyKey: m,
-        propertyNamespace: s,
+        onDelete: P,
+        propertyKey: h,
+        propertyNamespace: c,
         property: y,
-        existingProperty: !!m,
-        autoUpdateId: !m,
-        autoOpenTypeSelect: !m,
+        existingProperty: !!h,
+        autoUpdateId: !h,
+        autoOpenTypeSelect: !h,
         onPropertyChanged: v,
-        existingPropertyKeys: m ? void 0 : o.oneOf?.propertiesOrder,
+        existingPropertyKeys: h ? void 0 : o.oneOf?.propertiesOrder,
         propertyConfigs: i
       }
     )
@@ -1808,11 +1814,11 @@ function Ei({ disabled: t }) {
   const {
     values: r,
     handleChange: n
-  } = K(), i = "validation.min", l = "validation.max", o = "validation.lessThan", d = "validation.moreThan", u = "validation.positive", p = "validation.negative", m = "validation.integer";
+  } = K(), i = "validation.min", l = "validation.max", o = "validation.lessThan", d = "validation.moreThan";
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
-    /* @__PURE__ */ e(Fe, { disabled: t }),
+    /* @__PURE__ */ e(Se, { disabled: t }),
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
-      J,
+      Z,
       {
         value: I(r, i),
         label: "Min value",
@@ -1824,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",
@@ -1836,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",
@@ -1848,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",
@@ -1862,15 +1868,15 @@ function Ei({ disabled: t }) {
     /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
       H,
       {
-        name: u,
+        name: "validation.positive",
         type: "checkbox",
-        children: ({ field: c, form: s }) => /* @__PURE__ */ e(
+        children: ({ field: m, form: c }) => /* @__PURE__ */ e(
           se,
           {
             label: "Positive value",
             disabled: t,
-            form: s,
-            field: c
+            form: c,
+            field: m
           }
         )
       }
@@ -1878,15 +1884,15 @@ function Ei({ disabled: t }) {
     /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
       H,
       {
-        name: p,
+        name: "validation.negative",
         type: "checkbox",
-        children: ({ field: c, form: s }) => /* @__PURE__ */ e(
+        children: ({ field: m, form: c }) => /* @__PURE__ */ e(
           se,
           {
             label: "Negative value",
             disabled: t,
-            form: s,
-            field: c
+            form: c,
+            field: m
           }
         )
       }
@@ -1894,15 +1900,15 @@ function Ei({ disabled: t }) {
     /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
       H,
       {
-        name: m,
+        name: "validation.integer",
         type: "checkbox",
-        children: ({ field: c, form: s }) => /* @__PURE__ */ e(
+        children: ({ field: m, form: c }) => /* @__PURE__ */ e(
           se,
           {
             label: "Integer value",
             disabled: t,
-            form: s,
-            field: c
+            form: c,
+            field: m
           }
         )
       }
@@ -1912,7 +1918,7 @@ function Ei({ disabled: t }) {
 function Ai({ disabled: t }) {
   const { values: r, setFieldValue: n } = K();
   return /* @__PURE__ */ a(U, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Ei, { disabled: t }) }) }),
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Ei, { disabled: t }) }) }),
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       Oe,
       {
@@ -1928,7 +1934,7 @@ function Ai({ disabled: t }) {
     ) })
   ] });
 }
-function qt({
+function jt({
   existing: t,
   multiple: r,
   disabled: n,
@@ -1939,9 +1945,9 @@ function qt({
     handleChange: o,
     errors: d
   } = K();
-  if (!xe())
-    return /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(He, {}) });
-  const p = r ? "of.path" : "path", m = I(l, p), c = i && I(d, p);
+  if (!Pe())
+    return /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(De, {}) });
+  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,
     {
@@ -1949,8 +1955,8 @@ function qt({
       pathPath: p,
       type: "select",
       disabled: t || n,
-      value: m,
-      error: c,
+      value: h,
+      error: m,
       handleChange: o,
       as: Di
     }
@@ -1964,12 +1970,12 @@ function Di({
   error: l,
   ...o
 }) {
-  const d = xe();
+  const d = Pe();
   if (!d)
-    return /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(He, {}) });
+    return /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(De, {}) });
   const u = d?.collections ?? [], p = Array.from(new Set(
-    Object.values(u).map((c) => c.group).filter(Boolean)
-  ).values()), m = u.filter((c) => !c.group);
+    Object.values(u).map((m) => m.group).filter(Boolean)
+  ).values()), h = u.filter((m) => !m.group);
   return /* @__PURE__ */ a(U, { children: [
     /* @__PURE__ */ a(
       be,
@@ -1981,64 +1987,64 @@ function Di({
         name: r,
         onChange: i,
         label: "Target collection",
-        renderValue: (c) => {
-          const s = u.find((f) => f.id === c || f.path === c);
-          return s ? /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
-            /* @__PURE__ */ e(ot, { collectionOrView: s }),
+        renderValue: (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(
-              V,
+              O,
               {
                 variant: "subtitle2",
                 className: "font-medium ml-4",
-                children: s?.name.toUpperCase()
+                children: c?.name.toUpperCase()
               }
             )
           ] }) : null;
         },
         ...o,
         children: [
-          p.flatMap((c) => /* @__PURE__ */ e(
+          p.flatMap((m) => /* @__PURE__ */ e(
             At,
             {
-              label: c || "Views",
-              children: u.filter((s) => s.group === c).map((s) => /* @__PURE__ */ e(
+              label: m || "Views",
+              children: u.filter((c) => c.group === m).map((c) => /* @__PURE__ */ e(
                 ee,
                 {
-                  value: s.id ?? s.path,
+                  value: c.id ?? c.path,
                   children: /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
-                    /* @__PURE__ */ e(ot, { collectionOrView: s }),
+                    /* @__PURE__ */ e(ot, { collectionOrView: c }),
                     /* @__PURE__ */ e(
-                      V,
+                      O,
                       {
                         variant: "subtitle2",
                         className: "font-medium ml-4",
-                        children: s?.name.toUpperCase()
+                        children: c?.name.toUpperCase()
                       }
                     )
                   ] })
                 },
-                `${s.id ?? s.path}-${c}`
+                `${c.id ?? c.path}-${m}`
               ))
             },
-            `group_${c}`
+            `group_${m}`
           )),
-          m && /* @__PURE__ */ e(At, { label: "Views", children: m.map((c) => /* @__PURE__ */ e(
+          h && /* @__PURE__ */ e(At, { label: "Views", children: h.map((m) => /* @__PURE__ */ e(
             ee,
             {
-              value: c.id ?? c.path,
+              value: m.id ?? m.path,
               children: /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
-                /* @__PURE__ */ e(ot, { collectionOrView: c }),
+                /* @__PURE__ */ e(ot, { collectionOrView: m }),
                 /* @__PURE__ */ e(
-                  V,
+                  O,
                   {
                     variant: "subtitle2",
                     className: "font-medium ml-4",
-                    children: c?.name.toUpperCase()
+                    children: m?.name.toUpperCase()
                   }
                 )
               ] })
             },
-            c.id ?? c.path
+            m.id ?? m.path
           )) })
         ]
       }
@@ -2052,7 +2058,7 @@ function Bi({ disabled: t }) {
     errors: n,
     touched: i,
     setFieldValue: l
-  } = K(), o = "mode", d = I(r, o), u = I(i, o) && I(n, o), p = "autoValue", m = I(r, p), c = I(i, p) && I(n, p);
+  } = 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,10 +2067,10 @@ function Bi({ disabled: t }) {
           name: o,
           value: d ?? "date",
           error: !!u,
-          onValueChange: (s) => l(o, s),
+          onValueChange: (c) => l(o, c),
           label: "Mode",
-          renderValue: (s) => {
-            switch (s) {
+          renderValue: (c) => {
+            switch (c) {
               case "date_time":
                 return "Date/Time";
               case "date":
@@ -2086,10 +2092,10 @@ function Bi({ disabled: t }) {
         {
           name: p,
           disabled: t,
-          value: m ?? "",
-          onValueChange: (s) => l(p, s),
-          renderValue: (s) => {
-            switch (s) {
+          value: h ?? "",
+          onValueChange: (c) => l(p, c),
+          renderValue: (c) => {
+            switch (c) {
               case "on_create":
                 return "On create";
               case "on_update":
@@ -2098,7 +2104,7 @@ function Bi({ disabled: t }) {
                 return "None";
             }
           },
-          error: !!c,
+          error: !!m,
           label: "Automatic value",
           children: [
             /* @__PURE__ */ e(ee, { value: "", children: " None " }),
@@ -2107,9 +2113,9 @@ function Bi({ disabled: t }) {
           ]
         }
       ),
-      /* @__PURE__ */ e(X, { error: !!c, children: c ?? "Update this field automatically when creating or updating the entity" })
+      /* @__PURE__ */ e(X, { error: !!m, children: m ?? "Update this field automatically when creating or updating the entity" })
     ] }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Fe, { disabled: t }) }) })
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Se, { disabled: t }) }) })
   ] });
 }
 function zi({ disabled: t }) {
@@ -2144,7 +2150,7 @@ function zi({ disabled: t }) {
   ] });
 }
 function Mi({ disabled: t }) {
-  return /* @__PURE__ */ e(U, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Fe, { disabled: t }) }) }) });
+  return /* @__PURE__ */ e(U, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Se, { disabled: t }) }) }) });
 }
 function ar(t, r, n) {
   let i;
@@ -2368,16 +2374,16 @@ function or({ value: t, optionDisabled: r, propertyConfig: n, existing: i }) {
       children: /* @__PURE__ */ a(
         "div",
         {
-          className: pe(
+          className: me(
             "flex flex-row items-center text-base min-h-[52px]",
             r ? "w-full" : ""
           ),
           children: [
-            /* @__PURE__ */ e("div", { className: "mr-8", children: /* @__PURE__ */ e(je, { propertyConfig: n }) }),
+            /* @__PURE__ */ e("div", { className: "mr-8", children: /* @__PURE__ */ e(Ye, { propertyConfig: n }) }),
             /* @__PURE__ */ a("div", { children: [
               /* @__PURE__ */ e("div", { children: n.name }),
               /* @__PURE__ */ e(
-                V,
+                O,
                 {
                   variant: "caption",
                   color: "disabled",
@@ -2428,8 +2434,8 @@ function Ri({
         ]
       }
     ) }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(
-      Se,
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(
+      Ee,
       {
         disabled: t,
         max: !0,
@@ -2473,7 +2479,7 @@ const Ui = [
   "key_value",
   "repeat",
   "block"
-], lr = Object.entries(Wt).filter(([t]) => Ui.includes(t)).map(([t, r]) => ({ [t]: r })).reduce((t, r) => ({ ...t, ...r }), {}), sr = Y.memo(
+], lr = Object.entries(Gt).filter(([t]) => Ui.includes(t)).map(([t, r]) => ({ [t]: r })).reduce((t, r) => ({ ...t, ...r }), {}), sr = Y.memo(
   function(r) {
     const {
       includeIdAndName: n = !0,
@@ -2483,95 +2489,95 @@ const Ui = [
       inArray: d,
       propertyKey: u,
       existingPropertyKeys: p,
-      propertyNamespace: m,
-      property: c,
-      onPropertyChanged: s,
-      onPropertyChangedImmediate: f = !0,
+      propertyNamespace: h,
+      property: m,
+      onPropertyChanged: c,
+      onPropertyChangedImmediate: g = !0,
       onDelete: v,
-      onError: w,
+      onError: x,
       initialErrors: y,
-      forceShowErrors: C,
+      forceShowErrors: P,
       allowDataInference: T,
       getController: b,
-      getData: P,
-      propertyConfigs: O,
-      collectionEditable: h
-    } = r, N = {
+      getData: C,
+      propertyConfigs: N,
+      collectionEditable: f
+    } = r, w = {
       id: "",
       name: ""
-    }, F = !!(c && !Le(c)) && !h, R = qe(c ? {
+    }, _ = !!(m && !qe(m)) && !f, M = Le(m ? {
       id: u,
       previousId: u,
-      property: c
-    } : void 0), M = ({
-      id: x,
-      property: g
+      property: m
+    } : void 0), R = ({
+      id: A,
+      property: s
     }) => {
-      const _ = {
-        id: x,
-        previousId: R.current?.id,
-        property: g,
-        namespace: m
+      const V = {
+        id: A,
+        previousId: M.current?.id,
+        property: s,
+        namespace: h
       };
-      R.current = _, s?.(_);
-    }, B = Tt({
-      initialValues: c ? { id: u, ...c } : N,
+      M.current = V, c?.(V);
+    }, D = Tt({
+      initialValues: m ? { id: u, ...m } : w,
       initialErrors: y,
       validateOnChange: !0,
       validateOnInitialRender: !0,
-      onSubmit: (x, g) => {
-        console.debug("onSubmit", x);
+      onSubmit: (A, s) => {
+        console.debug("onSubmit", A);
         const {
-          id: _,
+          id: V,
           ...G
-        } = x;
-        M({
-          id: _,
+        } = A;
+        R({
+          id: V,
           property: { ...G, editable: G.editable ?? !0 }
-        }), l || g.resetForm({ values: N });
+        }), l || s.resetForm({ values: w });
       },
-      validation: (x) => {
-        const g = {};
+      validation: (A) => {
+        const s = {};
         if (n) {
-          if (!x.name)
-            g.name = "Required";
+          if (!A.name)
+            s.name = "Required";
           else {
-            const _ = ji(x.name);
-            _ && (g.name = _);
+            const V = $i(A.name);
+            V && (s.name = V);
           }
-          if (!x.id)
-            g.id = "Required";
+          if (!A.id)
+            s.id = "Required";
           else {
-            const _ = $i(x.id, p);
-            _ && (g.id = _);
+            const V = qi(A.id, p);
+            V && (s.id = V);
           }
         }
-        return x.dataType === "string" && x.validation?.matches && !Nr(x.validation?.matches.toString()) && (g.validation = {
+        return A.dataType === "string" && A.validation?.matches && !Pr(A.validation?.matches.toString()) && (s.validation = {
           matches: "Invalid regular expression"
-        }), x.dataType === "reference" && !x.path && (g.path = "You must specify a target collection for the field"), x.propertyConfig === "repeat" && (x.of || (g.of = "You need to specify a repeat field")), x.propertyConfig === "block" && (x.oneOf || (g.oneOf = "You need to specify the properties of this block")), g;
+        }), 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 de(() => {
-      b?.(B);
-    }, [B, b]), /* @__PURE__ */ e(kt, { value: B, children: /* @__PURE__ */ e(
-      qi,
+    return ce(() => {
+      b?.(D);
+    }, [D, b]), /* @__PURE__ */ e(kt, { value: D, children: /* @__PURE__ */ e(
+      ji,
       {
-        onPropertyChanged: f ? M : void 0,
+        onPropertyChanged: g ? R : void 0,
         onDelete: v,
         includeIdAndTitle: n,
-        propertyNamespace: m,
-        onError: w,
-        showErrors: C || B.submitCount > 0,
+        propertyNamespace: h,
+        onError: x,
+        showErrors: P || D.submitCount > 0,
         existing: l,
         autoUpdateId: o,
         inArray: d,
         autoOpenTypeSelect: i,
-        disabled: F,
-        getData: P,
+        disabled: _,
+        getData: C,
         allowDataInference: T,
-        propertyConfigs: O,
-        collectionEditable: h,
-        ...B
+        propertyConfigs: N,
+        collectionEditable: f,
+        ...D
       }
     ) });
   },
@@ -2586,9 +2592,9 @@ function Ve({
   collectionEditable: o,
   ...d
 }) {
-  const u = qe();
+  const u = Le();
   return /* @__PURE__ */ e(
-    _e,
+    Fe,
     {
       open: t ?? !1,
       maxWidth: "xl",
@@ -2598,26 +2604,26 @@ function Ve({
         {
           noValidate: !0,
           autoComplete: "off",
-          onSubmit: (m) => {
-            m.preventDefault(), m.stopPropagation(), u.current?.handleSubmit(m);
+          onSubmit: (h) => {
+            h.preventDefault(), h.stopPropagation(), u.current?.handleSubmit(h);
           },
           children: [
-            /* @__PURE__ */ e(De, { children: /* @__PURE__ */ e(
+            /* @__PURE__ */ e(Be, { children: /* @__PURE__ */ e(
               sr,
               {
                 ...d,
-                onPropertyChanged: (m) => {
-                  i?.(m), n?.();
+                onPropertyChanged: (h) => {
+                  i?.(h), n?.();
                 },
                 collectionEditable: o,
                 onPropertyChangedImmediate: !1,
-                getController: (m) => {
-                  u.current = m;
+                getController: (h) => {
+                  u.current = h;
                 },
                 getData: l
               }
             ) }),
-            /* @__PURE__ */ a(Be, { children: [
+            /* @__PURE__ */ a(ze, { children: [
               r && /* @__PURE__ */ e(
                 z,
                 {
@@ -2644,7 +2650,7 @@ function Ve({
     }
   );
 }
-function qi({
+function ji({
   values: t,
   errors: r,
   setValues: n,
@@ -2654,134 +2660,134 @@ function qi({
   includeIdAndTitle: d,
   onPropertyChanged: u,
   onDelete: p,
-  propertyNamespace: m,
-  onError: c,
-  showErrors: s,
-  disabled: f,
+  propertyNamespace: h,
+  onError: m,
+  showErrors: c,
+  disabled: g,
   inArray: v,
-  getData: w,
+  getData: x,
   allowDataInference: y,
-  propertyConfigs: C,
+  propertyConfigs: P,
   collectionEditable: T
 }) {
-  const [b, P] = j(o), [O, h] = j(!1), [N, F] = j(t?.dataType ? Zt(t) : void 0), R = Object.entries(lr).concat(Object.entries(C)), M = v ? R.filter(([$, L]) => !ne(L.property) && L.property?.dataType !== "array") : R, B = gr(t), x = qe(null), g = qe(t), _ = s && I(r, "selectedWidget");
-  de(() => {
-    if (u && (!d || B.id)) {
+  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 (u && (!d || D.id)) {
       const {
-        id: $,
+        id: q,
         ...L
-      } = B;
-      ge(B, g.current) || (u({
-        id: $,
+      } = D;
+      ve(D, s.current) || (u({
+        id: q,
         property: L,
-        namespace: m
-      }), g.current = B);
+        namespace: h
+      }), s.current = D);
     }
-  }, [B, d, u, m]), de(() => {
-    t?.id && c && c(t?.id, m, r);
-  }, [r, c, m, t?.id]);
-  const G = ($) => {
-    F($), n(ar(t, $, C)), setTimeout(() => {
-      x.current?.focus();
+  }, [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, 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,
-      disabled: f,
-      showErrors: s
+      widgetId: w,
+      disabled: g,
+      showErrors: c
     }
-  ) : N === "url" ? D = /* @__PURE__ */ e(
+  ) : w === "url" ? B = /* @__PURE__ */ e(
     Ri,
     {
-      disabled: f,
-      showErrors: s
+      disabled: g,
+      showErrors: c
     }
-  ) : N === "select" || N === "number_select" ? D = /* @__PURE__ */ e(
+  ) : w === "select" || w === "number_select" ? B = /* @__PURE__ */ e(
     Rt,
     {
       multiselect: !1,
       allowDataInference: y,
       updateIds: !i,
-      disabled: f,
-      getData: w,
-      showErrors: s
+      disabled: g,
+      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,
       updateIds: !i,
-      disabled: f,
+      disabled: g,
       allowDataInference: y,
-      getData: w,
-      showErrors: s
+      getData: x,
+      showErrors: c
     }
-  ) : N === "file_upload" ? D = /* @__PURE__ */ e(
+  ) : w === "file_upload" ? B = /* @__PURE__ */ e(
     Ut,
     {
       existing: i,
       multiple: !1,
-      disabled: f
+      disabled: g
     }
-  ) : N === "multi_file_upload" ? D = /* @__PURE__ */ e(
+  ) : w === "multi_file_upload" ? B = /* @__PURE__ */ e(
     Ut,
     {
       existing: i,
       multiple: !0,
-      disabled: f
+      disabled: g
     }
-  ) : N === "switch" ? D = /* @__PURE__ */ e(Fi, { disabled: f }) : N === "number_input" ? D = /* @__PURE__ */ e(Ai, { disabled: f }) : 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: f,
-      getData: w,
+      disabled: g,
+      getData: x,
       allowDataInference: y,
       collectionEditable: T,
-      propertyConfigs: C
+      propertyConfigs: P
     }
-  ) : N === "block" ? D = /* @__PURE__ */ e(
+  ) : w === "block" ? B = /* @__PURE__ */ e(
     Si,
     {
-      disabled: f,
-      getData: w,
+      disabled: g,
+      getData: x,
       allowDataInference: y,
       collectionEditable: T,
-      propertyConfigs: C
+      propertyConfigs: P
     }
-  ) : N === "reference" ? D = /* @__PURE__ */ e(
-    qt,
+  ) : w === "reference" ? B = /* @__PURE__ */ e(
+    jt,
     {
-      showErrors: s,
+      showErrors: c,
       existing: i,
       multiple: !1,
-      disabled: f
+      disabled: g
     }
-  ) : N === "date_time" ? D = /* @__PURE__ */ e(Bi, { disabled: f }) : N === "multi_references" ? D = /* @__PURE__ */ e(
-    qt,
+  ) : w === "date_time" ? B = /* @__PURE__ */ e(Bi, { disabled: g }) : w === "multi_references" ? B = /* @__PURE__ */ e(
+    jt,
     {
-      showErrors: s,
+      showErrors: c,
       existing: i,
       multiple: !0,
-      disabled: f
+      disabled: g
     }
-  ) : N === "repeat" ? D = /* @__PURE__ */ e(
+  ) : w === "repeat" ? B = /* @__PURE__ */ e(
     Vi,
     {
-      showErrors: s,
+      showErrors: c,
       existing: i,
-      getData: w,
+      getData: x,
       allowDataInference: y,
-      disabled: f,
+      disabled: g,
       collectionEditable: T,
-      propertyConfigs: C
+      propertyConfigs: P
     }
-  ) : N === "key_value" ? D = /* @__PURE__ */ e(Mi, { disabled: f }) : D = null, /* @__PURE__ */ a(U, { children: [
-    f && /* @__PURE__ */ a(Lr, { mode: "warn", children: [
-      /* @__PURE__ */ e(V, { children: "This property can't be edited" }),
-      /* @__PURE__ */ a(V, { variant: "caption", 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(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"
@@ -2792,37 +2798,37 @@ function qi({
         /* @__PURE__ */ e(
           be,
           {
-            error: !!_,
-            value: N ?? "",
+            error: !!V,
+            value: w ?? "",
             placeholder: "Select a property widget",
             open: b,
-            onOpenChange: P,
+            onOpenChange: C,
             position: "item-aligned",
-            disabled: f,
-            renderValue: ($) => {
-              if (!$)
+            disabled: g,
+            renderValue: (q) => {
+              if (!q)
                 return /* @__PURE__ */ e("em", { children: "Select a property widget" });
-              const L = $, Q = Wt[L] ?? C[L], le = Q.property, ze = le && !ne(le) ? $e(le, C) : void 0, Ne = ne(le) || i && le.dataType !== t?.dataType, ce = ze ? W(ze, 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",
                 {
                   onClick: (re) => {
-                    Ne && (re.stopPropagation(), re.preventDefault());
+                    we && (re.stopPropagation(), re.preventDefault());
                   },
-                  className: pe(
+                  className: me(
                     "flex items-center",
-                    Ne ? "w-full pointer-events-none opacity-50" : ""
+                    we ? "w-full pointer-events-none opacity-50" : ""
                   ),
                   children: [
-                    /* @__PURE__ */ e("div", { className: "mr-8", children: /* @__PURE__ */ e(je, { propertyConfig: ce }) }),
+                    /* @__PURE__ */ e("div", { className: "mr-8", children: /* @__PURE__ */ e(Ye, { propertyConfig: de }) }),
                     /* @__PURE__ */ a("div", { className: "flex flex-col items-start text-base text-left", children: [
-                      /* @__PURE__ */ e("div", { children: ce.name }),
+                      /* @__PURE__ */ e("div", { children: de.name }),
                       /* @__PURE__ */ e(
-                        V,
+                        O,
                         {
                           variant: "caption",
                           color: "disabled",
-                          children: Ne ? "You can only switch to widgets that use the same data type" : ce.description
+                          children: we ? "You can only switch to widgets that use the same data type" : de.description
                         }
                       )
                     ] })
@@ -2830,26 +2836,26 @@ function qi({
                 }
               );
             },
-            onValueChange: ($) => {
-              G($);
+            onValueChange: (q) => {
+              G(q);
             },
-            children: M.map(([$, 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,
                 {
-                  value: $,
+                  value: q,
                   optionDisabled: le,
                   propertyConfig: L,
                   existing: i
                 },
-                $
+                q
               );
             })
           }
         ),
-        _ && /* @__PURE__ */ e(
-          V,
+        V && /* @__PURE__ */ e(
+          O,
           {
             variant: "caption",
             className: "ml-3.5",
@@ -2863,9 +2869,9 @@ function qi({
         {
           variant: "ghost",
           className: "m-4",
-          disabled: f,
-          onClick: () => h(!0),
-          children: /* @__PURE__ */ e(ct, {})
+          disabled: g,
+          onClick: () => f(!0),
+          children: /* @__PURE__ */ e(dt, {})
         }
       )
     ] }),
@@ -2873,23 +2879,23 @@ function qi({
       d && /* @__PURE__ */ e(
         Ii,
         {
-          showErrors: s,
+          showErrors: c,
           disabledId: i,
           isNewProperty: !i,
-          disabled: f,
+          disabled: g,
           autoUpdateId: l,
-          ref: x
+          ref: A
         }
       ),
-      D,
-      /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(zi, { disabled: f }) })
+      B,
+      /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(zi, { disabled: g }) })
     ] }),
     p && /* @__PURE__ */ e(
       lt,
       {
-        open: O,
-        onAccept: () => p(t?.id, m),
-        onCancel: () => h(!1),
+        open: N,
+        onAccept: () => p(t?.id, h),
+        onCancel: () => f(!1),
         title: /* @__PURE__ */ e("div", { children: "Delete this property?" }),
         body: /* @__PURE__ */ a("div", { children: [
           " This will ",
@@ -2901,11 +2907,11 @@ function qi({
   ] });
 }
 const Li = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
-function $i(t, r) {
+function qi(t, r) {
   let n;
   return t || (n = "You must specify an id for the field"), t && !t.match(Li) && (n = "The id can only contain letters, numbers and underscores (_), and not start with a number"), t && r && r.includes(t) && (n = "There is another field with this ID already"), n;
 }
-function ji(t) {
+function $i(t) {
   let r;
   return t || (r = "You must specify a title for the field"), r;
 }
@@ -2915,20 +2921,20 @@ function Yi(t) {
 function Hi({ collection: t, onOpenChange: r, open: n }) {
   const i = Ie(), l = `import { EntityCollection } from "firecms";
 
-const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.stringify(dr(t), null, "	");
+const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.stringify(cr(t), null, "	");
   return /* @__PURE__ */ a(
-    _e,
+    Fe,
     {
       open: n,
       onOpenChange: r,
       maxWidth: "4xl",
       children: [
-        /* @__PURE__ */ a(De, { children: [
-          /* @__PURE__ */ a(V, { variant: "h6", className: "my-4", children: [
+        /* @__PURE__ */ a(Be, { children: [
+          /* @__PURE__ */ a(O, { variant: "h6", className: "my-4", children: [
             "Code for ",
             t.name
           ] }),
-          /* @__PURE__ */ a(V, { 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",
@@ -2946,11 +2952,11 @@ const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.s
               theme: si.vsDark,
               code: l,
               language: "typescript",
-              children: ({ className: o, style: d, tokens: u, getLineProps: p, getTokenProps: m }) => /* @__PURE__ */ e("pre", { style: d, className: "p-4 rounded text-sm", children: u.map((c, s) => /* @__PURE__ */ e("div", { ...p({ line: c }), children: c.map((f, v) => /* @__PURE__ */ e("span", { ...m({ token: f }) }, v)) }, s)) })
+              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)) })
             }
           )
         ] }),
-        /* @__PURE__ */ a(Be, { children: [
+        /* @__PURE__ */ a(ze, { children: [
           /* @__PURE__ */ a(
             z,
             {
@@ -2961,7 +2967,7 @@ const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.s
                 message: "Copied"
               }), navigator.clipboard.writeText(l)),
               children: [
-                /* @__PURE__ */ e($r, { size: "small" }),
+                /* @__PURE__ */ e(qr, { size: "small" }),
                 "Copy to clipboard"
               ]
             }
@@ -2972,7 +2978,7 @@ const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.s
     }
   );
 }
-function dr(t) {
+function cr(t) {
   const r = (n) => {
     const i = {
       ...n
@@ -2995,10 +3001,10 @@ function dr(t) {
     customId: t.customId,
     initialFilter: t.initialFilter,
     initialSort: t.initialSort,
-    properties: Object.entries(t.properties).map(([n, i]) => ({
+    properties: Object.entries(t.properties ?? {}).map(([n, i]) => ({
       [n]: r(i)
     })).reduce((n, i) => ({ ...n, ...i }), {}),
-    subcollections: (t.subcollections ?? []).map(dr)
+    subcollections: (t.subcollections ?? []).map(cr)
   };
 }
 function Gi({
@@ -3011,32 +3017,32 @@ function Gi({
   extraIcon: d,
   getUser: u,
   getData: p,
-  doCollectionInference: m,
-  propertyConfigs: c,
-  collectionEditable: s
+  doCollectionInference: h,
+  propertyConfigs: m,
+  collectionEditable: c
 }) {
   const {
-    values: f,
+    values: g,
     setFieldValue: v,
-    setFieldError: w,
+    setFieldError: x,
     setFieldTouched: y,
-    errors: C,
+    errors: P,
     dirty: T
-  } = K(), b = Ie(), P = xr(), O = !P, [h, N] = j(), [F, R] = j(), [M, B] = j(), x = F ? ae(F, M) : void 0, g = x ? I(f.properties, x.replaceAll(".", ".properties.")) : void 0, [_, G] = j(!1), [D, $] = j(!1), [L, Q] = j(!1), [le, ze] = j([]), Ne = Y.useRef(f.propertiesOrder ? { "": f.propertiesOrder } : {});
-  de(() => {
+  } = 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(T);
   }, [T]);
-  const ce = m ? () => {
-    m && ($(!0), m(f).then((S) => {
-      if (S && pt(S.properties), !S) {
+  const de = h ? () => {
+    h && (q(!0), h(g).then((F) => {
+      if (F && pt(F.properties), !F) {
         b.open({
           type: "error",
           message: "Could not infer properties from data"
         });
         return;
       }
-      const q = (S.properties ? Object.keys(S.properties) : []).filter((A) => !f.properties[A]);
-      if (q.length === 0) {
+      const j = (F.properties ? Object.keys(F.properties) : []).filter((E) => !g.properties[E]);
+      if (j.length === 0) {
         b.open({
           type: "info",
           message: "No new properties found in existing data"
@@ -3044,81 +3050,81 @@ function Gi({
         return;
       }
       const k = {
-        ...q.reduce((A, ie) => (A[ie] = (S.properties ?? {})[ie], A), {}),
-        ...f.properties
-      }, E = [
-        ...q,
-        ...f.propertiesOrder ?? []
+        ...j.reduce((E, ie) => (E[ie] = (F.properties ?? {})[ie], E), {}),
+        ...g.properties
+      }, S = [
+        ...j,
+        ...g.propertiesOrder ?? []
       ];
-      v("properties", k, !1), he(E), ze(q);
+      v("properties", k, !1), he(S), Me(j);
     }).finally(() => {
-      $(!1);
+      q(!1);
     }));
-  } : void 0, re = Z((S) => S ? Ne.current[S] ?? I(f, ye(S)) : Ne.current[""], [f]), he = Z((S, q) => {
-    const k = ye(q);
-    v(k, S, !1), Ne.current[q ?? ""] = S;
-  }, [v]), Te = Z((S, q) => {
-    const k = S ? ae(S, q) : void 0;
+  } : 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(ue(k), void 0, !1);
-    const A = re(q).filter((ie) => ie !== S);
-    he(A, q), Q(!1), N(void 0), R(void 0), B(void 0);
-  }, [re, v, he]), Ge = (S, q) => {
-    v(ye(q), S, !1);
+    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 = ({
-    id: S,
-    property: q
+    id: F,
+    property: j
   }) => {
-    if (!S)
+    if (!F)
       throw Error("Need to include an ID when creating a new property");
     v("properties", {
-      ...f.properties ?? {},
-      [S]: q
+      ...g.properties ?? {},
+      [F]: j
     }, !1);
-    const k = [...f.propertiesOrder ?? Object.keys(f.properties), S];
-    he(k), Q(!1), P && (N(k.indexOf(S)), R(S)), 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: S,
-    property: q,
+    id: F,
+    property: j,
     previousId: k,
-    namespace: E
+    namespace: S
   }) => {
-    const A = S ? ae(S, E) : void 0, ie = A ? ue(A) : void 0;
-    if (k && k !== S) {
-      const ke = ae(k, E), Vt = ue(ke), It = re(E).map((Xe) => Xe === k ? S : Xe).filter((Xe) => Xe !== void 0);
-      he(It, E), S && (N(It.indexOf(S)), R(S)), 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: S,
-      property: q,
+      id: F,
+      property: j,
       previousId: k,
-      namespace: E,
+      namespace: S,
       propertyPath: ie
-    }), ie && (v(ie, q, !1), y(ie, !0, !1));
-  }, Ke = Z((S, q, k) => {
-    const E = S ? ae(S, q) : void 0;
+    }), ie && (v(ie, j, !1), y(ie, !0, !1));
+  }, Ke = Q((F, j, k) => {
+    const S = F ? ae(F, j) : void 0;
     if (console.debug("onPropertyErrorInternal", {
-      id: S,
-      namespace: q,
+      id: F,
+      namespace: j,
       error: k,
-      propertyPath: E
-    }), E) {
-      const A = k && Object.keys(k).length > 0;
-      i(S, q, A ? k : void 0), w(ue(E), A ? "Property error" : void 0);
+      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 = F && n?.current?.properties ? n.current.properties[F] : void 0, Je = f?.propertiesOrder === void 0 || f.propertiesOrder.length === 0, Me = f.propertiesOrder ? f.propertiesOrder : Object.keys(f.properties), Qe = Gt(() => u(f.ownerId), [u, f.ownerId]), vt = Z((S, q) => {
+    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: S,
-      namespace: q
-    }), N(Me.indexOf(S)), R(S), B(q);
-  }, [Me]), 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: pe(
+      propertyKey: F,
+      namespace: 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: [
@@ -3126,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(
-            V,
+            O,
             {
               variant: "body2",
               className: "ml-2",
@@ -3155,44 +3161,44 @@ function Gi({
             oe,
             {
               variant: "filled",
-              disabled: D,
+              disabled: B,
               onClick: () => G(!0),
-              children: /* @__PURE__ */ e(jr, {})
+              children: /* @__PURE__ */ e($r, {})
             }
           ) }),
-          ce && /* @__PURE__ */ e(te, { title: "Add new properties based on data", children: /* @__PURE__ */ e(
+          de && /* @__PURE__ */ e(te, { title: "Add new properties based on data", children: /* @__PURE__ */ e(
             oe,
             {
               variant: "filled",
-              disabled: D,
-              onClick: ce,
-              children: D ? /* @__PURE__ */ e(He, { size: "small" }) : /* @__PURE__ */ e(ht, {})
+              disabled: B,
+              onClick: de,
+              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),
-              children: /* @__PURE__ */ e(me, {})
+              onClick: () => J(!0),
+              children: /* @__PURE__ */ e(ue, {})
             }
           ) })
         ] })
       ] }),
-      /* @__PURE__ */ e(ve, { children: /* @__PURE__ */ e(
+      /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
         ft,
         {
           className: "pl-8",
           inferredPropertyKeys: le,
-          selectedPropertyKey: F ? ae(F, M) : void 0,
-          properties: f.properties,
-          additionalFields: f.additionalFields,
-          propertiesOrder: Me,
+          selectedPropertyKey: _ ? ae(_, R) : void 0,
+          properties: g.properties,
+          additionalFields: g.additionalFields,
+          propertiesOrder: Re,
           onPropertyClick: vt,
           onPropertyMove: Ge,
           onPropertyRemove: r ? Te : void 0,
-          collectionEditable: s,
-          errors: C
+          collectionEditable: c,
+          errors: P
         }
       ) }),
       /* @__PURE__ */ e(
@@ -3202,18 +3208,18 @@ function Gi({
           color: "primary",
           variant: "outlined",
           size: "large",
-          onClick: () => Q(!0),
-          startIcon: /* @__PURE__ */ e(me, {}),
+          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: [
-          x && g && !ne(g) && /* @__PURE__ */ e(
+          A && s && !ne(s) && /* @__PURE__ */ e(
             sr,
             {
               inArray: !1,
@@ -3221,48 +3227,48 @@ function Gi({
               autoUpdateId: !1,
               allowDataInference: !r,
               autoOpenTypeSelect: !1,
-              propertyKey: F,
-              propertyNamespace: M,
-              property: g,
+              propertyKey: _,
+              propertyNamespace: R,
+              property: s,
               onPropertyChanged: fe,
               onDelete: Te,
               onError: Ke,
               forceShowErrors: t,
               initialErrors: Ze,
               getData: p,
-              propertyConfigs: c,
-              collectionEditable: s
+              propertyConfigs: m,
+              collectionEditable: c
             },
-            `edit_view_${h}`
+            `edit_view_${f}`
           ),
-          !g && /* @__PURE__ */ e(V, { 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" }),
-          g && ne(g) && /* @__PURE__ */ e(V, { 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,
-        open: h !== void 0,
-        autoUpdateId: !g,
+        open: f !== void 0,
+        autoUpdateId: !s,
         allowDataInference: !r,
         existingProperty: !0,
         autoOpenTypeSelect: !1,
-        propertyKey: F,
-        propertyNamespace: M,
-        property: g,
+        propertyKey: _,
+        propertyNamespace: R,
+        property: s,
         onPropertyChanged: fe,
         onDelete: Te,
         onError: Ke,
         forceShowErrors: t,
         initialErrors: Ze,
         getData: p,
-        propertyConfigs: c,
-        collectionEditable: s,
-        onOkClicked: O ? We : void 0
+        propertyConfigs: m,
+        collectionEditable: c,
+        onOkClicked: N ? We : void 0
       },
-      `edit_view_${h}`
+      `edit_view_${f}`
     )
   ] });
   return /* @__PURE__ */ a(U, { children: [
@@ -3276,20 +3282,20 @@ function Gi({
         autoUpdateId: !0,
         forceShowErrors: t,
         open: L,
-        onCancel: () => Q(!1),
+        onCancel: () => J(!1),
         onPropertyChanged: gt,
         getData: p,
         allowDataInference: !r,
-        propertyConfigs: c,
-        collectionEditable: s,
-        existingPropertyKeys: f.propertiesOrder
+        propertyConfigs: m,
+        collectionEditable: c,
+        existingPropertyKeys: g.propertiesOrder
       }
     ),
     /* @__PURE__ */ e(
       Hi,
       {
-        collection: f,
-        open: _,
+        collection: g,
+        open: V,
         onOpenChange: G
       }
     )
@@ -3303,19 +3309,19 @@ function Ki({
   title: l
 }) {
   return /* @__PURE__ */ a(
-    _e,
+    Fe,
     {
       open: t,
       onOpenChange: (o) => o ? n() : r(),
       "aria-labelledby": "alert-dialog-title",
       "aria-describedby": "alert-dialog-description",
       children: [
-        /* @__PURE__ */ a(De, { children: [
-          /* @__PURE__ */ e(V, { variant: "h6", children: l ?? "Unsaved changes" }),
-          i && /* @__PURE__ */ e(V, { children: i }),
-          /* @__PURE__ */ e(V, { children: "Are you sure?" })
-        ] }),
         /* @__PURE__ */ a(Be, { children: [
+          /* @__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 " }),
           /* @__PURE__ */ e(z, { onClick: r, children: " Ok " })
         ] })
@@ -3326,15 +3332,15 @@ function Ki({
 function Wi({ open: t, onClose: r }) {
   const {
     entityViews: n
-  } = Ee();
+  } = Ae();
   return /* @__PURE__ */ a(
-    _e,
+    Fe,
     {
       maxWidth: "md",
       open: t,
       children: [
-        /* @__PURE__ */ a(De, { className: "flex flex-col gap-4", children: [
-          /* @__PURE__ */ e(V, { variant: "h6", children: "Select view" }),
+        /* @__PURE__ */ a(Be, { className: "flex flex-col gap-4", children: [
+          /* @__PURE__ */ e(O, { variant: "h6", children: "Select view" }),
           n?.map((i) => /* @__PURE__ */ a(
             z,
             {
@@ -3350,9 +3356,9 @@ function Wi({ open: t, onClose: r }) {
             },
             i.key
           )),
-          (n ?? []).length === 0 && /* @__PURE__ */ e(V, { variant: "body2", children: "No custom views defined" })
+          (n ?? []).length === 0 && /* @__PURE__ */ e(O, { variant: "body2", children: "No custom views defined" })
         ] }),
-        /* @__PURE__ */ e(Be, { children: /* @__PURE__ */ e(z, { variant: "outlined", onClick: () => r(), children: "Cancel" }) })
+        /* @__PURE__ */ e(ze, { children: /* @__PURE__ */ e(z, { variant: "outlined", onClick: () => r(), children: "Cancel" }) })
       ]
     }
   );
@@ -3365,133 +3371,137 @@ function Zi({
   getUser: l,
   parentCollectionIds: o
 }) {
-  const { entityViews: d } = Ee(), [u, p] = Y.useState(), [m, c] = Y.useState(!1), [s, f] = Y.useState(), [v, w] = 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(), T = t.subcollections ?? [], b = y.entityViews?.filter((h) => typeof h == "string").map((h) => wr(h, d)).filter(Boolean) ?? [], P = t.entityViews?.filter((h) => typeof h != "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(V, { variant: "h5", children: [
+        /* @__PURE__ */ a(O, { variant: "h5", children: [
           "Subcollections of ",
           y.name
         ] }),
-        T && T.length > 0 && /* @__PURE__ */ e(Ce, { className: "flex flex-col gap-4 p-2 w-full", children: /* @__PURE__ */ e(Dt, { children: /* @__PURE__ */ e(Bt, { children: T.map((h) => /* @__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: () => w({
-              isNewCollection: !1,
-              editedCollectionPath: h.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(
-                Re,
+                Ue,
                 {
                   align: "left",
-                  children: /* @__PURE__ */ e(V, { variant: "subtitle2", className: "flex-grow", children: h.name })
+                  children: /* @__PURE__ */ e(O, { variant: "subtitle2", className: "flex-grow", children: f.name })
                 }
               ),
               /* @__PURE__ */ e(
-                Re,
+                Ue,
                 {
                   align: "right",
                   children: /* @__PURE__ */ e(te, { title: "Remove", children: /* @__PURE__ */ e(
                     oe,
                     {
                       size: "small",
-                      onClick: (N) => {
-                        N.preventDefault(), N.stopPropagation(), p(h.id);
+                      onClick: (w) => {
+                        w.preventDefault(), w.stopPropagation(), g(f.key);
                       },
                       color: "inherit",
-                      children: /* @__PURE__ */ e(ct, { size: "small" })
+                      children: /* @__PURE__ */ e(dt, { size: "small" })
                     }
                   ) })
                 }
               )
-            ]
-          },
-          h.path
-        )) }) }) }),
-        /* @__PURE__ */ e(
-          z,
-          {
-            onClick: () => {
-              w({
-                isNewCollection: !0
-              });
-            },
-            variant: "outlined",
-            startIcon: /* @__PURE__ */ e(me, {}),
-            children: "Add subcollection"
-          }
-        )
-      ] }),
-      /* @__PURE__ */ a("div", { className: "flex-grow  flex flex-col gap-4 items-start", children: [
-        /* @__PURE__ */ e(V, { 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((h) => /* @__PURE__ */ a(bt, { children: [
-            /* @__PURE__ */ e(
-              Re,
+            ] }, f.key)),
+            C.map((f) => /* @__PURE__ */ e(bt, { children: /* @__PURE__ */ a(
+              Ue,
               {
                 align: "left",
-                children: /* @__PURE__ */ e(V, { variant: "subtitle2", className: "flex-grow", children: h.name })
-              }
-            ),
-            /* @__PURE__ */ e(
-              Re,
-              {
-                align: "right",
-                children: /* @__PURE__ */ e(te, { title: "Remove", children: /* @__PURE__ */ e(
-                  oe,
-                  {
-                    size: "small",
-                    onClick: (N) => {
-                      N.preventDefault(), N.stopPropagation(), f(h.key);
-                    },
-                    color: "inherit",
-                    children: /* @__PURE__ */ e(ct, { 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 })
+                  ] })
+                ]
               }
-            )
-          ] }, h.key)),
-          P.map((h) => /* @__PURE__ */ e(bt, { children: /* @__PURE__ */ a(
-            Re,
+            ) }, f.key))
+          ] }) }),
+          /* @__PURE__ */ e(
+            z,
             {
-              align: "left",
-              children: [
-                /* @__PURE__ */ e(V, { variant: "subtitle2", className: "flex-grow", children: h.name }),
-                /* @__PURE__ */ a(V, { variant: "caption", className: "flex-grow", children: [
-                  "This view is defined in code with key ",
-                  /* @__PURE__ */ e("code", { children: h.key })
-                ] })
-              ]
+              onClick: () => {
+                m(!0);
+              },
+              variant: "text",
+              startIcon: /* @__PURE__ */ e(ue, {}),
+              children: "Add custom entity view"
             }
-          ) }, h.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: () => {
-              c(!0);
-            },
-            variant: "outlined",
-            startIcon: /* @__PURE__ */ e(me, {}),
-            children: "Add custom entity view"
-          }
-        )
+          )
+        ] }) })
       ] })
     ] }) }),
     /* @__PURE__ */ e("div", { style: { height: "52px" } }),
@@ -3500,11 +3510,11 @@ function Zi({
       {
         open: !!u,
         onAccept: () => {
-          const h = {
+          const f = {
             id: u,
             parentCollectionIds: [...o ?? [], t.id]
           };
-          console.debug("Deleting subcollection", h), n.deleteCollection(h), p(void 0);
+          console.debug("Deleting subcollection", f), n.deleteCollection(f), p(void 0);
         },
         onCancel: () => p(void 0),
         title: /* @__PURE__ */ e(U, { children: "Delete this subcollection?" }),
@@ -3515,14 +3525,14 @@ function Zi({
         ] })
       }
     ),
-    s && /* @__PURE__ */ e(
+    c && /* @__PURE__ */ e(
       lt,
       {
-        open: !!s,
+        open: !!c,
         onAccept: () => {
-          C("entityViews", y.entityViews?.filter((h) => h !== s)), f(void 0);
+          P("entityViews", y.entityViews?.filter((f) => f !== c)), g(void 0);
         },
-        onCancel: () => f(void 0),
+        onCancel: () => g(void 0),
         title: /* @__PURE__ */ e(U, { children: "Remove this view?" }),
         body: /* @__PURE__ */ a(U, { children: [
           "This will ",
@@ -3543,16 +3553,16 @@ function Zi({
         ...v,
         getUser: l,
         handleClose: () => {
-          w(void 0);
+          x(void 0);
         }
       }
     ),
     /* @__PURE__ */ e(
       Wi,
       {
-        open: m,
-        onClose: (h) => {
-          h && C("entityViews", [...y.entityViews ?? [], h]), c(!1);
+        open: h,
+        onClose: (f) => {
+          f && P("entityViews", [...y.entityViews ?? [], f]), m(!1);
         }
       }
     )
@@ -3643,7 +3653,7 @@ const Lt = {
       autoValue: "on_create"
     }
   })
-}, $t = {
+}, qt = {
   id: "blog",
   path: "blog",
   name: "Blog",
@@ -3755,7 +3765,7 @@ const Lt = {
   initialFilter: {
     status: ["==", "published"]
   }
-}, jt = {
+}, $t = {
   id: "users",
   path: "users",
   name: "Users",
@@ -3987,34 +3997,34 @@ function Ji({
   onContinue: i,
   existingCollectionPaths: l
 }) {
-  const [o, d] = j(!1), [u, p] = j();
-  de(() => {
+  const [o, d] = $(!1), [u, p] = $();
+  ce(() => {
     r && l && (d(!0), r(t).then((v) => {
-      const w = v.filter((y) => !(l ?? []).find((C) => C.trim().toLowerCase() === y.trim().toLowerCase()));
-      p(w);
+      const x = v.filter((y) => !(l ?? []).find((P) => P.trim().toLowerCase() === y.trim().toLowerCase()));
+      p(x);
     }).finally(() => d(!1)));
   }, [l, t, r]);
   const {
-    values: m,
-    setFieldValue: c,
-    setValues: s,
-    submitCount: f
+    values: h,
+    setFieldValue: m,
+    setValues: c,
+    submitCount: g
   } = K();
   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__ */ e(
       "div",
       {
         className: "flex flex-row py-2 pt-3 items-center",
-        children: /* @__PURE__ */ e(V, { 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(V, { 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(
-        V,
+        O,
         {
           variant: "caption",
           color: "secondary",
@@ -4022,25 +4032,25 @@ function Ji({
         }
       ),
       /* @__PURE__ */ a("div", { className: "flex flex-wrap gap-x-2 gap-y-1 items-center my-2 min-h-7", children: [
-        o && !u && /* @__PURE__ */ e(He, { size: "small" }),
-        u?.map((v, w) => /* @__PURE__ */ e(
+        o && !u && /* @__PURE__ */ e(De, { size: "small" }),
+        u?.map((v, x) => /* @__PURE__ */ e(
           st,
           {
             colorScheme: "cyanLighter",
             onClick: () => {
-              c("name", ut(v)), c("id", v), c("path", v), c("properties", void 0), i();
+              m("name", ut(v)), m("id", v), m("path", v), m("properties", void 0), i();
             },
             size: "small",
             children: v
           },
           v
         )),
-        !o && (u ?? [])?.length === 0 && /* @__PURE__ */ e(V, { 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(
-        V,
+        O,
         {
           variant: "caption",
           color: "secondary",
@@ -4055,7 +4065,7 @@ function Ji({
             subtitle: "A collection of products with images, prices and stock",
             icon: /* @__PURE__ */ e(et, { size: "small", iconKey: Lt.icon }),
             onClick: () => {
-              s(Lt), i();
+              c(Lt), i();
             }
           }
         ),
@@ -4064,9 +4074,9 @@ function Ji({
           {
             title: "Users",
             subtitle: "A collection of users with emails, names and roles",
-            icon: /* @__PURE__ */ e(et, { size: "small", iconKey: jt.icon }),
+            icon: /* @__PURE__ */ e(et, { size: "small", iconKey: $t.icon }),
             onClick: () => {
-              s(jt), i();
+              c($t), i();
             }
           }
         ),
@@ -4075,9 +4085,9 @@ function Ji({
           {
             title: "Blog posts",
             subtitle: "A collection of blog posts with images, authors and complex content",
-            icon: /* @__PURE__ */ e(et, { size: "small", iconKey: $t.icon }),
+            icon: /* @__PURE__ */ e(et, { size: "small", iconKey: qt.icon }),
             onClick: () => {
-              s($t), i();
+              c(qt), i();
             }
           }
         ),
@@ -4088,7 +4098,7 @@ function Ji({
             subtitle: "A collection of pages with images, authors and complex content",
             icon: /* @__PURE__ */ e(et, { size: "small", iconKey: Yt.icon }),
             onClick: () => {
-              s(Yt), i();
+              c(Yt), i();
             }
           }
         )
@@ -4096,7 +4106,7 @@ function Ji({
     ] }),
     !n && /* @__PURE__ */ a("div", { children: [
       /* @__PURE__ */ e(
-        V,
+        O,
         {
           variant: "caption",
           color: "secondary",
@@ -4104,7 +4114,7 @@ function Ji({
           children: "● Create a collection from a file (csv, json, xls, xslx...)"
         }
       ),
-      /* @__PURE__ */ e(di, { onDataAdded: (v) => i(v) })
+      /* @__PURE__ */ e(ci, { onDataAdded: (v) => i(v) })
     ] }),
     /* @__PURE__ */ e("div", { children: /* @__PURE__ */ e(z, { variant: "text", onClick: () => i(), className: "my-2", children: "Continue from scratch" }) })
   ] }) });
@@ -4119,7 +4129,7 @@ function nt({
     tr,
     {
       onClick: i,
-      className: pe(
+      className: me(
         "my-2 rounded-md border mx-0 p-6 px-4 focus:outline-none transition ease-in-out duration-150 flex flex-row gap-4 items-center",
         "text-gray-700 dark:text-gray-300",
         "hover:border-primary-dark hover:text-primary-dark dark:hover:text-primary focus:ring-primary hover:ring-1 hover:ring-primary",
@@ -4127,7 +4137,7 @@ function nt({
       ),
       children: [
         n,
-        /* @__PURE__ */ e("div", { className: "flex flex-col items-start", children: /* @__PURE__ */ e(V, { variant: "subtitle1", children: t }) })
+        /* @__PURE__ */ e("div", { className: "flex flex-col items-start", children: /* @__PURE__ */ e(O, { variant: "subtitle1", children: t }) })
       ]
     }
   ) });
@@ -4141,42 +4151,42 @@ function Qi({
     setFieldValue: i,
     setFieldTouched: l,
     values: o
-  } = K(), [d, u] = j(void 0), p = Y.useRef(o.propertiesOrder ? { "": o.propertiesOrder } : {}), m = d ? d.id : void 0, c = d || void 0, s = ({
+  } = 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: w,
+    property: x,
     previousId: y,
-    namespace: C
+    namespace: P
   }) => {
-    const T = v ? ae(v, C) : void 0, b = T ? ue(T) : void 0, P = (h) => h ? p.current[h] ?? I(o, ye(h)) : p.current[""], O = (h, N) => {
-      const F = ye(N);
-      i(F, h, !1), p.current[N ?? ""] = h;
+    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 h = ae(y, C), N = ue(h), 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, w, !1), l(b, !0, !1));
-  }, f = async ({
+    b && (i(b, x, !1), l(b, !0, !1));
+  }, g = async ({
     id: v,
-    importKey: w,
+    importKey: x,
     property: y,
-    namespace: C
+    namespace: P
   }) => {
-    const T = v ? ae(v, C) : void 0, b = T ? ue(T) : void 0, P = t.importData.map((h) => I(h, w)), 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 bg-gray-50 dark:bg-gray-900", children: [
+  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(V, { variant: "h6", className: "mt-4", children: "Data property mapping" }),
+      /* @__PURE__ */ e(O, { variant: "h6", className: "mt-4", children: "Data property mapping" }),
       /* @__PURE__ */ e(
-        ci,
+        di,
         {
           headersMapping: t.headersMapping,
           idColumn: t.idColumn,
@@ -4185,18 +4195,18 @@ function Qi({
           onIdPropertyChanged: (v) => t.setIdColumn(v),
           buildPropertyView: ({
             property: v,
-            propertyKey: w,
+            propertyKey: x,
             importKey: y
           }) => /* @__PURE__ */ e(
             ui,
             {
               property: v,
-              propertyKey: w,
-              onPropertyNameChanged: (C, T) => i(`properties.${C}.name`, T, !1),
+              propertyKey: x,
+              onPropertyNameChanged: (P, T) => i(`properties.${P}.name`, T, !1),
               onEditClick: () => {
-                !w || !v || u({
+                !x || !v || u({
                   ...v,
-                  id: w,
+                  id: x,
                   editable: !0
                 });
               },
@@ -4205,11 +4215,11 @@ function Qi({
                 {
                   property: v,
                   disabled: !1,
-                  onPropertyChanged: (C) => f({
-                    ...C,
+                  onPropertyChanged: (P) => g({
+                    ...P,
                     importKey: y
                   }),
-                  propertyKey: w,
+                  propertyKey: x,
                   propertyConfigs: r
                 }
               )
@@ -4222,11 +4232,11 @@ function Qi({
       Ve,
       {
         open: d !== void 0,
-        propertyKey: m,
-        property: c,
+        propertyKey: h,
+        property: m,
         inArray: !1,
         autoUpdateId: !1,
-        onPropertyChanged: s,
+        onPropertyChanged: c,
         allowDataInference: !1,
         collectionEditable: n,
         onOkClicked: () => {
@@ -4250,7 +4260,7 @@ function Xi({
   propertyConfigs: i,
   disabled: l
 }) {
-  const o = t ? Zt(t) : null, d = t ? $e(t, i) : null, [u, p] = j(!1);
+  const o = t ? Kt(t) : null, d = t ? $e(t, i) : null, [u, p] = $(!1);
   return /* @__PURE__ */ e(
     te,
     {
@@ -4268,25 +4278,25 @@ function Xi({
           value: o ?? "",
           placeholder: "Select a property widget",
           position: "item-aligned",
-          renderValue: (m) => d ? /* @__PURE__ */ e(je, { propertyConfig: d }) : null,
-          onValueChange: (m) => {
-            const c = ar(t, m, i);
+          renderValue: (h) => d ? /* @__PURE__ */ e(Ye, { propertyConfig: d }) : null,
+          onValueChange: (h) => {
+            const m = ar(t, h, i);
             n && r({
               id: n,
-              property: c,
+              property: m,
               previousId: n,
               namespace: void 0
             });
           },
-          children: Object.entries(lr).map(([m, c]) => /* @__PURE__ */ e(
+          children: Object.entries(lr).map(([h, m]) => /* @__PURE__ */ e(
             or,
             {
-              value: m,
+              value: h,
               optionDisabled: !1,
-              propertyConfig: c,
+              propertyConfig: m,
               existing: !1
             },
-            m
+            h
           ))
         }
       )
@@ -4294,17 +4304,17 @@ function Xi({
   );
 }
 function en({ importConfig: t, properties: r, propertiesOrder: n }) {
-  de(() => {
+  ce(() => {
     const l = pi(t.originProperties, r), o = t.importData.map((d) => mi(d, t.idColumn, t.headersMapping, r, l, "TEMP_PATH"));
     t.setEntities(o);
   }, []);
-  const i = Tr();
+  const i = wr();
   return /* @__PURE__ */ e(
-    kr,
+    Tr,
     {
       title: /* @__PURE__ */ a("div", { children: [
-        /* @__PURE__ */ e(V, { variant: "subtitle2", children: "Imported data preview" }),
-        /* @__PURE__ */ e(V, { 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,
@@ -4320,30 +4330,30 @@ function en({ importConfig: t, properties: r, propertiesOrder: n }) {
     }
   );
 }
-function cr(t, r = "") {
+function dr(t, r = "") {
   const n = Object.keys(t).reduce((o, d) => {
-    const u = t[d], p = Or(d), m = r ? `${r}.${p}` : p;
+    const u = t[d], p = kr(d), h = r ? `${r}.${p}` : p;
     if (u.dataType === "map" && u.properties) {
-      const f = cr(u.properties, m);
+      const g = dr(u.properties, h);
       return {
-        headersMapping: { ...o.headersMapping, [d]: m },
+        headersMapping: { ...o.headersMapping, [d]: h },
         properties: {
           ...o.properties,
           [p]: {
             ...u,
-            properties: f.properties,
-            propertiesOrder: Object.keys(f.properties)
+            properties: g.properties,
+            propertiesOrder: Object.keys(g.properties)
           }
         }
       };
     }
-    const c = {
+    const m = {
       ...o.properties,
       [p]: u
     };
     return {
-      headersMapping: { ...o.headersMapping, [d]: m },
-      properties: c
+      headersMapping: { ...o.headersMapping, [d]: h },
+      properties: m
     };
   }, { headersMapping: {}, properties: {} }), i = Object.keys(n.headersMapping)?.[0];
   let l;
@@ -4353,13 +4363,13 @@ function cr(t, r = "") {
   };
 }
 function ur(t) {
-  const r = t.open, [n, i] = Ue.useState(!1), [l, o] = Ue.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 de(() => {
+  return ce(() => {
     r || (i(!1), o(!1));
   }, [r]), /* @__PURE__ */ a(
-    _e,
+    Fe,
     {
       open: r,
       fullWidth: !0,
@@ -4390,13 +4400,13 @@ function ur(t) {
   );
 }
 function tn(t) {
-  const { propertyConfigs: r } = Ee(), n = xe(), i = Ae(), {
+  const { propertyConfigs: r } = Ae(), n = Pe(), i = _e(), {
     topLevelNavigation: l,
     collections: o
-  } = n, d = t.initialValues, u = !d?.path && (t.parentCollectionIds ?? []).length === 0, p = (t.parentCollection ? t.parentCollection.subcollections : o) ?? [], m = p.map((b) => b.path.trim().toLowerCase()), c = p.map((b) => b.id?.trim().toLowerCase()).filter(Boolean), [s, f] = Ue.useState(), [v, w] = Ue.useState(!1);
-  if (de(() => {
+  } = 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 ? f(n.getCollectionFromPaths([...t.parentCollectionIds ?? [], t.editedCollectionId])) : f(void 0), w(!0));
+      n.initialised && (t.editedCollectionId ? g(n.getCollectionFromPaths([...t.parentCollectionIds ?? [], t.editedCollectionId])) : g(void 0), x(!0));
     } catch (b) {
       console.error(b);
     }
@@ -4404,10 +4414,10 @@ function tn(t) {
     throw Error("Internal: Navigation not ready in collection editor");
   const {
     groups: y
-  } = l, C = s ? {
-    ...s,
-    id: s.id ?? s.path ?? _t(16)
-  } : void 0, T = C ? nn(C, r) : {
+  } = l, P = c ? {
+    ...c,
+    id: c.id ?? c.path ?? _t(16)
+  } : void 0, T = P ? nn(P, r) : {
     id: d?.path ?? _t(16),
     path: d?.path ?? "",
     name: d?.name ?? "",
@@ -4422,11 +4432,11 @@ function tn(t) {
     {
       ...t,
       initialValues: T,
-      existingPaths: m,
-      existingIds: c,
+      existingPaths: h,
+      existingIds: m,
       includeTemplates: u,
-      collection: s,
-      setCollection: f,
+      collection: c,
+      setCollection: g,
       groups: y,
       propertyConfigs: r
     }
@@ -4442,72 +4452,72 @@ function rn({
   handleClose: d,
   reservedGroups: u,
   extraView: p,
-  handleCancel: m,
-  setFormDirty: c,
-  pathSuggestions: s,
-  getUser: f,
+  handleCancel: h,
+  setFormDirty: m,
+  pathSuggestions: c,
+  getUser: g,
   parentCollection: v,
-  getData: w,
+  getData: x,
   existingPaths: y,
-  existingIds: C,
+  existingIds: P,
   includeTemplates: T,
   collection: b,
-  setCollection: P,
-  initialValues: O,
-  propertyConfigs: h,
-  groups: N
+  setCollection: C,
+  initialValues: N,
+  propertyConfigs: f,
+  groups: w
 }) {
-  const F = hi(), R = xe(), M = Ie(), B = qe({}), x = t ? T ? "welcome" : "details" : "properties", [g, _] = j(x), [G, D] = Ue.useState(), $ = (k) => {
-    const E = k.id || k.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,
+      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(() => {
-    g === "details" ? F.inUse ? _("import_data_saving") : _(p ? "extra_view" : "properties") : _(g === "welcome" ? "details" : g === "import_data_mapping" ? "import_data_preview" : g === "import_data_preview" ? "details" : g === "extra_view" ? "properties" : "details");
-  }, [g, F.inUse, p]), Q = Z((k) => {
+  }, 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?.(k.path, k.collectionGroup ?? !1, i ?? []);
-  }, [o, i]), le = Z(async (k) => {
+  }, [o, i]), le = Q(async (k) => {
     try {
-      if (!Q)
-        return P(k), Promise.resolve(k);
-      _("loading");
-      const E = await Q?.(k);
-      if (!E)
-        return P(k), Promise.resolve(k);
-      const A = {
+      if (!J)
+        return C(k), Promise.resolve(k);
+      V("loading");
+      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", {
+      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: A
-      }), A) : (A.propertiesOrder = Object.keys(A.properties), A);
-    } catch (E) {
-      return console.error(E), M.open({
+        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")
+        message: "Error inferring collection: " + (S.message ?? "Details in the console")
       }), k;
     }
-  }, [i, Q]), ce = Tt({
-    initialValues: O,
-    onSubmit: (k, E) => {
+  }, [i, J]), de = Tt({
+    initialValues: N,
+    onSubmit: (k, S) => {
       console.log("Submitting collection", k);
       try {
         if (!t) {
-          $(k).then(() => {
-            E.resetForm({ values: O }), d(k);
+          q(k).then(() => {
+            S.resetForm({ values: N }), d(k);
           });
           return;
         }
-        g === "welcome" ? (L(), E.resetForm({ values: k })) : g === "details" ? p || F.inUse ? (E.resetForm({ values: k }), L()) : t ? le(k).then((A) => {
-          E.resetForm({
-            values: A ?? k,
+        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
@@ -4515,34 +4525,34 @@ function rn({
           });
         }).finally(() => {
           L();
-        }) : (E.resetForm({ values: k }), L()) : g === "extra_view" ? (L(), E.resetForm({ values: k })) : g === "import_data_mapping" || g === "import_data_preview" ? L() : g === "properties" ? $(k).then(() => {
-          E.resetForm({ values: O }), L(), d(k);
-        }) : (L(), E.resetForm({ values: k }));
-      } 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: k });
+          message: "Error persisting collection: " + (E.message ?? "Details in the console")
+        }), console.error(E), S.resetForm({ values: k });
       }
     },
     validation: (k) => {
-      let E = {};
-      const A = (g === "properties" || g === "subcollections" || g === "details") && vi;
-      if (A)
+      let S = {};
+      const E = (s === "properties" || s === "subcollections" || s === "details") && vi;
+      if (E)
         try {
-          A.validateSync(k, { abortEarly: !1 });
+          E.validateSync(k, { abortEarly: !1 });
         } catch (ie) {
           ie.inner.forEach((ke) => {
-            E[ke.path] = ke.message;
+            S[ke.path] = ke.message;
           });
         }
-      if (g === "properties" && (E = { ...E, ...B.current }), g === "details") {
+      if (s === "properties" && (S = { ...S, ...D.current }), s === "details") {
         const ie = Ht(k.path, t, y, k.id);
-        ie && (E.path = ie);
-        const ke = an(k.id, t, y, C);
-        ke && (E.id = ke);
+        ie && (S.path = ie);
+        const ke = an(k.id, t, y, P);
+        ke && (S.id = ke);
       }
-      return E;
+      return S;
     }
   }), {
     values: re,
@@ -4550,27 +4560,27 @@ function rn({
     isSubmitting: Te,
     dirty: Ge,
     submitCount: gt
-  } = ce, 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), Me = Je && w ? () => w(Je, Ze ?? []) : void 0;
-  de(() => {
-    c(Ge);
+  } = 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(k) {
-    F.setInUse(!0), ri(k, rr).then((E) => {
-      const A = cr(E);
-      he("properties", A.properties), he("propertiesOrder", Object.keys(A.properties)), F.setIdColumn(A.idColumn), F.setImportData(k), F.setHeadersMapping(A.headersMapping), F.setOriginProperties(A.properties);
+    _.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 k = { ...re.properties };
-    F.idColumn && delete k[F.idColumn], he("properties", k), L();
-  }, q = b?.editable === void 0 || b?.editable === !0 || t;
-  return /* @__PURE__ */ e(De, { fullHeight: !0, children: /* @__PURE__ */ e(kt, { value: ce, children: /* @__PURE__ */ a(U, { children: [
+    _.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(
       Hr,
       {
-        value: g,
-        className: pe(wt, "justify-end bg-gray-50 dark:bg-gray-950 border-b"),
-        onValueChange: (k) => _(k),
+        value: s,
+        className: me(wt, "justify-end bg-gray-50 dark:bg-gray-950 border-b"),
+        onValueChange: (k) => V(k),
         children: [
           /* @__PURE__ */ e(Ct, { value: "details", children: "Details" }),
           /* @__PURE__ */ e(Ct, { value: "properties", children: "Properties" }),
@@ -4582,130 +4592,130 @@ function rn({
       "form",
       {
         noValidate: !0,
-        onSubmit: ce.handleSubmit,
-        className: pe(
+        onSubmit: de.handleSubmit,
+        className: me(
           t ? "h-full" : "h-[calc(100%-48px)]",
           "flex-grow flex flex-col relative"
         ),
         children: [
-          g === "loading" && /* @__PURE__ */ e(Nt, {}),
-          g === "extra_view" && fe && p?.View && /* @__PURE__ */ e(p.View, { path: fe }),
-          g === "welcome" && /* @__PURE__ */ e(
+          s === "loading" && /* @__PURE__ */ e(Nt, {}),
+          s === "extra_view" && fe && p?.View && /* @__PURE__ */ e(p.View, { path: fe }),
+          s === "welcome" && /* @__PURE__ */ e(
             Ji,
             {
               path: fe,
               onContinue: (k) => {
-                k ? (Qe(k), _("import_data_mapping")) : _("details");
+                k ? (Qe(k), V("import_data_mapping")) : V("details");
               },
               existingCollectionPaths: y,
               parentCollection: v,
-              pathSuggestions: s
+              pathSuggestions: c
             }
           ),
-          g === "import_data_mapping" && F && /* @__PURE__ */ e(
+          s === "import_data_mapping" && _ && /* @__PURE__ */ e(
             Qi,
             {
-              importConfig: F,
-              collectionEditable: q,
-              propertyConfigs: h
+              importConfig: _,
+              collectionEditable: j,
+              propertyConfigs: f
             }
           ),
-          g === "import_data_preview" && F && /* @__PURE__ */ e(
+          s === "import_data_preview" && _ && /* @__PURE__ */ e(
             en,
             {
-              importConfig: F,
+              importConfig: _,
               properties: re.properties,
               propertiesOrder: re.propertiesOrder
             }
           ),
-          g === "import_data_saving" && F && /* @__PURE__ */ e(
+          s === "import_data_saving" && _ && /* @__PURE__ */ e(
             fi,
             {
-              importConfig: F,
+              importConfig: _,
               collection: re,
-              onImportSuccess: (k) => {
-                d(k), M.open({
+              onImportSuccess: async (k) => {
+                R.open({
                   type: "info",
                   message: "Data imported successfully"
-                });
+                }), await q(re), d(k);
               }
             }
           ),
-          g === "details" && /* @__PURE__ */ e(
+          s === "details" && /* @__PURE__ */ e(
             yi,
             {
               existingPaths: y,
-              existingIds: C,
-              groups: N,
+              existingIds: P,
+              groups: w,
               parentCollectionIds: i,
               parentCollection: v,
               isNewCollection: t
             }
           ),
-          g === "subcollections" && b && /* @__PURE__ */ e(
+          s === "subcollections" && b && /* @__PURE__ */ e(
             Zi,
             {
               parentCollection: v,
               configController: r,
-              getUser: f,
+              getUser: g,
               collectionInference: o,
               parentCollectionIds: i,
               collection: b
             }
           ),
-          g === "properties" && /* @__PURE__ */ e(
+          s === "properties" && /* @__PURE__ */ e(
             Gi,
             {
               showErrors: gt > 0,
               isNewCollection: t,
               reservedGroups: u,
-              onPropertyError: (k, E, A) => {
+              onPropertyError: (k, S, E) => {
                 const ie = Ft({
-                  ...B.current,
-                  [ir(k, E)]: Ft(A, !0)
+                  ...D.current,
+                  [ir(k, S)]: Ft(E, !0)
                 }, !0);
-                B.current = ie, ce.validate();
+                D.current = ie, de.validate();
               },
-              getUser: f,
-              getData: Me,
-              doCollectionInference: Q,
-              propertyConfigs: h,
-              collectionEditable: q,
+              getUser: g,
+              getData: Re,
+              doCollectionInference: J,
+              propertyConfigs: f,
+              collectionEditable: j,
               extraIcon: p?.icon && /* @__PURE__ */ e(
                 oe,
                 {
                   color: "primary",
-                  onClick: () => _("extra_view"),
+                  onClick: () => V("extra_view"),
                   children: p.icon
                 }
               )
             }
           ),
-          g !== "welcome" && /* @__PURE__ */ a(
-            Be,
+          s !== "welcome" && /* @__PURE__ */ a(
+            ze,
             {
               position: "absolute",
               children: [
-                G && /* @__PURE__ */ e(Jt, { error: G }),
-                t && T && g === "import_data_mapping" && /* @__PURE__ */ a(
+                G && /* @__PURE__ */ e(Wt, { error: G }),
+                t && T && s === "import_data_mapping" && /* @__PURE__ */ a(
                   z,
                   {
                     variant: "text",
                     type: "button",
-                    onClick: () => (F.setInUse(!1), _("welcome")),
+                    onClick: () => (_.setInUse(!1), V("welcome")),
                     children: [
                       /* @__PURE__ */ e(tt, {}),
                       "Back"
                     ]
                   }
                 ),
-                t && T && g === "import_data_preview" && /* @__PURE__ */ a(
+                t && T && s === "import_data_preview" && /* @__PURE__ */ a(
                   z,
                   {
                     variant: "text",
                     type: "button",
                     onClick: () => {
-                      $(re), _("import_data_mapping");
+                      V("import_data_mapping");
                     },
                     children: [
                       /* @__PURE__ */ e(tt, {}),
@@ -4713,24 +4723,24 @@ function rn({
                     ]
                   }
                 ),
-                t && T && g === "details" && /* @__PURE__ */ a(
+                t && T && s === "details" && /* @__PURE__ */ a(
                   z,
                   {
                     variant: "text",
                     type: "button",
-                    onClick: () => _("welcome"),
+                    onClick: () => V("welcome"),
                     children: [
                       /* @__PURE__ */ e(tt, {}),
                       "Back"
                     ]
                   }
                 ),
-                t && g === "properties" && /* @__PURE__ */ a(
+                t && s === "properties" && /* @__PURE__ */ a(
                   z,
                   {
                     variant: "text",
                     type: "button",
-                    onClick: () => _("details"),
+                    onClick: () => V("details"),
                     children: [
                       /* @__PURE__ */ e(tt, {}),
                       "Back"
@@ -4742,12 +4752,12 @@ function rn({
                   {
                     variant: "text",
                     onClick: () => {
-                      m();
+                      h();
                     },
                     children: "Cancel"
                   }
                 ),
-                t && g === "import_data_mapping" && /* @__PURE__ */ e(
+                t && s === "import_data_mapping" && /* @__PURE__ */ e(
                   z,
                   {
                     variant: "filled",
@@ -4756,7 +4766,7 @@ function rn({
                     children: "Next"
                   }
                 ),
-                t && g === "import_data_preview" && /* @__PURE__ */ e(
+                t && s === "import_data_preview" && /* @__PURE__ */ e(
                   z,
                   {
                     variant: "filled",
@@ -4767,18 +4777,18 @@ function rn({
                     children: "Next"
                   }
                 ),
-                t && (g === "details" || g === "properties") && /* @__PURE__ */ a(
+                t && (s === "details" || s === "properties") && /* @__PURE__ */ a(
                   Mt,
                   {
                     variant: "filled",
                     color: "primary",
                     type: "submit",
                     loading: Te,
-                    disabled: Te || g === "details" && !vt,
-                    startIcon: g === "properties" ? /* @__PURE__ */ e(Gr, {}) : void 0,
+                    disabled: Te || s === "details" && !vt,
+                    startIcon: s === "properties" ? /* @__PURE__ */ e(Gr, {}) : void 0,
                     children: [
-                      g === "details" && "Next",
-                      g === "properties" && "Create collection"
+                      s === "details" && "Next",
+                      s === "properties" && "Create collection"
                     ]
                   }
                 ),
@@ -4823,7 +4833,7 @@ function pr(t, r) {
 }
 const Ht = (t, r, n, i) => {
   let l;
-  return t || (l = "You must specify a path in the database for this collection"), r && n?.includes(t.trim().toLowerCase()) && !i && (l = "There is already a collection with the specified path. If you want to have multiple collections referring to the same database path, make sure the have different ids"), Vr(t).split("/").length % 2 === 0 && (l = `Collection paths must have an odd number of segments: ${t}`), l;
+  return t || (l = "You must specify a path in the database for this collection"), r && n?.includes(t.trim().toLowerCase()) && !i && (l = "There is already a collection with the specified path. If you want to have multiple collections referring to the same database path, make sure the have different ids"), Or(t).split("/").length % 2 === 0 && (l = `Collection paths must have an odd number of segments: ${t}`), l;
 }, an = (t, r, n, i) => {
   if (!t)
     return;
@@ -4839,77 +4849,77 @@ const Ht = (t, r, n, i) => {
     extraView: d,
     pathSuggestions: u,
     getUser: p,
-    getData: m,
-    onAnalyticsEvent: c
+    getData: h,
+    onAnalyticsEvent: m
   }) {
-    const s = xe(), f = gi(), v = Ie(), { propertyConfigs: w } = Ee(), {
+    const c = Pe(), g = gi(), v = Ie(), { propertyConfigs: x } = Ae(), {
       collections: y
-    } = s, C = (y ?? []).map((g) => g.path.trim().toLowerCase()), [T, b] = Y.useState();
-    de(() => {
-      u && u().then((g) => {
-        b(g.filter((_) => !C.includes(_.trim().toLowerCase())));
+    } = c, P = (y ?? []).map((s) => s.path.trim().toLowerCase()), [T, b] = Y.useState();
+    ce(() => {
+      u && u().then((s) => {
+        b(s.filter((V) => !P.includes(V.trim().toLowerCase())));
       });
     }, [u]);
-    const [P, O] = Y.useState(), [h, N] = Y.useState(), F = Z(() => ({
+    const [C, N] = Y.useState(), [f, w] = Y.useState(), _ = Q(() => ({
       createCollections: !0,
       editCollections: !0,
       deleteCollections: !0
-    }), []), R = Z(({
-      id: g,
-      fullPath: _,
+    }), []), M = Q(({
+      id: s,
+      fullPath: V,
       parentCollectionIds: G,
-      parentCollection: D
+      parentCollection: B
     }) => {
-      console.debug("Edit collection", g, _, G, D), c?.("edit_collection", { id: g, fullPath: _ }), O({
-        editedCollectionId: g,
-        fullPath: _,
+      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(({
-      propertyKey: g,
-      property: _,
+    }, []), R = Q(({
+      propertyKey: s,
+      property: V,
       editedCollectionId: G,
-      currentPropertiesOrder: D,
-      parentCollectionIds: $,
+      currentPropertiesOrder: B,
+      parentCollectionIds: q,
       collection: L
     }) => {
-      console.debug("edit property", g, _, G, D, $, L), c?.("edit_property", { propertyKey: g, editedCollectionId: G });
-      const Q = g && g.includes(".") ? g.substring(0, g.lastIndexOf(".")) : void 0, le = g && g.includes(".") ? g.substring(g.lastIndexOf(".") + 1) : g;
-      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: _,
-        namespace: Q,
-        currentPropertiesOrder: D,
+        property: V,
+        namespace: J,
+        currentPropertiesOrder: B,
         editedCollectionId: G,
-        parentCollectionIds: $,
+        parentCollectionIds: q,
         collectionEditable: L?.editable ?? !1
       });
-    }, []), B = Y.useCallback(({
-      parentCollectionIds: g,
-      parentCollection: _,
+    }, []), D = Y.useCallback(({
+      parentCollectionIds: s,
+      parentCollection: V,
       initialValues: G,
-      redirect: D,
-      sourceClick: $
+      redirect: B,
+      sourceClick: q
     }) => {
-      console.debug("Create collection", { parentCollectionIds: g, parentCollection: _, initialValues: G, redirect: D, sourceClick: $ }), c?.("create_collection", { parentCollectionIds: g, parentCollection: _, initialValues: G, redirect: D, sourceClick: $ }), 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: g,
-        parentCollection: _,
+        parentCollectionIds: s,
+        parentCollection: V,
         initialValues: G,
-        redirect: D
+        redirect: B
       });
-    }, []), x = u ? (g) => !g && T ? Promise.resolve(T) : u?.(g) : 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,
-          configPermissions: i ?? F,
+          editCollection: M,
+          createCollection: D,
+          editProperty: R,
+          configPermissions: i ?? _,
           rootPathSuggestions: T
         },
         children: [
@@ -4917,112 +4927,112 @@ const Ht = (t, r, n, i) => {
           /* @__PURE__ */ e(
             ur,
             {
-              open: !!P,
+              open: !!C,
               configController: n,
               isNewCollection: !1,
               collectionInference: o,
-              ...P,
-              getData: m,
+              ...C,
+              getData: h,
               reservedGroups: l,
               extraView: d,
-              pathSuggestions: x,
+              pathSuggestions: A,
               getUser: p,
-              handleClose: (g) => {
-                if (P?.redirect && g && P?.isNewCollection && !P.parentCollectionIds.length) {
-                  const _ = s.buildUrlCollectionPath(g.id ?? g.path);
-                  f(_);
+              handleClose: (s) => {
+                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);
               }
             }
           ),
           /* @__PURE__ */ e(
             Ve,
             {
-              open: !!h,
+              open: !!f,
               includeIdAndName: !0,
-              existingProperty: !!h?.propertyKey,
-              autoUpdateId: h ? !h?.propertyKey : !1,
-              autoOpenTypeSelect: h ? !h?.propertyKey : !1,
+              existingProperty: !!f?.propertyKey,
+              autoUpdateId: f ? !f?.propertyKey : !1,
+              autoOpenTypeSelect: f ? !f?.propertyKey : !1,
               inArray: !1,
-              collectionEditable: h?.collectionEditable ?? !1,
-              getData: m && h?.editedCollectionId ? () => {
-                console.debug("get data for property", h?.editedCollectionId);
-                const g = s.resolveAliasesFrom(h.editedCollectionId);
-                return m(g, []);
+              collectionEditable: f?.collectionEditable ?? !1,
+              getData: h && f?.editedCollectionId ? () => {
+                console.debug("get data for property", f?.editedCollectionId);
+                const s = c.resolveAliasesFrom(f.editedCollectionId);
+                return h(s, []);
               } : void 0,
               onPropertyChanged: ({
-                id: g,
-                property: _
+                id: s,
+                property: V
               }) => {
-                if (!h || !g)
+                if (!f || !s)
                   return;
-                const G = !h.propertyKey;
+                const G = !f.propertyKey;
                 return n.saveProperty({
-                  path: h?.editedCollectionId,
-                  property: _,
-                  propertyKey: g,
-                  newPropertiesOrder: G && h.currentPropertiesOrder ? [...h.currentPropertiesOrder, g] : void 0,
-                  namespace: h.namespace,
-                  parentCollectionIds: h.parentCollectionIds
-                }).catch((D) => (console.error(D), v.open({
+                  path: f?.editedCollectionId,
+                  property: V,
+                  propertyKey: s,
+                  newPropertiesOrder: G && f.currentPropertiesOrder ? [...f.currentPropertiesOrder, s] : void 0,
+                  namespace: f.namespace,
+                  parentCollectionIds: f.parentCollectionIds
+                }).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,
               onDelete: () => {
-                if (!h?.propertyKey)
+                if (!f?.propertyKey)
                   return;
-                const g = h?.currentPropertiesOrder?.filter((_) => _ !== h?.propertyKey);
+                const s = f?.currentPropertiesOrder?.filter((V) => V !== f?.propertyKey);
                 return n.deleteProperty({
-                  path: h?.editedCollectionId,
-                  propertyKey: h?.propertyKey,
-                  namespace: h?.namespace,
-                  newPropertiesOrder: g,
-                  parentCollectionIds: h?.parentCollectionIds
+                  path: f?.editedCollectionId,
+                  propertyKey: f?.propertyKey,
+                  namespace: f?.namespace,
+                  newPropertiesOrder: s,
+                  parentCollectionIds: f?.parentCollectionIds
                 }).then(() => {
-                  N(void 0);
-                }).catch((_) => (console.error(_), v.open({
+                  w(void 0);
+                }).catch((V) => (console.error(V), v.open({
                   type: "error",
-                  message: "Error deleting property: " + (_.message ?? "Details in the console")
+                  message: "Error deleting property: " + (V.message ?? "Details in the console")
                 }), !1));
               },
               onError: () => {
               },
               onOkClicked: () => {
-                N(void 0);
+                w(void 0);
               },
               onCancel: () => {
-                N(void 0);
+                w(void 0);
               },
               initialErrors: {},
               forceShowErrors: !1,
               existingPropertyKeys: [],
               allowDataInference: !0,
-              propertyConfigs: w,
-              property: h?.property,
-              propertyKey: h?.propertyKey
+              propertyConfigs: x,
+              property: f?.property,
+              propertyKey: f?.propertyKey
             }
           )
         ]
       }
     ) });
   },
-  ge
-), we = () => Kt(hr), fr = () => Kt(mr);
+  ve
+), xe = () => Jt(hr), fr = () => Jt(mr);
 function ln({
   path: t,
   parentCollectionIds: r,
   collection: n,
   tableController: i
 }) {
-  const l = Ae(), o = xe(), d = we(), u = fr(), p = Ie(), m = o.getCollectionFromIds(r), c = 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;
-  let s = null;
-  return (!ge(at(i.filterValues), at(n.initialFilter)) || !ge(at(i.sortBy), at(n.initialSort))) && (s = /* @__PURE__ */ a(U, { children: [
+  let c = null;
+  return (!ve(at(i.filterValues), at(n.initialFilter)) || !ve(at(i.sortBy), at(n.initialSort))) && (c = /* @__PURE__ */ a(U, { children: [
     (n.initialFilter || n.initialSort) && /* @__PURE__ */ e(
       te,
       {
@@ -5073,18 +5083,18 @@ function ln({
       }
     )
   ] })), /* @__PURE__ */ a(U, { children: [
-    c && s,
+    m && c,
     /* @__PURE__ */ e(
       te,
       {
-        title: c ? "Edit collection" : "You don't have permissions to edit this collection",
+        title: m ? "Edit collection" : "You don't have permissions to edit this collection",
         children: /* @__PURE__ */ e(
           oe,
           {
             color: "primary",
-            disabled: !c,
-            onClick: c ? () => d?.editCollection({ id: n.id, fullPath: t, parentCollectionIds: r, parentCollection: m }) : void 0,
-            children: /* @__PURE__ */ e(Ye, {})
+            disabled: !m,
+            onClick: m ? () => d?.editCollection({ id: n.id, fullPath: t, parentCollectionIds: r, parentCollection: h }) : void 0,
+            children: /* @__PURE__ */ e(He, {})
           }
         )
       }
@@ -5098,14 +5108,14 @@ function sn({
   path: t,
   collection: r
 }) {
-  const n = Ie(), i = Ae(), l = fr(), o = we(), d = o.configPermissions({
+  const n = Ie(), i = _e(), l = fr(), o = xe(), d = o.configPermissions({
     user: i.user,
     collection: r
-  }), u = Z(() => {
+  }), u = Q(() => {
     o?.editCollection({ id: r.id, parentCollectionIds: [] });
-  }, [o, t]), [p, m] = j(!1), c = Z(() => {
+  }, [o, t]), [p, h] = $(!1), m = Q(() => {
     l?.deleteCollection({ id: r.id }).then(() => {
-      m(!1), n.open({
+      h(!1), n.open({
         message: "Collection deleted",
         type: "success"
       });
@@ -5117,10 +5127,10 @@ function sn({
         Zr,
         {
           trigger: /* @__PURE__ */ e(oe, { children: /* @__PURE__ */ e(Jr, { size: "small" }) }),
-          children: /* @__PURE__ */ a(Qr, { onClick: (s) => {
-            s.preventDefault(), s.stopPropagation(), m(!0);
+          children: /* @__PURE__ */ a(Qr, { onClick: (c) => {
+            c.preventDefault(), c.stopPropagation(), h(!0);
           }, children: [
-            /* @__PURE__ */ e(ct, {}),
+            /* @__PURE__ */ e(dt, {}),
             "Delete"
           ] })
         }
@@ -5128,10 +5138,10 @@ function sn({
       d.editCollections && /* @__PURE__ */ e(
         oe,
         {
-          onClick: (s) => {
+          onClick: (c) => {
             u();
           },
-          children: /* @__PURE__ */ e(Ye, { size: "small" })
+          children: /* @__PURE__ */ e(He, { size: "small" })
         }
       )
     ] }),
@@ -5139,8 +5149,8 @@ function sn({
       lt,
       {
         open: p,
-        onAccept: c,
-        onCancel: () => m(!1),
+        onAccept: m,
+        onCancel: () => h(!1),
         title: /* @__PURE__ */ e(U, { children: "Delete this collection?" }),
         body: /* @__PURE__ */ a(U, { children: [
           " This will ",
@@ -5151,19 +5161,19 @@ function sn({
     )
   ] });
 }
-function dn({
+function cn({
   group: t,
   context: r
 }) {
   if (!r.navigation.topLevelNavigation)
     throw Error("Navigation not ready in FireCMSHomePage");
-  const n = Ae(), i = we(), l = i.configPermissions ? i.configPermissions({
+  const n = _e(), i = xe(), l = i.configPermissions ? i.configPermissions({
     user: n.user
   }).createCollections : !0;
   return /* @__PURE__ */ e(
     tr,
     {
-      className: pe("h-full p-4 min-h-[124px]"),
+      className: me("h-full p-4 min-h-[124px]"),
       onClick: i && l ? () => i.createCollection({
         initialValues: t ? { group: t } : void 0,
         parentCollectionIds: [],
@@ -5175,9 +5185,9 @@ function dn({
         {
           className: "flex flex-col items-start h-full w-full items-center justify-center h-full w-full flex-grow flex-col",
           children: [
-            /* @__PURE__ */ e(me, { color: "primary", size: "large" }),
+            /* @__PURE__ */ e(ue, { color: "primary", size: "large" }),
             /* @__PURE__ */ e(
-              V,
+              O,
               {
                 color: "primary",
                 variant: "caption",
@@ -5185,46 +5195,59 @@ function dn({
                 children: "Add new collection".toUpperCase()
               }
             ),
-            !l && /* @__PURE__ */ e(V, { 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" })
           ]
         }
       )
     }
   );
 }
-function cn() {
-  const t = Ae(), r = xe(), n = we(), i = n.configPermissions ? n.configPermissions({
-    user: t.user
-  }).createCollections : !0, l = n.rootPathSuggestions ?? [], o = l.length > 3 || (r.collections ?? []).length === 0 && l.length > 0;
+function dn({ introMode: t }) {
+  const r = _e(), n = Pe(), i = xe(), l = i.configPermissions ? i.configPermissions({
+    user: r.user
+  }).createCollections : !0, o = i.rootPathSuggestions, d = (o ?? []).length > 3 || (n.collections ?? []).length === 0 && (o ?? []).length > 0;
   return /* @__PURE__ */ e(
     Xr,
     {
-      in: o,
+      in: t === "existing_project" || d,
       children: /* @__PURE__ */ a(
         "div",
         {
           className: "flex flex-col gap-1 p-2 my-4",
           children: [
-            /* @__PURE__ */ e(V, { variant: "body2", color: "secondary", children: "Create a collection from your data:" }),
-            /* @__PURE__ */ e(
+            !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"
+            ] }),
+            /* @__PURE__ */ a(
               "div",
               {
                 className: "flex flex-row gap-1 overflow-scroll no-scrollbar ",
-                children: l.map((d) => /* @__PURE__ */ e("div", { children: /* @__PURE__ */ e(
-                  st,
-                  {
-                    icon: /* @__PURE__ */ e(me, { size: "small" }),
-                    colorScheme: "cyanLighter",
-                    onClick: n && i ? () => n.createCollection({
-                      initialValues: { path: d, name: ut(d) },
-                      parentCollectionIds: [],
-                      redirect: !0,
-                      sourceClick: "root_collection_suggestion"
-                    }) : void 0,
-                    size: "small",
-                    children: d
-                  }
-                ) }, d))
+                children: [
+                  (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: p, name: ut(p) },
+                        parentCollectionIds: [],
+                        redirect: !0,
+                        sourceClick: "root_collection_suggestion"
+                      }) : void 0,
+                      size: "small",
+                      children: p
+                    }
+                  ) }, p)),
+                  o === void 0 && /* @__PURE__ */ e(De, { size: "small" }),
+                  o?.length === 0 && /* @__PURE__ */ e(O, { variant: "caption", children: "No suggestions" })
+                ]
               }
             )
           ]
@@ -5241,7 +5264,7 @@ function un({
   parentCollectionIds: l,
   collection: o
 }) {
-  const d = we();
+  const d = xe();
   return /* @__PURE__ */ e(te, { title: "Edit", children: /* @__PURE__ */ e(
     oe,
     {
@@ -5256,7 +5279,7 @@ function un({
         });
       },
       size: "small",
-      children: /* @__PURE__ */ e(Ye, { size: "small" })
+      children: /* @__PURE__ */ e(He, { size: "small" })
     }
   ) });
 }
@@ -5265,7 +5288,7 @@ function pn({
   parentCollectionIds: r,
   collection: n
 }) {
-  const i = Ae(), l = we(), o = l.configPermissions ? l.configPermissions({
+  const i = _e(), l = xe(), o = l.configPermissions ? l.configPermissions({
     user: i.user,
     collection: n
   }).editCollections : !0;
@@ -5277,16 +5300,16 @@ function pn({
         l.editProperty({
           editedCollectionId: n.id,
           parentCollectionIds: r,
-          currentPropertiesOrder: Ir(n),
+          currentPropertiesOrder: Vr(n),
           collection: n
         });
       },
-      children: /* @__PURE__ */ e(me, { color: "inherit" })
+      children: /* @__PURE__ */ e(ue, { color: "inherit" })
     }
   ) });
 }
 function mn() {
-  const t = we();
+  const t = xe();
   return /* @__PURE__ */ a(
     z,
     {
@@ -5298,15 +5321,15 @@ function mn() {
         sourceClick: "new_collection_button"
       }),
       children: [
-        /* @__PURE__ */ e(me, {}),
+        /* @__PURE__ */ e(ue, {}),
         "New collection"
       ]
     }
   );
 }
-function Vn({
+function In({
   collectionConfigController: t,
-  modifyCollection: r,
+  introMode: r,
   configPermissions: n,
   reservedGroups: i,
   extraView: l,
@@ -5314,7 +5337,7 @@ function Vn({
   getUser: d,
   collectionInference: u,
   getData: p,
-  onAnalyticsEvent: m
+  onAnalyticsEvent: h
 }) {
   return {
     name: "Collection Editor",
@@ -5333,14 +5356,15 @@ function Vn({
         pathSuggestions: o,
         getUser: d,
         getData: p,
-        onAnalyticsEvent: m
+        onAnalyticsEvent: h
       }
     },
     homePage: {
       additionalActions: /* @__PURE__ */ e(mn, {}),
-      additionalChildrenEnd: /* @__PURE__ */ e(cn, {}),
+      additionalChildrenStart: r ? /* @__PURE__ */ e(hn, { introMode: r }) : void 0,
+      additionalChildrenEnd: /* @__PURE__ */ e(dn, { introMode: r }),
       CollectionActions: sn,
-      AdditionalCards: dn
+      AdditionalCards: r ? void 0 : cn
     },
     collectionView: {
       HeaderAction: un,
@@ -5348,10 +5372,37 @@ function Vn({
     }
   };
 }
-function In({ path: t }) {
-  const r = xe(), n = hn(t), i = r.getParentCollectionIds(t), l = we();
+function hn({ introMode: t }) {
+  if (!Pe().topLevelNavigation)
+    throw Error("Navigation not ready in FireCMSHomePage");
+  const n = _e(), i = xe(), l = i.configPermissions ? i.configPermissions({
+    user: n.user
+  }).createCollections : !0;
+  return /* @__PURE__ */ a("div", { className: "mt-8 flex flex-col mt-8 p-2", children: [
+    /* @__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,
+      {
+        className: "mt-4",
+        onClick: i && l ? () => i.createCollection({
+          parentCollectionIds: [],
+          redirect: !0,
+          sourceClick: "new_collection_card"
+        }) : void 0,
+        children: [
+          /* @__PURE__ */ e(ue, {}),
+          "Create your first collection"
+        ]
+      }
+    )
+  ] });
+}
+function _n({ path: t }) {
+  const r = Pe(), n = fn(t), i = r.getParentCollectionIds(t), l = xe();
   return /* @__PURE__ */ a("div", { className: "p-1 flex flex-col items-center", children: [
-    /* @__PURE__ */ e(Jt, { error: "No collection for path: " + n }),
+    /* @__PURE__ */ e(Wt, { error: "No collection for path: " + n }),
     /* @__PURE__ */ e(
       z,
       {
@@ -5371,21 +5422,21 @@ function In({ path: t }) {
     )
   ] });
 }
-function hn(t) {
+function fn(t) {
   const r = t.split("/");
   return r[r.length - 1];
 }
 export {
-  In as MissingReferenceWidget,
-  Le as editableProperty,
+  _n as MissingReferenceWidget,
+  qe as editableProperty,
   ae as getFullId,
   ir as getFullIdPath,
-  ue as idToPropertiesPath,
+  pe as idToPropertiesPath,
   ye as namespaceToPropertiesOrderPath,
   bi as namespaceToPropertiesPath,
   wi as removeNonEditableProperties,
-  we as useCollectionEditorController,
-  Vn as useCollectionEditorPlugin,
+  xe as useCollectionEditorController,
+  In as useCollectionEditorPlugin,
   fr as useCollectionsConfigController
 };
 //# sourceMappingURL=index.es.js.map