Merge pull request #10537 from gitbutlerapp/setting-for-polling-frequency

Setting polling frequency

Author: Caleb-T-Owens

apps/desktop/src/components/profileSettings/GitSettings.svelte

@@ -1,21 +1,51 @@
 <script lang="ts">
+	import { SETTINGS_SERVICE } from '$lib/config/appSettingsV2';
 	import { GIT_CONFIG_SERVICE } from '$lib/config/gitConfigService';
 	import { inject } from '@gitbutler/core/context';
-	import { Link, SectionCard, Toggle } from '@gitbutler/ui';
+	import { Link, SectionCard, Toggle, Select, SelectItem } from '@gitbutler/ui';
 	import { onMount } from 'svelte';
 
 	const gitConfig = inject(GIT_CONFIG_SERVICE);
+	const settingsService = inject(SETTINGS_SERVICE);
+	const settings = settingsService.appSettings;
 
 	let annotateCommits = $state(true);
+	let fetchFrequency = $state<number>(-1);
+
+	const fetchFrequencyOptions = [
+		{ label: '1 minute', value: '1', minutes: 1 },
+		{ label: '5 minutes', value: '5', minutes: 5 },
+		{ label: '10 minutes', value: '10', minutes: 10 },
+		{ label: '15 minutes', value: '15', minutes: 15 },
+		{ label: 'None', value: 'none', minutes: -1 }
+	] as const;
 
 	function toggleCommitterSigning() {
 		annotateCommits = !annotateCommits;
 		gitConfig.set('gitbutler.gitbutlerCommitter', annotateCommits ? '1' : '0');
 	}
 
+	async function updateFetchFrequency(value: string) {
+		const option = fetchFrequencyOptions.find((opt) => opt.value === value);
+		if (option) {
+			fetchFrequency = option.minutes;
+			await settingsService.updateFetch({ autoFetchIntervalMinutes: option.minutes });
+		}
+	}
+
+	const selectedValue = $derived(
+		fetchFrequencyOptions.find((opt) => opt.minutes === fetchFrequency)?.value ?? 'none'
+	);
+
 	onMount(async () => {
 		annotateCommits = (await gitConfig.get('gitbutler.gitbutlerCommitter')) === '1';
 	});
+
+	$effect(() => {
+		if ($settings?.fetch) {
+			fetchFrequency = $settings.fetch.autoFetchIntervalMinutes;
+		}
+	});
 </script>
 
 <SectionCard labelFor="committerSigning" orientation="row">
@@ -37,3 +67,23 @@
 		<Toggle id="committerSigning" checked={annotateCommits} onclick={toggleCommitterSigning} />
 	{/snippet}
 </SectionCard>
+
+<SectionCard labelFor="fetchFrequency" orientation="row" centerAlign>
+	{#snippet title()}
+		Auto-fetch frequency
+	{/snippet}
+	{#snippet actions()}
+		<Select
+			id="fetchFrequency"
+			options={fetchFrequencyOptions}
+			value={selectedValue}
+			onselect={updateFetchFrequency}
+		>
+			{#snippet itemSnippet({ item, highlighted })}
+				<SelectItem selected={item.value === selectedValue} {highlighted}>
+					{item.label}
+				</SelectItem>
+			{/snippet}
+		</Select>
+	{/snippet}
+</SectionCard>

apps/desktop/src/lib/config/appSettingsV2.ts

@@ -63,6 +63,10 @@ export class SettingsService {
 		await this.backend.invoke('update_reviews', { update });
 	}
 
+	async updateFetch(update: Partial<Fetch>) {
+		await this.backend.invoke('update_fetch', { update });
+	}
+
 	private async nudge(): Promise<void> {
 		await this.autoOptInWs3();
 		await this.autoOptInRules();

crates/but-api/src/commands/settings.rs

@@ -1,6 +1,8 @@
 //! In place of commands.rs
 use but_api_macros::api_cmd;
-use but_settings::api::{ClaudeUpdate, FeatureFlagsUpdate, ReviewsUpdate, TelemetryUpdate};
+use but_settings::api::{
+    ClaudeUpdate, FeatureFlagsUpdate, FetchUpdate, ReviewsUpdate, TelemetryUpdate,
+};
 use but_settings::{AppSettings, AppSettingsWithDiskSync};
 use serde::Deserialize;
 use tracing::instrument;
@@ -104,3 +106,18 @@ pub fn update_reviews(
         .update_reviews(params.update)
         .map_err(|e| e.into())
 }
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateFetchParams {
+    pub update: FetchUpdate,
+}
+
+pub fn update_fetch(
+    app_settings_sync: &AppSettingsWithDiskSync,
+    params: UpdateFetchParams,
+) -> Result<(), Error> {
+    app_settings_sync
+        .update_fetch(params.update)
+        .map_err(|e| e.into())
+}

crates/but-server/src/lib.rs

@@ -221,6 +221,16 @@ async fn handle_command(
             .and_then(|params| {
                 settings::update_claude(&app_settings_sync, params).map(|r| json!(r))
             }),
+        "update_fetch" => serde_json::from_value(request.params)
+            .to_error()
+            .and_then(|params| {
+                settings::update_fetch(&app_settings_sync, params).map(|r| json!(r))
+            }),
+        "update_reviews" => serde_json::from_value(request.params)
+            .to_error()
+            .and_then(|params| {
+                settings::update_reviews(&app_settings_sync, params).map(|r| json!(r))
+            }),
         // Secret management
         "secret_get_global" => secret::secret_get_global_cmd(request.params),
         "secret_set_global" => secret::secret_set_global_cmd(request.params),

crates/but-settings/src/api.rs

@@ -42,6 +42,13 @@ pub struct ReviewsUpdate {
     pub auto_fill_pr_description_from_commit: Option<bool>,
 }
 
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+/// Update request for [`crate::app_settings::Fetch`].
+pub struct FetchUpdate {
+    pub auto_fetch_interval_minutes: Option<isize>,
+}
+
 /// Mutation, immediately followed by writing everything to disk.
 impl AppSettingsWithDiskSync {
     pub fn update_onboarding_complete(&self, update: bool) -> Result<()> {
@@ -136,4 +143,12 @@ impl AppSettingsWithDiskSync {
         }
         settings.save()
     }
+
+    pub fn update_fetch(&self, update: FetchUpdate) -> Result<()> {
+        let mut settings = self.get_mut_enforce_save()?;
+        if let Some(auto_fetch_interval_minutes) = update.auto_fetch_interval_minutes {
+            settings.fetch.auto_fetch_interval_minutes = auto_fetch_interval_minutes;
+        }
+        settings.save()
+    }
 }

crates/gitbutler-tauri/src/main.rs

@@ -307,6 +307,8 @@ fn main() {
                     settings::update_feature_flags,
                     settings::update_telemetry_distinct_id,
                     settings::update_claude,
+                    settings::update_fetch,
+                    settings::update_reviews,
                     action::list_actions,
                     action::handle_changes,
                     action::list_workflows,

crates/gitbutler-tauri/src/settings.rs

@@ -1,6 +1,8 @@
 #![allow(deprecated)]
 use but_api::commands::settings;
-use but_settings::api::{ClaudeUpdate, FeatureFlagsUpdate, TelemetryUpdate};
+use but_settings::api::{
+    ClaudeUpdate, FeatureFlagsUpdate, FetchUpdate, ReviewsUpdate, TelemetryUpdate,
+};
 use but_settings::AppSettingsWithDiskSync;
 use tauri::State;
 use tracing::instrument;
@@ -63,3 +65,21 @@ pub fn update_claude(
 ) -> Result<(), Error> {
     settings::update_claude(&app_settings_sync, settings::UpdateClaudeParams { update })
 }
+
+#[tauri::command(async)]
+#[instrument(skip(app_settings_sync), err(Debug))]
+pub fn update_fetch(
+    app_settings_sync: State<'_, AppSettingsWithDiskSync>,
+    update: FetchUpdate,
+) -> Result<(), Error> {
+    settings::update_fetch(&app_settings_sync, settings::UpdateFetchParams { update })
+}
+
+#[tauri::command(async)]
+#[instrument(skip(app_settings_sync), err(Debug))]
+pub fn update_reviews(
+    app_settings_sync: State<'_, AppSettingsWithDiskSync>,
+    update: ReviewsUpdate,
+) -> Result<(), Error> {
+    settings::update_reviews(&app_settings_sync, settings::UpdateReviewsParams { update })
+}