Refactor getCacheKey function to support fixedCacheKey in mutationThunk

riqts · riqts · commit 1a4988202f18 · 2024-01-15T20:47:02.000+11:00
diff --git a/packages/toolkit/src/query/core/buildMiddleware/cacheLifecycle.ts b/packages/toolkit/src/query/core/buildMiddleware/cacheLifecycle.ts
@@ -251,9 +251,11 @@ export const buildCacheLifecycleHandler: InternalHandlerBuilder = ({
     }
   }
 
-  function getCacheKey(action: any) {
+    function getCacheKey(action: any) {
     if (isQueryThunk(action)) return action.meta.arg.queryCacheKey
-    if (isMutationThunk(action)) return action.meta.requestId
+    if (isMutationThunk(action)) {
+      return action.meta.arg.fixedCacheKey ?? action.meta.requestId;
+    }
     if (api.internalActions.removeQueryResult.match(action))
       return action.payload.queryCacheKey
     if (api.internalActions.removeMutationResult.match(action))

Original file line number	Diff line number	Diff line change
`@@ -251,9 +251,11 @@ export const buildCacheLifecycleHandler: InternalHandlerBuilder = ({`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
`254`		`- function getCacheKey(action: any) {`
	`254`	`+ function getCacheKey(action: any) {`
`255`	`255`	`if (isQueryThunk(action)) return action.meta.arg.queryCacheKey`
`256`		`- if (isMutationThunk(action)) return action.meta.requestId`
	`256`	`+ if (isMutationThunk(action)) {`
	`257`	`+ return action.meta.arg.fixedCacheKey ?? action.meta.requestId;`
	`258`	`+ }`
`257`	`259`	`if (api.internalActions.removeQueryResult.match(action))`
`258`	`260`	`return action.payload.queryCacheKey`
`259`	`261`	`if (api.internalActions.removeMutationResult.match(action))`