Merge pull request #10871 from gitbutlerapp/copilot/add-feature-toggle-new-apply

Add apply3 feature flag toggle to Experimental settings

Author: Byron

apps/desktop/cypress/e2e/support/mock/settings.ts

@@ -10,6 +10,7 @@ export const MOCK_TELEMETRY_SETINGS: TelemetrySettings = {
 export const MOCK_FEATURE_FLAGS: FeatureFlags = {
 	cv3: false,
 	ws3: false,
+	apply3: false,
 	actions: false,
 	butbot: false,
 	rules: false,

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

@@ -56,6 +56,22 @@
 			/>
 		{/snippet}
 	</SectionCard>
+	<SectionCard labelFor="apply3" roundedTop={false} roundedBottom={false} orientation="row">
+		{#snippet title()}
+			New apply to workspace
+		{/snippet}
+		{#snippet caption()}
+			Use the V3 version of apply and unapply operations for workspace changes.
+		{/snippet}
+		{#snippet actions()}
+			<Toggle
+				id="apply3"
+				checked={$settingsStore?.featureFlags.apply3}
+				onclick={() =>
+					settingsService.updateFeatureFlags({ apply3: !$settingsStore?.featureFlags.apply3 })}
+			/>
+		{/snippet}
+	</SectionCard>
 	<SectionCard labelFor="rules" roundedTop={false} roundedBottom={false} orientation="row">
 		{#snippet title()}
 			Workspace Rules

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

@@ -190,6 +190,8 @@ export type FeatureFlags = {
 	cv3: boolean;
 	/** Enable the usage of the V3 workspace API */
 	ws3: boolean;
+	/** Use the V3 version of apply and unapply. */
+	apply3: boolean;
 	/** Enable the usage of GitButler Acitions. */
 	actions: boolean;
 	/** Enable the usage of butbot chat */

crates/but-settings/src/api.rs

@@ -18,6 +18,7 @@ pub struct TelemetryUpdate {
 pub struct FeatureFlagsUpdate {
     pub cv3: Option<bool>,
     pub ws3: Option<bool>,
+    pub apply3: Option<bool>,
     pub actions: Option<bool>,
     pub butbot: Option<bool>,
     pub rules: Option<bool>,
@@ -90,6 +91,7 @@ impl AppSettingsWithDiskSync {
         FeatureFlagsUpdate {
             cv3,
             ws3,
+            apply3,
             actions,
             butbot,
             rules,
@@ -103,6 +105,9 @@ impl AppSettingsWithDiskSync {
         if let Some(ws3) = ws3 {
             settings.feature_flags.ws3 = ws3;
         }
+        if let Some(apply3) = apply3 {
+            settings.feature_flags.apply3 = apply3;
+        }
         if let Some(actions) = actions {
             settings.feature_flags.actions = actions;
         }