Merge pull request #347 from dolthub/liuliu/not-fetch-from-specific-b…

…ranch Graphql, Web: do not fetch from a specific branch when fetching all remote branches
dolthub · Jan 6, 2025 · 1eb0744 · 1eb0744
2 parents 8d4890f + 0e7beaf
commit 1eb0744
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 45 deletions.
diff --git a/graphql-server/schema.gql b/graphql-server/schema.gql
@@ -335,7 +335,7 @@ type Query {
   docOrDefaultDoc(refName: String!, databaseName: String!, docType: DocType): Doc
   pullWithDetails(databaseName: String!, fromBranchName: String!, toBranchName: String!): PullWithDetails!
   remotes(databaseName: String!, offset: Int): RemoteList!
-  fetchRemote(remoteName: String!, databaseName: String!, branchName: String): FetchRes!
+  fetchRemote(databaseName: String!, remoteName: String!): FetchRes!
   remoteBranchDiffCounts(databaseName: String!, fromRefName: String!, toRefName: String!): RemoteBranchDiffCounts!
   rowDiffs(offset: Int, databaseName: String!, fromRefName: String!, toRefName: String!, refName: String, tableName: String!, filterByRowType: DiffRowType, type: CommitDiffType): RowDiffList!
   rows(schemaName: String, refName: String!, databaseName: String!, tableName: String!, offset: Int): RowList!

diff --git a/graphql-server/src/queryFactory/dolt/index.ts b/graphql-server/src/queryFactory/dolt/index.ts
@@ -481,12 +481,8 @@ export class DoltQueryFactory
     );
   }
 
-  async callFetchRemote(args: t.RemoteMaybeBranchArgs): t.PR {
-    return this.query(
-      qh.callFetchRemote(!!args.branchName),
-      [args.remoteName, args.branchName],
-      args.databaseName,
-    );
+  async callFetchRemote(args: t.RemoteArgs): t.PR {
+    return this.query(qh.callFetchRemote, [args.remoteName], args.databaseName);
   }
 
   async getMergeBase(args: t.RefsArgs): Promise<string> {

diff --git a/graphql-server/src/queryFactory/dolt/queries.ts b/graphql-server/src/queryFactory/dolt/queries.ts
@@ -84,8 +84,7 @@ export const callPullRemote = `CALL DOLT_PULL(?, ?)`;
 
 export const callPushRemote = `CALL DOLT_PUSH(?, ?)`;
 
-export const callFetchRemote = (hasBranchName?: boolean) =>
-  `CALL DOLT_FETCH(?${hasBranchName ? ", ?" : ""})`;
+export const callFetchRemote = `CALL DOLT_FETCH(?)`;
 
 // TAGS
 

diff --git a/graphql-server/src/queryFactory/doltgres/index.ts b/graphql-server/src/queryFactory/doltgres/index.ts
@@ -472,12 +472,8 @@ export class DoltgresQueryFactory
     );
   }
 
-  async callFetchRemote(args: t.RemoteMaybeBranchArgs): t.PR {
-    return this.query(
-      qh.callFetchRemote(!!args.branchName),
-      [args.remoteName, args.branchName],
-      args.databaseName,
-    );
+  async callFetchRemote(args: t.RemoteArgs): t.PR {
+    return this.query(qh.callFetchRemote, [args.remoteName], args.databaseName);
   }
 }
 

diff --git a/graphql-server/src/queryFactory/doltgres/queries.ts b/graphql-server/src/queryFactory/doltgres/queries.ts
@@ -171,7 +171,4 @@ export const callPullRemote = `SELECT DOLT_PULL($1::text, $2::text)`;
 
 export const callPushRemote = `SELECT DOLT_PUSH($1::text, $2::text)`;
 
-export const callFetchRemote = (hasBranchName?: boolean) =>
-  hasBranchName
-    ? `SELECT DOLT_FETCH($1::text, $2::text)`
-    : `SELECT DOLT_FETCH($1::text)`;
+export const callFetchRemote = `SELECT DOLT_FETCH($1::text)`;
diff --git a/graphql-server/src/queryFactory/index.ts b/graphql-server/src/queryFactory/index.ts
@@ -159,7 +159,7 @@ export declare class QueryFactory {
 
   callPushRemote(args: t.RemoteMaybeBranchArgs): t.PR;
 
-  callFetchRemote(args: t.RemoteMaybeBranchArgs): t.PR;
+  callFetchRemote(args: t.RemoteArgs): t.PR;
 
   getMergeBase(args: t.RefsArgs): Promise<string>;
 }
diff --git a/graphql-server/src/queryFactory/mysql/index.ts b/graphql-server/src/queryFactory/mysql/index.ts
@@ -340,7 +340,7 @@ export class MySQLQueryFactory
     throw notDoltError("push remote");
   }
 
-  async callFetchRemote(_: t.RemoteMaybeBranchArgs): t.PR {
+  async callFetchRemote(_: t.RemoteArgs): t.PR {
     throw notDoltError("fetch remote");
   }
 

diff --git a/graphql-server/src/remotes/remote.resolver.ts b/graphql-server/src/remotes/remote.resolver.ts
@@ -95,7 +95,7 @@ export class RemoteResolver {
   }
 
   @Query(_returns => FetchRes)
-  async fetchRemote(@Args() args: RemoteMaybeBranchArgs): Promise<FetchRes> {
+  async fetchRemote(@Args() args: RemoteArgs): Promise<FetchRes> {
     const conn = this.conn.connection();
     const res = await conn.callFetchRemote(args);
     if (res.length === 0) {

diff --git a/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchButton.tsx b/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchButton.tsx
@@ -3,7 +3,6 @@ import { HiRefresh } from "@react-icons/all-files/hi/HiRefresh";
 import { DropdownItem } from "@components/DatabaseOptionsDropdown";
 import { RemoteFragment, useFetchRemoteLazyQuery } from "@gen/graphql-types";
 import { OptionalRefParams } from "@lib/params";
-import useDefaultBranch from "@hooks/useDefaultBranch";
 import { SmallLoader } from "@dolthub/react-components";
 import { useState } from "react";
 import { SetApolloErrorType } from "@lib/errors/types";
@@ -21,8 +20,6 @@ export default function FetchButton({
   params,
   remote,
 }: Props) {
-  const { defaultBranchName } = useDefaultBranch(params);
-  const branchName = params.refName || defaultBranchName;
   const [fetch] = useFetchRemoteLazyQuery();
   const [loading, setLoading] = useState(false);
 
@@ -32,13 +29,13 @@ export default function FetchButton({
       variables: {
         databaseName: params.databaseName,
         remoteName: remote.name,
-        branchName,
       },
       fetchPolicy: "network-only",
     });
     setLoading(false);
     if (!fetchRes.data?.fetchRemote.success) {
       setErr(fetchRes.error || new Error("Fetch failed"));
+      setFetchModalOpen(true);
       return;
     }
 

diff --git a/...components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/queries.ts b/...components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/queries.ts
@@ -1,16 +1,8 @@
 import { gql } from "@apollo/client";
 
 export const FETCH_REMOTE = gql`
-  query FetchRemote(
-    $remoteName: String!
-    $databaseName: String!
-    $branchName: String
-  ) {
-    fetchRemote(
-      remoteName: $remoteName
-      databaseName: $databaseName
-      branchName: $branchName
-    ) {
+  query FetchRemote($remoteName: String!, $databaseName: String!) {
+    fetchRemote(remoteName: $remoteName, databaseName: $databaseName) {
       success
     }
   }

diff --git a/web/renderer/gen/graphql-types.tsx b/web/renderer/gen/graphql-types.tsx
@@ -550,7 +550,6 @@ export type QueryDoltSchemasArgs = {
 
 
 export type QueryFetchRemoteArgs = {
-  branchName?: InputMaybe<Scalars['String']['input']>;
   databaseName: Scalars['String']['input'];
   remoteName: Scalars['String']['input'];
 };
@@ -1285,7 +1284,6 @@ export type AddRemoteMutation = { __typename?: 'Mutation', addRemote: string };
 export type FetchRemoteQueryVariables = Exact<{
   remoteName: Scalars['String']['input'];
   databaseName: Scalars['String']['input'];
-  branchName?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
@@ -3741,12 +3739,8 @@ export type AddRemoteMutationHookResult = ReturnType<typeof useAddRemoteMutation
 export type AddRemoteMutationResult = Apollo.MutationResult<AddRemoteMutation>;
 export type AddRemoteMutationOptions = Apollo.BaseMutationOptions<AddRemoteMutation, AddRemoteMutationVariables>;
 export const FetchRemoteDocument = gql`
-    query FetchRemote($remoteName: String!, $databaseName: String!, $branchName: String) {
-  fetchRemote(
-    remoteName: $remoteName
-    databaseName: $databaseName
-    branchName: $branchName
-  ) {
+    query FetchRemote($remoteName: String!, $databaseName: String!) {
+  fetchRemote(remoteName: $remoteName, databaseName: $databaseName) {
     success
   }
 }
@@ -3766,7 +3760,6 @@ export const FetchRemoteDocument = gql`
  *   variables: {
  *      remoteName: // value for 'remoteName'
  *      databaseName: // value for 'databaseName'
- *      branchName: // value for 'branchName'
  *   },
  * });
  */