ding-react-admin 2.2.2 → 2.4.0

package/dist/src/crud/ResourceList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResourceList.d.ts","sourceRoot":"","sources":["../../../src/crud/ResourceList.tsx"],"names":[],"mappings":"AAOA,OAAO,EAUL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAIf,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAM9E,OAAO,KAAK,EACV,QAAQ,EACR,0BAA0B,EAC1B,sBAAsB,EAEtB,6BAA6B,EAC9B,MAAM,SAAS,CAAC;AAIjB,OAAO,yBAAyB,CAAC;AAEjC,KAAK,wBAAwB,GAAG;IAC9B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC1D,CAAC;AAMF,wBAAgB,sBAAsB,oCAErC;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,SAAS,CAAC;IACpB,qDAAqD;IACrD,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,yFAAyF;IACzF,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,4EAA4E;IAC5E,UAAU,CAAC,EAAE,CACX,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,OAAO,EAAE,6BAA6B,KACnC,SAAS,CAAC;IACf,yEAAyE;IACzE,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,oFAAoF;IACpF,WAAW,CAAC,EAAE,sBAAsB,EAAE,CAAC;IACvC,qFAAqF;IACrF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,8EAA8E;IAC9E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,+EAA+E;IAC/E,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC,CAAC;AA2oBF,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,KAAK,EACL,UAAU,EACV,OAAO,EACP,YAAY,EACZ,oBAAoB,EACpB,QAAiB,EACjB,eAAsB,EACtB,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,UAAU,EACV,WAAW,EACX,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,WAAW,GACZ,EAAE,iBAAiB,2CA8DnB"}
+{"version":3,"file":"ResourceList.d.ts","sourceRoot":"","sources":["../../../src/crud/ResourceList.tsx"],"names":[],"mappings":"AAOA,OAAO,EAUL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAIf,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAM9E,OAAO,KAAK,EACV,QAAQ,EACR,0BAA0B,EAC1B,sBAAsB,EAEtB,6BAA6B,EAC9B,MAAM,SAAS,CAAC;AAIjB,OAAO,yBAAyB,CAAC;AAEjC,KAAK,wBAAwB,GAAG;IAC9B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC1D,CAAC;AAMF,wBAAgB,sBAAsB,oCAErC;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,SAAS,CAAC;IACpB,qDAAqD;IACrD,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,yFAAyF;IACzF,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,4EAA4E;IAC5E,UAAU,CAAC,EAAE,CACX,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,OAAO,EAAE,6BAA6B,KACnC,SAAS,CAAC;IACf,yEAAyE;IACzE,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,oFAAoF;IACpF,WAAW,CAAC,EAAE,sBAAsB,EAAE,CAAC;IACvC,qFAAqF;IACrF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,8EAA8E;IAC9E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,+EAA+E;IAC/E,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC,CAAC;AAopBF,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,KAAK,EACL,UAAU,EACV,OAAO,EACP,YAAY,EACZ,oBAAoB,EACpB,QAAiB,EACjB,eAAsB,EACtB,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,UAAU,EACV,WAAW,EACX,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,WAAW,GACZ,EAAE,iBAAiB,2CA8DnB"}

package/dist/src/crud/utils/toFormData.d.ts

@@ -6,8 +6,8 @@ export type ToFormDataOptions = {
     skipExistingUploadUrls?: boolean;
 };
 /**
- * Flatten a save payload into `FormData` using bracket notation for nested fields
- * and arrays (e.g. `lines[0][label]`, `address[city]`).
+ * Flatten a save payload into `FormData` using Django REST Framework HTML form
+ * keys for nested fields and arrays (e.g. `lines[0]label`, `address.city`).
  */
 export declare function toFormData(data: Record<string, unknown>, options?: ToFormDataOptions): FormData;
 //# sourceMappingURL=toFormData.d.ts.map

package/dist/src/crud/utils/toFormData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toFormData.d.ts","sourceRoot":"","sources":["../../../../src/crud/utils/toFormData.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAoDF;;;GAGG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,QAAQ,CAWV"}
+{"version":3,"file":"toFormData.d.ts","sourceRoot":"","sources":["../../../../src/crud/utils/toFormData.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAiEF;;;GAGG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,QAAQ,CAWV"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ding-react-admin",
-  "version": "2.2.2",
+  "version": "2.4.0",
   "type": "module",
   "license": "MIT",
   "description": "Composable admin shell (Ant Design + React Router): quick-start AdminApp or build your own layout.",

package/src/crud/ResourceList.tsx

@@ -471,6 +471,15 @@ function ResourceListTable<T extends Record<string, unknown>>({
   const handleDelete = useCallback(
     async (row: T) => {
       if (!canDelete) return;
+      const confirmed = await new Promise<boolean>((resolve) => {
+        modal.confirm({
+          title: "Delete this item? This cannot be undone.",
+          okType: "danger",
+          onOk: () => resolve(true),
+          onCancel: () => resolve(false),
+        });
+      });
+      if (!confirmed) return;
       try {
         await dp.delete(resource, row.id as string | number);
         message.success("Deleted");
@@ -479,7 +488,7 @@ function ResourceListTable<T extends Record<string, unknown>>({
         message.error(e instanceof Error ? e.message : "Delete failed");
       }
     },
-    [canDelete, dp, resource, load, message],
+    [canDelete, dp, resource, load, message, modal],
   );
 
   const tableColumns = useMemo((): ColumnsType<T> => {

package/src/crud/utils/toFormData.ts

@@ -8,6 +8,14 @@ export type ToFormDataOptions = {
   skipExistingUploadUrls?: boolean;
 };
 
+/** DRF `parse_html_list` expects `lines[0]label`; nested dicts use `address.city`. */
+function nestedObjectKey(parentKey: string, childKey: string): string {
+  if (/\[[0-9]+\]$/.test(parentKey)) {
+    return `${parentKey}${childKey}`;
+  }
+  return `${parentKey}.${childKey}`;
+}
+
 function appendFormDataValue(
   formData: FormData,
   key: string,
@@ -50,7 +58,12 @@ function appendFormDataValue(
     for (const [childKey, childValue] of Object.entries(
       value as Record<string, unknown>,
     )) {
-      appendFormDataValue(formData, `${key}[${childKey}]`, childValue, options);
+      appendFormDataValue(
+        formData,
+        nestedObjectKey(key, childKey),
+        childValue,
+        options,
+      );
     }
     return;
   }
@@ -59,8 +72,8 @@ function appendFormDataValue(
 }
 
 /**
- * Flatten a save payload into `FormData` using bracket notation for nested fields
- * and arrays (e.g. `lines[0][label]`, `address[city]`).
+ * Flatten a save payload into `FormData` using Django REST Framework HTML form
+ * keys for nested fields and arrays (e.g. `lines[0]label`, `address.city`).
  */
 export function toFormData(
   data: Record<string, unknown>,

package/src/data/dataUtils.test.ts

@@ -102,15 +102,24 @@ describe("toFormData", () => {
     expect(fd.get("title")).toBe("Hello");
   });
 
-  it("encodes inline rows with bracket notation", () => {
+  it("encodes inline rows with Django REST Framework HTML keys", () => {
     const file = new File(["x"], "line.png", { type: "image/png" });
     const fd = toFormData({
       lines: [{ id: 10, label: "A", photo: file }],
     });
 
-    expect(fd.get("lines[0][id]")).toBe("10");
-    expect(fd.get("lines[0][label]")).toBe("A");
-    expect(fd.get("lines[0][photo]")).toBe(file);
+    expect(fd.get("lines[0]id")).toBe("10");
+    expect(fd.get("lines[0]label")).toBe("A");
+    expect(fd.get("lines[0]photo")).toBe(file);
+  });
+
+  it("encodes nested objects with dotted keys", () => {
+    const fd = toFormData({
+      address: { city: "Lahore", zip: 54000 },
+    });
+
+    expect(fd.get("address.city")).toBe("Lahore");
+    expect(fd.get("address.zip")).toBe("54000");
   });
 });