Pass QueryInfo to fetchQuery

apollographql · Dec 26, 2024 · 6b49bd7 · 6b49bd7
1 parent 7eb4e9c
commit 6b49bd7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/core/ObservableQuery.ts b/src/core/ObservableQuery.ts
@@ -517,7 +517,7 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
     }
 
     return this.queryManager
-      .fetchQuery(qid, combinedOptions, NetworkStatus.fetchMore)
+      .fetchQuery(queryInfo, combinedOptions, NetworkStatus.fetchMore)
       .then((fetchMoreResult) => {
         this.queryManager.removeQuery(qid);
 

diff --git a/src/core/QueryManager.ts b/src/core/QueryManager.ts
@@ -656,15 +656,12 @@ export class QueryManager<TStore> {
   }
 
   public fetchQuery<TData, TVars extends OperationVariables>(
-    queryId: string,
+    queryInfo: QueryInfo,
     options: WatchQueryOptions<TVars, TData>,
     networkStatus?: NetworkStatus
   ): Promise<ApolloQueryResult<TData>> {
-    return this.fetchConcastWithInfo(
-      this.getQuery(queryId),
-      options,
-      networkStatus
-    ).concast.promise as TODO;
+    return this.fetchConcastWithInfo(queryInfo, options, networkStatus).concast
+      .promise as TODO;
   }
 
   public getQueryStore() {
@@ -825,7 +822,10 @@ export class QueryManager<TStore> {
 
     const query = this.transform(options.query);
 
-    return this.fetchQuery<TData, TVars>(queryId, { ...options, query })
+    return this.fetchQuery<TData, TVars>(this.getQuery(queryId), {
+      ...options,
+      query,
+    })
       .then(
         (result) =>
           result && {

diff --git a/src/core/__tests__/QueryManager/index.ts b/src/core/__tests__/QueryManager/index.ts
@@ -3810,7 +3810,7 @@ describe("QueryManager", () => {
 
       const queryId = "1";
       queryManager
-        .fetchQuery(queryId, { query })
+        .fetchQuery(queryManager.getQuery(queryId), { query })
         .catch((e) => reject("Exception thrown for stopped query"));
 
       queryManager.removeQuery(queryId);
@@ -3840,7 +3840,7 @@ describe("QueryManager", () => {
           delay: 10000, //i.e. forever
         });
         queryManager
-          .fetchQuery("made up id", { query })
+          .fetchQuery(queryManager.getQuery("made up id"), { query })
           .then(() => {
             reject(new Error("Returned a result."));
           })
@@ -4325,7 +4325,7 @@ describe("QueryManager", () => {
           delay: 100,
         });
         queryManager
-          .fetchQuery("made up id", { query })
+          .fetchQuery(queryManager.getQuery("made up id"), { query })
           .then(resolve)
           .catch((error) => {
             reject(new Error("Should not return an error"));