Skip to content

Commit 6ecc116

Browse files
committed
fix(settings): reset mixed new-project directories
1 parent 3a0c8e2 commit 6ecc116

3 files changed

Lines changed: 31 additions & 2 deletions

File tree

‎apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
SettingsEnvironmentFilterHeader,
2727
} from "./components/SettingsEnvironmentFilterHeader";
2828
import { BranchNamingSettings } from "./components/BranchNamingSettings";
29+
import { SettingsActionRow } from "./components/SettingsActionRow";
2930
import { SettingsChoiceRow } from "./components/SettingsChoiceRow";
3031
import { SettingsSection } from "./components/SettingsSection";
3132
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
@@ -307,6 +308,14 @@ function ServerSettingsDetail(props: { readonly page: SettingsPage }) {
307308
}}
308309
/>
309310
</View>
311+
{uniform("newProjectBaseDirectory") !== "" ? (
312+
<SettingsActionRow
313+
icon="arrow.clockwise"
314+
label="Use default directory"
315+
disabled={disabled}
316+
onPress={() => write({ newProjectBaseDirectory: "" })}
317+
/>
318+
) : null}
310319
</SettingsSection>
311320
) : null}
312321
<SettingsSection

‎apps/web/src/components/settings/SettingsPanels.restore.test.tsx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { reactHookHarness as hooks } from "../../test/reactHookHarness";
55

66
const state = vi.hoisted(() => ({
77
settings: null as UnifiedSettings | null,
8+
mixedNewProjectDirectory: false,
89
update: vi.fn(),
910
confirm: vi.fn(),
1011
}));
@@ -43,6 +44,8 @@ vi.mock("../../hooks/useTheme", async (importOriginal) => ({
4344
vi.mock("./useScopedSettings", async (importOriginal) => ({
4445
...(await importOriginal<typeof import("./useScopedSettings")>()),
4546
useScopedSettings: () => state.settings,
47+
useScopedSettingsMixed: (keys: readonly string[]) =>
48+
keys.includes("newProjectBaseDirectory") && state.mixedNewProjectDirectory,
4649
useUpdateScopedSettings: () => state.update,
4750
}));
4851

@@ -57,6 +60,7 @@ beforeEach(() => {
5760
hooks.reset();
5861
vi.clearAllMocks();
5962
state.settings = { ...DEFAULT_UNIFIED_SETTINGS };
63+
state.mixedNewProjectDirectory = false;
6064
state.confirm.mockResolvedValue(true);
6165
});
6266

@@ -88,4 +92,16 @@ describe("restoring V2 settings", () => {
8892
expect(state.confirm).toHaveBeenCalledOnce();
8993
expect(state.update).not.toHaveBeenCalled();
9094
});
95+
96+
it("restores mixed project directories when the representative environment uses the default", async () => {
97+
state.mixedNewProjectDirectory = true;
98+
hooks.beginRender();
99+
const restore = useSettingsRestore();
100+
101+
expect(restore.changedSettingLabels).toEqual(["New projects directory"]);
102+
await restore.restoreDefaults();
103+
104+
expect(state.confirm.mock.calls[0]?.[0]).toContain("New projects directory");
105+
expect(state.update.mock.calls[0]?.[0].newProjectBaseDirectory).toBe("");
106+
});
91107
});

‎apps/web/src/components/settings/SettingsPanels.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ export function useSettingsRestore(onRestored?: () => void) {
527527
themeHalves,
528528
} = useTheme();
529529
const settings = useScopedSettings();
530+
const mixedNewProjectBaseDirectory = useScopedSettingsMixed(["newProjectBaseDirectory"]);
530531
const updateSettings = useUpdateScopedSettings();
531532

532533
const isTextGenerationModelDirty = !Equal.equals(
@@ -642,7 +643,8 @@ export function useSettingsRestore(onRestored?: () => void) {
642643
DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin
643644
? ["New worktrees start from origin"]
644645
: []),
645-
...(settings.newProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.newProjectBaseDirectory
646+
...(mixedNewProjectBaseDirectory ||
647+
settings.newProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.newProjectBaseDirectory
646648
? ["New projects directory"]
647649
: []),
648650
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
@@ -667,6 +669,7 @@ export function useSettingsRestore(onRestored?: () => void) {
667669
[
668670
isTextGenerationModelDirty,
669671
isBackgroundActivityDirty,
672+
mixedNewProjectBaseDirectory,
670673
settings.browserDefaultViewport,
671674
settings.browserDefaultZoomFactor,
672675
settings.browserDefaultAppearance,
@@ -3090,8 +3093,9 @@ export function GeneralSettingsPanel() {
30903093
{...searchableSetting("new-projects-directory")}
30913094
description="Folder on this environment for new projects. Leave empty to use the projects folder in its T3 data directory. Existing projects stay where they are."
30923095
resetAction={
3096+
mixedNewProjectBaseDirectory ||
30933097
settings.newProjectBaseDirectory !==
3094-
DEFAULT_UNIFIED_SETTINGS.newProjectBaseDirectory ? (
3098+
DEFAULT_UNIFIED_SETTINGS.newProjectBaseDirectory ? (
30953099
<SettingResetButton
30963100
label="new projects directory"
30973101
onClick={() =>

0 commit comments

Comments
 (0)