web,graphql: Fix add connection error, hide merge/resolve button for doltgres

Author: tbantle22

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

@@ -345,7 +345,7 @@ export class DoltgresQueryFactory
     return this.queryMultiple(
       async query => {
         await query("BEGIN");
-        await query("SET autocommit TO 0");
+        // await query("SET autocommit off");
 
         const msg = `Merge branch ${args.fromBranchName}`;
         const params = [msg];

web/renderer/components/pageComponents/ConnectionsPage/ExistingConnections/Item.tsx

@@ -1,13 +1,13 @@
+import { DatabaseTypeLabel } from "@components/ConnectionsAndDatabases/DatabaseTypeLabel";
 import { getDatabaseType } from "@components/DatabaseTypeLabel";
 import { Button, ErrorMsg, Loader } from "@dolthub/react-components";
 import { DatabaseConnectionFragment } from "@gen/graphql-types";
 import { IoMdClose } from "@react-icons/all-files/io/IoMdClose";
+import cx from "classnames";
 import Image from "next/legacy/image";
 import { SyntheticEvent, useState } from "react";
-import cx from "classnames";
-import { DatabaseTypeLabel } from "@components/ConnectionsAndDatabases/DatabaseTypeLabel";
-import useAddConnection from "./useAddConnection";
 import css from "./index.module.css";
+import useAddConnection from "./useAddConnection";
 
 const forElectron = process.env.NEXT_PUBLIC_FOR_ELECTRON === "true";
 
@@ -84,7 +84,7 @@ export default function Item({
                 {conn.name}
               </Button.Link>
             </div>
-            <ErrorMsg err={err || startDoltServerError} className={css.err} />
+            <ErrorMsg err={err ?? startDoltServerError} className={css.err} />
           </div>
         </div>
       </li>

web/renderer/components/pageComponents/ConnectionsPage/ExistingConnections/index.module.css

@@ -115,7 +115,7 @@
 }
 
 .err {
-  @apply text-center;
+  @apply text-center pt-0;
 }
 
 .leftLine {

web/renderer/components/pageComponents/ConnectionsPage/ExistingConnections/useAddConnection.ts

@@ -3,6 +3,7 @@ import {
   useAddDatabaseConnectionMutation,
   useDoltServerStatusQuery,
 } from "@gen/graphql-types";
+import useMutation from "@hooks/useMutation";
 import { ApolloErrorType } from "@lib/errors/types";
 import { maybeDatabase } from "@lib/urls";
 import { useRouter } from "next/router";
@@ -18,19 +19,23 @@ export default function useAddConnection(
   conn: DatabaseConnectionFragment,
 ): ReturnType {
   const router = useRouter();
-  const [addDb, res] = useAddDatabaseConnectionMutation();
+  const { mutateFn: addDb, ...res } = useMutation({
+    hook: useAddDatabaseConnectionMutation,
+  });
   const doltServerStatus = useDoltServerStatusQuery({
     variables: conn,
   });
+
   const onAdd = async () => {
     try {
-      const db = await addDb({ variables: conn });
-      await res.client.clearStore();
-      if (!db.data) {
+      const { data, success } = await addDb({ variables: conn });
+      if (!success || !data) {
         return;
       }
+      await res.client.cache.reset();
+
       const { href, as } = maybeDatabase(
-        db.data.addDatabaseConnection.currentDatabase,
+        data.addDatabaseConnection.currentDatabase,
       );
       router.push(href, as).catch(console.error);
     } catch {
@@ -40,7 +45,7 @@ export default function useAddConnection(
 
   return {
     onAdd,
-    err: res.error || doltServerStatus.error,
+    err: res.err ?? doltServerStatus.error,
     loading: res.loading,
     doltServerIsActive: !!doltServerStatus.data?.doltServerStatus.active,
   };

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 useDatabaseDetails from "@hooks/useDatabaseDetails";
 import { ApolloErrorType } from "@lib/errors/types";
 import { PullDiffParams } from "@lib/params";
 import { FiGitPullRequest } from "@react-icons/all-files/fi/FiGitPullRequest";
@@ -109,10 +110,11 @@ type MergeButtonProps = {
 
 function MergeButton(props: MergeButtonProps) {
   const [modalOpen, setModalOpen] = useState(false);
+  const { isPostgres } = useDatabaseDetails();
 
   return (
     <div aria-label="merge-button-container">
-      {props.disabled ? (
+      {props.disabled && !isPostgres ? (
         <>
           <Button
             className={css.merge}
@@ -132,6 +134,7 @@ function MergeButton(props: MergeButtonProps) {
           className={css.merge}
           onClick={props.onClick}
           data-cy="merge-button"
+          disabled={props.disabled}
           green
         >
           {props.loading ? "Merging..." : "Merge"}