web: Select all buttons

Author: tbantle22

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

@@ -10,6 +10,18 @@
   }
 }
 
+.selectAllButtons {
+  @apply mb-3 mt-4;
+
+  button {
+    @apply px-0 mr-6 text-base;
+  }
+}
+
+.bold {
+  @apply font-bold;
+}
+
 .tableResolve {
   @apply flex;
 }

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

@@ -22,6 +22,19 @@ type Props = ModalProps & {
 };
 
 export default function ResolveModal(props: Props) {
+  function setResolutionAllTables(resType: ConflictResolveType) {
+    const tablesToResolve = new Map(
+      [...props.state.tablesToResolve.keys()].map(t => [t, resType]),
+    );
+    props.setState({ tablesToResolve });
+  }
+
+  function setResolutionOneTable(table: string, resType: ConflictResolveType) {
+    const tablesToResolve = props.state.tablesToResolve;
+    tablesToResolve.set(table, resType);
+    props.setState({ tablesToResolve });
+  }
+
   return (
     <Modal
       title="Resolve Conflicts and Merge"
@@ -42,6 +55,24 @@ export default function ResolveModal(props: Props) {
           To merge this pull request, choose a conflict resolution strategy for
           all tables or each individual table:
         </p>
+        <div className={css.selectAllButtons}>
+          <Button.Link
+            onClick={() => {
+              setResolutionAllTables(ConflictResolveType.Ours);
+            }}
+            underlined
+          >
+            Select <span className={css.bold}>ours</span> for all
+          </Button.Link>
+          <Button.Link
+            onClick={() => {
+              setResolutionAllTables(ConflictResolveType.Theirs);
+            }}
+            underlined
+          >
+            Select <span className={css.bold}>theirs</span> for all
+          </Button.Link>
+        </div>
         <ul>
           {[...props.state.tablesToResolve.entries()].map(
             ([table, resType]) => (
@@ -53,9 +84,7 @@ export default function ResolveModal(props: Props) {
                     name={`ours-${table}`}
                     checked={resType === ConflictResolveType.Ours}
                     onChange={() => {
-                      const tablesToResolve = props.state.tablesToResolve;
-                      tablesToResolve.set(table, ConflictResolveType.Ours);
-                      props.setState({ tablesToResolve });
+                      setResolutionOneTable(table, ConflictResolveType.Ours);
                     }}
                     className={css.radio}
                   />
@@ -64,9 +93,7 @@ export default function ResolveModal(props: Props) {
                     name={`theirs-${table}`}
                     checked={resType === ConflictResolveType.Theirs}
                     onChange={() => {
-                      const tablesToResolve = props.state.tablesToResolve;
-                      tablesToResolve.set(table, ConflictResolveType.Theirs);
-                      props.setState({ tablesToResolve });
+                      setResolutionOneTable(table, ConflictResolveType.Theirs);
                     }}
                     className={css.radio}
                   />

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

@@ -50,9 +50,14 @@ export default function useMergeButton(params: PullDiffParams) {
   const disabled = hasConflicts;
 
   useEffect(() => {
-    if (conflictsRes.loading || !conflictsRes.data?.pullConflictsSummary) {
+    if (
+      conflictsRes.loading ||
+      !conflictsRes.data?.pullConflictsSummary ||
+      state.tablesToResolve.size > 0
+    ) {
       return;
     }
+
     const tablesToResolve = state.tablesToResolve;
     conflictsRes.data.pullConflictsSummary.forEach(conflict => {
       tablesToResolve.set(conflict.tableName, ConflictResolveType.Ours);
@@ -86,12 +91,14 @@ export default function useMergeButton(params: PullDiffParams) {
     const { success } = await mergeWithResolve({
       variables: {
         ...variables,
-        resolveOursTables: Array.from(state.tablesToResolve)
-          .filter(([, v]) => v === ConflictResolveType.Ours)
-          .map(([k]) => k),
-        resolveTheirsTables: Array.from(state.tablesToResolve)
-          .filter(([, v]) => v === ConflictResolveType.Theirs)
-          .map(([k]) => k),
+        resolveOursTables: tableResolveMapToArray(
+          state.tablesToResolve,
+          ConflictResolveType.Ours,
+        ),
+        resolveTheirsTables: tableResolveMapToArray(
+          state.tablesToResolve,
+          ConflictResolveType.Theirs,
+        ),
         author:
           state.addAuthor && userHeaders?.email && userHeaders.user
             ? { name: userHeaders.user, email: userHeaders.email }
@@ -125,3 +132,12 @@ export default function useMergeButton(params: PullDiffParams) {
     },
   };
 }
+
+function tableResolveMapToArray(
+  resolveMap: Map<string, ConflictResolveType>,
+  resolveType: ConflictResolveType,
+): string[] {
+  return Array.from(resolveMap)
+    .filter(([, v]) => v === resolveType)
+    .map(([k]) => k);
+}