Simplify code

Author: djhi

packages/ra-core/src/dataProvider/useMutationWithMutationMode.spec.tsx

@@ -122,6 +122,7 @@ describe('useMutationWithMutationMode', () => {
             );
             return (
                 <>
+                    <p>{data.value}</p>
                     <button onClick={() => setData({ value: 'value2' })}>
                         Update data
                     </button>
@@ -138,14 +139,15 @@ describe('useMutationWithMutationMode', () => {
         fireEvent.click(screen.getByText('Update'));
         // In case of undoable, clicking the _Update data_ button would trigger the mutation
         fireEvent.click(screen.getByText('Update data'));
+        await screen.findByText('value2');
+        fireEvent.click(screen.getByText('Update'));
         await waitFor(() => {
             expect(dataProvider.updateUserProfile).toHaveBeenCalledWith({
                 data: { value: 'value1' },
             });
         });
 
         // Ensure the next call uses the latest data
-        fireEvent.click(screen.getByText('Update'));
         await waitFor(() => {
             expect(dataProvider.updateUserProfile).toHaveBeenCalledWith({
                 data: { value: 'value2' },

packages/ra-core/src/dataProvider/useMutationWithMutationMode.ts

@@ -55,14 +55,10 @@ export const useMutationWithMutationMode = <
         mode.current = mutationMode;
     }, [mutationMode]);
 
-    const paramsRef = useRef<Partial<TVariables>>(params);
-    useEffect(() => {
-        paramsRef.current = params;
-    }, [params]);
     // This ref won't be updated when params change in an effect, only when the mutate callback is called (See L247)
     // This ensures that for undoable and optimistic mutations, the params are not changed by side effects (unselectAll for instance)
     // _after_ the mutate function has been called, while keeping the ability to change declaration time params _until_ the mutation is called.
-    const paramsAtExecutionTimeRef = useRef<Partial<TVariables>>(params);
+    const paramsRef = useRef<Partial<TVariables>>(params);
 
     // Ref that stores the snapshot of the state before the mutation to allow reverting it
     const snapshot = useRef<Snapshot>([]);
@@ -213,16 +209,16 @@ export const useMutationWithMutationMode = <
             ...otherCallTimeOptions
         } = callTimeOptions;
 
+        // store the hook time params *at the moment of the call*
+        // because they may change afterwards, which would break the undoable mode
+        // as the previousData would be overwritten by the optimistic update
+        paramsRef.current = params;
+
         // Store the mutation with middlewares to avoid losing them if the calling component is unmounted
         if (getMutateWithMiddlewares) {
             mutateWithMiddlewares.current = getMutateWithMiddlewaresEvent(
                 (params: TVariables) => {
-                    // Store the final parameters which might have been changed by middlewares
-                    paramsRef.current = params;
-                    return mutationFnEvent({
-                        ...params,
-                        ...callTimeParams,
-                    });
+                    return mutationFnEvent(params);
                 }
             );
         } else {
@@ -236,14 +232,6 @@ export const useMutationWithMutationMode = <
         callTimeOnError.current = onError;
         callTimeOnSettled.current = onSettled;
 
-        // store the hook time params *at the moment of the call*
-        // because they may change afterwards, which would break the undoable mode
-        // as the previousData would be overwritten by the optimistic update
-        paramsRef.current = params;
-        // Also store them in a ref that will always be used for optimistic and undoable updates
-        // as their actual mutation happens after their side effects which may change the params (unselectAll for instance)
-        paramsAtExecutionTimeRef.current = params;
-
         if (mutationMode) {
             mode.current = mutationMode;
         }
@@ -255,7 +243,7 @@ export const useMutationWithMutationMode = <
         }
 
         snapshot.current = getSnapshotEvent(
-            { ...paramsAtExecutionTimeRef.current, ...callTimeParams },
+            { ...paramsRef.current, ...callTimeParams },
             {
                 mutationMode: mode.current,
             }
@@ -264,13 +252,13 @@ export const useMutationWithMutationMode = <
         if (mode.current === 'pessimistic') {
             if (returnPromise) {
                 return mutation.mutateAsync(
-                    { ...paramsAtExecutionTimeRef.current, ...callTimeParams },
+                    { ...paramsRef.current, ...callTimeParams },
                     // We don't pass onError and onSettled here as we will call them in the useMutation hook side effects
                     { onSuccess, ...otherCallTimeOptions }
                 );
             }
             return mutation.mutate(
-                { ...paramsAtExecutionTimeRef.current, ...callTimeParams },
+                { ...paramsRef.current, ...callTimeParams },
                 // We don't pass onError and onSettled here as we will call them in the useMutation hook side effects
                 { onSuccess, ...otherCallTimeOptions }
             );
@@ -285,7 +273,7 @@ export const useMutationWithMutationMode = <
 
         // Optimistically update to the new value
         const optimisticResult = updateCacheEvent(
-            { ...paramsAtExecutionTimeRef.current, ...callTimeParams },
+            { ...paramsRef.current, ...callTimeParams },
             {
                 mutationMode: mode.current,
             },
@@ -297,7 +285,7 @@ export const useMutationWithMutationMode = <
             if (onSuccess) {
                 onSuccess(
                     optimisticResult,
-                    { ...paramsAtExecutionTimeRef.current, ...callTimeParams },
+                    { ...paramsRef.current, ...callTimeParams },
                     {
                         snapshot: snapshot.current,
                     },
@@ -313,7 +301,7 @@ export const useMutationWithMutationMode = <
             ) {
                 mutationOptions.onSuccess(
                     optimisticResult,
-                    { ...paramsAtExecutionTimeRef.current, ...callTimeParams },
+                    { ...paramsRef.current, ...callTimeParams },
                     {
                         snapshot: snapshot.current,
                     },
@@ -329,7 +317,7 @@ export const useMutationWithMutationMode = <
         if (mode.current === 'optimistic') {
             // call the mutate method without success side effects
             return mutation.mutate({
-                ...paramsAtExecutionTimeRef.current,
+                ...paramsRef.current,
                 ...callTimeParams,
             });
         } else {
@@ -340,7 +328,7 @@ export const useMutationWithMutationMode = <
                     if (onUndo) {
                         onUndoEvent(
                             {
-                                ...paramsAtExecutionTimeRef.current,
+                                ...paramsRef.current,
                                 ...callTimeParams,
                             },
                             {
@@ -355,7 +343,7 @@ export const useMutationWithMutationMode = <
                 } else {
                     // call the mutate method without success side effects
                     mutation.mutate({
-                        ...paramsAtExecutionTimeRef.current,
+                        ...paramsRef.current,
                         ...callTimeParams,
                     });
                 }