@open-mercato/ui 0.8.1-develop.7261.1.5d42353f61 → 0.8.1-develop.7266.1.8e520bbe03

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
 Generated lucide registry with 170 icons -> /home/runner/work/open-mercato/open-mercato/packages/ui/src/backend/icons/lucideRegistry.generated.tsx
-[build:ui] found 450 entry points
+[build:ui] found 451 entry points
 [build:ui] built successfully

package/dist/backend/CrudForm.js

@@ -191,6 +191,7 @@ function readByDotPath(source, path) {
   return current;
 }
 const PROTO_POLLUTING_KEYS = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
+const EMPTY_HIDDEN_GROUP_IDS = /* @__PURE__ */ new Set();
 function isProtoPollutingKey(key) {
   return PROTO_POLLUTING_KEYS.has(key);
 }
@@ -383,6 +384,7 @@ function CrudForm({
   entityId,
   entityIds,
   groups,
+  hiddenGroupIds,
   isLoading = false,
   loadingMessage,
   customEntity = false,
@@ -1367,6 +1369,46 @@ function CrudForm({
     }
     return hidden;
   }, [fields, values]);
+  const hiddenGroupIdsKey = (hiddenGroupIds ?? []).join("\0");
+  const hiddenGroupIdSet = React.useMemo(
+    () => hiddenGroupIdsKey ? new Set(hiddenGroupIdsKey.split("\0")) : EMPTY_HIDDEN_GROUP_IDS,
+    [hiddenGroupIdsKey]
+  );
+  const placedCustomFieldIds = React.useMemo(() => {
+    const placed = /* @__PURE__ */ new Set();
+    for (const other of groups ?? []) {
+      if (other.kind === "customFields" || !other.fields) continue;
+      for (const entry of other.fields) {
+        if (typeof entry === "string") placed.add(entry);
+        else if (entry && typeof entry.id === "string") placed.add(entry.id);
+      }
+    }
+    return placed;
+  }, [groups]);
+  const hiddenGroupFieldIds = React.useMemo(() => {
+    if (hiddenGroupIdSet.size === 0) return EMPTY_HIDDEN_GROUP_IDS;
+    const groupFieldIds = (group) => {
+      if (group.kind === "customFields") {
+        return cfFields.filter((field) => !placedCustomFieldIds.has(field.id)).map((field) => field.id);
+      }
+      return (group.fields ?? []).map((entry) => typeof entry === "string" ? entry : entry.id);
+    };
+    const declaredGroups = groups ?? [];
+    const hidden = /* @__PURE__ */ new Set();
+    const visible = /* @__PURE__ */ new Set();
+    for (const group of declaredGroups) {
+      const target = hiddenGroupIdSet.has(group.id) ? hidden : visible;
+      for (const fieldId of groupFieldIds(group)) target.add(fieldId);
+    }
+    const declaredGroupIds = new Set(declaredGroups.map((group) => group.id));
+    const fallbackGroupId = declaredGroups[declaredGroups.length - 1]?.id;
+    for (const definition of injectedFieldDefinitions) {
+      const targetGroupId = definition.group && declaredGroupIds.has(definition.group) ? definition.group : fallbackGroupId;
+      if (targetGroupId && hiddenGroupIdSet.has(targetGroupId)) hidden.add(definition.id);
+    }
+    for (const fieldId of visible) hidden.delete(fieldId);
+    return hidden;
+  }, [cfFields, groups, hiddenGroupIdSet, injectedFieldDefinitions, placedCustomFieldIds]);
   const hiddenInjectedFieldIds = React.useMemo(() => {
     const hidden = /* @__PURE__ */ new Set();
     for (const definition of injectedFieldDefinitions) {
@@ -1442,6 +1484,7 @@ function CrudForm({
     const field = fieldById.get(fieldId);
     if (!field || field.disabled) return;
     if (hiddenBaseFieldIds.has(fieldId) || hiddenInjectedFieldIds.has(fieldId)) return;
+    if (hiddenGroupFieldIds.has(fieldId)) return;
     if (!everEditedFieldIdsRef.current.has(fieldId)) return;
     const nextValues = sourceValues ?? valuesRef.current;
     const nextFieldErrors = {};
@@ -1521,6 +1564,7 @@ function CrudForm({
     fieldById,
     formReadOnly,
     hiddenBaseFieldIds,
+    hiddenGroupFieldIds,
     hiddenInjectedFieldIds,
     injectedFieldIdSet,
     mapDefsForValidation,
@@ -1584,13 +1628,26 @@ function CrudForm({
     return cloned;
   }, [groups, injectedFieldDefinitions]);
   const shouldAutoGroup = (!groupsWithInjectedFields || groupsWithInjectedFields.length === 0) && injectionGroupCards.length > 0;
-  const resolvedGroupsForLayout = React.useMemo(() => {
+  const declaredGroupsForLayout = React.useMemo(() => {
     const baseGroups = groupsWithInjectedFields && groupsWithInjectedFields.length ? groupsWithInjectedFields : [];
     const autoGroup = shouldAutoGroup ? [{ id: "__auto-fields__", fields: allFields }] : [];
     return [...baseGroups.length ? baseGroups : autoGroup, ...injectionGroupCards];
   }, [allFields, groupsWithInjectedFields, injectionGroupCards, shouldAutoGroup]);
-  const useGroupedLayout = resolvedGroupsForLayout.length > 0;
-  const defaultGroupIds = React.useMemo(() => resolvedGroupsForLayout.map((g) => g.id), [resolvedGroupsForLayout]);
+  const resolvedGroupsForLayout = React.useMemo(() => {
+    if (hiddenGroupIdSet.size === 0) return declaredGroupsForLayout;
+    return declaredGroupsForLayout.filter((group) => !hiddenGroupIdSet.has(group.id));
+  }, [declaredGroupsForLayout, hiddenGroupIdSet]);
+  React.useEffect(() => {
+    if (process.env.NODE_ENV === "production" || hiddenGroupIdSet.size === 0) return;
+    const declaredIds = new Set(declaredGroupsForLayout.map((group) => group.id));
+    for (const hiddenId of hiddenGroupIdSet) {
+      if (!declaredIds.has(hiddenId)) {
+        logger.warn("hiddenGroupIds names a group that does not exist on this form", { groupId: hiddenId });
+      }
+    }
+  }, [declaredGroupsForLayout, hiddenGroupIdSet]);
+  const useGroupedLayout = declaredGroupsForLayout.length > 0;
+  const defaultGroupIds = React.useMemo(() => declaredGroupsForLayout.map((g) => g.id), [declaredGroupsForLayout]);
   const { orderedIds: sortedGroupIds, reorder: reorderGroups } = useGroupOrder(
     sortablePageType,
     defaultGroupIds
@@ -1621,17 +1678,6 @@ function CrudForm({
     () => (injectionWidgets ?? []).filter((widget) => (widget.placement?.kind ?? "stack") === "stack"),
     [injectionWidgets]
   );
-  const placedCustomFieldIds = React.useMemo(() => {
-    const placed = /* @__PURE__ */ new Set();
-    for (const other of groups ?? []) {
-      if (other.kind === "customFields" || !other.fields) continue;
-      for (const entry of other.fields) {
-        if (typeof entry === "string") placed.add(entry);
-        else if (entry && typeof entry.id === "string") placed.add(entry.id);
-      }
-    }
-    return placed;
-  }, [groups]);
   const resolveGroupFields = React.useCallback((g) => {
     if (g.kind === "customFields") {
       return cfFields.filter((f) => !placedCustomFieldIds.has(f.id));
@@ -1683,10 +1729,10 @@ function CrudForm({
       if (fromCol2) return fromCol2;
     }
     for (const field of allFields) {
-      if (field?.id && !field.disabled) return field.id;
+      if (field?.id && !field.disabled && !hiddenGroupFieldIds.has(field.id)) return field.id;
     }
     return null;
-  }, [allFields, resolveGroupFields, resolvedGroupsForLayout, useGroupedLayout]);
+  }, [allFields, hiddenGroupFieldIds, resolveGroupFields, resolvedGroupsForLayout, useGroupedLayout]);
   const requestSubmit = React.useCallback(() => {
     if (formReadOnly) return;
     if (typeof document === "undefined") return;
@@ -2137,6 +2183,7 @@ function CrudForm({
         if (!field.required) continue;
         if (field.disabled) continue;
         if (hiddenBaseFieldIds.has(field.id) || hiddenInjectedFieldIds.has(field.id)) continue;
+        if (hiddenGroupFieldIds.has(field.id)) continue;
         const v = values[field.id];
         const isArray = Array.isArray(v);
         const isString = typeof v === "string";