fix logic bug, overload for getRunningOperationPromise

Author: phryneas

packages/toolkit/src/query/core/buildInitiate.ts

@@ -212,7 +212,7 @@ export function buildInitiate({
   function getRunningOperationPromise(
     endpointName: string,
     argOrRequestId: any
-  ) {
+  ): any {
     const endpointDefinition = context.endpointDefinitions[endpointName]
     if (endpointDefinition.type === DefinitionType.query) {
       const queryCacheKey = serializeQueryArgs({

packages/toolkit/src/query/core/buildSlice.ts

@@ -249,8 +249,8 @@ export function buildSlice({
           for (const [key, entry] of Object.entries(mutations)) {
             if (
               // do not rehydrate entries that were currently in flight.
-              entry?.status === QueryStatus.fulfilled ||
-              entry?.status === QueryStatus.rejected ||
+              (entry?.status === QueryStatus.fulfilled ||
+                entry?.status === QueryStatus.rejected) &&
               // only rehydrate endpoints that were persisted using a `fixedCacheKey`
               key !== entry?.requestId
             ) {

packages/toolkit/src/query/core/module.ts

@@ -20,7 +20,12 @@ import type {
   FullTagDescription,
 } from '../endpointDefinitions'
 import { isQueryDefinition, isMutationDefinition } from '../endpointDefinitions'
-import type { CombinedState, QueryKeys, RootState } from './apiState'
+import type {
+  CombinedState,
+  QueryKeys,
+  MutationKeys,
+  RootState,
+} from './apiState'
 import type { Api, Module } from '../apiTypes'
 import { onFocus, onFocusLost, onOnline, onOffline } from './setupListeners'
 import { buildSlice } from './buildSlice'
@@ -267,13 +272,16 @@ declare module '../apiTypes' {
           : never
       }
       getRunningOperationPromises: () => Array<Promise<unknown>>
-      getRunningOperationPromise: <EndpointName extends QueryKeys<Definitions>>(
+      getRunningOperationPromise<EndpointName extends QueryKeys<Definitions>>(
         endpointName: EndpointName,
         args: QueryArgFrom<Definitions[EndpointName]>
-      ) =>
-        | QueryActionCreatorResult<Definitions[EndpointName]>
-        | MutationActionCreatorResult<Definitions[EndpointName]>
-        | undefined
+      ): QueryActionCreatorResult<Definitions[EndpointName]> | undefined
+      getRunningOperationPromise<
+        EndpointName extends MutationKeys<Definitions>
+      >(
+        endpointName: EndpointName,
+        fixedCacheKeyOrRequestId: string
+      ): MutationActionCreatorResult<Definitions[EndpointName]> | undefined
     }
   }
 }