Skip to content

Commit 0ae3aec

Browse files
fix: workspace modal stays open after creating workspace (anomalyco#80)
- Move WorkspacePicker and CreateWorkspaceModal to App.tsx level - Close CreateWorkspaceModal immediately when user clicks Create - Enables workspace picker to work from both Dashboard and Session views Fixes anomalyco#76
1 parent c4bcd9f commit 0ae3aec

3 files changed

Lines changed: 23 additions & 20 deletions

File tree

‎src/App.tsx‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import { getVersion } from "@tauri-apps/api/app";
1919
import ModelPickerModal from "./components/ModelPickerModal";
2020
import ResetModal from "./components/ResetModal";
2121
import TemplateModal from "./components/TemplateModal";
22+
import WorkspacePicker from "./components/WorkspacePicker";
23+
import CreateWorkspaceModal from "./components/CreateWorkspaceModal";
2224
import OnboardingView from "./views/OnboardingView";
2325
import DashboardView from "./views/DashboardView";
2426
import SessionView from "./views/SessionView";
@@ -1891,6 +1893,23 @@ export default function App() {
18911893
onPromptChange={setTemplateDraftPrompt}
18921894
onScopeChange={setTemplateDraftScope}
18931895
/>
1896+
1897+
<WorkspacePicker
1898+
open={workspaceStore.workspacePickerOpen()}
1899+
workspaces={workspaceStore.filteredWorkspaces()}
1900+
activeWorkspaceId={workspaceStore.activeWorkspaceId()}
1901+
search={workspaceStore.workspaceSearch()}
1902+
onSearch={workspaceStore.setWorkspaceSearch}
1903+
onClose={() => workspaceStore.setWorkspacePickerOpen(false)}
1904+
onSelect={workspaceStore.activateWorkspace}
1905+
onCreateNew={() => workspaceStore.setCreateWorkspaceOpen(true)}
1906+
/>
1907+
1908+
<CreateWorkspaceModal
1909+
open={workspaceStore.createWorkspaceOpen()}
1910+
onClose={() => workspaceStore.setCreateWorkspaceOpen(false)}
1911+
onConfirm={(preset) => workspaceStore.createWorkspaceFlow(preset)}
1912+
/>
18941913
</>
18951914
);
18961915
}

‎src/app/workspace.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,15 @@ export function createWorkspaceStore(options: {
315315
return;
316316
}
317317

318+
// Close the modal immediately when confirming - folder picker will appear
319+
setCreateWorkspaceOpen(false);
320+
318321
try {
319322
const selection = await pickDirectory({ title: "Choose workspace folder" });
320323
const folder =
321324
typeof selection === "string" ? selection : Array.isArray(selection) ? selection[0] : null;
322325

326+
// User cancelled folder selection
323327
if (!folder) return;
324328

325329
options.setBusy(true);
@@ -340,7 +344,6 @@ export function createWorkspaceStore(options: {
340344
}
341345

342346
setWorkspacePickerOpen(false);
343-
setCreateWorkspaceOpen(false);
344347
options.setView("dashboard");
345348
options.setTab("home");
346349
} catch (e) {

‎src/views/DashboardView.tsx‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ import type { WorkspaceInfo } from "../lib/tauri";
44
import { formatRelativeTime } from "../app/utils";
55

66
import Button from "../components/Button";
7-
import CreateWorkspaceModal from "../components/CreateWorkspaceModal";
87
import OpenWorkLogo from "../components/OpenWorkLogo";
98
import WorkspaceChip from "../components/WorkspaceChip";
10-
import WorkspacePicker from "../components/WorkspacePicker";
119
import PluginsView from "./PluginsView";
1210
import SettingsView from "./SettingsView";
1311
import SkillsView from "./SkillsView";
@@ -563,23 +561,6 @@ export default function DashboardView(props: DashboardViewProps) {
563561
</div>
564562
</Show>
565563

566-
<WorkspacePicker
567-
open={props.workspacePickerOpen}
568-
workspaces={props.filteredWorkspaces}
569-
activeWorkspaceId={props.activeWorkspaceId}
570-
search={props.workspaceSearch}
571-
onSearch={props.setWorkspaceSearch}
572-
onClose={() => props.setWorkspacePickerOpen(false)}
573-
onSelect={props.activateWorkspace}
574-
onCreateNew={() => props.setCreateWorkspaceOpen(true)}
575-
/>
576-
577-
<CreateWorkspaceModal
578-
open={props.createWorkspaceOpen}
579-
onClose={() => props.setCreateWorkspaceOpen(false)}
580-
onConfirm={(preset) => props.createWorkspaceFlow(preset)}
581-
/>
582-
583564
<nav class="md:hidden fixed bottom-0 left-0 right-0 border-t border-zinc-800 bg-zinc-950/90 backdrop-blur-md">
584565
<div class="mx-auto max-w-5xl px-4 py-3 grid grid-cols-6 gap-2">
585566
<button

0 commit comments

Comments
 (0)