@dataverse-kit/export-engine 1.3.0 → 1.5.0

package/dist/index.mjs

@@ -12790,6 +12790,7 @@ function buildV8Body(args) {
     handlerBlock = "",
     rowCommandsLiteral = "",
     deleteDialogJsx = "",
+    createDialogJsx = "",
     commandBarBlock = "",
     selectionModeAttr = "",
     onSelectionChangedAttr = ""
@@ -12816,7 +12817,7 @@ const ${componentName}: React.FC<{ items: Record<string, unknown>[] }> = ({ item
         editable
         editTrigger="click"
         getKey={(it) => String((it as { __rowIndex?: number }).__rowIndex ?? '')}${selectionModeAttr}${onSelectionChangedAttr}${onValueChangeAttr}${rowCommandsAttr}
-      />${editableAggregate}${editablePagination}${saveStatusJsx}${deleteDialogJsx}
+      />${editableAggregate}${editablePagination}${saveStatusJsx}${deleteDialogJsx}${createDialogJsx}
     </div>
   );
 };`;
@@ -12869,6 +12870,7 @@ function buildLiveReadOnlyV8Body(args) {
     handlerBlock = "",
     rowCommandsLiteral = "",
     deleteDialogJsx = "",
+    createDialogJsx = "",
     commandBarBlock = ""
   } = args;
   const rowCommandsAttr = rowCommandsLiteral ? `
@@ -12897,7 +12899,7 @@ const ${helperName}: React.FC = () => {
         ] as ColumnDef[]}
         registry={registry}
         getKey={(it) => String((it as { __rowIndex?: number }).__rowIndex ?? '')}${rowCommandsAttr}
-      />${flatAggregateInner}${flatPaginationInner}${deleteDialogJsx}
+      />${flatAggregateInner}${flatPaginationInner}${deleteDialogJsx}${createDialogJsx}
     </div>
   );
 };`;
@@ -12943,6 +12945,7 @@ function buildCardV8LiveBody(args) {
     handlerBlock = "",
     rowCommandsLiteral = "",
     deleteDialogJsx = "",
+    createDialogJsx = "",
     commandBarBlock = "",
     selectionModeAttr = "",
     onSelectionChangedAttr = ""
@@ -12974,7 +12977,7 @@ const ${helperName}: React.FC = () => {
         registry={registry}
         getKey={(it) => String((it as { __rowIndex?: number }).__rowIndex ?? '')}${selectionModeAttr}${onSelectionChangedAttr}
         card={{ ${cardConfigLiteral} }}${rowCommandsAttr}
-      />${flatAggregateInner}${flatPaginationInner}${deleteDialogJsx}
+      />${flatAggregateInner}${flatPaginationInner}${deleteDialogJsx}${createDialogJsx}
     </div>
   );
 };`;
@@ -13300,6 +13303,7 @@ function buildNestedSubgridBody(args) {
     commandBarBlock,
     handlerBlock,
     deleteDialogJsx,
+    createDialogJsx,
     hasSelection,
     hasHandler,
     dataverseHooks,
@@ -13355,7 +13359,7 @@ const ${componentName}: React.FC<{ items: Record<string, unknown>[] }> = ({ item
           calloutMaxRows: ${calloutMaxRows},
           hoverDelay: ${hoverDelay},${childEditableLiteral}
         }}
-      />${deleteDialogJsx}${childSaveStatusJsx}
+      />${deleteDialogJsx}${createDialogJsx}${childSaveStatusJsx}
     </div>
   );
 };`;
@@ -13398,6 +13402,7 @@ function buildFocusedViewSubgridBody(args) {
     commandBarBlock,
     handlerBlock,
     deleteDialogJsx,
+    createDialogJsx,
     hasSelection,
     hasHandler,
     dataverseHooks,
@@ -13451,7 +13456,7 @@ const ${componentName}: React.FC<{ items: Record<string, unknown>[] }> = ({ item
           childSelectionMode: ${JSON.stringify(childSelectionMode)},
           childSelectionGating: ${JSON.stringify(childSelectionGating)},${childEditableLiteral}
         }}
-      />${deleteDialogJsx}${childSaveStatusJsx}
+      />${deleteDialogJsx}${createDialogJsx}${childSaveStatusJsx}
     </div>
   );
 };`;
@@ -14230,14 +14235,182 @@ function effectiveMinSelection(item) {
   if (typeof item.minSelectionCount === "number") return item.minSelectionCount;
   return DEFAULT_MIN_SEL_BY_ACTION[item.actionType ?? "custom"] ?? 0;
 }
+function buildExportColumnsLiteral(cols) {
+  return cols.map(
+    (c) => `{ key: ${JSON.stringify(c.fieldName)}, name: ${JSON.stringify(c.displayName ?? c.fieldName)} }`
+  ).join(", ");
+}
+var CREATE_FIELD_DENYLIST = /* @__PURE__ */ new Set([
+  "createdon",
+  "createdby",
+  "createdonbehalfby",
+  "modifiedon",
+  "modifiedby",
+  "modifiedonbehalfby",
+  "owningbusinessunit",
+  "owningteam",
+  "owninguser",
+  "ownerid",
+  "versionnumber",
+  "overriddencreatedon",
+  "importsequencenumber",
+  "timezoneruleversionnumber",
+  "utcconversiontimezonecode",
+  "statecode",
+  "statuscode"
+]);
+function buildCreateFields(cols, primaryIdAttribute) {
+  const primaryLower = (primaryIdAttribute ?? "").toLowerCase();
+  const entries = [];
+  for (const c of cols) {
+    if (!c.fieldName) continue;
+    const logical = (c.attributeLogicalName ?? c.fieldName).toLowerCase();
+    if (logical === primaryLower) continue;
+    if (c.isLocked) continue;
+    if (c.dataType === "lookup" || c.dataType === "image") continue;
+    if (CREATE_FIELD_DENYLIST.has(logical)) continue;
+    const label = c.displayName ?? c.fieldName;
+    let kind = "text";
+    let inputType;
+    let optionsLit = "";
+    switch (c.dataType) {
+      case "numeric":
+      case "currency":
+        kind = "number";
+        inputType = "number";
+        break;
+      case "boolean":
+        kind = "boolean";
+        break;
+      case "date":
+        kind = "date";
+        inputType = "date";
+        break;
+      case "datetime":
+        kind = "date";
+        inputType = "datetime-local";
+        break;
+      case "optionset": {
+        const opts = c.rendererConfig?.options ?? [];
+        if (opts.length === 0) {
+          kind = "number";
+          inputType = "number";
+        } else {
+          kind = "optionset";
+          optionsLit = opts.map(
+            (o) => `{ key: ${JSON.stringify(o.value)}, text: ${JSON.stringify(o.label)} }`
+          ).join(", ");
+        }
+        break;
+      }
+      case "email":
+        kind = "text";
+        inputType = "email";
+        break;
+      case "phone":
+        kind = "text";
+        inputType = "tel";
+        break;
+      case "url":
+        kind = "text";
+        inputType = "url";
+        break;
+      default:
+        kind = "text";
+        break;
+    }
+    const payloadKey = c.attributeLogicalName ?? c.fieldName;
+    const parts = [
+      `key: ${JSON.stringify(payloadKey)}`,
+      `label: ${JSON.stringify(label)}`,
+      `kind: ${JSON.stringify(kind)}`
+    ];
+    if (inputType) parts.push(`inputType: ${JSON.stringify(inputType)}`);
+    if (kind === "optionset") parts.push(`options: [${optionsLit}]`);
+    entries.push(`{ ${parts.join(", ")} }`);
+  }
+  return entries.join(", ");
+}
 function buildGridCommandHandlerBlock(args) {
   const {
     entityName,
     entitySetName,
     primaryIdAttribute,
     itemsExpr,
-    selectionExpr
+    selectionExpr,
+    exportColumnsLiteral,
+    createColumnsLiteral
   } = args;
+  const exportCase = exportColumnsLiteral ? `{
+        const exportColumns = [${exportColumnsLiteral}];
+        const rowsToExport = (indices.length ? indices.map((i) => items[i]) : items.slice())
+          .filter((r): r is Record<string, unknown> => Boolean(r))
+          .map((r) => {
+            const formattedRow: Record<string, unknown> = {};
+            for (const col of exportColumns) {
+              formattedRow[col.key] = r[col.key + '@OData.Community.Display.V1.FormattedValue'] ?? r[col.key];
+            }
+            return formattedRow;
+          });
+        exportToFile(rowsToExport, exportColumns, 'csv', generateDefaultFilename(${JSON.stringify(entityName + "-export")}));
+        return;
+      }` : `{
+        console.warn('[grid] Export to Excel is not yet wired in generated forms.');
+        return;
+      }`;
+  const createStateBlock = createColumnsLiteral ? `
+  const gridCreateMutation = useCreateRecord<Record<string, unknown>>('${entitySetName}');
+  const [pendingCreate, setPendingCreate] = React.useState(false);
+  const [createValues, setCreateValues] = React.useState<Record<string, unknown>>({});
+  const [createError, setCreateError] = React.useState<string | null>(null);
+  // Derived from the grid's columns; lookups/images/system fields are excluded by
+  // the emitter. The payload is best-effort and validated server-side (errors show
+  // in \`createError\`). NOTE: against a mock/standalone host (no Dataverse token),
+  // MockApiService.createRecord no-ops and resolves \u2014 the dialog closes as if it
+  // succeeded but nothing is created. Xrm is the primary path in a model-driven host.
+  const createFields = React.useMemo<Array<{ key: string; label: string; kind: 'text' | 'number' | 'boolean' | 'optionset' | 'date'; inputType?: string; options?: Array<{ key: number; text: string }> }>>(
+    () => [${createColumnsLiteral}],
+    [],
+  );
+  const submitCreate = React.useCallback(async () => {
+    setCreateError(null);
+    const payload: Record<string, unknown> = {};
+    for (const f of createFields) {
+      const raw = createValues[f.key];
+      if (raw === undefined || raw === null || raw === '') continue;
+      payload[f.key] = (f.kind === 'number' || f.kind === 'optionset') ? Number(raw) : raw;
+    }
+    if (Object.keys(payload).length === 0) {
+      setCreateError('Enter at least one value before creating.');
+      return;
+    }
+    try {
+      await gridCreateMutation.mutateAsync(payload);
+      setPendingCreate(false);
+      setCreateValues({});
+    } catch (err) {
+      setCreateError((err as Error)?.message ?? 'Create failed.');
+    }
+  }, [createValues, gridCreateMutation, createFields]);` : "";
+  const newCase = createColumnsLiteral ? `{
+        if (xrm?.Navigation?.openForm) {
+          await xrm.Navigation.openForm({ entityName: '${entityName}', useQuickCreateForm: false });
+          await refreshGrid();
+        } else {
+          setCreateError(null);
+          setCreateValues({});
+          setPendingCreate(true);
+        }
+        return;
+      }` : `{
+        if (xrm?.Navigation?.openForm) {
+          await xrm.Navigation.openForm({ entityName: '${entityName}', useQuickCreateForm: false });
+          await refreshGrid();
+        } else {
+          console.warn('[grid] New action requires Xrm.Navigation.openForm; not available in this host.');
+        }
+        return;
+      }`;
   return `
   const queryClient = useQueryClient();
   const gridUpdateMutation = useUpdateRecord<Record<string, unknown>>('${entitySetName}');
@@ -14261,7 +14434,7 @@ function buildGridCommandHandlerBlock(args) {
     } catch (err) {
       setDeleteError((err as Error)?.message ?? 'Delete failed.');
     }
-  }, [pendingDelete, gridDeleteMutation]);
+  }, [pendingDelete, gridDeleteMutation]);${createStateBlock}
   const handleGridCommand = React.useCallback(async (actionType: string, overrideRowIndex?: number) => {
     const xrm = (typeof window !== 'undefined' ? (window as unknown as { Xrm?: any }).Xrm : undefined);
     const items = ${itemsExpr} as ReadonlyArray<Record<string, unknown>>;
@@ -14286,15 +14459,7 @@ function buildGridCommandHandlerBlock(args) {
       return true;
     };
     switch (actionType) {
-      case 'new': {
-        if (xrm?.Navigation?.openForm) {
-          await xrm.Navigation.openForm({ entityName: '${entityName}', useQuickCreateForm: false });
-          await refreshGrid();
-        } else {
-          console.warn('[grid] New action requires Xrm.Navigation.openForm; not available in this host.');
-        }
-        return;
-      }
+      case 'new': ${newCase}
       case 'addExisting': {
         if (xrm?.Navigation?.openForm) {
           await xrm.Navigation.openForm({ entityName: '${entityName}' });
@@ -14339,10 +14504,7 @@ function buildGridCommandHandlerBlock(args) {
         await refreshGrid();
         return;
       }
-      case 'export': {
-        console.warn('[grid] Export to Excel is not yet wired in generated forms.');
-        return;
-      }
+      case 'export': ${exportCase}
       case 'bulkEdit': {
         if (!requireSel('bulk edit')) return;
         if (xrm?.Navigation?.openBulkEditForm) {
@@ -14359,7 +14521,7 @@ function buildGridCommandHandlerBlock(args) {
   }, [${itemsExpr}, ${selectionExpr}, gridUpdateMutation, refreshGrid]);`;
 }
 function buildRowCommandsLiteral(contextMenuItems) {
-  return contextMenuItems.filter((ci) => (ci.actionType ?? "custom") !== "custom").map(
+  return contextMenuItems.filter((ci) => (ci.actionType ?? "custom") !== "custom").filter((ci) => ci.actionType !== "new").map(
     (ci) => `{ key: ${JSON.stringify(ci.id)}, text: ${JSON.stringify(ci.text)}` + (ci.iconName ? `, iconName: ${JSON.stringify(ci.iconName)}` : "") + `, onClick: (item: Record<string, unknown>) => { void handleGridCommand(${JSON.stringify(ci.actionType)}, (item as { __rowIndex?: number }).__rowIndex); } }`
   ).join(",\n          ");
 }
@@ -14395,6 +14557,68 @@ function buildGridDeleteDialogJsx(entityName) {
         </DialogFooter>
       </Dialog>`;
 }
+function buildGridCreateDialogJsx(entityName) {
+  return `
+      <Dialog
+        hidden={!pendingCreate}
+        onDismiss={() => { if (!gridCreateMutation.isPending) setPendingCreate(false); }}
+        dialogContentProps={{
+          type: DialogType.normal,
+          title: ${JSON.stringify("Create " + entityName)},
+        }}
+        modalProps={{ isBlocking: true }}
+      >
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 10 }}>
+          {createFields.map((f) => {
+            if (f.kind === 'boolean') {
+              return (
+                <Checkbox
+                  key={f.key}
+                  label={f.label}
+                  checked={createValues[f.key] === true}
+                  onChange={(_ev, checked) => setCreateValues((prev) => ({ ...prev, [f.key]: !!checked }))}
+                />
+              );
+            }
+            if (f.kind === 'optionset') {
+              return (
+                <Dropdown
+                  key={f.key}
+                  label={f.label}
+                  options={f.options ?? []}
+                  selectedKey={(createValues[f.key] as number | undefined) ?? null}
+                  onChange={(_ev, opt) => setCreateValues((prev) => ({ ...prev, [f.key]: opt?.key }))}
+                />
+              );
+            }
+            return (
+              <TextField
+                key={f.key}
+                label={f.label}
+                type={f.inputType ?? 'text'}
+                value={createValues[f.key] == null ? '' : String(createValues[f.key])}
+                onChange={(_ev, val) => setCreateValues((prev) => ({ ...prev, [f.key]: val }))}
+              />
+            );
+          })}
+        </div>
+        {createError && (
+          <div style={{ color: '#a4262c', fontSize: 12, marginTop: 8 }}>{createError}</div>
+        )}
+        <DialogFooter>
+          <PrimaryButton
+            onClick={submitCreate}
+            text={gridCreateMutation.isPending ? 'Creating\u2026' : 'Create'}
+            disabled={gridCreateMutation.isPending}
+          />
+          <DefaultButton
+            onClick={() => setPendingCreate(false)}
+            text="Cancel"
+            disabled={gridCreateMutation.isPending}
+          />
+        </DialogFooter>
+      </Dialog>`;
+}
 function buildV9RenderCell(col) {
   const safeFieldName = JSON.stringify(col.fieldName);
   switch (col.rendererType) {
@@ -14772,6 +14996,8 @@ function generateLinkedSubgrid(gridDef, entityName, imports, library = "fluent-v
     // need the dispatcher in scope even when no wired commandBarItems exist.
     !!gridDef.toolbar?.showRefresh)
   );
+  const enableExport = _handlerAvailable && (showExport || barItems.some((ci) => ci.actionType === "export") || contextMenuItems.some((ci) => ci.actionType === "export"));
+  const enableCreate = _handlerAvailable && barItems.some((ci) => ci.actionType === "new");
   if (gridDef.showCommandBar && (barItems.length > 0 || showSearch || hasToolbarIcons)) {
     if (showSearch) imports.add("SearchBox");
     imports.add("DefaultButton");
@@ -14823,10 +15049,12 @@ function generateLinkedSubgrid(gridDef, entityName, imports, library = "fluent-v
       toolbarIcons.push(
         `<IconButton iconProps={{ iconName: 'ColumnOptions' }} title="Column chooser" ariaLabel="Column chooser" />`
       );
-    if (showExport)
+    if (showExport) {
+      const exportOnClick = _handlerAvailable ? ` onClick={() => { void handleGridCommand('export'); }}` : "";
       toolbarIcons.push(
-        `<IconButton iconProps={{ iconName: 'Download' }} title="Export" ariaLabel="Export" />`
+        `<IconButton iconProps={{ iconName: 'Download' }} title="Export" ariaLabel="Export"${exportOnClick} />`
       );
+    }
     if (showRefresh) {
       const refreshOnClick = _handlerAvailable ? ` onClick={() => { void handleGridCommand('refresh'); }}` : "";
       toolbarIcons.push(
@@ -14850,6 +15078,9 @@ function generateLinkedSubgrid(gridDef, entityName, imports, library = "fluent-v
   const childGridDef = gridDef.nestedGridId ? _currentGridCustomizers.find((g) => g.id === gridDef.nestedGridId) : void 0;
   const isGridKitNested = !!childGridDef;
   const visibleCols = [...gridDef.columns].filter((c) => c.isVisible).sort((a, b) => a.order - b.order);
+  const exportColumnsLiteral = enableExport ? buildExportColumnsLiteral(visibleCols) : "";
+  const primaryIdAttr = resolvePrimaryIdAttribute(gridDef);
+  const createColumnsLiteral = enableCreate ? buildCreateFields(visibleCols, primaryIdAttr) : "";
   visibleCols.filter((c) => c.rendererType !== "text");
   const colEntries = isGridKitNested ? "" : generateColumnEntries(visibleCols, library);
   const selectionMode = gridDef.selectionMode === "multiple" ? "SelectionMode.multiple" : gridDef.selectionMode === "single" ? "SelectionMode.single" : "SelectionMode.none";
@@ -14915,19 +15146,27 @@ ${childEntries.join(",\n")},
         entitySetName: gridDef.dataSource.entitySetName,
         primaryIdAttribute: resolvePrimaryIdAttribute(gridDef),
         itemsExpr: "keyedItems",
-        selectionExpr: "selectedIndices"
+        selectionExpr: "selectedIndices",
+        exportColumnsLiteral,
+        createColumnsLiteral
       }) : "";
       const ngHasDelete = (gridDef.commandBarItems ?? []).some(
         (ci) => ci.actionType === "delete"
       );
       const ngDeleteDialogJsx = ngHasDelete && ngHandlerBlock !== "" ? buildGridDeleteDialogJsx(gridDef.dataSource?.entityName ?? entityName) : "";
-      if (ngDeleteDialogJsx) {
+      const ngCreateDialogJsx = ngHandlerBlock !== "" && createColumnsLiteral ? buildGridCreateDialogJsx(gridDef.dataSource?.entityName ?? entityName) : "";
+      if (ngDeleteDialogJsx || ngCreateDialogJsx) {
         imports.add("Dialog");
         imports.add("DialogType");
         imports.add("DialogFooter");
         imports.add("PrimaryButton");
         imports.add("DefaultButton");
       }
+      if (ngCreateDialogJsx) {
+        imports.add("TextField");
+        imports.add("Dropdown");
+        imports.add("Checkbox");
+      }
       const ngRowCommandsLiteral = _handlerAvailable && (ngHasCommandBar || ngHasContextMenu && useLiveNested) ? buildRowCommandsLiteral(contextMenuItems) : "";
       const ngToolbarWired = (gridDef.commandBarItems ?? []).some(
         (ci) => (ci.actionType ?? "custom") !== "custom"
@@ -14941,9 +15180,18 @@ ${childEntries.join(",\n")},
       const ngDataverseHooks = [
         ...useLiveNested ? ["useDataverseQuery"] : [],
         ...useLiveNested && ngNeedsUpdate || ngHasHandler ? ["useUpdateRecord"] : [],
-        ...useLiveNested && ngNeedsDelete || ngHasHandler ? ["useDeleteRecord"] : []
+        ...useLiveNested && ngNeedsDelete || ngHasHandler ? ["useDeleteRecord"] : [],
+        // Create mutation only when the create dialog is wired (the `new` case's
+        // non-Xrm fallback) — gated like the export util import to stay byte-stable
+        // for non-create handler grids.
+        ...ngHasHandler && createColumnsLiteral ? ["useCreateRecord"] : []
+      ];
+      const ngCommandBarImports = [
+        ...useLiveNested && ngNeedsDelete || ngHasHandler ? [`import { useQueryClient } from '@tanstack/react-query';`] : [],
+        // Export case (shared dispatcher → both nested + focused-view) calls
+        // exportToFile/generateDefaultFilename when export is wired.
+        ...ngHasHandler && enableExport ? [`import { exportToFile, generateDefaultFilename } from '../lib/grid-kit/utils';`] : []
       ];
-      const ngCommandBarImports = useLiveNested && ngNeedsDelete || ngHasHandler ? [`import { useQueryClient } from '@tanstack/react-query';`] : [];
       const ngParentSelectionMode = ngHasCommandBar ? gridDef.selectionMode === "single" ? "single" : "multiple" : gridDef.selectionMode ?? "none";
       const ngChildSaveBack = Boolean(
         useLiveNested && live && (childGridDef.isEditable ?? false)
@@ -14992,6 +15240,7 @@ ${childEntries.join(",\n")},
           commandBarBlock: gridCommandBarBlock,
           handlerBlock: ngHandlerBlock,
           deleteDialogJsx: ngDeleteDialogJsx,
+          createDialogJsx: ngCreateDialogJsx,
           hasSelection: ngHasCommandBar,
           hasHandler: ngHandlerBlock !== "",
           dataverseHooks: ngDataverseHooks,
@@ -15047,6 +15296,7 @@ ${childEntries.join(",\n")},
         commandBarBlock: gridCommandBarBlock,
         handlerBlock: ngHandlerBlock,
         deleteDialogJsx: ngDeleteDialogJsx,
+        createDialogJsx: ngCreateDialogJsx,
         hasSelection: ngHasCommandBar,
         dataverseHooks: ngDataverseHooks,
         commandBarImports: ngCommandBarImports,
@@ -15127,11 +15377,14 @@ ${childEntries.join(",\n")},
       entitySetName: gridDef.dataSource.entitySetName,
       primaryIdAttribute: resolvePrimaryIdAttribute(gridDef),
       itemsExpr: "rows",
-      selectionExpr: "selectedIndices"
+      selectionExpr: "selectedIndices",
+      exportColumnsLiteral,
+      createColumnsLiteral
     }) : "";
     const cardSelectedIndicesState = cardEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
     const cardRowCommandsLiteral = cardEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
     const cardDeleteDialogJsx = cardEmitRowCommands && flatHasDelete || cardEmitToolbar && flatBarHasDelete ? buildGridDeleteDialogJsx(gridDef.dataSource?.entityName ?? entityName) : "";
+    const cardCreateDialogJsx = cardEmitHandler && createColumnsLiteral ? buildGridCreateDialogJsx(gridDef.dataSource?.entityName ?? entityName) : "";
     const cardCommandBarBlock = cardEmitToolbar ? gridCommandBarBlock : "";
     const cardSelectionModeAttr = cardEmitToolbar ? flatSelectionModeAttr : "";
     const cardOnSelectionChangedAttr = cardEmitToolbar ? flatOnSelectionChangedAttr : "";
@@ -15150,20 +15403,26 @@ ${childEntries.join(",\n")},
         handlerBlock: cardHandlerBlock,
         rowCommandsLiteral: cardRowCommandsLiteral,
         deleteDialogJsx: cardDeleteDialogJsx,
+        createDialogJsx: cardCreateDialogJsx,
         commandBarBlock: cardCommandBarBlock,
         selectionModeAttr: cardSelectionModeAttr,
         onSelectionChangedAttr: cardOnSelectionChangedAttr
       })
     ];
     _usesGridKit = true;
-    const cardDataverseImport = cardEmitHandler ? `import { useDataverseQuery, useUpdateRecord, useDeleteRecord } from '../lib/dataverse';` : `import { useDataverseQuery } from '../lib/dataverse';`;
-    if (cardDeleteDialogJsx) {
+    const cardDataverseImport = cardEmitHandler ? `import { useDataverseQuery, useUpdateRecord, useDeleteRecord${createColumnsLiteral ? ", useCreateRecord" : ""} } from '../lib/dataverse';` : `import { useDataverseQuery } from '../lib/dataverse';`;
+    if (cardDeleteDialogJsx || cardCreateDialogJsx) {
       imports.add("Dialog");
       imports.add("DialogType");
       imports.add("DialogFooter");
       imports.add("PrimaryButton");
       imports.add("DefaultButton");
     }
+    if (cardCreateDialogJsx) {
+      imports.add("TextField");
+      imports.add("Dropdown");
+      imports.add("Checkbox");
+    }
     return {
       imports,
       v9Imports,
@@ -15171,7 +15430,10 @@ ${childEntries.join(",\n")},
       extraImports: cardIsLive ? cardEmitHandler ? [
         cardDataverseImport,
         `import { useQueryClient } from '@tanstack/react-query';`,
-        `import { CardGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`
+        `import { CardGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`,
+        // Export case calls exportToFile/generateDefaultFilename (cardEmitHandler
+        // here; the export case is only real when enableExport).
+        ...enableExport ? [`import { exportToFile, generateDefaultFilename } from '../lib/grid-kit/utils';`] : []
       ] : [
         `import { useDataverseQuery } from '../lib/dataverse';`,
         `import { CardGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`
@@ -15209,11 +15471,14 @@ ${childEntries.join(",\n")},
       entitySetName: gridDef.dataSource.entitySetName,
       primaryIdAttribute: resolvePrimaryIdAttribute(gridDef),
       itemsExpr: "rows",
-      selectionExpr: "selectedIndices"
+      selectionExpr: "selectedIndices",
+      exportColumnsLiteral,
+      createColumnsLiteral
     }) : "";
     const roSelectedIndicesState = roEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
     const roRowCommandsLiteral = roEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
     const roDeleteDialogJsx = roEmitRowCommands && flatHasDelete ? buildGridDeleteDialogJsx(gridDef.dataSource?.entityName ?? entityName) : "";
+    const roCreateDialogJsx = roEmitHandler && createColumnsLiteral ? buildGridCreateDialogJsx(gridDef.dataSource?.entityName ?? entityName) : "";
     const roCommandBarBlock = roEmitToolbar ? gridCommandBarBlock : "";
     const helperComponents = [
       buildLiveReadOnlySubgridBody({
@@ -15232,18 +15497,24 @@ ${childEntries.join(",\n")},
         handlerBlock: roHandlerBlock,
         rowCommandsLiteral: roRowCommandsLiteral,
         deleteDialogJsx: roDeleteDialogJsx,
+        createDialogJsx: roCreateDialogJsx,
         commandBarBlock: roCommandBarBlock
       })
     ];
     if (!isV9) _usesGridKit = true;
-    const roDataverseImport = roEmitHandler ? `import { useDataverseQuery, useUpdateRecord, useDeleteRecord } from '../lib/dataverse';` : `import { useDataverseQuery } from '../lib/dataverse';`;
-    if (roDeleteDialogJsx) {
+    const roDataverseImport = roEmitHandler ? `import { useDataverseQuery, useUpdateRecord, useDeleteRecord${createColumnsLiteral ? ", useCreateRecord" : ""} } from '../lib/dataverse';` : `import { useDataverseQuery } from '../lib/dataverse';`;
+    if (roDeleteDialogJsx || roCreateDialogJsx) {
       imports.add("Dialog");
       imports.add("DialogType");
       imports.add("DialogFooter");
       imports.add("PrimaryButton");
       imports.add("DefaultButton");
     }
+    if (roCreateDialogJsx) {
+      imports.add("TextField");
+      imports.add("Dropdown");
+      imports.add("Checkbox");
+    }
     return {
       imports,
       v9Imports,
@@ -15251,7 +15522,8 @@ ${childEntries.join(",\n")},
       extraImports: isV9 ? [`import { useDataverseQuery } from '../lib/dataverse';`] : roEmitHandler ? [
         roDataverseImport,
         `import { useQueryClient } from '@tanstack/react-query';`,
-        `import { ReadOnlyGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`
+        `import { ReadOnlyGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`,
+        ...enableExport ? [`import { exportToFile, generateDefaultFilename } from '../lib/grid-kit/utils';`] : []
       ] : [
         `import { useDataverseQuery } from '../lib/dataverse';`,
         `import { ReadOnlyGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`
@@ -15311,11 +15583,14 @@ const ${liveWrapperName}: React.FC = () => {
         entitySetName: gridDef.dataSource.entitySetName,
         primaryIdAttribute: resolvePrimaryIdAttribute(gridDef),
         itemsExpr: "keyedItems",
-        selectionExpr: "selectedIndices"
+        selectionExpr: "selectedIndices",
+        exportColumnsLiteral,
+        createColumnsLiteral
       }) : "";
       const edSelectedIndicesState = edEmitHandler ? "\n  const [selectedIndices, setSelectedIndices] = React.useState<Set<number>>(new Set());" : "";
       const edRowCommandsLiteral = edEmitRowCommands ? buildRowCommandsLiteral(contextMenuItems) : "";
       const edDeleteDialogJsx = edEmitRowCommands && flatHasDelete || edEmitToolbar && flatBarHasDelete ? buildGridDeleteDialogJsx(gridDef.dataSource?.entityName ?? entityName) : "";
+      const edCreateDialogJsx = edEmitHandler && createColumnsLiteral ? buildGridCreateDialogJsx(gridDef.dataSource?.entityName ?? entityName) : "";
       const edCommandBarBlock = edEmitToolbar ? gridCommandBarBlock : "";
       const edSelectionModeAttr = edEmitToolbar ? flatSelectionModeAttr : "";
       const edOnSelectionChangedAttr = edEmitToolbar ? flatOnSelectionChangedAttr : "";
@@ -15332,6 +15607,7 @@ const ${liveWrapperName}: React.FC = () => {
         handlerBlock: edHandlerBlock,
         rowCommandsLiteral: edRowCommandsLiteral,
         deleteDialogJsx: edDeleteDialogJsx,
+        createDialogJsx: edCreateDialogJsx,
         commandBarBlock: edCommandBarBlock,
         selectionModeAttr: edSelectionModeAttr,
         onSelectionChangedAttr: edOnSelectionChangedAttr
@@ -15343,18 +15619,24 @@ const ${liveWrapperName}: React.FC = () => {
       const jsx3 = editableUsesLiveData && liveWrapperName ? `{/* Subgrid: ${safeEntityName} \u2014 ${safeGridName} (editable, live) */}${todoComment}
             <${liveWrapperName} />` : `{/* Subgrid: ${safeEntityName} \u2014 ${safeGridName} (editable) */}${todoComment}
             <${componentName} items={${itemsLiteral}} />`;
-      const edDataverseImport = edEmitHandler ? `import { useDataverseQuery, useUpdateRecord, useDeleteRecord } from '../lib/dataverse';` : `import { useDataverseQuery, useUpdateRecord } from '../lib/dataverse';`;
-      if (edDeleteDialogJsx) {
+      const edDataverseImport = edEmitHandler ? `import { useDataverseQuery, useUpdateRecord, useDeleteRecord${createColumnsLiteral ? ", useCreateRecord" : ""} } from '../lib/dataverse';` : `import { useDataverseQuery, useUpdateRecord } from '../lib/dataverse';`;
+      if (edDeleteDialogJsx || edCreateDialogJsx) {
         imports.add("Dialog");
         imports.add("DialogType");
         imports.add("DialogFooter");
         imports.add("PrimaryButton");
         imports.add("DefaultButton");
       }
+      if (edCreateDialogJsx) {
+        imports.add("TextField");
+        imports.add("Dropdown");
+        imports.add("Checkbox");
+      }
       const extraImports2 = editableUsesLiveData ? edEmitHandler ? [
         edDataverseImport,
         `import { useQueryClient } from '@tanstack/react-query';`,
-        `import { DataGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`
+        `import { DataGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`,
+        ...enableExport ? [`import { exportToFile, generateDefaultFilename } from '../lib/grid-kit/utils';`] : []
       ] : [
         `import { useDataverseQuery, useUpdateRecord } from '../lib/dataverse';`,
         `import { DataGrid, createCellRegistry, type ColumnDef } from '../lib/grid-kit';`
@@ -20258,7 +20540,7 @@ function walkForm(form, entities, gridById) {
   for (const section of sections) {
     for (const row of section.rows ?? []) {
       for (const cell of row.cells ?? []) {
-        for (const control of cell.controls ?? []) {
+        for (const control of cellControls(cell)) {
           absorbControl(control, primary, entities, gridById);
         }
       }
@@ -20266,11 +20548,17 @@ function walkForm(form, entities, gridById) {
   }
   const headerCells = form.header?.cells ?? [];
   for (const cell of headerCells) {
-    for (const control of cell.controls ?? []) {
+    for (const control of cellControls(cell)) {
       absorbControl(control, primary, entities, gridById);
     }
   }
 }
+function cellControls(cell) {
+  return [
+    ...cell.control ? [cell.control] : [],
+    ...cell.controls ?? []
+  ];
+}
 function absorbControl(control, primary, entities, gridById) {
   if (control.dataBinding && primary) {
     absorbBinding(control.dataBinding, primary);
@@ -20796,7 +21084,11 @@ function anyFormHasBindings(forms) {
     for (const section of sections) {
       for (const row of section.rows ?? []) {
         for (const cell of row.cells ?? []) {
-          for (const control of cell.controls ?? []) {
+          const controls = [
+            ...cell.control ? [cell.control] : [],
+            ...cell.controls ?? []
+          ];
+          for (const control of controls) {
             if (control.dataBinding) return true;
             if (control.type === "subgrid" && typeof control.properties?.entityName === "string" && control.properties.entityName) {
               return true;