Make commit author configurable

Author: eric-richardson1

web/main/authorStorage.ts

@@ -0,0 +1,20 @@
+import Store from "electron-store";
+
+export type StoredAuthor = {
+  name: string;
+  email: string;
+};
+
+const store = new Store<{ commitAuthor?: StoredAuthor }>({
+  name: "commit-author",
+});
+
+const AUTHOR_KEY = "commitAuthor";
+
+export function getStoredAuthor(): StoredAuthor | null {
+  return store.get(AUTHOR_KEY) ?? null;
+}
+
+export function setStoredAuthor(author: StoredAuthor): void {
+  store.set(AUTHOR_KEY, author);
+}

web/main/background.ts

@@ -19,6 +19,7 @@ import { startServer } from "./doltServer";
 import { createWindow } from "./helpers/createWindow";
 import { initMenu } from "./helpers/menu";
 import { registerAgentIpcHandlers, cleanupAgent } from "./agent";
+import { getStoredAuthor, setStoredAuthor, StoredAuthor } from "./authorStorage";
 import {
   getErrorMessage,
   removeDoltServerFolder,
@@ -247,6 +248,13 @@ ipcMain.handle("get-headers", (event, arg) => {
   return headers;
 });
 
+ipcMain.handle("get-commit-author", () => getStoredAuthor());
+
+ipcMain.handle(
+  "set-commit-author",
+  (_, author: StoredAuthor) => setStoredAuthor(author),
+);
+
 ipcMain.handle("api-config", async () => {
   const cfg = {
     graphqlApiUrl: process.env.GRAPHQLAPI_URL,

web/main/preload.ts

@@ -108,6 +108,14 @@ const handler = {
   onLoginStarted: (callback: (requestId: string) => void) => {
     ipcRenderer.on("login-started", (_event, requestId) => callback(requestId));
   },
+  // Commit author storage
+  getCommitAuthor: async (): Promise<{
+    name: string;
+    email: string;
+  } | null> => ipcRenderer.invoke("get-commit-author"),
+  setCommitAuthor: async (author: { name: string; email: string }) =>
+    ipcRenderer.invoke("set-commit-author", author),
+
   startMcpServer: (config: McpServerConfig) =>
     ipcRenderer.send("start-mcp-server", config),
   stopMcpServer: () => ipcRenderer.send("stop-mcp-server"),

web/renderer/components/StatusWithOptions/CommitModal.tsx

@@ -1,5 +1,5 @@
-import HeaderUserCheckbox from "@components/HeaderUserCheckbox";
-import { FormModal, Textarea } from "@dolthub/react-components";
+import { FormInput, FormModal, Textarea } from "@dolthub/react-components";
+import { useEffectAsync } from "@dolthub/react-hooks";
 import { Maybe } from "@dolthub/web-utils";
 import { StatusFragment } from "@gen/graphql-types";
 import useSqlBuilder from "@hooks/useSqlBuilder";
@@ -16,20 +16,50 @@ type Props = ModalProps & {
   status: StatusFragment[];
 };
 
+const isElectron = process.env.NEXT_PUBLIC_FOR_ELECTRON === "true";
+
 export default function CommitModal(props: Props) {
   const router = useRouter();
   const defaultMsg = getDefaultCommitMsg(props.params.refName, props.status);
   const [msg, setMsg] = useState(defaultMsg);
+  const [authorName, setAuthorName] = useState("");
+  const [authorEmail, setAuthorEmail] = useState("");
   const userHeaders = useUserHeaders();
-  const [addCommitAuthor, setAddCommitAuthor] = useState(!!userHeaders);
   const { getCallProcedure } = useSqlBuilder();
 
-  const onSubmit = (e: SyntheticEvent) => {
+  const headerName = userHeaders?.user;
+  const headerEmail = userHeaders?.email;
+  const hasHeaders = !!headerName || !!headerEmail;
+
+  // Load stored author for Electron, or populate from headers
+  useEffectAsync(async () => {
+    if (hasHeaders) {
+      setAuthorName(headerName ?? "");
+      setAuthorEmail(headerEmail ?? "");
+      return;
+    }
+    if (isElectron) {
+      const stored = await window.ipc.getCommitAuthor();
+      if (stored) {
+        setAuthorName(stored.name);
+        setAuthorEmail(stored.email);
+      }
+    }
+  }, [userHeaders]);
+
+  const onSubmit = async (e: SyntheticEvent) => {
     e.preventDefault();
+    // Persist author on desktop when not using headers
+    if (isElectron && !hasHeaders && authorName && authorEmail) {
+      await window.ipc.setCommitAuthor({
+        name: authorName,
+        email: authorEmail,
+      });
+    }
     const q = getCallProcedure("DOLT_COMMIT", [
       "-Am",
       msg,
-      ...getAuthorArgs(userHeaders?.user, userHeaders?.email),
+      ...getAuthorArgs(authorName, authorEmail),
     ]);
     const { href, as } = sqlQuery({ ...props.params, q });
     router.push(href, as).catch(console.error);
@@ -64,12 +94,40 @@ export default function CommitModal(props: Props) {
           required
           light
         />
-        <HeaderUserCheckbox
-          shouldAddAuthor={addCommitAuthor}
-          setShouldAddAuthor={setAddCommitAuthor}
-          userHeaders={userHeaders}
-          kind="commit"
-        />
+        <div className={css.authorFields}>
+          <FormInput
+            value={authorName}
+            label="Author Name"
+            onChangeString={setAuthorName}
+            placeholder="Author Name"
+            disabled={hasHeaders}
+            light
+          />
+          <FormInput
+            value={authorEmail}
+            label="Author Email"
+            onChangeString={setAuthorEmail}
+            placeholder="author@example.com"
+            disabled={hasHeaders}
+            light
+          />
+          {hasHeaders && (
+            <p className={css.authorNote}>
+              Author is set from request headers and cannot be edited.
+            </p>
+          )}
+          {!hasHeaders && !isElectron && (
+            <p className={css.authorNote}>
+              Optional. If not provided, the SQL user will be used as the commit
+              author.
+            </p>
+          )}
+          {!hasHeaders && isElectron && (
+            <p className={css.authorNote}>
+              Optional. Author will be saved for future commits.
+            </p>
+          )}
+        </div>
       </div>
     </FormModal>
   );

web/renderer/components/StatusWithOptions/index.module.css

@@ -31,6 +31,14 @@
   }
 }
 
+.authorFields {
+  @apply mt-3 flex flex-col gap-2;
+}
+
+.authorNote {
+  @apply text-sm text-stone-500 mt-1;
+}
+
 .checkboxContainer {
   @apply flex items-start text-sm;
 }