web,graphql: Fixes

Author: tbantle22

graphql-server/src/queryFactory/dolt/index.ts

@@ -335,6 +335,7 @@ export class DoltQueryFactory
     return this.queryMultiple(
       async query => {
         await query("BEGIN");
+        await query("SET @autocommit = 0");
 
         const msg = `Merge branch ${args.fromBranchName}`;
         const params = [msg];
@@ -350,9 +351,11 @@ export class DoltQueryFactory
           await query(qh.resolveConflicts, [`--${args.conflictResolveType}`]);
           await query(qh.getCommitMerge(!!args.author), params);
         } else {
+          await query("ROLLBACK");
           throw new Error("expected conflicts but none found");
         }
 
+        await query("COMMIT");
         return true;
       },
       args.databaseName,

graphql-server/src/queryFactory/doltgres/index.ts

@@ -345,6 +345,7 @@ export class DoltgresQueryFactory
     return this.queryMultiple(
       async query => {
         await query("BEGIN");
+        await query("SET autocommit TO 0");
 
         const msg = `Merge branch ${args.fromBranchName}`;
         const params = [msg];
@@ -360,9 +361,11 @@ export class DoltgresQueryFactory
           await query(qh.resolveConflicts, [`--${args.conflictResolveType}`]);
           await query(qh.getCommitMerge(!!args.author), params);
         } else {
+          await query("ROLLBACK");
           throw new Error("expected conflicts but none found");
         }
 
+        await query("COMMIT");
         return true;
       },
       args.databaseName,

web/renderer/components/pageComponents/DatabasePage/ForPullConflicts/ConflictsTable/index.tsx

@@ -89,7 +89,7 @@ export default function ConflictsTable(props: Props) {
           </table>
         </InfiniteScroll>
       ) : (
-        <p className={css.noChanges}>No conflicts for this table</p>
+        <p className={css.noChanges}>No data conflicts for this table</p>
       )}
     </div>
   );

web/renderer/components/pageComponents/DatabasePage/ForPulls/PullActions/Merge/ResolveModal.tsx

@@ -1,6 +1,13 @@
 import Link from "@components/links/Link";
-import { Button, ExternalLink, Modal, Radio } from "@dolthub/react-components";
+import {
+  Button,
+  ErrorMsg,
+  ExternalLink,
+  Modal,
+  Radio,
+} from "@dolthub/react-components";
 import { ConflictResolveType } from "@gen/graphql-types";
+import { ApolloErrorType } from "@lib/errors/types";
 import { ModalProps } from "@lib/modalProps";
 import { PullDiffParams } from "@lib/params";
 import { pullConflicts } from "@lib/urls";
@@ -10,6 +17,7 @@ import css from "./index.module.css";
 type Props = ModalProps & {
   onClickWithResolve: (resolveType: ConflictResolveType) => Promise<void>;
   params: PullDiffParams;
+  err?: ApolloErrorType;
 };
 
 export default function ResolveModal(props: Props) {
@@ -24,7 +32,10 @@ export default function ResolveModal(props: Props) {
       onRequestClose={() => props.setIsOpen(false)}
       className={css.modal}
       button={
-        <Button onClick={async () => await props.onClickWithResolve(resType)}>
+        <Button
+          onClick={async () => await props.onClickWithResolve(resType)}
+          disabled={!!props.err}
+        >
           Choose {resType.toLowerCase()} and merge
         </Button>
       }
@@ -56,6 +67,7 @@ export default function ResolveModal(props: Props) {
           </ExternalLink>
           .
         </p>
+        <ErrorMsg err={props.err} />
       </div>
     </Modal>
   );

web/renderer/components/pageComponents/DatabasePage/ForPulls/PullActions/Merge/index.module.css

@@ -157,4 +157,8 @@
   p {
     @apply my-3;
   }
+
+  h3 {
+    @apply my-0;
+  }
 }

web/renderer/components/pageComponents/DatabasePage/ForPulls/PullActions/Merge/index.tsx

@@ -1,6 +1,7 @@
 import HeaderUserCheckbox from "@components/HeaderUserCheckbox";
 import { Button, SmallLoader } from "@dolthub/react-components";
 import { ConflictResolveType, PullDetailsFragment } from "@gen/graphql-types";
+import { ApolloErrorType } from "@lib/errors/types";
 import { PullDiffParams } from "@lib/params";
 import { FiGitPullRequest } from "@react-icons/all-files/fi/FiGitPullRequest";
 import cx from "classnames";
@@ -31,6 +32,7 @@ export default function Merge(props: Props) {
     state,
     setState,
     mergeState,
+    resolveState,
   } = useMergeButton(props.params);
   const red = hasConflicts;
 
@@ -47,7 +49,8 @@ export default function Merge(props: Props) {
             disabled={disabled}
             onClick={onClick}
             onClickWithResolve={onClickWithResolve}
-            loading={mergeState.loading}
+            loading={resolveState.loading}
+            err={resolveState.err}
             params={props.params}
           />
           {mergeState.err && (
@@ -101,6 +104,7 @@ type MergeButtonProps = {
   onClickWithResolve: (resolveType: ConflictResolveType) => Promise<void>;
   loading: boolean;
   params: PullDiffParams;
+  err?: ApolloErrorType;
 };
 
 function MergeButton(props: MergeButtonProps) {
@@ -118,10 +122,9 @@ function MergeButton(props: MergeButtonProps) {
             {props.loading ? "Merging..." : "Resolve conflicts and merge"}
           </Button>
           <ResolveModal
+            {...props}
             isOpen={modalOpen}
             setIsOpen={setModalOpen}
-            onClickWithResolve={props.onClickWithResolve}
-            params={props.params}
           />
         </>
       ) : (

web/renderer/components/pageComponents/DatabasePage/ForPulls/PullActions/Merge/useMergeButton.ts

@@ -37,7 +37,7 @@ export default function useMergeButton(params: PullDiffParams) {
   const disabled = hasConflicts;
 
   const onClick = async () => {
-    await merge({
+    const { success } = await merge({
       variables: {
         ...variables,
         author:
@@ -47,13 +47,14 @@ export default function useMergeButton(params: PullDiffParams) {
       },
     });
 
+    if (!success) return;
     res.client
       .refetchQueries(refetchMergeQueriesCacheEvict)
       .catch(console.error);
   };
 
   const onClickWithResolve = async (resolveType: ConflictResolveType) => {
-    await mergeWithResolve({
+    const { success } = await mergeWithResolve({
       variables: {
         ...variables,
         conflictResolveType: resolveType,
@@ -64,6 +65,7 @@ export default function useMergeButton(params: PullDiffParams) {
       },
     });
 
+    if (!success) return;
     res.client
       .refetchQueries(refetchMergeQueriesCacheEvict)
       .catch(console.error);
@@ -80,8 +82,12 @@ export default function useMergeButton(params: PullDiffParams) {
     state,
     setState,
     mergeState: {
-      loading: res.loading || resolveRes.loading,
-      err: res.err ?? resolveRes.err,
+      loading: res.loading,
+      err: res.err,
+    },
+    resolveState: {
+      loading: resolveRes.loading,
+      err: resolveRes.err,
     },
   };
 }

web/renderer/lib/refetchQueries.ts

@@ -145,9 +145,6 @@ export const refetchMergeQueriesCacheEvict: RefetchOptions = {
   updateCache(cache: TCacheShape) {
     [
       "docs",
-      "pullWithDetails",
-      // We don't include `pull` here to avoid multiple pull logs on merge
-      "pulls",
       "doc",
       "rows",
       "tableNames",
@@ -158,6 +155,9 @@ export const refetchMergeQueriesCacheEvict: RefetchOptions = {
       "branchOrDefault",
       "docOrDefaultDoc",
       "pullConflictsSummary",
+      "pullWithDetails",
+      // We don't include `pull` here to avoid multiple pull logs on merge
+      "pulls",
     ].forEach(fieldName => {
       cache.evict({ fieldName });
     });