@firecms/core 3.0.0-canary.90 → 3.0.0-canary.92

package/dist/index.umd.js

@@ -3982,7 +3982,7 @@
           ]
         );
         let shouldUpdateTopLevelNav = false;
-        if (!areCollectionListsEqual(collectionsRef.current ?? [], resolvedCollections)) {
+        if (!areCollectionListsEqual(collectionsRef.current ?? [], resolvedCollections) || resolvedCollections.length === 0) {
           collectionsRef.current = resolvedCollections;
           shouldUpdateTopLevelNav = true;
         }
@@ -8537,6 +8537,18 @@
       disabled: disabled || Boolean(property.disabled) || Boolean(property.readOnly)
     }];
   }
+  function getFormFieldKeys(collection) {
+    const propertyKeys = Object.keys(collection.properties);
+    const additionalFields = collection.additionalFields ?? [];
+    const allKeys = [
+      ...propertyKeys,
+      ...additionalFields.map((field) => field.key)
+    ];
+    if (collection.propertiesOrder) {
+      return collection.propertiesOrder.filter((key) => allKeys.includes(key));
+    }
+    return allKeys;
+  }
   function buildIdColumn(largeLayout) {
     return {
       key: "id_ewcfedcswdf3",
@@ -18165,46 +18177,74 @@
         });
       }
     }, [formex$1.isSubmitting, autoSave, underlyingChanges, entity, formex$1.values, formex$1.touched, formex$1.setFieldValue]);
-    const formFields = /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: (resolvedCollection.propertiesOrder ?? Object.keys(resolvedCollection.properties)).map((key) => {
+    const formFields = /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: getFormFieldKeys(resolvedCollection).map((key) => {
       const property = resolvedCollection.properties[key];
-      if (!property) {
-        console.warn(`Property ${key} not found in collection ${resolvedCollection.name}`);
-        return null;
+      if (property) {
+        const underlyingValueHasChanged = !!underlyingChanges && Object.keys(underlyingChanges).includes(key) && !!formex$1.touched[key];
+        const disabled2 = !autoSave && formex$1.isSubmitting || isReadOnly(property) || Boolean(property.disabled);
+        const hidden = isHidden(property);
+        if (hidden) return null;
+        const cmsFormFieldProps = {
+          propertyKey: key,
+          disabled: disabled2,
+          property,
+          includeDescription: property.description || property.longDescription,
+          underlyingValueHasChanged: underlyingValueHasChanged && !autoSave,
+          context: formContext,
+          tableMode: false,
+          partOfArray: false,
+          partOfBlock: false,
+          autoFocus: false
+        };
+        return /* @__PURE__ */ jsxRuntime.jsx(
+          "div",
+          {
+            id: `form_field_${key}`,
+            children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsx(
+              ui.Tooltip,
+              {
+                title: /* @__PURE__ */ jsxRuntime.jsx(PropertyIdCopyTooltipContent, { propertyId: key }),
+                delayDuration: 800,
+                side: "left",
+                align: "start",
+                sideOffset: 16,
+                children: /* @__PURE__ */ jsxRuntime.jsx(PropertyFieldBinding, { ...cmsFormFieldProps })
+              }
+            ) })
+          },
+          `field_${resolvedCollection.name}_${key}`
+        );
       }
-      const underlyingValueHasChanged = !!underlyingChanges && Object.keys(underlyingChanges).includes(key) && !!formex$1.touched[key];
-      const disabled2 = !autoSave && formex$1.isSubmitting || isReadOnly(property) || Boolean(property.disabled);
-      const hidden = isHidden(property);
-      if (hidden) return null;
-      const cmsFormFieldProps = {
-        propertyKey: key,
-        disabled: disabled2,
-        property,
-        includeDescription: property.description || property.longDescription,
-        underlyingValueHasChanged: underlyingValueHasChanged && !autoSave,
-        context: formContext,
-        tableMode: false,
-        partOfArray: false,
-        partOfBlock: false,
-        autoFocus: false
-      };
-      return /* @__PURE__ */ jsxRuntime.jsx(
-        "div",
-        {
-          id: `form_field_${key}`,
-          children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsx(
-            ui.Tooltip,
+      const additionalField = resolvedCollection.additionalFields?.find((f) => f.key === key);
+      if (additionalField && entity) {
+        const Builder = additionalField.Builder;
+        if (!Builder && !additionalField.value) {
+          throw new Error("When using additional fields you need to provide a Builder or a value");
+        }
+        const child = Builder ? /* @__PURE__ */ jsxRuntime.jsx(Builder, { entity, context }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: additionalField.value?.({
+          entity,
+          context
+        }) });
+        return /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            LabelWithIcon,
             {
-              title: /* @__PURE__ */ jsxRuntime.jsx(PropertyIdCopyTooltipContent, { propertyId: key }),
-              delayDuration: 800,
-              side: "left",
-              align: "start",
-              sideOffset: 16,
-              children: /* @__PURE__ */ jsxRuntime.jsx(PropertyFieldBinding, { ...cmsFormFieldProps })
+              icon: /* @__PURE__ */ jsxRuntime.jsx(ui.NotesIcon, { size: "small" }),
+              title: additionalField.name,
+              className: "text-text-secondary dark:text-text-secondary-dark ml-3.5"
             }
-          ) })
-        },
-        `field_${resolvedCollection.name}_${key}`
-      );
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "div",
+            {
+              className: ui.cls(ui.paperMixin, "min-h-14 p-4 md:p-6 overflow-x-scroll no-scrollbar"),
+              children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: child })
+            }
+          )
+        ] });
+      }
+      console.warn(`Property ${key} not found in collection ${resolvedCollection.name} in properties or additional fields. Skipping.`);
+      return null;
     }).filter(Boolean) });
     const disabled = formex$1.isSubmitting || !modified && status === "existing";
     const formRef = React.useRef(null);
@@ -20113,6 +20153,7 @@
   exports2.getEntityTitlePropertyKey = getEntityTitlePropertyKey;
   exports2.getFieldConfig = getFieldConfig;
   exports2.getFieldId = getFieldId;
+  exports2.getFormFieldKeys = getFormFieldKeys;
   exports2.getHashValue = getHashValue;
   exports2.getIcon = getIcon;
   exports2.getIconForProperty = getIconForProperty;