feat: add a settings toggle for disabling auto-branch names even with…

… ai generaton enabled
joeaelkhoury · Feb 16, 2024 · 913d4b0 · 913d4b0
1 parent 8377a30
commit 913d4b0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/gitbutler-ui/src/lib/components/BranchCard.svelte b/gitbutler-ui/src/lib/components/BranchCard.svelte
@@ -7,6 +7,7 @@
 	import ImgThemed from '$lib/components/ImgThemed.svelte';
 	import Resizer from '$lib/components/Resizer.svelte';
 	import { projectAiGenEnabled } from '$lib/config/config';
+	import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
 	import {
 		isDraggableFile,
 		isDraggableHunk,
@@ -48,6 +49,7 @@
 	export let isLaneCollapsed: Persisted<boolean>;
 
 	const aiGenEnabled = projectAiGenEnabled(project.id);
+	const aiGenAutoBranchNamingEnabled = projectAiGenAutoBranchNamingEnabled(project.id);
 
 	let rsViewport: HTMLElement;
 
@@ -82,6 +84,7 @@
 
 	$: linesTouched = computeAddedRemovedByFiles(...branch.files);
 	$: if (
+		$aiGenAutoBranchNamingEnabled &&
 		branch.name.toLowerCase().includes('virtual branch') &&
 		linesTouched.added + linesTouched.removed > 4
 	) {

diff --git a/gitbutler-ui/src/lib/components/CloudForm.svelte b/gitbutler-ui/src/lib/components/CloudForm.svelte
@@ -4,6 +4,7 @@
 	import Link from '$lib/components/Link.svelte';
 	import Login from '$lib/components/Login.svelte';
 	import { projectAiGenEnabled } from '$lib/config/config';
+	import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
 	import * as toasts from '$lib/utils/toasts';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import type { Project } from '$lib/backend/projects';
@@ -16,6 +17,7 @@
 
 	const cloud = getCloudApiClient();
 	const aiGenEnabled = projectAiGenEnabled(project.id);
+	const aiGenAutoBranchNamingEnabled = projectAiGenAutoBranchNamingEnabled(project.id);
 
 	const dispatch = createEventDispatcher<{
 		updated: Project;
@@ -66,6 +68,7 @@
 						checked={$aiGenEnabled}
 						on:change={() => {
 							$aiGenEnabled = !$aiGenEnabled;
+							$aiGenAutoBranchNamingEnabled = $aiGenEnabled;
 						}}
 					/>
 					<label class="ml-2" for="sync">Enable branch and commit message generation.</label>
@@ -74,6 +77,19 @@
 					Uses OpenAI's API. If enabled, diffs will sent to OpenAI's servers when pressing the
 					"Generate message" button.
 				</div>
+				<div class="flex flex-col space-x-3">
+					<div class="flex flex-row items-center gap-x-1">
+						<Checkbox
+							name="sync"
+							disabled={user === undefined || !$aiGenEnabled}
+							checked={$aiGenAutoBranchNamingEnabled}
+							on:change={() => {
+								$aiGenAutoBranchNamingEnabled = !$aiGenAutoBranchNamingEnabled;
+							}}
+						/>
+						<label class="ml-2" for="sync">Automatically generate branch names.</label>
+					</div>
+				</div>
 			</div>
 		</div>
 		{#if user.role === 'admin'}

diff --git a/gitbutler-ui/src/lib/components/ProjectSetup.svelte b/gitbutler-ui/src/lib/components/ProjectSetup.svelte
@@ -9,6 +9,7 @@
 	import SetupFeature from '$lib/components/SetupFeature.svelte';
 	import Toggle from '$lib/components/Toggle.svelte';
 	import { projectAiGenEnabled } from '$lib/config/config';
+	import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
 	import type { UserService } from '$lib/stores/user';
 	import type { BranchController } from '$lib/vbranches/branchController';
 
@@ -20,6 +21,7 @@
 	$: user$ = userService.user$;
 
 	const aiGenEnabled = projectAiGenEnabled(projectId);
+	const aiGenAutoBranchNamingEnabled = projectAiGenAutoBranchNamingEnabled(projectId);
 
 	let aiGenCheckbox: Toggle;
 	let loading = false;
@@ -110,6 +112,7 @@
 							checked={$aiGenEnabled}
 							on:change={() => {
 								$aiGenEnabled = !$aiGenEnabled;
+								$aiGenAutoBranchNamingEnabled = $aiGenEnabled;
 							}}
 						/>
 					{/if}

diff --git a/gitbutler-ui/src/lib/config/config.ts b/gitbutler-ui/src/lib/config/config.ts
@@ -36,6 +36,11 @@ export function projectAiGenEnabled(projectId: string): Persisted<boolean> {
 	return persisted(false, key + projectId);
 }
 
+export function projectAiGenAutoBranchNamingEnabled(projectId: string): Persisted<boolean> {
+	const key = 'projectAiGenAutoBranchNamingEnabled_';
+	return persisted(false, key + projectId);
+}
+
 export function projectRunCommitHooks(projectId: string): Persisted<boolean> {
 	const key = 'projectRunCommitHooks_';
 	return persisted(false, key + projectId);