Merge branch 'api-platform:main' into formId-attribute

PawelSuwinski · Mar 27, 2024 · 7d62034 · 7d62034
2 parents 95678d7 + 4645fb5
commit 7d62034
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/src/CreateGuesser.tsx b/src/CreateGuesser.tsx
@@ -99,7 +99,8 @@ export const IntrospectedCreateGuesser = ({
         const response = await create(
           resource,
           {
-            data: { ...data, extraInformation: { hasFileField } },
+            data,
+            meta: { hasFileField },
           },
           { returnPromise: true },
         );

diff --git a/src/EditGuesser.tsx b/src/EditGuesser.tsx
@@ -123,7 +123,8 @@ export const IntrospectedEditGuesser = ({
           resource,
           {
             id,
-            data: { ...data, extraInformation: { hasFileField } },
+            data,
+            meta: { hasFileField },
           },
           { returnPromise: true },
         );
@@ -200,10 +201,6 @@ export const IntrospectedEditGuesser = ({
       mutationMode={mutationMode}
       redirect={redirectTo}
       component={viewComponent}
-      transform={(data: Partial<RaRecord>) => ({
-        ...data,
-        extraInformation: { hasFileField },
-      })}
       {...props}>
       <FormType
         id={formId}

diff --git a/src/hydra/dataProvider.test.ts b/src/hydra/dataProvider.test.ts
@@ -295,9 +295,9 @@ describe('Transform a React Admin request to an Hydra request', () => {
       data: {
         bar: 'baz',
         foo: 'foo',
-        extraInformation: {
-          hasFileField: true,
-        },
+      },
+      meta: {
+        hasFileField: true,
       },
     });
     const url = mockFetchHydra.mock.calls?.[0]?.[0] ?? new URL('https://foo');
@@ -360,9 +360,9 @@ describe('Transform a React Admin request to an Hydra request', () => {
         foo: 'foo',
         bar: 'baz',
         qux: null,
-        extraInformation: {
-          hasFileField: true,
-        },
+      },
+      meta: {
+        hasFileField: true,
       },
       previousData: {
         id: '/entrypoint/resource/1',

diff --git a/src/hydra/dataProvider.ts b/src/hydra/dataProvider.ts
@@ -351,9 +351,8 @@ function dataProvider(
       }
     });
     let extraInformation: { hasFileField?: boolean } = {};
-    if ('data' in params && params.data.extraInformation) {
-      extraInformation = params.data.extraInformation;
-      delete params.data.extraInformation;
+    if ('meta' in params) {
+      extraInformation = params.meta;
     }
     const updateHttpMethod = extraInformation.hasFileField ? 'POST' : 'PUT';