@firecms/collection_editor 3.0.0-canary.4 → 3.0.0-canary.41

package/dist/index.es.js

@@ -1,29 +1,23 @@
-import { jsx as e, jsxs as a, Fragment as j } from "react/jsx-runtime";
-import { SearchIconsView as gr, toSnakeCase as Pt, singular as vr, IconForView as ot, ArrayContainer as yr, serializeRegExp as br, useSnackbarController as Ie, resolveEnumValues as Cr, isPropertyBuilder as ne, useCustomizationController as Ae, getFieldConfig as $e, ErrorBoundary as ge, PropertyConfigBadge as Ye, unslugify as ut, useNavigationController as Pe, mergeDeep as W, DEFAULT_FIELD_CONFIGS as Gt, isValidRegExp as Pr, getFieldId as Kt, DeleteConfirmationDialog as lt, useLargeLayout as Nr, makePropertiesEditable as pt, resolveEntityView as xr, useSelectionController as wr, EntityCollectionTable as Tr, slugify as kr, useAuthController as _e, randomString as _t, CircularProgressCenter as Nt, removeUndefined as Ft, ErrorView as Wt, removeInitialAndTrailingSlashes as Or, getDefaultPropertiesOrder as Vr } from "@firecms/core";
+import { jsx as e, jsxs as a, Fragment as R } from "react/jsx-runtime";
+import { FieldCaption as X, SearchIconsView as gr, toSnakeCase as Pt, singular as vr, IconForView as lt, ArrayContainer as yr, serializeRegExp as br, useSnackbarController as _e, resolveEnumValues as Cr, isPropertyBuilder as ne, useCustomizationController as Ae, getFieldConfig as $e, ErrorBoundary as me, PropertyConfigBadge as Ye, unslugify as pt, useNavigationController as Ne, mergeDeep as W, DEFAULT_FIELD_CONFIGS as Gt, isValidRegExp as Pr, getFieldId as Kt, DeleteConfirmationDialog as st, useLargeLayout as Nr, makePropertiesEditable as He, resolveEntityView as xr, useSelectionController as wr, EntityCollectionTable as Tr, slugify as kr, useAuthController as Te, randomString as _t, CircularProgressCenter as Nt, removeUndefined as St, ErrorView as Wt, removeInitialAndTrailingSlashes as Or, getDefaultPropertiesOrder as Vr, joinCollectionLists as Ir } from "@firecms/core";
 import * as je from "react";
-import Y, { useState as $, useEffect as de, 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 se, 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 Y, { useState as $, useEffect as de, useMemo as Zt, useCallback as Q, useRef as Le, useDeferredValue as _r, useContext as Jt } from "react";
+import ye from "react-fast-compare";
+import { useAutoComplete as Sr, Container as mt, Typography as O, Tooltip as te, IconButton as oe, Chip as ct, TextField as Ve, cn as fe, DebouncedTextField as Z, Autocomplete as Fr, AutocompleteItem as Er, ExpandablePanel as xt, SettingsIcon as Ge, Select as Ce, SelectItem as ee, BooleanSwitchWithLabel as dt, Dialog as Se, AutoAwesomeIcon as ht, Badge as Ar, ListIcon as Dr, Button as z, CircularProgress as De, Paper as Pe, DialogContent as Be, DialogActions as ze, RuleIcon as Br, FileUploadIcon as zr, MultiSelect as Mr, MultiSelectItem as Ft, Checkbox as Et, cardMixin as Qt, cardClickableMixin as Xt, cardSelectedMixin as er, FunctionsIcon as Rr, RemoveCircleIcon as Ur, defaultBorderMixin as wt, RemoveIcon as jr, DragHandleIcon as Lr, AddIcon as se, SelectGroup as At, InfoLabel as qr, DeleteIcon as ut, ContentCopyIcon as $r, CodeIcon as Yr, Table as Dt, TableBody as Bt, TableRow as bt, TableCell as Ue, Alert as Hr, Icon as tt, Card as tr, coolIconKeys as zt, Tabs as Gr, Tab as Ct, ArrowBackIcon as rt, LoadingButton as Mt, DoneIcon as Kr, Menu as Wr, MoreVertIcon as Zr, MenuItem as Jr, Collapse as Qr, SaveIcon as Xr, UndoIcon as ei } from "@firecms/ui";
+import * as it 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 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"),
-  name: rt.string().required("Required"),
-  path: rt.string().required("Required")
+import { extractEnumFromValues as ti, buildPropertyFromData as ri, buildEntityPropertiesFromData as ii } from "@firecms/schema_inference";
+import { DragDropContext as ni, Droppable as ai, Draggable as oi } from "@hello-pangea/dnd";
+import li from "json5";
+import { Highlight as si, themes as ci } from "prism-react-renderer";
+import { ImportFileUpload as di, DataNewPropertiesMapping as ui, ImportNewPropertyFieldPreview as pi, getInferenceType as rr, getPropertiesMapping as mi, convertDataToEntity as hi, useImportConfig as fi, ImportSaveInProgress as gi } from "@firecms/data_import_export";
+import { useNavigate as vi } from "react-router";
+const yi = it.object().shape({
+  id: it.string().required("Required"),
+  name: it.string().required("Required"),
+  path: it.string().required("Required")
 });
-function X({
-  error: t,
-  children: r
-}) {
-  return r ? /* @__PURE__ */ e(O, { variant: "caption", color: t ? "error" : "secondary", className: "ml-3.5 mt-0.5", children: r }) : null;
-}
-function yi({
+function bi({
   isNewCollection: t,
   reservedGroups: r,
   existingPaths: n,
@@ -31,12 +25,12 @@ function yi({
   groups: l,
   parentCollection: o
 }) {
-  const d = Y.useRef(null), {
+  const c = Y.useRef(null), {
     values: u,
     setFieldValue: p,
     handleChange: h,
     touched: m,
-    errors: c,
+    errors: d,
     setFieldTouched: g,
     isSubmitting: v,
     submitCount: x
@@ -44,15 +38,15 @@ function yi({
     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(() => {
-    c.id && b(!0);
-  }, [c.id]);
-  const N = /* @__PURE__ */ e(ot, { collectionOrView: u }), f = l?.filter((s) => !r?.includes(s)), {
+    d.id && b(!0);
+  }, [d.id]);
+  const N = /* @__PURE__ */ e(lt, { collectionOrView: u }), f = l?.filter((s) => !r?.includes(s)), {
     inputFocused: w,
     autoCompleteOpen: _,
     setAutoCompleteOpen: M
-  } = _r({
-    ref: d
-  }), R = !!o;
+  } = Sr({
+    ref: c
+  }), U = !!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;
@@ -75,7 +69,7 @@ function yi({
           ]
         }
       ),
-      o && /* @__PURE__ */ e(st, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(O, { variant: "caption", children: [
+      o && /* @__PURE__ */ e(ct, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(O, { variant: "caption", children: [
         "This is a subcollection of ",
         /* @__PURE__ */ e("b", { children: o.name })
       ] }) })
@@ -83,18 +77,18 @@ function yi({
     /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-4", children: [
       /* @__PURE__ */ a("div", { className: "col-span-12", children: [
         /* @__PURE__ */ e(
-          Oe,
+          Ve,
           {
             value: u.name ?? "",
             onChange: (s) => C(s.target.value),
             label: "Name",
             required: !0,
-            error: A && !!c.name
+            error: A && !!d.name
           }
         ),
-        /* @__PURE__ */ e(X, { error: m.name && !!c.name, children: m.name && c.name ? c.name : "Name of in this collection, usually a plural name (e.g. Products)" })
+        /* @__PURE__ */ e(X, { error: m.name && !!d.name, children: m.name && d.name ? d.name : "Name of in this collection, usually a plural name (e.g. Products)" })
       ] }),
-      /* @__PURE__ */ a("div", { className: me("col-span-12 ", R ? "" : "sm:col-span-8"), children: [
+      /* @__PURE__ */ a("div", { className: fe("col-span-12 ", U ? "" : "sm:col-span-8"), children: [
         /* @__PURE__ */ e(
           H,
           {
@@ -103,22 +97,22 @@ function yi({
             label: "Path",
             disabled: !t,
             required: !0,
-            error: A && !!c.path
+            error: A && !!d.path
           }
         ),
-        /* @__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" })
+        /* @__PURE__ */ e(X, { error: m.path && !!d.path, children: m.path && d.path ? d.path : U ? "Relative path to the parent (no need to include the parent path)" : "Path that this collection is stored in, in the database" })
       ] }),
-      !R && /* @__PURE__ */ a("div", { className: "col-span-12 sm:col-span-4 relative", children: [
+      !U && /* @__PURE__ */ a("div", { className: "col-span-12 sm:col-span-4 relative", children: [
         /* @__PURE__ */ e(
-          Oe,
+          Ve,
           {
-            error: A && !!c.group,
+            error: A && !!d.group,
             disabled: v,
             value: u.group ?? "",
             autoComplete: "off",
             onChange: (s) => p("group", s.target.value),
             name: "group",
-            inputRef: d,
+            inputRef: c,
             label: "Group"
           }
         ),
@@ -128,7 +122,7 @@ function yi({
             open: _ && (f ?? []).length > 0,
             setOpen: M,
             children: f?.map((s, V) => /* @__PURE__ */ e(
-              Sr,
+              Er,
               {
                 onClick: () => {
                   M(!1), p("group", s ?? null);
@@ -139,7 +133,7 @@ function yi({
             ))
           }
         ),
-        /* @__PURE__ */ e(X, { children: A && c.group ? c.group : "Group of the collection" })
+        /* @__PURE__ */ e(X, { children: A && d.group ? d.group : "Group of the collection" })
       ] }),
       /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
         xt,
@@ -147,7 +141,7 @@ function yi({
           expanded: k,
           onExpandedChange: b,
           title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
-            /* @__PURE__ */ e(He, {}),
+            /* @__PURE__ */ e(Ge, {}),
             /* @__PURE__ */ e(
               O,
               {
@@ -167,16 +161,16 @@ function yi({
                   as: Z,
                   disabled: !t,
                   label: "Collection id",
-                  error: A && !!c.id
+                  error: A && !!d.id
                 }
               ),
-              /* @__PURE__ */ e(X, { error: m.id && !!c.id, children: m.id && c.id ? c.id : "This id identifies this collection" })
+              /* @__PURE__ */ e(X, { error: m.id && !!d.id, children: m.id && d.id ? d.id : "This id identifies this collection" })
             ] }),
             /* @__PURE__ */ a("div", { className: "col-span-12", children: [
               /* @__PURE__ */ e(
-                Oe,
+                Ve,
                 {
-                  error: A && !!c.singularName,
+                  error: A && !!d.singularName,
                   name: "singularName",
                   "aria-describedby": "singularName-helper",
                   onChange: (s) => (g("singularName", !0), h(s)),
@@ -184,13 +178,13 @@ function yi({
                   label: "Singular name"
                 }
               ),
-              /* @__PURE__ */ e(X, { error: A && !!c.singularName, children: A && c.singularName ? c.singularName : "Optionally define a singular name for your entities" })
+              /* @__PURE__ */ e(X, { error: A && !!d.singularName, children: A && d.singularName ? d.singularName : "Optionally define a singular name for your entities" })
             ] }),
             /* @__PURE__ */ a("div", { className: "col-span-12", children: [
               /* @__PURE__ */ e(
-                Oe,
+                Ve,
                 {
-                  error: A && !!c.description,
+                  error: A && !!d.description,
                   name: "description",
                   value: u.description ?? "",
                   onChange: h,
@@ -200,10 +194,10 @@ function yi({
                   label: "Description"
                 }
               ),
-              /* @__PURE__ */ e(X, { error: A && !!c.description, children: A && c.description ? c.description : "Description of the collection, you can use markdown" })
+              /* @__PURE__ */ e(X, { error: A && !!d.description, children: A && d.description ? d.description : "Description of the collection, you can use markdown" })
             ] }),
             /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
-              be,
+              Ce,
               {
                 name: "defaultSize",
                 label: "Default row size",
@@ -222,7 +216,7 @@ function yi({
               }
             ) }),
             /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(
-              be,
+              Ce,
               {
                 name: "customId",
                 label: "Data IDs generation",
@@ -244,7 +238,7 @@ function yi({
             ) }),
             /* @__PURE__ */ a("div", { className: "col-span-12", children: [
               /* @__PURE__ */ e(
-                ct,
+                dt,
                 {
                   position: "start",
                   label: "Collection group",
@@ -256,7 +250,7 @@ function yi({
             ] }),
             /* @__PURE__ */ a("div", { className: "col-span-12", children: [
               /* @__PURE__ */ e(
-                ct,
+                dt,
                 {
                   position: "start",
                   label: "Enable text search for this collection",
@@ -272,7 +266,7 @@ function yi({
     ] }),
     /* @__PURE__ */ e("div", { style: { height: "52px" } }),
     /* @__PURE__ */ e(
-      Fe,
+      Se,
       {
         open: y,
         onOpenChange: P,
@@ -291,13 +285,13 @@ function yi({
     )
   ] }) });
 }
-function pe(t) {
+function he(t) {
   return "properties." + t.replaceAll(".", ".properties.");
 }
-function bi(t) {
+function Ci(t) {
   return t ? "properties." + t.replaceAll(".", ".properties.") + ".properties" : "properties";
 }
-function ye(t) {
+function be(t) {
   return t ? "properties." + t.replaceAll(".", ".properties.") + ".propertiesOrder" : "propertiesOrder";
 }
 function ae(t, r) {
@@ -305,33 +299,33 @@ function ae(t, r) {
 }
 function ir(t, r) {
   const n = r ? `${r}.${t}` : t;
-  return pe(n);
+  return he(n);
 }
-function Ci({
+function Pi({
   enumValues: t,
   onValuesChanged: r,
   onError: n,
   updateIds: i,
   disabled: l,
   allowDataInference: o,
-  getData: d
+  getData: c
 }) {
   const u = Tt({
     initialValues: { enumValues: t },
     validateOnChange: !0,
     validation: (m) => {
-      const c = {};
+      const d = {};
       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");
+        v?.label || (d.enumValues = d.enumValues ?? [], d.enumValues[x] = d.enumValues[x] ?? {}, d.enumValues[x].label = "You must specify a label for this enum value entry"), v?.id || (d.enumValues = d.enumValues ?? [], d.enumValues[x] = d.enumValues[x] ?? {}, d.enumValues[x].id = "You must specify an ID for this enum value entry");
       });
-      const g = !!(c?.enumValues && Object.keys(c?.enumValues).length > 0);
-      return n?.(g), c;
+      const g = !!(d?.enumValues && Object.keys(d?.enumValues).length > 0);
+      return n?.(g), d;
     }
   }), { values: p, errors: h } = u;
   return de(() => {
     r && r(p.enumValues);
   }, [p.enumValues]), /* @__PURE__ */ e(kt, { value: u, children: /* @__PURE__ */ e(
-    Pi,
+    Ni,
     {
       enumValuesPath: "enumValues",
       values: p,
@@ -339,25 +333,25 @@ function Ci({
       shouldUpdateId: i,
       disabled: l,
       allowDataInference: o,
-      getData: d
+      getData: c
     }
   ) });
 }
-function Pi({
+function Ni({
   values: t,
   errors: r,
   disabled: n,
   enumValuesPath: i,
   shouldUpdateId: l,
   allowDataInference: o,
-  getData: d
+  getData: c
 }) {
   const {
     setFieldValue: u
-  } = K(), [p, h] = Y.useState(), [m, c] = Y.useState(), [g, v] = Y.useState(!1), y = Y.useRef(/* @__PURE__ */ new Set()).current, P = (b, C) => {
+  } = K(), [p, h] = Y.useState(), [m, d] = 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,
+      xi,
       {
         index: b,
         disabled: n,
@@ -365,7 +359,7 @@ function Pi({
         autoFocus: N,
         entryError: f,
         shouldUpdateId: l || N,
-        onDialogOpen: () => c(b),
+        onDialogOpen: () => d(b),
         inferredEntry: y.has(t.enumValues[b]?.id)
       },
       `${C}`
@@ -373,7 +367,7 @@ function Pi({
   };
   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(Dr, {}),
       /* @__PURE__ */ e(
         O,
         {
@@ -390,10 +384,10 @@ function Pi({
           variant: "text",
           size: "small",
           onClick: async () => {
-            d && (v(!0), d?.().then((b) => {
+            c && (v(!0), c?.().then((b) => {
               if (!b)
                 return;
-              const C = b.flat(), N = Array.from(new Set(C)), f = t.enumValues, _ = ei(N).filter((M) => !f?.some((R) => R.id === M.id));
+              const C = b.flat(), N = Array.from(new Set(C)), f = t.enumValues, _ = ti(N).filter((M) => !f?.some((U) => U.id === M.id));
               _.forEach((M) => {
                 y.add(M.id);
               }), u(i, [..._, ...f], !0);
@@ -408,7 +402,7 @@ function Pi({
         }
       )
     ] }),
-    /* @__PURE__ */ a(Ce, { className: "p-4 m-1", children: [
+    /* @__PURE__ */ a(Pe, { className: "p-4 m-1", children: [
       /* @__PURE__ */ e(
         yr,
         {
@@ -425,38 +419,38 @@ function Pi({
         }
       ),
       /* @__PURE__ */ e(
-        xi,
+        wi,
         {
           index: m,
           open: m !== void 0,
           enumValuesPath: i,
-          onClose: () => c(void 0)
+          onClose: () => d(void 0)
         }
       )
     ] })
   ] });
 }
-const Ni = Y.memo(
+const xi = Y.memo(
   function({
     index: r,
     shouldUpdateId: n,
     enumValuesPath: i,
     autoFocus: l,
     onDialogOpen: o,
-    disabled: d,
+    disabled: c,
     inferredEntry: u,
     entryError: p
   }) {
     const {
       values: h,
       handleChange: m,
-      errors: c,
+      errors: d,
       setFieldValue: g,
       touched: v
     } = K(), x = Y.useRef(!I(h, `${i}[${r}].id`)), y = n || x.current, P = I(h, `${i}[${r}].id`), k = I(h, `${i}[${r}].label`), b = Y.useRef(k);
     return Y.useEffect(() => {
       (b.current === P || !P) && y && g(`${i}[${r}].id`, k), b.current = k;
-    }, [k]), /* @__PURE__ */ a(j, { children: [
+    }, [k]), /* @__PURE__ */ a(R, { children: [
       /* @__PURE__ */ a("div", { className: "flex w-full align-center justify-center", children: [
         /* @__PURE__ */ e(
           H,
@@ -465,7 +459,7 @@ const Ni = Y.memo(
             as: Z,
             className: "flex-grow",
             required: !0,
-            disabled: d,
+            disabled: c,
             size: "small",
             autoFocus: l,
             autoComplete: "off",
@@ -473,14 +467,14 @@ const Ni = Y.memo(
             error: !!p?.label
           }
         ),
-        !d && /* @__PURE__ */ e(Er, { color: "error", invisible: !p?.id, children: /* @__PURE__ */ e(
+        !c && /* @__PURE__ */ e(Ar, { color: "error", invisible: !p?.id, children: /* @__PURE__ */ e(
           oe,
           {
             size: "small",
             "aria-label": "edit",
             className: "m-1",
             onClick: () => o(),
-            children: /* @__PURE__ */ e(He, { size: "small" })
+            children: /* @__PURE__ */ e(Ge, { size: "small" })
           }
         ) })
       ] }),
@@ -503,10 +497,10 @@ const Ni = Y.memo(
     ] });
   },
   function(r, n) {
-    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;
+    return r.index === n.index && r.enumValuesPath === n.enumValuesPath && r.shouldUpdateId === n.shouldUpdateId && r.inferredEntry === n.inferredEntry && ye(r.entryError, n.entryError) && r.autoFocus === n.autoFocus;
   }
 );
-function xi({
+function wi({
   index: t,
   open: r,
   onClose: n,
@@ -516,12 +510,12 @@ function xi({
     errors: l
   } = K(), o = t !== void 0 ? I(l, `${i}[${t}].id`) : void 0;
   return /* @__PURE__ */ a(
-    Fe,
+    Se,
     {
       maxWidth: "md",
       "aria-labelledby": "enum-edit-dialog",
       open: r,
-      onOpenChange: (d) => d ? void 0 : n(),
+      onOpenChange: (c) => c ? void 0 : n(),
       children: [
         /* @__PURE__ */ e(Be, { children: t !== void 0 && /* @__PURE__ */ a("div", { children: [
           /* @__PURE__ */ e(
@@ -559,17 +553,17 @@ function ce({
   tooltip: i,
   disabled: l,
   size: o = "small",
-  allowIndeterminate: d
+  allowIndeterminate: c
 }) {
   const u = /* @__PURE__ */ e(
-    ct,
+    dt,
     {
       label: n,
       size: o,
       position: "start",
       value: t.value,
       disabled: l,
-      allowIndeterminate: d,
+      allowIndeterminate: c,
       onValueChange: (p) => r.setFieldValue(t.name, p)
     }
   );
@@ -581,22 +575,22 @@ function ce({
     }
   ) : u;
 }
-function Se({ disabled: t }) {
+function Fe({ disabled: t }) {
   const { values: r, handleChange: n } = K(), i = "validation.required", l = "validation.requiredMessage";
-  return /* @__PURE__ */ a(j, { children: [
+  return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
       H,
       {
         name: i,
         type: "checkbox",
-        children: ({ field: d, form: u }) => /* @__PURE__ */ e(
+        children: ({ field: c, form: u }) => /* @__PURE__ */ e(
           ce,
           {
             disabled: t,
             label: "Required",
             tooltip: "You won't be able to save this entity if this value is not set",
             form: u,
-            field: d
+            field: c
           }
         )
       }
@@ -606,14 +600,14 @@ function Se({ disabled: t }) {
       {
         name: "validation.unique",
         type: "checkbox",
-        children: ({ field: d, form: u }) => /* @__PURE__ */ e(
+        children: ({ field: c, form: u }) => /* @__PURE__ */ e(
           ce,
           {
             disabled: t,
             label: "Unique",
             tooltip: "There cannot be multiple entities with the same value",
             form: u,
-            field: d
+            field: c
           }
         )
       }
@@ -638,17 +632,17 @@ function Ee({
   max: i,
   min: l,
   trim: o,
-  uppercase: d,
+  uppercase: c,
   disabled: u,
   showErrors: p
 }) {
   const {
     values: h,
     handleChange: m,
-    errors: c
-  } = K(), g = "validation.length", v = "validation.min", x = "validation.max", y = "validation.trim", P = "validation.matches", k = "validation.lowercase", b = "validation.uppercase", C = I(c, P), N = I(h, P), f = typeof N == "string" ? N : br(N);
+    errors: d
+  } = K(), g = "validation.length", v = "validation.min", x = "validation.max", y = "validation.trim", P = "validation.matches", k = "validation.lowercase", b = "validation.uppercase", C = I(d, P), N = I(h, P), f = typeof N == "string" ? N : br(N);
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
-    /* @__PURE__ */ e(Se, { disabled: u }),
+    /* @__PURE__ */ e(Fe, { 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,
@@ -666,7 +660,7 @@ function Ee({
           )
         }
       ) }),
-      d && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
+      c && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
         H,
         {
           name: b,
@@ -762,9 +756,9 @@ function Ot({
   const {
     values: i,
     handleChange: l
-  } = K(), o = "validation.min", d = "validation.max";
+  } = K(), o = "validation.min", c = "validation.max";
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
-    /* @__PURE__ */ e(Se, { disabled: n }),
+    /* @__PURE__ */ e(Fe, { disabled: n }),
     r && /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
       Z,
       {
@@ -780,10 +774,10 @@ function Ot({
     t && /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
       Z,
       {
-        value: I(i, d),
+        value: I(i, c),
         disabled: n,
         label: "Max length",
-        name: d,
+        name: c,
         type: "number",
         size: "small",
         onChange: l
@@ -791,7 +785,7 @@ function Ot({
     ) })
   ] });
 }
-function Ne({
+function xe({
   children: t
 }) {
   return /* @__PURE__ */ e(
@@ -801,7 +795,7 @@ function Ne({
       asField: !0,
       className: "p-4",
       title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
-        /* @__PURE__ */ e(Dr, {}),
+        /* @__PURE__ */ e(Br, {}),
         /* @__PURE__ */ e(
           O,
           {
@@ -824,13 +818,13 @@ function Rt({
   getData: o
 }) {
   const {
-    values: d,
+    values: c,
     setFieldError: u,
     setFieldValue: p
-  } = K(), h = Ie(), m = t ? "of.enumValues" : "enumValues", c = I(d, "defaultValue"), g = I(d, m), v = Zt(() => !g || typeof g == "boolean" ? [] : Cr(g) ?? [], [g]);
-  return /* @__PURE__ */ a(j, { children: [
+  } = K(), h = _e(), m = t ? "of.enumValues" : "enumValues", d = I(c, "defaultValue"), g = I(c, m), v = Zt(() => !g || typeof g == "boolean" ? [] : Cr(g) ?? [], [g]);
+  return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
-      Ci,
+      Pi,
       {
         enumValues: v,
         updateIds: r,
@@ -839,11 +833,11 @@ function Rt({
         onError: (y) => {
           u(m, y ? "This enum property is missing some values" : void 0);
         },
-        getData: o ? () => o().then((y) => y.map((P) => d.id && I(P, d.id)).filter(Boolean)) : void 0,
+        getData: o ? () => o().then((y) => y.map((P) => c.id && I(P, c.id)).filter(Boolean)) : void 0,
         onValuesChanged: (y) => {
-          if (d && (p(m, y), !t)) {
+          if (c && (p(m, y), !t)) {
             const P = y.filter((k) => !!k?.id).map((k) => k.id);
-            c && !P.includes(c) && (p("defaultValue", void 0), h.open({
+            d && !P.includes(d) && (p("defaultValue", void 0), h.open({
               type: "warning",
               message: "Default value was cleared"
             }));
@@ -851,7 +845,7 @@ function Rt({
         }
       }
     ) }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Ne, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(xe, { children: [
       !t && /* @__PURE__ */ e(
         Ee,
         {
@@ -862,7 +856,7 @@ function Rt({
       t && /* @__PURE__ */ e(Ot, { disabled: n })
     ] }) }),
     !t && /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
-      be,
+      Ce,
       {
         disabled: n,
         position: "item-aligned",
@@ -870,7 +864,7 @@ function Rt({
           p("defaultValue", y);
         },
         label: "Default value",
-        value: c ?? "",
+        value: d ?? "",
         children: v.filter((y) => !!y?.id).map((y) => /* @__PURE__ */ e(
           ee,
           {
@@ -883,7 +877,7 @@ function Rt({
     ) })
   ] });
 }
-const it = {
+const nt = {
   "image/*": "Images",
   "video/*": "Videos",
   "audio/*": "Audio files",
@@ -898,15 +892,15 @@ function Ut({
   const {
     values: i,
     setFieldValue: l
-  } = 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", k = typeof c == "function";
-  return /* @__PURE__ */ a(j, { children: [
+  } = K(), o = t ? "of.storage" : "storage", c = `${o}.acceptedFiles`, u = `${o}.fileName`, p = `${o}.storagePath`, h = `${o}.storeUrl`, m = I(i, u) ?? "{rand}_{file}", d = I(i, p) ?? "/", g = I(i, c), v = Array.isArray(g) ? g : void 0, x = !v || v.length === 0, y = (b) => {
+    b ? b.includes("all") || b.length >= Object.keys(nt).length ? l(c, void 0) : x ? l(c, Object.keys(nt).filter((C) => !b.includes(C))) : l(c, b) : l(c, void 0);
+  }, P = typeof m == "function", k = typeof d == "function";
+  return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       xt,
       {
         title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
-          /* @__PURE__ */ e(Br, {}),
+          /* @__PURE__ */ e(zr, {}),
           /* @__PURE__ */ e(
             O,
             {
@@ -918,16 +912,16 @@ function Ut({
         ] }),
         children: /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2 p-4", children: [
           /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(
-            zr,
+            Mr,
             {
               disabled: n,
-              name: d,
+              name: c,
               value: v ?? [],
               onMultiValueChange: y,
               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(", "),
+              renderValues: (b) => !b || b.length === 0 ? "All file types allowed" : b.map((C) => nt[C]).filter((C) => !!C).join(", "),
               children: [
-                /* @__PURE__ */ a(St, { value: "all", className: "flex items-center gap-2", children: [
+                /* @__PURE__ */ a(Ft, { value: "all", className: "flex items-center gap-2", children: [
                   /* @__PURE__ */ e(
                     Et,
                     {
@@ -936,7 +930,7 @@ function Ut({
                   ),
                   "All"
                 ] }, "all"),
-                Object.entries(it).map(([b, C]) => /* @__PURE__ */ a(St, { value: b, className: "flex items-center gap-2", children: [
+                Object.entries(nt).map(([b, C]) => /* @__PURE__ */ a(Ft, { value: b, className: "flex items-center gap-2", children: [
                   /* @__PURE__ */ e(
                     Et,
                     {
@@ -949,7 +943,7 @@ function Ut({
                     {
                       size: "small",
                       variant: "outlined",
-                      onClick: (N) => (N.preventDefault(), N.stopPropagation(), l(d, [b])),
+                      onClick: (N) => (N.preventDefault(), N.stopPropagation(), l(c, [b])),
                       children: "Only"
                     }
                   )
@@ -977,7 +971,7 @@ function Ut({
                 label: "Storage path",
                 disabled: k || n,
                 size: "small",
-                value: k ? "-" : c
+                value: k ? "-" : d
               }
             ),
             /* @__PURE__ */ a(O, { variant: "caption", className: "ml-3.5 mt-1 mb-2", children: [
@@ -1013,8 +1007,8 @@ function Ut({
         ] })
       }
     ) }),
-    /* @__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 }) }),
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(xe, { children: [
+      !t && /* @__PURE__ */ e("div", { className: "grid grid-cols-12 gap-2", children: /* @__PURE__ */ e(Fe, { disabled: n }) }),
       t && /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ot, { disabled: n }) })
     ] }) })
   ] });
@@ -1027,14 +1021,14 @@ function qe(t) {
     return r.dataType === "array" && typeof r.of == "function" || r.dataType === "array" && Array.isArray(r.of) ? !1 : !!r.editable;
   }
 }
-function wi(t) {
+function Ti(t) {
   return Object.entries(t).filter(([r, n]) => qe(n)).map(([r, n]) => {
     const i = n;
     if (qe(i))
       return i.dataType === "map" && i.properties ? {
         [r]: {
           ...i,
-          properties: wi(i.properties)
+          properties: Ti(i.properties)
         }
       } : { [r]: i };
   }).filter((r) => !!r).reduce((r, n) => ({ ...r, ...n }), {});
@@ -1047,10 +1041,10 @@ function nr({
   includeEditButton: l,
   selected: o
 }) {
-  const { propertyConfigs: d } = Ae(), u = $e(t, d);
+  const { propertyConfigs: c } = Ae(), u = $e(t, c);
   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(ge, { children: /* @__PURE__ */ a(
+  return n && console.log("PropertyFieldPreview", t), /* @__PURE__ */ e(me, { children: /* @__PURE__ */ a(
     "div",
     {
       onClick: r,
@@ -1058,9 +1052,9 @@ function nr({
       children: [
         /* @__PURE__ */ e("div", { className: "m-4", children: /* @__PURE__ */ e(Ye, { propertyConfig: u }) }),
         /* @__PURE__ */ a(
-          Ce,
+          Pe,
           {
-            className: me(
+            className: fe(
               "border",
               "pl-2 w-full flex flex-row gap-4 items-center",
               Qt,
@@ -1071,7 +1065,7 @@ function nr({
             ),
             children: [
               /* @__PURE__ */ a("div", { className: "w-full flex flex-col", children: [
-                i && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                i && /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
                   O,
                   {
                     variant: "body1",
@@ -1081,7 +1075,7 @@ function nr({
                   }
                 ) }),
                 /* @__PURE__ */ a("div", { className: "flex flex-row items-center", children: [
-                  /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                  /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
                     O,
                     {
                       className: "flex-grow pr-2",
@@ -1091,7 +1085,7 @@ function nr({
                       children: u?.name
                     }
                   ) }),
-                  /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                  /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
                     O,
                     {
                       variant: "body2",
@@ -1110,7 +1104,7 @@ function nr({
     }
   ) });
 }
-function Ti({
+function ki({
   name: t,
   selected: r,
   onClick: n,
@@ -1129,15 +1123,15 @@ function Ti({
             "div",
             {
               className: "h-8 w-8 p-1 rounded-full shadow text-white bg-gray-500",
-              children: /* @__PURE__ */ e(Mr, { color: "inherit", size: "medium" })
+              children: /* @__PURE__ */ e(Rr, { color: "inherit", size: "medium" })
             }
           ),
-          /* @__PURE__ */ e(Rr, { color: "disabled", size: "small", className: "absolute -right-2 -top-2" })
+          /* @__PURE__ */ e(Ur, { color: "disabled", size: "small", className: "absolute -right-2 -top-2" })
         ] }),
         /* @__PURE__ */ e(
-          Ce,
+          Pe,
           {
-            className: me(
+            className: fe(
               "pl-2 w-full flex flex-row gap-4 items-center",
               Qt,
               n ? Xt : "",
@@ -1166,7 +1160,7 @@ function Ti({
                     children: o?.name
                   }
                 ),
-                i && !ne(i) && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                i && !ne(i) && /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
                   O,
                   {
                     variant: "body2",
@@ -1175,7 +1169,7 @@ function Ti({
                     children: i.dataType
                   }
                 ) }),
-                i && ne(i) && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                i && ne(i) && /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
                   O,
                   {
                     variant: "body2",
@@ -1184,7 +1178,7 @@ function Ti({
                     children: "This property is defined as a property builder in code"
                   }
                 ) }),
-                !i && /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+                !i && /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
                   O,
                   {
                     variant: "body2",
@@ -1208,12 +1202,12 @@ const ft = Y.memo(
     onPropertyClick: i,
     properties: l,
     propertiesOrder: o,
-    additionalFields: d,
+    additionalFields: c,
     errors: u,
     onPropertyMove: p,
     onPropertyRemove: h,
     className: m,
-    inferredPropertyKeys: c,
+    inferredPropertyKeys: d,
     collectionEditable: g
   }) {
     const v = o ?? Object.keys(l), x = Q((y) => {
@@ -1222,7 +1216,7 @@ const ft = Y.memo(
       const P = y.source.index, k = y.destination.index, b = Array.from(v), [C] = b.splice(P, 1);
       b.splice(k, 0, C), p && p(b, r);
     }, [r, p, v]);
-    return /* @__PURE__ */ e(j, { children: /* @__PURE__ */ e(ii, { onDragEnd: x, children: /* @__PURE__ */ e(ni, { droppableId: `droppable_${r}`, children: (y, P) => /* @__PURE__ */ a(
+    return /* @__PURE__ */ e(R, { children: /* @__PURE__ */ e(ni, { onDragEnd: x, children: /* @__PURE__ */ e(ai, { droppableId: `droppable_${r}`, children: (y, P) => /* @__PURE__ */ a(
       "div",
       {
         ...y.droppableProps,
@@ -1230,14 +1224,14 @@ const ft = Y.memo(
         className: m,
         children: [
           v && v.map((k, b) => {
-            const C = l[k], N = d?.find((f) => f.key === k);
+            const C = l[k], N = c?.find((f) => f.key === k);
             return !C && !N ? (console.warn(`Property ${k} not found in properties or additionalFields`), null) : /* @__PURE__ */ e(
-              ai,
+              oi,
               {
                 draggableId: `array_field_${r}_${k}}`,
                 index: b,
-                children: (f, w) => /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
-                  ki,
+                children: (f, w) => /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
+                  Oi,
                   {
                     propertyKey: k,
                     propertyOrBuilder: C,
@@ -1245,7 +1239,7 @@ const ft = Y.memo(
                     provided: f,
                     errors: u,
                     namespace: r,
-                    inferredPropertyKeys: c,
+                    inferredPropertyKeys: d,
                     onPropertyMove: p,
                     onPropertyRemove: h,
                     onPropertyClick: w.isDragging ? void 0 : i,
@@ -1264,26 +1258,26 @@ const ft = Y.memo(
   },
   (t, r) => {
     const n = r.selectedPropertyKey?.startsWith(r.namespace ?? ""), i = t.selectedPropertyKey?.startsWith(t.namespace ?? "");
-    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) &&
+    return n || i ? !1 : ye(t.properties, r.properties) && t.propertiesOrder === r.propertiesOrder && ye(t.additionalFields, r.additionalFields) && ye(t.errors, r.errors) && ye(t.onPropertyClick, r.onPropertyClick) && // equal(prevProps.onPropertyMove, nextProps.onPropertyMove) &&
     // equal(prevProps.onPropertyRemove, nextProps.onPropertyRemove) &&
     t.namespace === r.namespace && t.collectionEditable === r.collectionEditable;
   }
 );
-function ki({
+function Oi({
   propertyKey: t,
   namespace: r,
   propertyOrBuilder: n,
   additionalField: i,
   provided: l,
   selectedPropertyKey: o,
-  errors: d,
+  errors: c,
   onPropertyClick: u,
   onPropertyMove: p,
   onPropertyRemove: h,
   inferredPropertyKeys: m,
-  collectionEditable: c
+  collectionEditable: d
 }) {
-  const g = m?.includes(r ? `${r}.${t}` : t), v = ae(t, r), y = ir(t, r) in d;
+  const g = m?.includes(r ? `${r}.${t}` : t), v = ae(t, r), y = ir(t, r) in c;
   let P;
   if (typeof n == "object") {
     const C = n;
@@ -1294,15 +1288,15 @@ function ki({
         namespace: v,
         properties: C.properties,
         propertiesOrder: C.propertiesOrder,
-        errors: d,
+        errors: c,
         onPropertyClick: u,
         onPropertyMove: p,
         onPropertyRemove: h,
-        collectionEditable: c
+        collectionEditable: d
       }
     ));
   }
-  const k = o === v, b = n && (c && !ne(n) || qe(n));
+  const k = o === v, b = n && (d && !ne(n) || qe(n));
   return /* @__PURE__ */ a(
     "div",
     {
@@ -1332,7 +1326,7 @@ function ki({
             hasError: y
           }
         ) : /* @__PURE__ */ e(
-          Ti,
+          ki,
           {
             name: t,
             property: n,
@@ -1348,7 +1342,7 @@ function ki({
               size: "small",
               color: "inherit",
               onClick: () => h(t, r),
-              children: /* @__PURE__ */ e(Ur, { size: "small" })
+              children: /* @__PURE__ */ e(jr, { size: "small" })
             }
           ) }),
           p && /* @__PURE__ */ e(te, { title: "Move", children: /* @__PURE__ */ e(
@@ -1356,7 +1350,7 @@ function ki({
             {
               component: "span",
               size: "small",
-              children: /* @__PURE__ */ e(jr, { size: "small" })
+              children: /* @__PURE__ */ e(Lr, { size: "small" })
             }
           ) })
         ] }),
@@ -1365,32 +1359,32 @@ function ki({
     }
   );
 }
-function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i, collectionEditable: l }) {
+function Vi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i, collectionEditable: l }) {
   const {
     values: o,
-    setFieldValue: d
-  } = K(), [u, p] = $(!1), [h, m] = $(), [c, g] = $(), v = o.propertiesOrder ?? Object.keys(o.properties ?? {}), x = ({
+    setFieldValue: c
+  } = K(), [u, p] = $(!1), [h, m] = $(), [d, g] = $(), v = o.propertiesOrder ?? Object.keys(o.properties ?? {}), x = ({
     id: N,
     property: f
   }) => {
     if (!N)
       throw Error();
-    d("properties", {
+    c("properties", {
       ...o.properties ?? {},
       [N]: f
     }, !1);
     const w = o.propertiesOrder ?? Object.keys(o.properties ?? {}), _ = w.includes(N) ? w : [...w, N];
-    d("propertiesOrder", _, !1), p(!1);
+    c("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 _ = 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, k = P ? I(o.properties, P.replaceAll(".", ".properties.")) : void 0, b = !v || v.length < 1, C = Q((N, f) => {
-    d(ye(f), N, !1);
+    const _ = he(w), M = be(f), U = I(o, M) ?? Object.keys(I(o, Ci(f)));
+    c(_, void 0, !1), c(M, U.filter((D) => D !== N), !1), p(!1), m(void 0), g(void 0);
+  }, [c, o]), P = h ? ae(h, d) : void 0, k = P ? I(o.properties, P.replaceAll(".", ".properties.")) : void 0, b = !v || v.length < 1, C = Q((N, f) => {
+    c(be(f), N, !1);
   }, []);
-  return /* @__PURE__ */ a(j, { children: [
+  return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
       /* @__PURE__ */ a("div", { className: "flex justify-between items-end my-4", children: [
         /* @__PURE__ */ e(O, { variant: "subtitle2", children: "Properties in this group" }),
@@ -1408,7 +1402,7 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
           }
         )
       ] }),
-      /* @__PURE__ */ a(Ce, { className: "p-2 pl-8", children: [
+      /* @__PURE__ */ a(Pe, { className: "p-2 pl-8", children: [
         /* @__PURE__ */ e(
           ft,
           {
@@ -1434,19 +1428,19 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
     ] }),
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
       /* @__PURE__ */ e(
-        ct,
+        dt,
         {
           position: "start",
           size: "small",
           label: "Spread children as columns",
-          onValueChange: (N) => d("spreadChildren", N),
+          onValueChange: (N) => c("spreadChildren", N),
           value: o.spreadChildren ?? !1
         }
       ),
       /* @__PURE__ */ e(X, { children: "Set this flag to true if you want to display the children of this group as individual columns." })
     ] }),
     /* @__PURE__ */ e(
-      Ve,
+      Ie,
       {
         inArray: !1,
         forceShowErrors: !1,
@@ -1462,7 +1456,7 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
         getData: r,
         onDelete: y,
         propertyKey: h,
-        propertyNamespace: c,
+        propertyNamespace: d,
         property: k,
         existingProperty: !!h,
         autoUpdateId: !h,
@@ -1474,25 +1468,25 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
     )
   ] });
 }
-function Vi({
+function Ii({
   showErrors: t,
   existing: r,
   disabled: n,
   getData: i,
   allowDataInference: l,
   propertyConfigs: o,
-  collectionEditable: d
+  collectionEditable: c
 }) {
   const {
     values: u,
     handleChange: p,
     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 }) => {
+    touched: d
+  } = K(), [g, v] = $(!1), x = I(u, "of"), y = I(d, "of") && I(h, "of"), P = ({ id: b, property: C, namespace: N }) => {
     console.log("onPropertyChanged", b, C, N), m("of", C);
   }, k = x && $e(x, o);
-  return /* @__PURE__ */ a(j, { children: [
+  return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
       /* @__PURE__ */ e(O, { variant: "subtitle2", children: "Repeat component" }),
       /* @__PURE__ */ e(
@@ -1500,7 +1494,7 @@ function Vi({
         {
           name: "of",
           value: x,
-          children: ({}) => /* @__PURE__ */ a(Ce, { className: "p-2 mt-4", children: [
+          children: ({}) => /* @__PURE__ */ a(Pe, { className: "p-2 mt-4", children: [
             x && /* @__PURE__ */ e(
               nr,
               {
@@ -1526,7 +1520,7 @@ function Vi({
               }
             ),
             /* @__PURE__ */ e(
-              Ve,
+              Ie,
               {
                 inArray: !0,
                 open: g,
@@ -1541,30 +1535,30 @@ function Vi({
                 onPropertyChanged: P,
                 forceShowErrors: t,
                 propertyConfigs: o,
-                collectionEditable: d
+                collectionEditable: c
               }
             )
           ] })
         }
       )
     ] }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Ot, { disabled: n }) }) })
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Ot, { disabled: n }) }) })
   ] });
 }
-const Ii = Y.forwardRef(
+const _i = Y.forwardRef(
   function({
     showErrors: r,
     disabledId: n,
     disabled: i,
     autoUpdateId: l,
     isNewProperty: o
-  }, d) {
+  }, c) {
     const {
       errors: u,
       values: p,
       setFieldValue: h,
       setFieldTouched: m,
-      touched: c,
+      touched: d,
       validate: g
     } = K(), v = "name", x = r && I(u, v), y = "id", P = r && I(u, y), k = "description", b = r && I(u, k);
     return /* @__PURE__ */ a("div", { className: "flex flex-col gap-2 col-span-12", children: [
@@ -1573,12 +1567,12 @@ const Ii = Y.forwardRef(
           H,
           {
             name: v,
-            inputRef: d,
+            inputRef: c,
             as: Z,
             value: p[v],
             onChange: (C) => {
               const N = C.target.value;
-              !I(c, y) && l && h(y, N ? Pt(N) : "", !1), h(v, N, !0), m(v, !0);
+              !I(d, y) && l && h(y, N ? Pt(N) : "", !1), h(v, N, !0), m(v, !0);
             },
             style: { fontSize: 20 },
             placeholder: "Field name",
@@ -1599,7 +1593,7 @@ const Ii = Y.forwardRef(
             value: p[y],
             onChange: (C) => {
               const N = C.target.value;
-              !I(c, v) && l && h(v, N ? ut(N) : ""), h(y, N, !0), m(y, !0);
+              !I(d, v) && l && h(v, N ? pt(N) : ""), h(y, N, !0), m(y, !0);
             },
             disabled: n || i,
             required: !0,
@@ -1625,14 +1619,14 @@ const Ii = Y.forwardRef(
     ] });
   }
 );
-function _i({
+function Si({
   widgetId: t,
   disabled: r,
   showErrors: n
 }) {
   const { values: i, setFieldValue: l } = K();
-  return /* @__PURE__ */ a(j, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Ne, { children: [
+  return /* @__PURE__ */ a(R, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(xe, { children: [
       t === "text_field" && /* @__PURE__ */ e(
         Ee,
         {
@@ -1685,7 +1679,7 @@ function _i({
       )
     ] }) }),
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
-      Oe,
+      Ve,
       {
         name: "defaultValue",
         disabled: r,
@@ -1700,8 +1694,8 @@ function _i({
 }
 function Fi({ disabled: t }) {
   const { values: r } = K(), n = I(r, "defaultValue");
-  return /* @__PURE__ */ a(j, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Se, { disabled: t }) }) }),
+  return /* @__PURE__ */ a(R, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Fe, { disabled: t }) }) }),
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       H,
       {
@@ -1720,30 +1714,30 @@ function Fi({ disabled: t }) {
     ) })
   ] });
 }
-function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i, collectionEditable: l }) {
+function Ei({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i, collectionEditable: l }) {
   const {
     values: o,
-    setFieldValue: d
-  } = K(), [u, p] = $(!1), [h, m] = $(), [c, g] = $(), v = ({
+    setFieldValue: c
+  } = K(), [u, p] = $(!1), [h, m] = $(), [d, g] = $(), v = ({
     id: C,
     property: N
   }) => {
     if (!C)
       throw Error();
-    d("oneOf.properties", {
+    c("oneOf.properties", {
       ...o.oneOf?.properties ?? {},
       [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) => {
+    c("oneOf.propertiesOrder", w, !1), p(!1);
+  }, x = h ? ae(h, d) : void 0, y = x ? I(o.oneOf?.properties, x.replaceAll(".", ".properties.")) : void 0, P = Q((C, N) => {
     const f = C ? ae(C, N) : void 0;
     if (!f)
       throw Error("collection editor miss config");
-    d(`oneOf.${pe(f)}`, void 0, !1);
-    const w = `oneOf.${ye(N)}`, _ = I(o, w);
-    d(w, _.filter((M) => M !== C), !1), p(!1), m(void 0), g(void 0);
-  }, [d, o]), k = /* @__PURE__ */ a(
+    c(`oneOf.${he(f)}`, void 0, !1);
+    const w = `oneOf.${be(N)}`, _ = I(o, w);
+    c(w, _.filter((M) => M !== C), !1), p(!1), m(void 0), g(void 0);
+  }, [c, o]), k = /* @__PURE__ */ a(
     z,
     {
       autoFocus: !0,
@@ -1756,15 +1750,15 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
       ]
     }
   ), b = Q((C, N) => {
-    d(`oneOf.${ye(N)}`, C, !1);
+    c(`oneOf.${be(N)}`, C, !1);
   }, []);
-  return /* @__PURE__ */ a(j, { children: [
+  return /* @__PURE__ */ a(R, { 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(O, { variant: "subtitle2", children: "Properties in this block" }),
         k
       ] }),
-      /* @__PURE__ */ a(Ce, { className: "p-2 pl-8", children: [
+      /* @__PURE__ */ a(Pe, { className: "p-2 pl-8", children: [
         /* @__PURE__ */ e(
           ft,
           {
@@ -1782,7 +1776,7 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
       ] })
     ] }),
     !t && /* @__PURE__ */ e(
-      Ve,
+      Ie,
       {
         inArray: !1,
         forceShowErrors: !1,
@@ -1798,7 +1792,7 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
         collectionEditable: l,
         onDelete: P,
         propertyKey: h,
-        propertyNamespace: c,
+        propertyNamespace: d,
         property: y,
         existingProperty: !!h,
         autoUpdateId: !h,
@@ -1810,13 +1804,13 @@ function Si({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
     )
   ] });
 }
-function Ei({ disabled: t }) {
+function Ai({ disabled: t }) {
   const {
     values: r,
     handleChange: n
-  } = K(), i = "validation.min", l = "validation.max", o = "validation.lessThan", d = "validation.moreThan";
+  } = K(), i = "validation.min", l = "validation.max", o = "validation.lessThan", c = "validation.moreThan";
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
-    /* @__PURE__ */ e(Se, { disabled: t }),
+    /* @__PURE__ */ e(Fe, { disabled: t }),
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
       Z,
       {
@@ -1856,9 +1850,9 @@ function Ei({ disabled: t }) {
     /* @__PURE__ */ e("div", { className: "col-span-6", children: /* @__PURE__ */ e(
       Z,
       {
-        value: I(r, d),
+        value: I(r, c),
         label: "More than",
-        name: d,
+        name: c,
         type: "number",
         size: "small",
         disabled: t,
@@ -1870,12 +1864,12 @@ function Ei({ disabled: t }) {
       {
         name: "validation.positive",
         type: "checkbox",
-        children: ({ field: m, form: c }) => /* @__PURE__ */ e(
+        children: ({ field: m, form: d }) => /* @__PURE__ */ e(
           ce,
           {
             label: "Positive value",
             disabled: t,
-            form: c,
+            form: d,
             field: m
           }
         )
@@ -1886,12 +1880,12 @@ function Ei({ disabled: t }) {
       {
         name: "validation.negative",
         type: "checkbox",
-        children: ({ field: m, form: c }) => /* @__PURE__ */ e(
+        children: ({ field: m, form: d }) => /* @__PURE__ */ e(
           ce,
           {
             label: "Negative value",
             disabled: t,
-            form: c,
+            form: d,
             field: m
           }
         )
@@ -1902,12 +1896,12 @@ function Ei({ disabled: t }) {
       {
         name: "validation.integer",
         type: "checkbox",
-        children: ({ field: m, form: c }) => /* @__PURE__ */ e(
+        children: ({ field: m, form: d }) => /* @__PURE__ */ e(
           ce,
           {
             label: "Integer value",
             disabled: t,
-            form: c,
+            form: d,
             field: m
           }
         )
@@ -1915,12 +1909,12 @@ function Ei({ disabled: t }) {
     ) })
   ] });
 }
-function Ai({ disabled: t }) {
+function Di({ disabled: t }) {
   const { values: r, setFieldValue: n } = K();
-  return /* @__PURE__ */ a(j, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Ei, { disabled: t }) }) }),
+  return /* @__PURE__ */ a(R, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Ai, { disabled: t }) }) }),
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
-      Oe,
+      Ve,
       {
         name: "defaultValue",
         disabled: t,
@@ -1943,12 +1937,12 @@ function jt({
   const {
     values: l,
     handleChange: o,
-    errors: d
+    errors: c
   } = K();
-  if (!Pe())
+  if (!Ne())
     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(j, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
+  const p = r ? "of.path" : "path", h = I(l, p), m = i && I(c, p);
+  return /* @__PURE__ */ e(R, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
     H,
     {
       name: p,
@@ -1958,11 +1952,11 @@ function jt({
       value: h,
       error: m,
       handleChange: o,
-      as: Di
+      as: Bi
     }
   ) }) });
 }
-function Di({
+function Bi({
   disabled: t,
   pathPath: r,
   value: n,
@@ -1970,15 +1964,15 @@ function Di({
   error: l,
   ...o
 }) {
-  const d = Pe();
-  if (!d)
+  const c = Ne();
+  if (!c)
     return /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(De, {}) });
-  const u = d?.collections ?? [], p = Array.from(new Set(
+  const u = c?.collections ?? [], p = Array.from(new Set(
     Object.values(u).map((m) => m.group).filter(Boolean)
   ).values()), h = u.filter((m) => !m.group);
-  return /* @__PURE__ */ a(j, { children: [
+  return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ a(
-      be,
+      Ce,
       {
         error: !!l,
         disabled: t,
@@ -1988,15 +1982,15 @@ function Di({
         onChange: i,
         label: "Target collection",
         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 }),
+          const d = u.find((g) => g.id === m || g.path === m);
+          return d ? /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
+            /* @__PURE__ */ e(lt, { collectionOrView: d }),
             /* @__PURE__ */ e(
               O,
               {
                 variant: "subtitle2",
                 className: "font-medium ml-4",
-                children: c?.name.toUpperCase()
+                children: d?.name.toUpperCase()
               }
             )
           ] }) : null;
@@ -2007,23 +2001,23 @@ function Di({
             At,
             {
               label: m || "Views",
-              children: u.filter((c) => c.group === m).map((c) => /* @__PURE__ */ e(
+              children: u.filter((d) => d.group === m).map((d) => /* @__PURE__ */ e(
                 ee,
                 {
-                  value: c.id ?? c.path,
+                  value: d.id ?? d.path,
                   children: /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
-                    /* @__PURE__ */ e(ot, { collectionOrView: c }),
+                    /* @__PURE__ */ e(lt, { collectionOrView: d }),
                     /* @__PURE__ */ e(
                       O,
                       {
                         variant: "subtitle2",
                         className: "font-medium ml-4",
-                        children: c?.name.toUpperCase()
+                        children: d?.name.toUpperCase()
                       }
                     )
                   ] })
                 },
-                `${c.id ?? c.path}-${m}`
+                `${d.id ?? d.path}-${m}`
               ))
             },
             `group_${m}`
@@ -2033,7 +2027,7 @@ function Di({
             {
               value: m.id ?? m.path,
               children: /* @__PURE__ */ a("div", { className: "flex flex-row", children: [
-                /* @__PURE__ */ e(ot, { collectionOrView: m }),
+                /* @__PURE__ */ e(lt, { collectionOrView: m }),
                 /* @__PURE__ */ e(
                   O,
                   {
@@ -2052,25 +2046,25 @@ function Di({
     /* @__PURE__ */ e(X, { children: "You can only edit the reference collection upon field creation." })
   ] });
 }
-function Bi({ disabled: t }) {
+function zi({ disabled: t }) {
   const {
     values: r,
     errors: n,
     touched: i,
     setFieldValue: l
-  } = 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(j, { children: [
+  } = K(), o = "mode", c = 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(R, { children: [
     /* @__PURE__ */ a("div", { className: "flex flex-col col-span-12", children: [
       /* @__PURE__ */ a(
-        be,
+        Ce,
         {
           name: o,
-          value: d ?? "date",
+          value: c ?? "date",
           error: !!u,
-          onValueChange: (c) => l(o, c),
+          onValueChange: (d) => l(o, d),
           label: "Mode",
-          renderValue: (c) => {
-            switch (c) {
+          renderValue: (d) => {
+            switch (d) {
               case "date_time":
                 return "Date/Time";
               case "date":
@@ -2088,14 +2082,14 @@ function Bi({ disabled: t }) {
       ),
       /* @__PURE__ */ e(X, { error: !!u, children: u }),
       /* @__PURE__ */ a(
-        be,
+        Ce,
         {
           name: p,
           disabled: t,
           value: h ?? "",
-          onValueChange: (c) => l(p, c),
-          renderValue: (c) => {
-            switch (c) {
+          onValueChange: (d) => l(p, d === "none" ? null : d),
+          renderValue: (d) => {
+            switch (d) {
               case "on_create":
                 return "On create";
               case "on_update":
@@ -2107,7 +2101,7 @@ function Bi({ disabled: t }) {
           error: !!m,
           label: "Automatic value",
           children: [
-            /* @__PURE__ */ e(ee, { value: "", children: " None " }),
+            /* @__PURE__ */ e(ee, { value: "none", children: " None " }),
             /* @__PURE__ */ e(ee, { value: "on_create", children: " On create " }),
             /* @__PURE__ */ e(ee, { value: "on_update", children: " On any update " })
           ]
@@ -2115,10 +2109,10 @@ function Bi({ disabled: t }) {
       ),
       /* @__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(Ne, { children: /* @__PURE__ */ e(Se, { disabled: t }) }) })
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Fe, { disabled: t }) }) })
   ] });
 }
-function zi({ disabled: t }) {
+function Mi({ disabled: t }) {
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(H, { type: "checkbox", name: "hideFromCollection", children: ({ field: i, form: l }) => /* @__PURE__ */ e(
       ce,
@@ -2149,8 +2143,8 @@ function zi({ disabled: t }) {
     ) })
   ] });
 }
-function Mi({ disabled: t }) {
-  return /* @__PURE__ */ e(j, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(Se, { disabled: t }) }) }) });
+function Ri({ disabled: t }) {
+  return /* @__PURE__ */ e(R, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Fe, { disabled: t }) }) }) });
 }
 function ar(t, r, n) {
   let i;
@@ -2374,7 +2368,7 @@ function or({ value: t, optionDisabled: r, propertyConfig: n, existing: i }) {
       children: /* @__PURE__ */ a(
         "div",
         {
-          className: me(
+          className: fe(
             "flex flex-row items-center text-base min-h-[52px]",
             r ? "w-full" : ""
           ),
@@ -2398,14 +2392,14 @@ function or({ value: t, optionDisabled: r, propertyConfig: n, existing: i }) {
     }
   );
 }
-function Ri({
+function Ui({
   disabled: t,
   showErrors: r
 }) {
   const { values: n, setFieldValue: i } = K(), l = I(n, "url");
-  return /* @__PURE__ */ a(j, { children: [
+  return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(
-      be,
+      Ce,
       {
         disabled: t,
         position: "item-aligned",
@@ -2434,7 +2428,7 @@ function Ri({
         ]
       }
     ) }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Ne, { children: /* @__PURE__ */ e(
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(
       Ee,
       {
         disabled: t,
@@ -2445,7 +2439,7 @@ function Ri({
       }
     ) }) }),
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
-      Oe,
+      Ve,
       {
         name: "defaultValue",
         disabled: t,
@@ -2458,7 +2452,7 @@ function Ri({
     ) })
   ] });
 }
-const Ui = [
+const ji = [
   "text_field",
   "multiline",
   "markdown",
@@ -2479,19 +2473,19 @@ const Ui = [
   "key_value",
   "repeat",
   "block"
-], lr = Object.entries(Gt).filter(([t]) => Ui.includes(t)).map(([t, r]) => ({ [t]: r })).reduce((t, r) => ({ ...t, ...r }), {}), sr = Y.memo(
+], lr = Object.entries(Gt).filter(([t]) => ji.includes(t)).map(([t, r]) => ({ [t]: r })).reduce((t, r) => ({ ...t, ...r }), {}), sr = Y.memo(
   function(r) {
     const {
       includeIdAndName: n = !0,
       autoOpenTypeSelect: i,
       existingProperty: l,
       autoUpdateId: o,
-      inArray: d,
+      inArray: c,
       propertyKey: u,
       existingPropertyKeys: p,
       propertyNamespace: h,
       property: m,
-      onPropertyChanged: c,
+      onPropertyChanged: d,
       onPropertyChangedImmediate: g = !0,
       onDelete: v,
       onError: x,
@@ -2509,7 +2503,7 @@ const Ui = [
       id: u,
       previousId: u,
       property: m
-    } : void 0), R = ({
+    } : void 0), U = ({
       id: A,
       property: s
     }) => {
@@ -2519,7 +2513,7 @@ const Ui = [
         property: s,
         namespace: h
       };
-      M.current = V, c?.(V);
+      M.current = V, d?.(V);
     }, D = Tt({
       initialValues: m ? { id: u, ...m } : w,
       initialErrors: y,
@@ -2531,7 +2525,7 @@ const Ui = [
           id: V,
           ...G
         } = A;
-        R({
+        U({
           id: V,
           property: { ...G, editable: G.editable ?? !0 }
         }), l || s.resetForm({ values: w });
@@ -2542,13 +2536,13 @@ const Ui = [
           if (!A.name)
             s.name = "Required";
           else {
-            const V = $i(A.name);
+            const V = Yi(A.name);
             V && (s.name = V);
           }
           if (!A.id)
             s.id = "Required";
           else {
-            const V = qi(A.id, p);
+            const V = $i(A.id, p);
             V && (s.id = V);
           }
         }
@@ -2560,9 +2554,9 @@ const Ui = [
     return de(() => {
       b?.(D);
     }, [D, b]), /* @__PURE__ */ e(kt, { value: D, children: /* @__PURE__ */ e(
-      ji,
+      Li,
       {
-        onPropertyChanged: g ? R : void 0,
+        onPropertyChanged: g ? U : void 0,
         onDelete: v,
         includeIdAndTitle: n,
         propertyNamespace: h,
@@ -2570,7 +2564,7 @@ const Ui = [
         showErrors: P || D.submitCount > 0,
         existing: l,
         autoUpdateId: o,
-        inArray: d,
+        inArray: c,
         autoOpenTypeSelect: i,
         disabled: _,
         getData: C,
@@ -2583,18 +2577,18 @@ const Ui = [
   },
   (t, r) => t.getData === r.getData && t.propertyKey === r.propertyKey && t.propertyNamespace === r.propertyNamespace && t.includeIdAndName === r.includeIdAndName && t.autoOpenTypeSelect === r.autoOpenTypeSelect && t.autoUpdateId === r.autoUpdateId && t.existingProperty === r.existingProperty
 );
-function Ve({
+function Ie({
   open: t,
   onCancel: r,
   onOkClicked: n,
   onPropertyChanged: i,
   getData: l,
   collectionEditable: o,
-  ...d
+  ...c
 }) {
   const u = Le();
   return /* @__PURE__ */ e(
-    Fe,
+    Se,
     {
       open: t ?? !1,
       maxWidth: "xl",
@@ -2611,7 +2605,7 @@ function Ve({
             /* @__PURE__ */ e(Be, { children: /* @__PURE__ */ e(
               sr,
               {
-                ...d,
+                ...c,
                 onPropertyChanged: (h) => {
                   i?.(h), n?.();
                 },
@@ -2650,19 +2644,19 @@ function Ve({
     }
   );
 }
-function ji({
+function Li({
   values: t,
   errors: r,
   setValues: n,
   existing: i,
   autoUpdateId: l = !1,
   autoOpenTypeSelect: o,
-  includeIdAndTitle: d,
+  includeIdAndTitle: c,
   onPropertyChanged: u,
   onDelete: p,
   propertyNamespace: h,
   onError: m,
-  showErrors: c,
+  showErrors: d,
   disabled: g,
   inArray: v,
   getData: x,
@@ -2670,20 +2664,20 @@ function ji({
   propertyConfigs: P,
   collectionEditable: k
 }) {
-  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");
+  const [b, C] = $(o), [N, f] = $(!1), [w, _] = $(t?.dataType ? Kt(t) : void 0), M = Object.entries(lr).concat(Object.entries(P)), U = v ? M.filter(([q, L]) => !ne(L.property) && L.property?.dataType !== "array") : M, D = _r(t), A = Le(null), s = Le(t), V = d && I(r, "selectedWidget");
   de(() => {
-    if (u && (!d || D.id)) {
+    if (u && (!c || D.id)) {
       const {
         id: q,
         ...L
       } = D;
-      ve(D, s.current) || (u({
+      ye(D, s.current) || (u({
         id: q,
         property: L,
         namespace: h
       }), s.current = D);
     }
-  }, [D, d, u, h]), de(() => {
+  }, [D, c, u, h]), de(() => {
     t?.id && m && m(t?.id, h, r);
   }, [r, m, h, t?.id]);
   const G = (q) => {
@@ -2693,17 +2687,17 @@ function ji({
   };
   let B;
   return w === "text_field" || w === "multiline" || w === "markdown" || w === "email" ? B = /* @__PURE__ */ e(
-    _i,
+    Si,
     {
       widgetId: w,
       disabled: g,
-      showErrors: c
+      showErrors: d
     }
   ) : w === "url" ? B = /* @__PURE__ */ e(
-    Ri,
+    Ui,
     {
       disabled: g,
-      showErrors: c
+      showErrors: d
     }
   ) : w === "select" || w === "number_select" ? B = /* @__PURE__ */ e(
     Rt,
@@ -2713,7 +2707,7 @@ function ji({
       updateIds: !i,
       disabled: g,
       getData: x,
-      showErrors: c
+      showErrors: d
     }
   ) : w === "multi_select" || w === "multi_number_select" ? B = /* @__PURE__ */ e(
     Rt,
@@ -2723,7 +2717,7 @@ function ji({
       disabled: g,
       allowDataInference: y,
       getData: x,
-      showErrors: c
+      showErrors: d
     }
   ) : w === "file_upload" ? B = /* @__PURE__ */ e(
     Ut,
@@ -2739,8 +2733,8 @@ function ji({
       multiple: !0,
       disabled: g
     }
-  ) : w === "switch" ? B = /* @__PURE__ */ e(Fi, { disabled: g }) : w === "number_input" ? B = /* @__PURE__ */ e(Ai, { disabled: g }) : w === "group" ? B = /* @__PURE__ */ e(
-    Oi,
+  ) : w === "switch" ? B = /* @__PURE__ */ e(Fi, { disabled: g }) : w === "number_input" ? B = /* @__PURE__ */ e(Di, { disabled: g }) : w === "group" ? B = /* @__PURE__ */ e(
+    Vi,
     {
       disabled: g,
       getData: x,
@@ -2749,7 +2743,7 @@ function ji({
       propertyConfigs: P
     }
   ) : w === "block" ? B = /* @__PURE__ */ e(
-    Si,
+    Ei,
     {
       disabled: g,
       getData: x,
@@ -2760,23 +2754,23 @@ function ji({
   ) : w === "reference" ? B = /* @__PURE__ */ e(
     jt,
     {
-      showErrors: c,
+      showErrors: d,
       existing: i,
       multiple: !1,
       disabled: g
     }
-  ) : w === "date_time" ? B = /* @__PURE__ */ e(Bi, { disabled: g }) : w === "multi_references" ? B = /* @__PURE__ */ e(
+  ) : w === "date_time" ? B = /* @__PURE__ */ e(zi, { disabled: g }) : w === "multi_references" ? B = /* @__PURE__ */ e(
     jt,
     {
-      showErrors: c,
+      showErrors: d,
       existing: i,
       multiple: !0,
       disabled: g
     }
   ) : w === "repeat" ? B = /* @__PURE__ */ e(
-    Vi,
+    Ii,
     {
-      showErrors: c,
+      showErrors: d,
       existing: i,
       getData: x,
       allowDataInference: y,
@@ -2784,8 +2778,8 @@ function ji({
       collectionEditable: k,
       propertyConfigs: P
     }
-  ) : w === "key_value" ? B = /* @__PURE__ */ e(Mi, { disabled: g }) : B = null, /* @__PURE__ */ a(j, { children: [
-    g && /* @__PURE__ */ a(Lr, { mode: "warn", children: [
+  ) : w === "key_value" ? B = /* @__PURE__ */ e(Ri, { disabled: g }) : B = null, /* @__PURE__ */ a(R, { children: [
+    g && /* @__PURE__ */ a(qr, { 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 ",
@@ -2796,7 +2790,7 @@ function ji({
     /* @__PURE__ */ a("div", { className: "flex mt-2 justify-between", children: [
       /* @__PURE__ */ a("div", { className: "w-full flex flex-col gap-2", children: [
         /* @__PURE__ */ e(
-          be,
+          Ce,
           {
             error: !!V,
             value: w ?? "",
@@ -2815,7 +2809,7 @@ function ji({
                   onClick: (re) => {
                     we && (re.stopPropagation(), re.preventDefault());
                   },
-                  className: me(
+                  className: fe(
                     "flex items-center",
                     we ? "w-full pointer-events-none opacity-50" : ""
                   ),
@@ -2839,7 +2833,7 @@ function ji({
             onValueChange: (q) => {
               G(q);
             },
-            children: R.map(([q, L]) => {
+            children: U.map(([q, L]) => {
               const J = L.property, le = i && !ne(J) && J.dataType !== t?.dataType;
               return /* @__PURE__ */ e(
                 or,
@@ -2871,15 +2865,15 @@ function ji({
           className: "m-4",
           disabled: g,
           onClick: () => f(!0),
-          children: /* @__PURE__ */ e(dt, {})
+          children: /* @__PURE__ */ e(ut, {})
         }
       )
     ] }),
     /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-y-12 mt-8 mb-8", children: [
-      d && /* @__PURE__ */ e(
-        Ii,
+      c && /* @__PURE__ */ e(
+        _i,
         {
-          showErrors: c,
+          showErrors: d,
           disabledId: i,
           isNewProperty: !i,
           disabled: g,
@@ -2888,10 +2882,10 @@ function ji({
         }
       ),
       B,
-      /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(zi, { disabled: g }) })
+      /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Mi, { disabled: g }) })
     ] }),
     p && /* @__PURE__ */ e(
-      lt,
+      st,
       {
         open: N,
         onAccept: () => p(t?.id, h),
@@ -2906,24 +2900,28 @@ function ji({
     )
   ] });
 }
-const Li = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
-function qi(t, r) {
+const qi = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+function $i(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;
+  return t || (n = "You must specify an id for the field"), t && !t.match(qi) && (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 $i(t) {
+function Yi(t) {
   let r;
   return t || (r = "You must specify a title for the field"), r;
 }
-function Yi(t) {
+function Hi(t) {
   return t ? (t.slice(0, 1).toLowerCase() + t.slice(1)).replace(/([-_ ]){1,}/g, " ").split(/[-_ ]/).reduce((r, n) => r + n[0].toUpperCase() + n.substring(1), "") : "";
 }
-function Hi({ collection: t, onOpenChange: r, open: n }) {
-  const i = Ie(), l = `import { EntityCollection } from "firecms";
+function Gi({
+  collection: t,
+  onOpenChange: r,
+  open: n
+}) {
+  const i = _e(), l = t ? `import { EntityCollection } from "firecms";
 
-const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.stringify(cr(t), null, "	");
+const ` + (t?.name ? Hi(t.name) : "my") + "Collection:EntityCollection = " + li.stringify(cr(t), null, "	") : "No collection selected";
   return /* @__PURE__ */ a(
-    Fe,
+    Se,
     {
       open: n,
       onOpenChange: r,
@@ -2947,12 +2945,18 @@ const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.s
             "."
           ] }),
           /* @__PURE__ */ e(
-            li,
+            si,
             {
-              theme: si.vsDark,
+              theme: ci.vsDark,
               code: l,
               language: "typescript",
-              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)) })
+              children: ({
+                className: o,
+                style: c,
+                tokens: u,
+                getLineProps: p,
+                getTokenProps: h
+              }) => /* @__PURE__ */ e("pre", { style: c, className: "p-4 rounded text-sm", children: u.map((m, d) => /* @__PURE__ */ e("div", { ...p({ line: m }), children: m.map((g, v) => /* @__PURE__ */ e("span", { ...h({ token: g }) }, v)) }, d)) })
             }
           )
         ] }),
@@ -2967,7 +2971,7 @@ const ` + (t.name ? Yi(t.name) : "my") + "Collection:EntityCollection = " + oi.s
                 message: "Copied"
               }), navigator.clipboard.writeText(l)),
               children: [
-                /* @__PURE__ */ e(qr, { size: "small" }),
+                /* @__PURE__ */ e($r, { size: "small" }),
                 "Copy to clipboard"
               ]
             }
@@ -3007,19 +3011,19 @@ function cr(t) {
     subcollections: (t.subcollections ?? []).map(cr)
   };
 }
-function Gi({
+function Ki({
   showErrors: t,
   isNewCollection: r,
   propertyErrorsRef: n,
   onPropertyError: i,
   setDirty: l,
   reservedGroups: o,
-  extraIcon: d,
+  extraIcon: c,
   getUser: u,
   getData: p,
   doCollectionInference: h,
   propertyConfigs: m,
-  collectionEditable: c
+  collectionEditable: d
 }) {
   const {
     values: g,
@@ -3028,21 +3032,21 @@ function Gi({
     setFieldTouched: y,
     errors: P,
     dirty: k
-  } = 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 } : {});
+  } = K(), b = _e(), C = Nr(), N = !C, [f, w] = $(), [_, M] = $(), [U, D] = $(), A = _ ? ae(_, U) : 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 } : {});
   de(() => {
     l && l(k);
   }, [k]);
   const ue = h ? () => {
-    h && (q(!0), h(g).then((F) => {
-      if (F && pt(F.properties), !F) {
+    h && (q(!0), h(g).then((S) => {
+      if (S && He(S.properties), !S) {
         b.open({
           type: "error",
           message: "Could not infer properties from data"
         });
         return;
       }
-      const U = (F.properties ? Object.keys(F.properties) : []).filter((E) => !g.properties[E]);
-      if (U.length === 0) {
+      const j = (S.properties ? Object.keys(S.properties) : []).filter((E) => !g.properties[E]);
+      if (j.length === 0) {
         b.open({
           type: "info",
           message: "No new properties found in existing data"
@@ -3050,84 +3054,84 @@ function Gi({
         return;
       }
       const T = {
-        ...U.reduce((E, ie) => (E[ie] = (F.properties ?? {})[ie], E), {}),
+        ...j.reduce((E, ie) => (E[ie] = (S.properties ?? {})[ie], E), {}),
         ...g.properties
-      }, S = [
-        ...U,
+      }, F = [
+        ...j,
         ...g.propertiesOrder ?? []
       ];
-      v("properties", T, !1), he(S), Me(U);
+      v("properties", T, !1), ve(F), Me(j);
     }).finally(() => {
       q(!1);
     }));
-  } : void 0, re = Q((F) => F ? we.current[F] ?? I(g, ye(F)) : we.current[""], [g]), he = Q((F, U) => {
-    const T = ye(U);
-    v(T, F, !1), we.current[U ?? ""] = F;
-  }, [v]), Te = Q((F, U) => {
-    const T = F ? ae(F, U) : void 0;
+  } : void 0, re = Q((S) => S ? we.current[S] ?? I(g, be(S)) : we.current[""], [g]), ve = Q((S, j) => {
+    const T = be(j);
+    v(T, S, !1), we.current[j ?? ""] = S;
+  }, [v]), ke = Q((S, j) => {
+    const T = S ? ae(S, j) : void 0;
     if (!T)
       throw Error("collection editor miss config");
-    v(pe(T), void 0, !1);
-    const E = re(U).filter((ie) => ie !== F);
-    he(E, U), J(!1), w(void 0), M(void 0), D(void 0);
-  }, [re, v, he]), Ge = (F, U) => {
-    v(ye(U), F, !1);
+    v(he(T), void 0, !1);
+    const E = re(j).filter((ie) => ie !== S);
+    ve(E, j), J(!1), w(void 0), M(void 0), D(void 0);
+  }, [re, v, ve]), Ke = (S, j) => {
+    v(be(j), S, !1);
   }, gt = ({
-    id: F,
-    property: U
+    id: S,
+    property: j
   }) => {
-    if (!F)
+    if (!S)
       throw Error("Need to include an ID when creating a new property");
     v("properties", {
       ...g.properties ?? {},
-      [F]: U
+      [S]: j
     }, !1);
-    const T = [...g.propertiesOrder ?? Object.keys(g.properties), F];
-    he(T), J(!1), C && (w(T.indexOf(F)), M(F)), D(void 0);
-  }, fe = ({
-    id: F,
-    property: U,
+    const T = [...g.propertiesOrder ?? Object.keys(g.properties), S];
+    ve(T), J(!1), C && (w(T.indexOf(S)), M(S)), D(void 0);
+  }, pe = ({
+    id: S,
+    property: j,
     previousId: T,
-    namespace: S
+    namespace: F
   }) => {
-    const E = F ? ae(F, S) : void 0, ie = E ? pe(E) : void 0;
-    if (T && T !== F) {
+    const E = S ? ae(S, F) : void 0, ie = E ? he(E) : void 0;
+    if (T && T !== S) {
       console.debug("onPropertyChanged, id change", {
-        id: F,
-        property: U,
+        id: S,
+        property: j,
         previousId: T,
-        namespace: S
+        namespace: F
       });
-      const ke = ae(T, S), Vt = pe(ke), It = re(S).map((Xe) => Xe === T ? 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);
+      const Oe = ae(T, F), Vt = he(Oe), It = re(F).map((et) => et === T ? S : et).filter((et) => et !== void 0);
+      ve(It, F), S && (w(It.indexOf(S)), M(S)), v(Vt, void 0, !1), y(Vt, !1, !1);
     }
     console.debug("onPropertyChanged", {
-      id: F,
-      property: U,
+      id: S,
+      property: j,
       previousId: T,
-      namespace: S,
+      namespace: F,
       propertyPath: ie
-    }), ie && (v(ie, U, !1), y(ie, !0, !1));
-  }, Ke = Q((F, U, T) => {
-    const S = F ? ae(F, U) : void 0;
+    }), ie && (v(ie, j, !1), y(ie, !0, !1));
+  }, We = Q((S, j, T) => {
+    const F = S ? ae(S, j) : void 0;
     if (console.debug("onPropertyErrorInternal", {
-      id: F,
-      namespace: U,
+      id: S,
+      namespace: j,
       error: T,
-      propertyPath: S
-    }), S) {
+      propertyPath: F
+    }), F) {
       const E = T && Object.keys(T).length > 0;
-      i(F, U, E ? T : void 0), x(pe(S), E ? "Property error" : void 0);
+      i(S, j, E ? T : void 0), x(he(F), E ? "Property error" : void 0);
     }
-  }, []), We = () => {
+  }, []), Ze = () => {
     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, U) => {
+  }, Je = _ && n?.current?.properties ? n.current.properties[_] : void 0, Qe = g?.propertiesOrder === void 0 || g.propertiesOrder.length === 0, Re = g.propertiesOrder ? g.propertiesOrder : Object.keys(g.properties), Xe = Zt(() => g.ownerId && u ? u(g.ownerId) : null, [u, g.ownerId]), vt = Q((S, j) => {
     console.debug("CollectionEditor: onPropertyClick", {
-      propertyKey: F,
-      namespace: U
-    }), w(Re.indexOf(F)), M(F), D(U);
+      propertyKey: S,
+      namespace: j
+    }), w(Re.indexOf(S)), M(S), 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(
+    /* @__PURE__ */ a("div", { className: fe(
       "p-4 md:p-8 pb-20 md:pb-20",
       "col-span-12 lg:col-span-5 h-full overflow-auto",
       !N && "border-r " + wt
@@ -3148,7 +3152,7 @@ function Gi({
               error: !!P?.name
             }
           ),
-          Qe && /* @__PURE__ */ a(
+          Xe && /* @__PURE__ */ a(
             O,
             {
               variant: "body2",
@@ -3156,12 +3160,12 @@ function Gi({
               color: "secondary",
               children: [
                 "Created by ",
-                Qe.displayName
+                Xe.displayName
               ]
             }
           )
         ] }),
-        d && /* @__PURE__ */ e("div", { className: "ml-4", children: d }),
+        c && /* @__PURE__ */ e("div", { className: "ml-4", children: c }),
         /* @__PURE__ */ a("div", { className: "ml-1 mt-2 flex flex-row gap-2", children: [
           /* @__PURE__ */ e(te, { title: "Get the code for this collection", children: /* @__PURE__ */ e(
             oe,
@@ -3169,7 +3173,7 @@ function Gi({
               variant: "filled",
               disabled: B,
               onClick: () => G(!0),
-              children: /* @__PURE__ */ e($r, {})
+              children: /* @__PURE__ */ e(Yr, {})
             }
           ) }),
           ue && /* @__PURE__ */ e(te, { title: "Add new properties based on data", children: /* @__PURE__ */ e(
@@ -3191,19 +3195,19 @@ function Gi({
           ) })
         ] })
       ] }),
-      /* @__PURE__ */ e(ge, { children: /* @__PURE__ */ e(
+      /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
         ft,
         {
           className: "pl-8",
           inferredPropertyKeys: le,
-          selectedPropertyKey: _ ? ae(_, R) : void 0,
+          selectedPropertyKey: _ ? ae(_, U) : void 0,
           properties: g.properties,
           additionalFields: g.additionalFields,
           propertiesOrder: Re,
           onPropertyClick: vt,
-          onPropertyMove: Ge,
-          onPropertyRemove: r ? Te : void 0,
-          collectionEditable: c,
+          onPropertyMove: Ke,
+          onPropertyRemove: r ? ke : void 0,
+          collectionEditable: d,
           errors: P
         }
       ) }),
@@ -3221,7 +3225,7 @@ function Gi({
       )
     ] }),
     !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,
+      Pe,
       {
         className: "sticky top-8 p-4 min-h-full border border-transparent w-full flex flex-col justify-center ",
         children: [
@@ -3234,21 +3238,21 @@ function Gi({
               allowDataInference: !r,
               autoOpenTypeSelect: !1,
               propertyKey: _,
-              propertyNamespace: R,
+              propertyNamespace: U,
               property: s,
-              onPropertyChanged: fe,
-              onDelete: Te,
-              onError: Ke,
+              onPropertyChanged: pe,
+              onDelete: ke,
+              onError: We,
               forceShowErrors: t,
-              initialErrors: Ze,
+              initialErrors: Je,
               getData: p,
               propertyConfigs: m,
-              collectionEditable: c
+              collectionEditable: d
             },
             `edit_view_${f}`
           ),
           !s && /* @__PURE__ */ a("div", { className: "w-full flex flex-col items-center justify-center h-full gap-4", children: [
-            /* @__PURE__ */ e(O, { variant: "label", className: "", children: Je ? "Now you can add your first property" : "Select a property to edit it" }),
+            /* @__PURE__ */ e(O, { variant: "label", className: "", children: Qe ? "Now you can add your first property" : "Select a property to edit it" }),
             /* @__PURE__ */ a(
               z,
               {
@@ -3266,7 +3270,7 @@ function Gi({
       }
     ) }),
     N && /* @__PURE__ */ e(
-      Ve,
+      Ie,
       {
         inArray: !1,
         open: f !== void 0,
@@ -3275,25 +3279,25 @@ function Gi({
         existingProperty: !0,
         autoOpenTypeSelect: !1,
         propertyKey: _,
-        propertyNamespace: R,
+        propertyNamespace: U,
         property: s,
-        onPropertyChanged: fe,
-        onDelete: Te,
-        onError: Ke,
+        onPropertyChanged: pe,
+        onDelete: ke,
+        onError: We,
         forceShowErrors: t,
-        initialErrors: Ze,
+        initialErrors: Je,
         getData: p,
         propertyConfigs: m,
-        collectionEditable: c,
-        onOkClicked: N ? We : void 0
+        collectionEditable: d,
+        onOkClicked: N ? Ze : void 0
       },
       `edit_view_${f}`
     )
   ] });
-  return /* @__PURE__ */ a(j, { children: [
+  return /* @__PURE__ */ a(R, { children: [
     yt,
     /* @__PURE__ */ e(
-      Ve,
+      Ie,
       {
         inArray: !1,
         existingProperty: !1,
@@ -3306,21 +3310,21 @@ function Gi({
         getData: p,
         allowDataInference: !r,
         propertyConfigs: m,
-        collectionEditable: c,
+        collectionEditable: d,
         existingPropertyKeys: g.propertiesOrder
       }
     ),
-    /* @__PURE__ */ e(
-      Hi,
+    /* @__PURE__ */ e(me, { children: /* @__PURE__ */ e(
+      Gi,
       {
         collection: g,
         open: V,
         onOpenChange: G
       }
-    )
+    ) })
   ] });
 }
-function Ki({
+function Wi({
   open: t,
   handleOk: r,
   handleCancel: n,
@@ -3328,7 +3332,7 @@ function Ki({
   title: l
 }) {
   return /* @__PURE__ */ a(
-    Fe,
+    Se,
     {
       open: t,
       onOpenChange: (o) => o ? n() : r(),
@@ -3348,12 +3352,12 @@ function Ki({
     }
   );
 }
-function Wi({ open: t, onClose: r }) {
+function Zi({ open: t, onClose: r }) {
   const {
     entityViews: n
   } = Ae();
   return /* @__PURE__ */ a(
-    Fe,
+    Se,
     {
       maxWidth: "md",
       open: t,
@@ -3382,7 +3386,7 @@ function Wi({ open: t, onClose: r }) {
     }
   );
 }
-function Zi({
+function Ji({
   collection: t,
   parentCollection: r,
   configController: n,
@@ -3390,10 +3394,10 @@ function Zi({
   getUser: l,
   parentCollectionIds: o
 }) {
-  const { entityViews: d } = Ae(), [u, p] = Y.useState(), [h, m] = Y.useState(!1), [c, g] = Y.useState(), [v, x] = Y.useState(), {
+  const { entityViews: c } = Ae(), [u, p] = Y.useState(), [h, m] = Y.useState(!1), [d, g] = Y.useState(), [v, x] = Y.useState(), {
     values: y,
     setFieldValue: P
-  } = K(), k = 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;
+  } = K(), k = t.subcollections ?? [], b = y.entityViews?.filter((f) => typeof f == "string").map((f) => xr(f, c)).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: [
@@ -3401,7 +3405,7 @@ function Zi({
           "Subcollections of ",
           y.name
         ] }),
-        /* @__PURE__ */ a(Ce, { className: "flex flex-col gap-4 p-2 w-full", children: [
+        /* @__PURE__ */ a(Pe, { className: "flex flex-col gap-4 p-2 w-full", children: [
           k && k.length > 0 && /* @__PURE__ */ e(Dt, { children: /* @__PURE__ */ e(Bt, { children: k.map((f) => /* @__PURE__ */ a(
             bt,
             {
@@ -3429,7 +3433,7 @@ function Zi({
                           w.preventDefault(), w.stopPropagation(), p(f.id);
                         },
                         color: "inherit",
-                        children: /* @__PURE__ */ e(dt, { size: "small" })
+                        children: /* @__PURE__ */ e(ut, { size: "small" })
                       }
                     ) })
                   }
@@ -3455,7 +3459,7 @@ function Zi({
       ] }),
       /* @__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(
+        N === 0 && /* @__PURE__ */ e(Hr, { action: /* @__PURE__ */ e(
           z,
           {
             variant: "text",
@@ -3467,7 +3471,7 @@ function Zi({
             children: "More info"
           }
         ), children: "Define your own custom views by uploading them with the CLI." }),
-        /* @__PURE__ */ e(j, { children: /* @__PURE__ */ a(Ce, { className: "flex flex-col gap-4 p-2 w-full", children: [
+        /* @__PURE__ */ e(R, { children: /* @__PURE__ */ a(Pe, { 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(
@@ -3489,7 +3493,7 @@ function Zi({
                         w.preventDefault(), w.stopPropagation(), g(f.key);
                       },
                       color: "inherit",
-                      children: /* @__PURE__ */ e(dt, { size: "small" })
+                      children: /* @__PURE__ */ e(ut, { size: "small" })
                     }
                   ) })
                 }
@@ -3525,7 +3529,7 @@ function Zi({
     ] }) }),
     /* @__PURE__ */ e("div", { style: { height: "52px" } }),
     u && /* @__PURE__ */ e(
-      lt,
+      st,
       {
         open: !!u,
         onAccept: () => {
@@ -3536,24 +3540,24 @@ function Zi({
           console.debug("Deleting subcollection", f), n.deleteCollection(f), p(void 0);
         },
         onCancel: () => p(void 0),
-        title: /* @__PURE__ */ e(j, { children: "Delete this subcollection?" }),
-        body: /* @__PURE__ */ a(j, { children: [
+        title: /* @__PURE__ */ e(R, { children: "Delete this subcollection?" }),
+        body: /* @__PURE__ */ a(R, { children: [
           " This will ",
           /* @__PURE__ */ e("b", { children: "not delete any data" }),
           ", only the collection in the CMS"
         ] })
       }
     ),
-    c && /* @__PURE__ */ e(
-      lt,
+    d && /* @__PURE__ */ e(
+      st,
       {
-        open: !!c,
+        open: !!d,
         onAccept: () => {
-          P("entityViews", y.entityViews?.filter((f) => f !== c)), g(void 0);
+          P("entityViews", y.entityViews?.filter((f) => f !== d)), g(void 0);
         },
         onCancel: () => g(void 0),
-        title: /* @__PURE__ */ e(j, { children: "Remove this view?" }),
-        body: /* @__PURE__ */ a(j, { children: [
+        title: /* @__PURE__ */ e(R, { children: "Remove this view?" }),
+        body: /* @__PURE__ */ a(R, { children: [
           "This will ",
           /* @__PURE__ */ e("b", { children: "not delete any data" }),
           ", only the view in the CMS"
@@ -3577,7 +3581,7 @@ function Zi({
       }
     ),
     /* @__PURE__ */ e(
-      Wi,
+      Zi,
       {
         open: h,
         onClose: (f) => {
@@ -3594,7 +3598,7 @@ const Lt = {
   singularName: "Product",
   icon: "shopping_cart",
   description: "List of the products currently sold in your shop",
-  properties: pt({
+  properties: He({
     name: {
       dataType: "string",
       name: "Name",
@@ -3680,7 +3684,7 @@ const Lt = {
   icon: "article",
   description: "A collection of blog entries",
   defaultSize: "l",
-  properties: pt({
+  properties: He({
     name: {
       name: "Name",
       validation: { required: !0 },
@@ -3791,7 +3795,7 @@ const Lt = {
   singularName: "User",
   description: "Registered users in the app/web",
   icon: "person",
-  properties: pt({
+  properties: He({
     displayName: {
       name: "Display name",
       dataType: "string"
@@ -4009,24 +4013,24 @@ const Lt = {
     }
   }
 };
-function Ji({
+function Qi({
   path: t,
   pathSuggestions: r,
   parentCollection: n,
   onContinue: i,
   existingCollectionPaths: l
 }) {
-  const [o, d] = $(!1), [u, p] = $();
+  const [o, c] = $(!1), [u, p] = $();
   de(() => {
-    r && l && (d(!0), r(t).then((v) => {
+    r && l && (c(!0), r(t).then((v) => {
       const x = v.filter((y) => !(l ?? []).find((P) => P.trim().toLowerCase() === y.trim().toLowerCase()));
       p(x);
-    }).finally(() => d(!1)));
+    }).finally(() => c(!1)));
   }, [l, t, r]);
   const {
     values: h,
     setFieldValue: m,
-    setValues: c,
+    setValues: d,
     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: [
@@ -4037,7 +4041,7 @@ function Ji({
         children: /* @__PURE__ */ e(O, { variant: "h4", className: "flex-grow", children: "New collection" })
       }
     ),
-    n && /* @__PURE__ */ e(st, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(O, { variant: "caption", children: [
+    n && /* @__PURE__ */ e(ct, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(O, { variant: "caption", children: [
       "This is a subcollection of ",
       /* @__PURE__ */ e("b", { children: n.name })
     ] }) }),
@@ -4053,11 +4057,11 @@ 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(De, { size: "small" }),
         u?.map((v, x) => /* @__PURE__ */ e(
-          st,
+          ct,
           {
             colorScheme: "cyanLighter",
             onClick: () => {
-              m("name", ut(v)), m("id", v), m("path", v), m("properties", void 0), i();
+              m("name", pt(v)), m("id", v), m("path", v), m("properties", void 0), i();
             },
             size: "small",
             children: v
@@ -4078,46 +4082,46 @@ function Ji({
       ),
       /* @__PURE__ */ a("div", { className: "flex gap-4", children: [
         /* @__PURE__ */ e(
-          nt,
+          at,
           {
             title: "Products",
             subtitle: "A collection of products with images, prices and stock",
-            icon: /* @__PURE__ */ e(et, { size: "small", iconKey: Lt.icon }),
+            icon: /* @__PURE__ */ e(tt, { size: "small", iconKey: Lt.icon }),
             onClick: () => {
-              c(Lt), i();
+              d(Lt), i();
             }
           }
         ),
         /* @__PURE__ */ e(
-          nt,
+          at,
           {
             title: "Users",
             subtitle: "A collection of users with emails, names and roles",
-            icon: /* @__PURE__ */ e(et, { size: "small", iconKey: $t.icon }),
+            icon: /* @__PURE__ */ e(tt, { size: "small", iconKey: $t.icon }),
             onClick: () => {
-              c($t), i();
+              d($t), i();
             }
           }
         ),
         /* @__PURE__ */ e(
-          nt,
+          at,
           {
             title: "Blog posts",
             subtitle: "A collection of blog posts with images, authors and complex content",
-            icon: /* @__PURE__ */ e(et, { size: "small", iconKey: qt.icon }),
+            icon: /* @__PURE__ */ e(tt, { size: "small", iconKey: qt.icon }),
             onClick: () => {
-              c(qt), i();
+              d(qt), i();
             }
           }
         ),
         /* @__PURE__ */ e(
-          nt,
+          at,
           {
             title: "Pages",
             subtitle: "A collection of pages with images, authors and complex content",
-            icon: /* @__PURE__ */ e(et, { size: "small", iconKey: Yt.icon }),
+            icon: /* @__PURE__ */ e(tt, { size: "small", iconKey: Yt.icon }),
             onClick: () => {
-              c(Yt), i();
+              d(Yt), i();
             }
           }
         )
@@ -4133,12 +4137,12 @@ function Ji({
           children: "● Create a collection from a file (csv, json, xls, xslx...)"
         }
       ),
-      /* @__PURE__ */ e(ci, { onDataAdded: (v) => i(v) })
+      /* @__PURE__ */ e(di, { onDataAdded: (v) => i(v) })
     ] }),
     /* @__PURE__ */ e("div", { children: /* @__PURE__ */ e(z, { variant: "text", onClick: () => i(), className: "my-2", children: "Continue from scratch" }) })
   ] }) });
 }
-function nt({
+function at({
   title: t,
   subtitle: r,
   icon: n,
@@ -4148,9 +4152,9 @@ function nt({
     tr,
     {
       onClick: i,
-      className: me(
+      className: fe(
         "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",
+        "text-gray-700 dark:text-slate-300",
         "hover:border-primary-dark hover:text-primary-dark dark:hover:text-primary focus:ring-primary hover:ring-1 hover:ring-primary",
         "border-gray-400 dark:border-gray-600 "
       ),
@@ -4161,7 +4165,7 @@ function nt({
     }
   ) });
 }
-function Qi({
+function Xi({
   importConfig: t,
   propertyConfigs: r,
   collectionEditable: n
@@ -4170,23 +4174,23 @@ function Qi({
     setFieldValue: i,
     setFieldTouched: l,
     values: o
-  } = K(), [d, u] = $(void 0), p = Y.useRef(o.propertiesOrder ? { "": o.propertiesOrder } : {}), h = d ? d.id : void 0, m = d || void 0, c = ({
+  } = K(), [c, u] = $(void 0), p = Y.useRef(o.propertiesOrder ? { "": o.propertiesOrder } : {}), h = c ? c.id : void 0, m = c || void 0, d = ({
     id: v,
     property: x,
     previousId: y,
     namespace: P
   }) => {
-    const k = v ? ae(v, P) : void 0, b = k ? pe(k) : void 0, C = (f) => f ? p.current[f] ?? I(o, ye(f)) : p.current[""], N = (f, w) => {
-      const _ = ye(w);
+    const k = v ? ae(v, P) : void 0, b = k ? he(k) : void 0, C = (f) => f ? p.current[f] ?? I(o, be(f)) : p.current[""], N = (f, w) => {
+      const _ = be(w);
       i(_, f, !1), p.current[w ?? ""] = f;
     };
     if (y && y !== v) {
-      const f = ae(y, P), w = pe(f), M = C(P).map((D) => D === y ? v : D).filter((D) => D !== void 0);
+      const f = ae(y, P), w = he(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);
+      const U = { ...t.headersMapping };
+      Object.keys(U).forEach((D) => {
+        U[D] === y && (U[D] = v ?? "");
+      }), t.setHeadersMapping(U), i(w, void 0, !1), l(w, !1, !1);
     }
     b && (i(b, x, !1), l(b, !0, !1));
   }, g = async ({
@@ -4195,8 +4199,8 @@ function Qi({
     property: y,
     namespace: P
   }) => {
-    const k = v ? ae(v, P) : void 0, b = k ? pe(k) : void 0, C = t.importData.map((f) => I(f, x)), N = {
-      ...ti(C, y, rr),
+    const k = v ? ae(v, P) : void 0, b = k ? he(k) : void 0, C = t.importData.map((f) => I(f, x)), N = {
+      ...ri(C, y, rr),
       editable: !0
     };
     b && (N ? i(b, N, !1) : i(b, y, !1), l(b, !0, !1));
@@ -4205,19 +4209,19 @@ function Qi({
     /* @__PURE__ */ a(mt, { maxWidth: "6xl", className: "flex flex-col gap-4 p-8 m-auto", children: [
       /* @__PURE__ */ e(O, { variant: "h6", className: "mt-4", children: "Data property mapping" }),
       /* @__PURE__ */ e(
-        di,
+        ui,
         {
           headersMapping: t.headersMapping,
           idColumn: t.idColumn,
           originProperties: t.originProperties,
           destinationProperties: o.properties,
-          onIdPropertyChanged: (v) => t.setIdColumn(v),
+          onIdPropertyChanged: (v) => t.setIdColumn(v ?? void 0),
           buildPropertyView: ({
             property: v,
             propertyKey: x,
             importKey: y
           }) => /* @__PURE__ */ e(
-            ui,
+            pi,
             {
               property: v,
               propertyKey: x,
@@ -4230,7 +4234,7 @@ function Qi({
                 });
               },
               propertyTypeView: /* @__PURE__ */ e(
-                Xi,
+                en,
                 {
                   property: v,
                   disabled: !1,
@@ -4248,14 +4252,14 @@ function Qi({
       )
     ] }),
     /* @__PURE__ */ e(
-      Ve,
+      Ie,
       {
-        open: d !== void 0,
+        open: c !== void 0,
         propertyKey: h,
         property: m,
         inArray: !1,
         autoUpdateId: !1,
-        onPropertyChanged: c,
+        onPropertyChanged: d,
         allowDataInference: !1,
         collectionEditable: n,
         onOkClicked: () => {
@@ -4272,32 +4276,32 @@ function Qi({
     /* @__PURE__ */ e("div", { style: { height: "52px" } })
   ] });
 }
-function Xi({
+function en({
   property: t,
   onPropertyChanged: r,
   propertyKey: n,
   propertyConfigs: i,
   disabled: l
 }) {
-  const o = t ? Kt(t) : null, d = t ? $e(t, i) : null, [u, p] = $(!1);
+  const o = t ? Kt(t) : null, c = t ? $e(t, i) : null, [u, p] = $(!1);
   return /* @__PURE__ */ e(
     te,
     {
-      title: t && d ? `${d?.name} - ${t.dataType}` : void 0,
+      title: t && c ? `${c?.name} - ${t.dataType}` : void 0,
       open: u ? !1 : void 0,
       children: /* @__PURE__ */ e(
-        be,
+        Ce,
         {
           open: u,
           onOpenChange: p,
           invisible: !0,
           className: "w-full",
           disabled: l,
-          error: !d,
+          error: !c,
           value: o ?? "",
           placeholder: "Select a property widget",
           position: "item-aligned",
-          renderValue: (h) => d ? /* @__PURE__ */ e(Ye, { propertyConfig: d }) : null,
+          renderValue: (h) => c ? /* @__PURE__ */ e(Ye, { propertyConfig: c }) : null,
           onValueChange: (h) => {
             const m = ar(t, h, i);
             n && r({
@@ -4322,9 +4326,9 @@ function Xi({
     }
   );
 }
-function en({ importConfig: t, properties: r, propertiesOrder: n }) {
+function tn({ importConfig: t, properties: r, propertiesOrder: n }) {
   de(() => {
-    const l = pi(t.originProperties, r), o = t.importData.map((d) => mi(d, t.idColumn, t.headersMapping, r, l, "TEMP_PATH"));
+    const l = mi(t.originProperties, r), o = t.importData.map((c) => hi(c, t.idColumn, t.headersMapping, r, l, "TEMP_PATH"));
     t.setEntities(o);
   }, []);
   const i = wr();
@@ -4350,12 +4354,12 @@ function en({ importConfig: t, properties: r, propertiesOrder: n }) {
   );
 }
 function dr(t, r = "") {
-  const n = Object.keys(t).reduce((o, d) => {
-    const u = t[d], p = kr(d), h = r ? `${r}.${p}` : p;
+  const n = Object.keys(t).reduce((o, c) => {
+    const u = t[c], p = kr(c), h = r ? `${r}.${p}` : p;
     if (u.dataType === "map" && u.properties) {
       const g = dr(u.properties, h);
       return {
-        headersMapping: { ...o.headersMapping, [d]: h },
+        headersMapping: { ...o.headersMapping, [c]: h },
         properties: {
           ...o.properties,
           [p]: {
@@ -4371,7 +4375,7 @@ function dr(t, r = "") {
       [p]: u
     };
     return {
-      headersMapping: { ...o.headersMapping, [d]: h },
+      headersMapping: { ...o.headersMapping, [c]: h },
       properties: m
     };
   }, { headersMapping: {}, properties: {} }), i = Object.keys(n.headersMapping)?.[0];
@@ -4382,31 +4386,31 @@ function dr(t, r = "") {
   };
 }
 function ur(t) {
-  const r = t.open, [n, i] = je.useState(!1), [l, o] = je.useState(!1), d = Q(() => {
+  const r = t.open, [n, i] = je.useState(!1), [l, o] = je.useState(!1), c = Q(() => {
     n ? o(!0) : t.handleClose(void 0);
   }, [n, t.handleClose]);
   return de(() => {
     r || (i(!1), o(!1));
   }, [r]), /* @__PURE__ */ a(
-    Fe,
+    Se,
     {
       open: r,
       fullWidth: !0,
       fullHeight: !0,
       scrollable: !1,
       maxWidth: "7xl",
-      onOpenChange: (u) => u ? void 0 : d(),
+      onOpenChange: (u) => u ? void 0 : c(),
       children: [
         r && /* @__PURE__ */ e(
-          tn,
+          rn,
           {
             ...t,
-            handleCancel: d,
+            handleCancel: c,
             setFormDirty: i
           }
         ),
         /* @__PURE__ */ e(
-          Ki,
+          Wi,
           {
             open: l,
             handleOk: () => t.handleClose(void 0),
@@ -4418,62 +4422,62 @@ function ur(t) {
     }
   );
 }
-function tn(t) {
-  const { propertyConfigs: r } = Ae(), n = Pe(), i = _e(), {
+function rn(t) {
+  const { propertyConfigs: r } = Ae(), n = Ne(), i = Te(), {
     topLevelNavigation: l,
     collections: o
-  } = 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);
+  } = n, c = t.initialValues, u = !c?.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), [d, g] = je.useState(), [v, x] = je.useState(!1);
   if (de(() => {
     try {
       n.initialised && (t.editedCollectionId ? g(n.getCollectionFromPaths([...t.parentCollectionIds ?? [], t.editedCollectionId])) : g(void 0), x(!0));
     } catch (b) {
       console.error(b);
     }
-  }, [n.getCollectionFromPaths, t.editedCollectionId, t.parentCollectionIds, n.initialised]), !l)
+  }, [t.editedCollectionId, t.parentCollectionIds, n]), !l)
     throw Error("Internal: Navigation not ready in collection editor");
   const {
     groups: y
-  } = l, P = c ? {
-    ...c,
-    id: c.id ?? c.path ?? _t(16)
-  } : void 0, k = P ? nn(P, r) : {
-    id: d?.path ?? _t(16),
-    path: d?.path ?? "",
-    name: d?.name ?? "",
-    group: d?.group ?? "",
+  } = l, P = d ? {
+    ...d,
+    id: d.id ?? d.path ?? _t(16)
+  } : void 0, k = P ? an(P, r) : {
+    id: c?.path ?? _t(16),
+    path: c?.path ?? "",
+    name: c?.name ?? "",
+    group: c?.group ?? "",
     properties: {},
     propertiesOrder: [],
     icon: zt[Math.floor(Math.random() * zt.length)],
     ownerId: i.user?.uid ?? ""
   };
   return v ? !t.isNewCollection && (!n.initialised || !v) ? /* @__PURE__ */ e(Nt, {}) : /* @__PURE__ */ e(
-    rn,
+    nn,
     {
       ...t,
       initialValues: k,
       existingPaths: h,
       existingIds: m,
       includeTemplates: u,
-      collection: c,
+      collection: d,
       setCollection: g,
       groups: y,
       propertyConfigs: r
     }
   ) : /* @__PURE__ */ e(Nt, {});
 }
-function rn({
+function nn({
   isNewCollection: t,
   configController: r,
   editedCollectionId: n,
   parentCollectionIds: i,
   fullPath: l,
   collectionInference: o,
-  handleClose: d,
+  handleClose: c,
   reservedGroups: u,
   extraView: p,
   handleCancel: h,
   setFormDirty: m,
-  pathSuggestions: c,
+  pathSuggestions: d,
   getUser: g,
   parentCollection: v,
   getData: x,
@@ -4486,14 +4490,14 @@ function rn({
   propertyConfigs: f,
   groups: w
 }) {
-  const _ = hi(), M = Pe(), R = Ie(), D = Le({}), A = t ? k ? "welcome" : "details" : "properties", [s, V] = $(A), [G, B] = je.useState(), q = (T) => {
-    const S = T.id || T.path;
+  const _ = fi(), M = Ne(), U = _e(), D = Le({}), A = t ? k ? "welcome" : "details" : "properties", [s, V] = $(A), [G, B] = je.useState(), q = (T) => {
+    const F = T.id || T.path;
     return r.saveCollection({
-      id: S,
+      id: F,
       collectionData: T,
       previousId: n,
       parentCollectionIds: i
-    }).then(() => (B(void 0), !0)).catch((E) => (B(E), console.error(E), R.open({
+    }).then(() => (B(void 0), !0)).catch((E) => (B(E), console.error(E), U.open({
       type: "error",
       message: "Error persisting collection: " + (E.message ?? "Details in the console")
     }), !1));
@@ -4507,35 +4511,35 @@ function rn({
       if (!J)
         return C(T), Promise.resolve(T);
       V("loading");
-      const S = await J?.(T);
-      if (!S)
+      const F = await J?.(T);
+      if (!F)
         return C(T), Promise.resolve(T);
       const E = {
         ...T ?? {}
       };
-      return Object.keys(S.properties ?? {}).length > 0 && (E.properties = S.properties, E.propertiesOrder = S.propertiesOrder), E.propertiesOrder ? (C(E), console.debug("Inferred collection", {
+      return Object.keys(F.properties ?? {}).length > 0 && (E.properties = F.properties, E.propertiesOrder = F.propertiesOrder), E.propertiesOrder ? (C(E), console.debug("Inferred collection", {
         newCollection: T ?? {},
         values: E
       }), E) : (E.propertiesOrder = Object.keys(E.properties), E);
-    } catch (S) {
-      return console.error(S), R.open({
+    } catch (F) {
+      return console.error(F), U.open({
         type: "error",
-        message: "Error inferring collection: " + (S.message ?? "Details in the console")
+        message: "Error inferring collection: " + (F.message ?? "Details in the console")
       }), T;
     }
   }, [i, J]), ue = Tt({
     initialValues: N,
-    onSubmit: (T, S) => {
+    onSubmit: (T, F) => {
       console.log("Submitting collection", T);
       try {
         if (!t) {
           q(T).then(() => {
-            S.resetForm({ values: N }), d(T);
+            F.resetForm({ values: N }), c(T);
           });
           return;
         }
-        s === "welcome" ? (L(), S.resetForm({ values: T })) : s === "details" ? p || _.inUse ? (S.resetForm({ values: T }), L()) : t ? le(T).then((E) => {
-          S.resetForm({
+        s === "welcome" ? (L(), F.resetForm({ values: T })) : s === "details" ? p || _.inUse ? (F.resetForm({ values: T }), L()) : t ? le(T).then((E) => {
+          F.resetForm({
             values: E ?? T,
             touched: {
               path: !0,
@@ -4544,61 +4548,61 @@ function rn({
           });
         }).finally(() => {
           L();
-        }) : (S.resetForm({ values: T }), L()) : s === "extra_view" ? (L(), S.resetForm({ values: T })) : s === "import_data_mapping" || s === "import_data_preview" ? L() : s === "properties" ? q(T).then(() => {
-          S.resetForm({ values: N }), L(), d(T);
-        }) : (L(), S.resetForm({ values: T }));
+        }) : (F.resetForm({ values: T }), L()) : s === "extra_view" ? (L(), F.resetForm({ values: T })) : s === "import_data_mapping" || s === "import_data_preview" ? L() : s === "properties" ? q(T).then(() => {
+          F.resetForm({ values: N }), L(), c(T);
+        }) : (L(), F.resetForm({ values: T }));
       } catch (E) {
-        R.open({
+        U.open({
           type: "error",
           message: "Error persisting collection: " + (E.message ?? "Details in the console")
-        }), console.error(E), S.resetForm({ values: T });
+        }), console.error(E), F.resetForm({ values: T });
       }
     },
     validation: (T) => {
-      let S = {};
-      const E = (s === "properties" || s === "subcollections" || s === "details") && vi;
+      let F = {};
+      const E = (s === "properties" || s === "subcollections" || s === "details") && yi;
       if (E)
         try {
           E.validateSync(T, { abortEarly: !1 });
         } catch (ie) {
-          ie.inner.forEach((ke) => {
-            S[ke.path] = ke.message;
+          ie.inner.forEach((Oe) => {
+            F[Oe.path] = Oe.message;
           });
         }
-      if (s === "properties" && (S = { ...S, ...D.current }), s === "details") {
+      if (s === "properties" && (F = { ...F, ...D.current }), s === "details") {
         const ie = Ht(T.path, t, y, T.id);
-        ie && (S.path = ie);
-        const ke = an(T.id, t, y, P);
-        ke && (S.id = ke);
+        ie && (F.path = ie);
+        const Oe = on(T.id, t, y, P);
+        Oe && (F.id = Oe);
       }
-      return S;
+      return F;
     }
   }), {
     values: re,
-    setFieldValue: he,
-    isSubmitting: Te,
-    dirty: Ge,
+    setFieldValue: ve,
+    isSubmitting: ke,
+    dirty: Ke,
     submitCount: gt
-  } = ue, 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;
+  } = ue, pe = re.path, We = l?.includes("/") ? l?.split("/").slice(0, -1).join("/") + "/" + pe : pe, Ze = Ht(pe, t, y, re.id), Je = !Ze && i ? M.convertIdsToPaths(i) : void 0, Qe = Ze ? void 0 : M.resolveAliasesFrom(We), Re = Qe && x ? () => x(Qe, Je ?? []) : void 0;
   de(() => {
-    m(Ge);
-  }, [Ge]);
-  function Qe(T) {
-    _.setInUse(!0), ri(T, rr).then((S) => {
-      const E = dr(S);
-      he("properties", E.properties), he("propertiesOrder", Object.keys(E.properties)), _.setIdColumn(E.idColumn), _.setImportData(T), _.setHeadersMapping(E.headersMapping), _.setOriginProperties(E.properties);
+    m(Ke);
+  }, [Ke]);
+  function Xe(T) {
+    _.setInUse(!0), ii(T, rr).then((F) => {
+      const E = dr(F);
+      ve("properties", E.properties), ve("propertiesOrder", Object.keys(E.properties)), _.setIdColumn(E.idColumn), _.setImportData(T), _.setHeadersMapping(E.headersMapping), _.setOriginProperties(E.properties);
     });
   }
   const vt = !!re.name && !!re.id, yt = () => {
     const T = { ...re.properties };
-    _.idColumn && delete T[_.idColumn], he("properties", T), L();
-  }, U = b?.editable === void 0 || b?.editable === !0 || t;
-  return /* @__PURE__ */ e(Be, { fullHeight: !0, children: /* @__PURE__ */ e(kt, { value: ue, children: /* @__PURE__ */ a(j, { children: [
+    _.idColumn && delete T[_.idColumn], ve("properties", T), L();
+  }, j = b?.editable === void 0 || b?.editable === !0 || t;
+  return /* @__PURE__ */ e(Be, { fullHeight: !0, children: /* @__PURE__ */ e(kt, { value: ue, children: /* @__PURE__ */ a(R, { children: [
     !t && /* @__PURE__ */ a(
-      Hr,
+      Gr,
       {
         value: s,
-        className: me(wt, "justify-end bg-gray-50 dark:bg-gray-950 border-b"),
+        className: fe(wt, "justify-end bg-gray-50 dark:bg-gray-950 border-b"),
         onValueChange: (T) => V(T),
         children: [
           /* @__PURE__ */ e(Ct, { value: "details", children: "Details" }),
@@ -4612,35 +4616,35 @@ function rn({
       {
         noValidate: !0,
         onSubmit: ue.handleSubmit,
-        className: me(
+        className: fe(
           t ? "h-full" : "h-[calc(100%-48px)]",
           "flex-grow flex flex-col relative"
         ),
         children: [
           s === "loading" && /* @__PURE__ */ e(Nt, {}),
-          s === "extra_view" && fe && p?.View && /* @__PURE__ */ e(p.View, { path: fe }),
+          s === "extra_view" && pe && p?.View && /* @__PURE__ */ e(p.View, { path: pe }),
           s === "welcome" && /* @__PURE__ */ e(
-            Ji,
+            Qi,
             {
-              path: fe,
+              path: pe,
               onContinue: (T) => {
-                T ? (Qe(T), V("import_data_mapping")) : V("details");
+                T ? (Xe(T), V("import_data_mapping")) : V("details");
               },
               existingCollectionPaths: y,
               parentCollection: v,
-              pathSuggestions: c
+              pathSuggestions: d
             }
           ),
           s === "import_data_mapping" && _ && /* @__PURE__ */ e(
-            Qi,
+            Xi,
             {
               importConfig: _,
-              collectionEditable: U,
+              collectionEditable: j,
               propertyConfigs: f
             }
           ),
           s === "import_data_preview" && _ && /* @__PURE__ */ e(
-            en,
+            tn,
             {
               importConfig: _,
               properties: re.properties,
@@ -4648,20 +4652,21 @@ function rn({
             }
           ),
           s === "import_data_saving" && _ && /* @__PURE__ */ e(
-            fi,
+            gi,
             {
               importConfig: _,
               collection: re,
+              path: pe,
               onImportSuccess: async (T) => {
-                R.open({
+                U.open({
                   type: "info",
                   message: "Data imported successfully"
-                }), await q(re), d(T);
+                }), await q(re), c(T);
               }
             }
           ),
           s === "details" && /* @__PURE__ */ e(
-            yi,
+            bi,
             {
               existingPaths: y,
               existingIds: P,
@@ -4672,7 +4677,7 @@ function rn({
             }
           ),
           s === "subcollections" && b && /* @__PURE__ */ e(
-            Zi,
+            Ji,
             {
               parentCollection: v,
               configController: r,
@@ -4683,15 +4688,15 @@ function rn({
             }
           ),
           s === "properties" && /* @__PURE__ */ e(
-            Gi,
+            Ki,
             {
               showErrors: gt > 0,
               isNewCollection: t,
               reservedGroups: u,
-              onPropertyError: (T, S, E) => {
-                const ie = Ft({
+              onPropertyError: (T, F, E) => {
+                const ie = St({
                   ...D.current,
-                  [ir(T, S)]: Ft(E, !0)
+                  [ir(T, F)]: St(E, !0)
                 }, !0);
                 D.current = ie, ue.validate();
               },
@@ -4699,7 +4704,7 @@ function rn({
               getData: Re,
               doCollectionInference: J,
               propertyConfigs: f,
-              collectionEditable: U,
+              collectionEditable: j,
               extraIcon: p?.icon && /* @__PURE__ */ e(
                 oe,
                 {
@@ -4723,7 +4728,7 @@ function rn({
                     type: "button",
                     onClick: () => (_.setInUse(!1), V("welcome")),
                     children: [
-                      /* @__PURE__ */ e(tt, {}),
+                      /* @__PURE__ */ e(rt, {}),
                       "Back"
                     ]
                   }
@@ -4737,7 +4742,7 @@ function rn({
                       V("import_data_mapping");
                     },
                     children: [
-                      /* @__PURE__ */ e(tt, {}),
+                      /* @__PURE__ */ e(rt, {}),
                       "Back"
                     ]
                   }
@@ -4749,7 +4754,7 @@ function rn({
                     type: "button",
                     onClick: () => V("welcome"),
                     children: [
-                      /* @__PURE__ */ e(tt, {}),
+                      /* @__PURE__ */ e(rt, {}),
                       "Back"
                     ]
                   }
@@ -4761,7 +4766,7 @@ function rn({
                     type: "button",
                     onClick: () => V("details"),
                     children: [
-                      /* @__PURE__ */ e(tt, {}),
+                      /* @__PURE__ */ e(rt, {}),
                       "Back"
                     ]
                   }
@@ -4802,9 +4807,9 @@ function rn({
                     variant: "filled",
                     color: "primary",
                     type: "submit",
-                    loading: Te,
-                    disabled: Te || s === "details" && !vt,
-                    startIcon: s === "properties" ? /* @__PURE__ */ e(Gr, {}) : void 0,
+                    loading: ke,
+                    disabled: ke || s === "details" && !vt,
+                    startIcon: s === "properties" ? /* @__PURE__ */ e(Kr, {}) : void 0,
                     children: [
                       s === "details" && "Next",
                       s === "properties" && "Create collection"
@@ -4817,7 +4822,7 @@ function rn({
                     variant: "filled",
                     color: "primary",
                     type: "submit",
-                    loading: Te,
+                    loading: ke,
                     children: "Update collection"
                   }
                 )
@@ -4829,11 +4834,17 @@ function rn({
     )
   ] }) }) });
 }
-function nn(t, r) {
-  const { properties: n, ...i } = t, l = {};
-  return Object.keys(n).forEach((o) => {
+function an(t, r) {
+  const {
+    properties: n,
+    ...i
+  } = t, l = {};
+  return n && Object.keys(n).forEach((o) => {
     l[o] = pr(n[o], r);
-  }), { ...i, properties: l };
+  }), {
+    ...i,
+    properties: l
+  };
 }
 function pr(t, r) {
   let n = t;
@@ -4845,7 +4856,10 @@ function pr(t, r) {
       const l = {};
       Object.keys(n.properties).forEach((o) => {
         l[o] = pr(n.properties[o], r);
-      }), n = { ...n, properties: l };
+      }), n = {
+        ...n,
+        properties: l
+      };
     }
   }
   return n;
@@ -4853,27 +4867,27 @@ 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"), Or(t).split("/").length % 2 === 0 && (l = `Collection paths must have an odd number of segments: ${t}`), l;
-}, an = (t, r, n, i) => {
+}, on = (t, r, n, i) => {
   if (!t)
     return;
   let l;
   return r && n?.includes(t.trim().toLowerCase()) && (l = "There is already a collection that uses this value as a path"), r && i?.includes(t.trim().toLowerCase()) && (l = "There is already a collection which uses this id"), l;
-}, mr = Y.createContext({}), hr = Y.createContext({}), on = Y.memo(
+}, mr = Y.createContext({}), hr = Y.createContext({}), ln = Y.memo(
   function({
     children: r,
     collectionConfigController: n,
     configPermissions: i,
     reservedGroups: l,
     collectionInference: o,
-    extraView: d,
+    extraView: c,
     pathSuggestions: u,
     getUser: p,
     getData: h,
     onAnalyticsEvent: m
   }) {
-    const c = Pe(), g = gi(), v = Ie(), { propertyConfigs: x } = Ae(), {
+    const d = Ne(), g = vi(), v = _e(), { propertyConfigs: x } = Ae(), {
       collections: y
-    } = c, P = (y ?? []).map((s) => s.path.trim().toLowerCase()), [k, b] = Y.useState();
+    } = d, P = (y ?? []).map((s) => s.path.trim().toLowerCase()), [k, b] = Y.useState();
     de(() => {
       u && u().then((s) => {
         b(s.filter((V) => !P.includes(V.trim().toLowerCase())));
@@ -4897,7 +4911,7 @@ const Ht = (t, r, n, i) => {
         parentCollection: B,
         redirect: !1
       });
-    }, []), R = Q(({
+    }, []), U = Q(({
       propertyKey: s,
       property: V,
       editedCollectionId: G,
@@ -4905,7 +4919,7 @@ const Ht = (t, r, n, i) => {
       parentCollectionIds: q,
       collection: L
     }) => {
-      console.debug("edit property", s, V, G, B, q, L), m?.("edit_property", { propertyKey: s, editedCollectionId: G });
+      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,
@@ -4937,7 +4951,7 @@ const Ht = (t, r, n, i) => {
         value: {
           editCollection: M,
           createCollection: D,
-          editProperty: R,
+          editProperty: U,
           configPermissions: i ?? _,
           rootPathSuggestions: k
         },
@@ -4953,12 +4967,12 @@ const Ht = (t, r, n, i) => {
               ...C,
               getData: h,
               reservedGroups: l,
-              extraView: d,
+              extraView: c,
               pathSuggestions: A,
               getUser: p,
               handleClose: (s) => {
                 if (C?.redirect && s && C?.isNewCollection && !C.parentCollectionIds.length) {
-                  const V = c.buildUrlCollectionPath(s.id ?? s.path);
+                  const V = d.buildUrlCollectionPath(s.id ?? s.path);
                   g(V);
                 }
                 N(void 0);
@@ -4966,7 +4980,7 @@ const Ht = (t, r, n, i) => {
             }
           ),
           /* @__PURE__ */ e(
-            Ve,
+            Ie,
             {
               open: !!f,
               includeIdAndName: !0,
@@ -4977,7 +4991,7 @@ const Ht = (t, r, n, i) => {
               collectionEditable: f?.collectionEditable ?? !1,
               getData: h && f?.editedCollectionId ? () => {
                 console.debug("get data for property", f?.editedCollectionId);
-                const s = c.resolveAliasesFrom(f.editedCollectionId);
+                const s = d.resolveAliasesFrom(f.editedCollectionId);
                 return h(s, []);
               } : void 0,
               onPropertyChanged: ({
@@ -5038,96 +5052,40 @@ const Ht = (t, r, n, i) => {
       }
     ) });
   },
-  ve
-), xe = () => Jt(hr), fr = () => Jt(mr);
-function ln({
+  ye
+), ge = () => Jt(hr);
+function sn({
   path: t,
   parentCollectionIds: r,
   collection: n,
   tableController: i
 }) {
-  const l = _e(), o = Pe(), d = xe(), u = fr(), p = Ie(), h = o.getCollectionFromIds(r), m = d.configPermissions ? d.configPermissions({
+  const l = Te(), o = Ne(), c = ge(), u = o.getCollectionFromIds(r), p = c.configPermissions ? c.configPermissions({
     user: l.user,
     collection: n
   }).editCollections : !0;
-  let c = null;
-  return (!ve(at(i.filterValues), at(n.initialFilter)) || !ve(at(i.sortBy), at(n.initialSort))) && (c = /* @__PURE__ */ a(j, { children: [
-    (n.initialFilter || n.initialSort) && /* @__PURE__ */ e(
-      te,
-      {
-        title: "Reset to default filter and sort",
-        children: /* @__PURE__ */ e(
-          z,
-          {
-            color: "primary",
-            size: "small",
-            variant: "text",
-            onClick: () => {
-              i.clearFilter?.(), n?.initialFilter && i.setFilterValues?.(n?.initialFilter), n?.initialSort && i.setSortBy?.(n?.initialSort);
-            },
-            children: /* @__PURE__ */ e(Kr, {})
-          }
-        )
-      }
-    ),
-    /* @__PURE__ */ e(
-      te,
-      {
-        title: i.sortBy || i.filterValues ? "Save default filter and sort" : "Clear default filter and sort",
-        children: /* @__PURE__ */ e(
-          z,
-          {
-            color: "primary",
-            size: "small",
-            variant: "outlined",
-            onClick: () => u?.saveCollection({
-              id: n.id,
-              parentCollectionIds: r,
-              collectionData: W(
-                n,
-                {
-                  initialFilter: i.filterValues ?? null,
-                  initialSort: i.sortBy ?? null
-                }
-              )
-            }).then(() => {
-              p.open({
-                type: "success",
-                message: "Default config saved"
-              });
-            }),
-            children: /* @__PURE__ */ e(Wr, {})
-          }
-        )
-      }
-    )
-  ] })), /* @__PURE__ */ a(j, { children: [
-    m && c,
-    /* @__PURE__ */ e(
-      te,
-      {
-        title: m ? "Edit collection" : "You don't have permissions to edit this collection",
-        children: /* @__PURE__ */ e(
-          oe,
-          {
-            color: "primary",
-            disabled: !m,
-            onClick: m ? () => d?.editCollection({ id: n.id, fullPath: t, parentCollectionIds: r, parentCollection: h }) : void 0,
-            children: /* @__PURE__ */ e(He, {})
-          }
-        )
-      }
-    )
-  ] });
-}
-function at(t) {
-  return t && Object.keys(t).length === 0 ? t : t ?? null;
+  return /* @__PURE__ */ e(R, { children: /* @__PURE__ */ e(
+    te,
+    {
+      title: p ? "Edit collection" : "You don't have permissions to edit this collection",
+      children: /* @__PURE__ */ e(
+        oe,
+        {
+          color: "primary",
+          disabled: !p,
+          onClick: p ? () => c?.editCollection({ id: n.id, fullPath: t, parentCollectionIds: r, parentCollection: u }) : void 0,
+          children: /* @__PURE__ */ e(Ge, {})
+        }
+      )
+    }
+  ) });
 }
-function sn({
+const fr = () => Jt(mr);
+function cn({
   path: t,
   collection: r
 }) {
-  const n = Ie(), i = _e(), l = fr(), o = xe(), d = o.configPermissions({
+  const n = _e(), i = Te(), l = fr(), o = ge(), c = o.configPermissions({
     user: i.user,
     collection: r
   }), u = Q(() => {
@@ -5140,38 +5098,38 @@ function sn({
       });
     });
   }, [t, l]);
-  return /* @__PURE__ */ a(j, { children: [
+  return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ a("div", { children: [
-      d.deleteCollections && /* @__PURE__ */ e(
-        Zr,
+      c.deleteCollections && /* @__PURE__ */ e(
+        Wr,
         {
-          trigger: /* @__PURE__ */ e(oe, { children: /* @__PURE__ */ e(Jr, { size: "small" }) }),
-          children: /* @__PURE__ */ a(Qr, { onClick: (c) => {
-            c.preventDefault(), c.stopPropagation(), h(!0);
+          trigger: /* @__PURE__ */ e(oe, { children: /* @__PURE__ */ e(Zr, { size: "small" }) }),
+          children: /* @__PURE__ */ a(Jr, { onClick: (d) => {
+            d.preventDefault(), d.stopPropagation(), h(!0);
           }, children: [
-            /* @__PURE__ */ e(dt, {}),
+            /* @__PURE__ */ e(ut, {}),
             "Delete"
           ] })
         }
       ),
-      d.editCollections && /* @__PURE__ */ e(
+      c.editCollections && /* @__PURE__ */ e(
         oe,
         {
-          onClick: (c) => {
+          onClick: (d) => {
             u();
           },
-          children: /* @__PURE__ */ e(He, { size: "small" })
+          children: /* @__PURE__ */ e(Ge, { size: "small" })
         }
       )
     ] }),
     /* @__PURE__ */ e(
-      lt,
+      st,
       {
         open: p,
         onAccept: m,
         onCancel: () => h(!1),
-        title: /* @__PURE__ */ e(j, { children: "Delete this collection?" }),
-        body: /* @__PURE__ */ a(j, { children: [
+        title: /* @__PURE__ */ e(R, { children: "Delete this collection?" }),
+        body: /* @__PURE__ */ a(R, { children: [
           " This will ",
           /* @__PURE__ */ e("b", { children: "not delete any data" }),
           ", only the collection in the CMS"
@@ -5180,19 +5138,19 @@ function sn({
     )
   ] });
 }
-function cn({
+function dn({
   group: t,
   context: r
 }) {
   if (!r.navigation.topLevelNavigation)
     throw Error("Navigation not ready in FireCMSHomePage");
-  const n = _e(), i = xe(), l = i.configPermissions ? i.configPermissions({
+  const n = Te(), i = ge(), l = i.configPermissions ? i.configPermissions({
     user: n.user
   }).createCollections : !0;
   return /* @__PURE__ */ e(
     tr,
     {
-      className: me("h-full p-4 min-h-[124px]"),
+      className: fe("h-full p-4 min-h-[124px]"),
       onClick: i && l ? () => i.createCollection({
         initialValues: t ? { group: t } : void 0,
         parentCollectionIds: [],
@@ -5221,14 +5179,14 @@ function cn({
     }
   );
 }
-function dn({ introMode: t }) {
-  const r = _e(), n = Pe(), i = xe(), l = i.configPermissions ? i.configPermissions({
+function un({ introMode: t }) {
+  const r = Te(), n = Ne(), i = ge(), l = i.configPermissions ? i.configPermissions({
     user: r.user
-  }).createCollections : !0, o = i.rootPathSuggestions, d = (o ?? []).length > 3 || (n.collections ?? []).length === 0 && (o ?? []).length > 0;
+  }).createCollections : !0, o = i.rootPathSuggestions, c = (o ?? []).length > 3 || (n.collections ?? []).length === 0 && (o ?? []).length > 0;
   return /* @__PURE__ */ e(
-    Xr,
+    Qr,
     {
-      in: t === "existing_project" || d,
+      in: t === "existing_project" || c,
       children: /* @__PURE__ */ a(
         "div",
         {
@@ -5250,12 +5208,12 @@ function dn({ introMode: t }) {
                 className: "flex flex-row gap-1 overflow-scroll no-scrollbar ",
                 children: [
                   (o ?? []).map((p) => /* @__PURE__ */ e("div", { children: /* @__PURE__ */ e(
-                    st,
+                    ct,
                     {
                       icon: /* @__PURE__ */ e(se, { size: "small" }),
                       colorScheme: "cyanLighter",
                       onClick: i && l ? () => i.createCollection({
-                        initialValues: { path: p, name: ut(p) },
+                        initialValues: { path: p, name: pt(p) },
                         parentCollectionIds: [],
                         redirect: !0,
                         sourceClick: "root_collection_suggestion"
@@ -5275,7 +5233,7 @@ function dn({ introMode: t }) {
     }
   );
 }
-function un({
+function pn({
   propertyKey: t,
   onHover: r,
   property: n,
@@ -5283,13 +5241,13 @@ function un({
   parentCollectionIds: l,
   collection: o
 }) {
-  const d = xe();
+  const c = ge();
   return /* @__PURE__ */ e(te, { title: "Edit", children: /* @__PURE__ */ e(
     oe,
     {
       className: r ? "bg-white dark:bg-gray-950" : "hidden",
       onClick: () => {
-        d.editProperty({
+        c.editProperty({
           propertyKey: t,
           property: n,
           editedCollectionId: o.id,
@@ -5298,16 +5256,16 @@ function un({
         });
       },
       size: "small",
-      children: /* @__PURE__ */ e(He, { size: "small" })
+      children: /* @__PURE__ */ e(Ge, { size: "small" })
     }
   ) });
 }
-function pn({
+function mn({
   fullPath: t,
   parentCollectionIds: r,
   collection: n
 }) {
-  const i = _e(), l = xe(), o = l.configPermissions ? l.configPermissions({
+  const i = Te(), l = ge(), o = l.configPermissions ? l.configPermissions({
     user: i.user,
     collection: n
   }).editCollections : !0;
@@ -5327,9 +5285,9 @@ function pn({
     }
   ) });
 }
-function mn() {
-  const t = xe();
-  return /* @__PURE__ */ a(
+function hn() {
+  const t = ge();
+  return /* @__PURE__ */ e("div", { className: "bg-gray-50 dark:bg-gray-900 min-w-fit rounded", children: /* @__PURE__ */ a(
     z,
     {
       className: "min-w-fit",
@@ -5344,28 +5302,91 @@ function mn() {
         "New collection"
       ]
     }
-  );
+  ) });
+}
+function fn({
+  path: t,
+  parentCollectionIds: r,
+  collection: n,
+  tableController: i
+}) {
+  const l = Te(), o = ge(), c = fr(), u = _e(), p = o.configPermissions ? o.configPermissions({
+    user: l.user,
+    collection: n
+  }).editCollections : !0;
+  let h = null;
+  return (!ye(ot(i.filterValues), ot(n.initialFilter)) || !ye(ot(i.sortBy), ot(n.initialSort))) && (h = /* @__PURE__ */ a(R, { children: [
+    /* @__PURE__ */ e(
+      te,
+      {
+        title: i.sortBy || i.filterValues ? "Save default filter and sort" : "Clear default filter and sort",
+        children: /* @__PURE__ */ e(
+          z,
+          {
+            color: "primary",
+            size: "small",
+            variant: "outlined",
+            onClick: () => c?.saveCollection({
+              id: n.id,
+              parentCollectionIds: r,
+              collectionData: W(
+                n,
+                {
+                  initialFilter: i.filterValues ?? null,
+                  initialSort: i.sortBy ?? null
+                }
+              )
+            }).then(() => {
+              u.open({
+                type: "success",
+                message: "Default config saved"
+              });
+            }),
+            children: /* @__PURE__ */ e(Xr, {})
+          }
+        )
+      }
+    ),
+    (n.initialFilter || n.initialSort) && /* @__PURE__ */ e(
+      te,
+      {
+        title: "Reset to default filter and sort",
+        children: /* @__PURE__ */ e(
+          z,
+          {
+            color: "primary",
+            size: "small",
+            variant: "text",
+            onClick: () => {
+              i.clearFilter?.(), n?.initialFilter && i.setFilterValues?.(n?.initialFilter), n?.initialSort && i.setSortBy?.(n?.initialSort);
+            },
+            children: /* @__PURE__ */ e(ei, {})
+          }
+        )
+      }
+    )
+  ] })), /* @__PURE__ */ e(R, { children: p && h });
 }
-function In({
+function ot(t) {
+  return t && Object.keys(t).length === 0 ? t : t ?? null;
+}
+function Sn({
   collectionConfigController: t,
   introMode: r,
   configPermissions: n,
   reservedGroups: i,
   extraView: l,
   pathSuggestions: o,
-  getUser: d,
+  getUser: c,
   collectionInference: u,
   getData: p,
   onAnalyticsEvent: h
 }) {
   return {
-    name: "Collection Editor",
+    key: "collection_editor",
     loading: t.loading,
-    collections: {
-      CollectionActions: ln
-    },
     provider: {
-      Component: on,
+      Component: ln,
       props: {
         collectionConfigController: t,
         configPermissions: n,
@@ -5373,28 +5394,30 @@ function In({
         reservedGroups: i,
         extraView: l,
         pathSuggestions: o,
-        getUser: d,
+        getUser: c,
         getData: p,
         onAnalyticsEvent: h
       }
     },
     homePage: {
-      additionalActions: /* @__PURE__ */ e(mn, {}),
-      additionalChildrenStart: r ? /* @__PURE__ */ e(hn, { introMode: r }) : void 0,
-      additionalChildrenEnd: /* @__PURE__ */ e(dn, { introMode: r }),
-      CollectionActions: sn,
-      AdditionalCards: r ? void 0 : cn
+      additionalActions: /* @__PURE__ */ e(hn, {}),
+      additionalChildrenStart: r ? /* @__PURE__ */ e(gn, { introMode: r }) : void 0,
+      additionalChildrenEnd: /* @__PURE__ */ e(un, { introMode: r }),
+      CollectionActions: cn,
+      AdditionalCards: r ? void 0 : dn
     },
     collectionView: {
-      HeaderAction: un,
-      AddColumnComponent: pn
+      CollectionActionsStart: fn,
+      CollectionActions: sn,
+      HeaderAction: pn,
+      AddColumnComponent: mn
     }
   };
 }
-function hn({ introMode: t }) {
-  if (!Pe().topLevelNavigation)
+function gn({ introMode: t }) {
+  if (!Ne().topLevelNavigation)
     throw Error("Navigation not ready in FireCMSHomePage");
-  const n = _e(), i = xe(), l = i.configPermissions ? i.configPermissions({
+  const n = Te(), i = ge(), 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: [
@@ -5418,8 +5441,16 @@ function hn({ introMode: t }) {
     )
   ] });
 }
-function _n({ path: t }) {
-  const r = Pe(), n = fn(t), i = r.getParentCollectionIds(t), l = xe();
+const Fn = (t, r, n) => {
+  const i = (c) => {
+    He(c.properties), c.subcollections?.forEach(i);
+  }, l = r ?? [];
+  l.forEach(i), console.debug("Collections specified in code:", t), console.debug("Collections stored in the backend", l);
+  const o = Ir(t, l, [], n);
+  return console.debug("Collections after joining:", o), o;
+};
+function En({ path: t }) {
+  const r = Ne(), n = vn(t), i = r.getParentCollectionIds(t), l = ge();
   return /* @__PURE__ */ a("div", { className: "p-1 flex flex-col items-center", children: [
     /* @__PURE__ */ e(Wt, { error: "No collection for path: " + n }),
     /* @__PURE__ */ e(
@@ -5430,7 +5461,7 @@ function _n({ path: t }) {
         size: "small",
         onClick: () => {
           l.createCollection({
-            initialValues: { path: n, name: ut(n) },
+            initialValues: { path: n, name: pt(n) },
             parentCollectionIds: i,
             redirect: !1,
             sourceClick: "missing_reference"
@@ -5441,21 +5472,22 @@ function _n({ path: t }) {
     )
   ] });
 }
-function fn(t) {
+function vn(t) {
   const r = t.split("/");
   return r[r.length - 1];
 }
 export {
-  _n as MissingReferenceWidget,
+  En as MissingReferenceWidget,
   qe as editableProperty,
   ae as getFullId,
   ir as getFullIdPath,
-  pe as idToPropertiesPath,
-  ye as namespaceToPropertiesOrderPath,
-  bi as namespaceToPropertiesPath,
-  wi as removeNonEditableProperties,
-  xe as useCollectionEditorController,
-  In as useCollectionEditorPlugin,
+  he as idToPropertiesPath,
+  Fn as mergeCollections,
+  be as namespaceToPropertiesOrderPath,
+  Ci as namespaceToPropertiesPath,
+  Ti as removeNonEditableProperties,
+  ge as useCollectionEditorController,
+  Sn as useCollectionEditorPlugin,
   fr as useCollectionsConfigController
 };
 //# sourceMappingURL=index.es.js.map