Merge pull request #7899 from gitbutlerapp/e-branch-4

Persist the commit message

Author: estib-vega

apps/desktop/src/components/v3/CommitMessageInput.svelte

@@ -1,11 +1,13 @@
 <script lang="ts">
 	import EditorFooter from '$components/v3/editor/EditorFooter.svelte';
 	import MessageEditor from '$components/v3/editor/MessageEditor.svelte';
+	import { persistedCommitMessage } from '$lib/config/config';
 	import { persisted } from '@gitbutler/shared/persisted';
 	import Button from '@gitbutler/ui/Button.svelte';
 	import Textbox from '@gitbutler/ui/Textbox.svelte';
 
 	type Props = {
+		isNewCommit?: boolean;
 		projectId: string;
 		stackId: string;
 		actionLabel: string;
@@ -18,6 +20,7 @@
 	};
 
 	const {
+		isNewCommit,
 		projectId,
 		stackId,
 		actionLabel,
@@ -35,14 +38,19 @@
 	let markdown = persisted(true, 'useMarkdown__' + projectId);
 
 	let titleText = $state<string | undefined>(initialTitle);
-	let composer = $state<ReturnType<typeof MessageEditor>>();
+	let descriptionText = $state<string | undefined>(initialValue);
+	const commitMessage = persistedCommitMessage(projectId, stackId);
 
-	export function getTitle(): string | undefined {
-		return titleText;
-	}
+	$effect(() => {
+		if (isNewCommit) {
+			$commitMessage = [titleText, descriptionText].filter((a) => a).join('\n\n');
+		}
+	});
+
+	let composer = $state<ReturnType<typeof MessageEditor>>();
 
-	export async function getPlaintext(): Promise<string | undefined> {
-		return await composer?.getPlaintext();
+	export function getMessage() {
+		return $commitMessage;
 	}
 </script>
 
@@ -54,6 +62,9 @@
 		{initialValue}
 		{projectId}
 		{stackId}
+		onChange={(text: string) => {
+			descriptionText = text;
+		}}
 	/>
 </div>
 <EditorFooter {onCancel}>

apps/desktop/src/components/v3/CommitView.svelte

@@ -6,6 +6,7 @@
 	import CommitMessageInput from '$components/v3/CommitMessageInput.svelte';
 	import Drawer from '$components/v3/Drawer.svelte';
 	import { FocusManager } from '$lib/focus/focusManager.svelte';
+	import { showToast } from '$lib/notifications/toasts';
 	import { StackService } from '$lib/stacks/stackService.svelte';
 	import { UiState } from '$lib/state/uiState.svelte';
 	import { inject } from '@gitbutler/shared/context';
@@ -54,11 +55,11 @@
 			throw new Error('No branch selected!');
 		}
 		if (!commitMessageInput) return;
-		const title = commitMessageInput.getTitle();
-		const message = await commitMessageInput.getPlaintext();
-		if (!message && !title) return;
-
-		const commitMessage = [title, message].filter((a) => a).join('\n\n');
+		const commitMessage = commitMessageInput.getMessage();
+		if (!commitMessage) {
+			showToast({ message: 'Commit message is required', style: 'error' });
+			return;
+		}
 
 		const newCommitId = await updateCommitMessage({
 			projectId,

apps/desktop/src/components/v3/NewCommitView.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
 	import CommitMessageInput from '$components/v3/CommitMessageInput.svelte';
 	import Drawer from '$components/v3/Drawer.svelte';
-	import { showError } from '$lib/notifications/toasts';
+	import { persistedCommitMessage } from '$lib/config/config';
+	import { showError, showToast } from '$lib/notifications/toasts';
 	import { ChangeSelectionService } from '$lib/selection/changeSelection.svelte';
 	import { IdSelection } from '$lib/selection/idSelection.svelte';
 	import { StackService } from '$lib/stacks/stackService.svelte';
@@ -25,6 +26,8 @@
 	const changeSelection = getContext(ChangeSelectionService);
 	const selection = $derived(changeSelection.list());
 	const canCommit = $derived(branchName && selection.current.length > 0);
+	const commitMessage = persistedCommitMessage(projectId, stackId);
+	const [initialTitle, initialMessage] = $derived($commitMessage.split('\n\n'));
 
 	let input = $state<ReturnType<typeof CommitMessageInput>>();
 	let drawer = $state<ReturnType<typeof Drawer>>();
@@ -61,16 +64,18 @@
 	}
 
 	async function handleCommitCreation() {
-		const titleText = await input?.getTitle();
-		const message = await input?.getPlaintext();
-		if (!titleText) return;
-
-		const commitMessage = [titleText, message].filter((a) => a).join('\n\n');
+		const message = input?.getMessage();
+		if (!message) {
+			showToast({ message: 'Commit message is required', style: 'error' });
+			return;
+		}
 
 		try {
-			await createCommit(commitMessage);
+			await createCommit(message);
 		} catch (err: unknown) {
 			showError('Failed to commit', err);
+		} finally {
+			$commitMessage = '';
 		}
 	}
 
@@ -89,5 +94,8 @@
 		onCancel={cancel}
 		disabledAction={!canCommit}
 		loading={commitCreation.current.isLoading}
+		{initialTitle}
+		{initialMessage}
+		isNewCommit
 	/>
 </Drawer>

apps/desktop/src/components/v3/editor/MessageEditor.svelte

@@ -24,9 +24,10 @@
 		stackId: string;
 		markdown: boolean;
 		initialValue?: string;
+		onChange?: (text: string) => void;
 	}
 
-	let { markdown = $bindable(), projectId, initialValue }: Props = $props();
+	let { markdown = $bindable(), projectId, initialValue, onChange }: Props = $props();
 
 	const [aiService, idSelection, worktreeService, diffService] = inject(
 		AIService,
@@ -78,10 +79,11 @@
 	}
 
 	async function handleChange(
-		_text: string,
+		text: string,
 		textUpToAnchor: string | undefined,
 		textAfterAnchor: string | undefined
 	) {
+		onChange?.(text);
 		await suggestionsHandler.onChange(textUpToAnchor, textAfterAnchor);
 	}