ding-react-admin 2.3.0 → 2.5.0

package/src/crud/utils/buildInlineRowsPayload.ts

@@ -1,3 +1,6 @@
+import { getFormValue } from "./getFormValue";
+import { setFormValue } from "./setFormValue";
+
 export type BuildInlineRowsPayloadOptions = {
   transformRows?: (rows: Record<string, unknown>[]) => unknown;
 };
@@ -16,9 +19,9 @@ export function buildInlineRowsPayload(
     const out: Record<string, unknown> = {};
 
     for (const source of sources) {
-      const value = record[source];
+      const value = getFormValue(record, source);
       if (value !== undefined) {
-        out[source] = value;
+        setFormValue(out, source, value);
       }
     }
 

package/src/crud/utils/columnDataIndex.ts

@@ -0,0 +1,6 @@
+/**
+ * Ant Design nested `dataIndex` for dotted sources (`address.city`).
+ */
+export function columnDataIndex(source: string): string | string[] {
+  return source.includes(".") ? source.split(".") : source;
+}

package/src/crud/utils/shouldRegisterSourceInPayload.ts

@@ -0,0 +1,10 @@
+/**
+ * Parent form fields register even when `source` is nested (`address.city`).
+ * Inline cells pass a different `name` (`lines.0.label`) and must not.
+ */
+export function shouldRegisterSourceInPayload(
+  source: string,
+  name?: string,
+): boolean {
+  return name == null || name === source;
+}

package/src/data/dataUtils.test.ts

@@ -2,6 +2,9 @@ import { describe, expect, it, vi } from "vitest";
 import { buildFormPayload } from "../crud/utils/buildFormPayload";
 import { buildInlineRowsPayload } from "../crud/utils/buildInlineRowsPayload";
 import { nestedFieldPath } from "../crud/utils/nestedFieldPath";
+import { columnDataIndex } from "../crud/utils/columnDataIndex";
+import { shouldRegisterSourceInPayload } from "../crud/utils/shouldRegisterSourceInPayload";
+import { isSourceHidden } from "../crud/HiddenSources";
 import { hasUploadValues } from "../crud/utils/hasUploadValues";
 import { prepareFormSubmitBody } from "../crud/utils/prepareFormSubmitBody";
 import { toFormData } from "../crud/utils/toFormData";
@@ -17,7 +20,7 @@ describe("buildFormPayload", () => {
     const values = {
       username: "jane",
       email: "jane@example.com",
-      tenants: [{ id: 1 }],
+      tags: [{ id: 1 }],
     };
     expect(buildFormPayload(values, ["username", "email"])).toEqual({
       username: "jane",
@@ -37,6 +40,16 @@ describe("buildFormPayload", () => {
     });
   });
 
+  it("picks JSON nested sources", () => {
+    const values = {
+      address: { city: "Lahore", notes: "x" },
+      extra: "ignored",
+    };
+    expect(buildFormPayload(values, ["address.city"])).toEqual({
+      address: { city: "Lahore" },
+    });
+  });
+
   it("returns all values when no field paths registered", () => {
     const values = { a: 1, b: 2 };
     expect(buildFormPayload(values, [])).toEqual(values);
@@ -62,6 +75,15 @@ describe("buildInlineRowsPayload", () => {
     });
     expect(result).toEqual([{ label: "A", kind: "line" }]);
   });
+
+  it("picks nested sources on each row", () => {
+    const rows = [
+      { rowKey: "a", id: 10, address: { city: "Lahore" }, extra: "x" },
+    ];
+    expect(buildInlineRowsPayload(rows, ["address.city"])).toEqual([
+      { address: { city: "Lahore" }, id: 10 },
+    ]);
+  });
 });
 
 describe("nestedFieldPath", () => {
@@ -235,3 +257,32 @@ describe("createRestResourceHandlers", () => {
     expect(create).toHaveBeenCalledWith(fd);
   });
 });
+
+describe("shouldRegisterSourceInPayload", () => {
+  it("registers parent fields including nested sources", () => {
+    expect(shouldRegisterSourceInPayload("email")).toBe(true);
+    expect(shouldRegisterSourceInPayload("address.city")).toBe(true);
+    expect(shouldRegisterSourceInPayload("address.city", "address.city")).toBe(true);
+  });
+
+  it("does not register inline cells", () => {
+    expect(shouldRegisterSourceInPayload("label", "lines.0.label")).toBe(false);
+  });
+});
+
+describe("columnDataIndex", () => {
+  it("splits dotted sources for Ant Design", () => {
+    expect(columnDataIndex("name")).toBe("name");
+    expect(columnDataIndex("address.city")).toEqual(["address", "city"]);
+  });
+});
+
+describe("isSourceHidden", () => {
+  it("hides from the prop or the source set", () => {
+    const hide = new Set(["phone"]);
+    expect(isSourceHidden("phone", undefined, hide)).toBe(true);
+    expect(isSourceHidden("email", undefined, hide)).toBe(false);
+    expect(isSourceHidden("email", true, hide)).toBe(true);
+    expect(isSourceHidden("email", false, new Set())).toBe(false);
+  });
+});

package/src/index.ts

@@ -135,6 +135,7 @@ export {
   FilterBar,
   ResourceForm,
   ResourceFormModal,
+  HiddenSources,
   InlineFormSet,
   InlineFormSetStacked,
   FormTabs,
@@ -178,6 +179,7 @@ export {
   setFormValue,
   buildFormPayload,
   buildInlineRowsPayload,
+  columnDataIndex,
   buildResourceFormSubmitBody,
   prepareFormSubmitBody,
   toFormData,
@@ -200,6 +202,7 @@ export type {
   ResourceListProps,
   TextFilterProps,
   BaseSourceProps,
+  FieldSourceProps,
   ChoiceOption,
   ChoicesLoader,
   UseChoicesOptions,