Skip to content

fix: ensure default space creation when skipping onboarding (fixes #150) #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: ensure default space creation when skipping onboarding (fixes #150) #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions src/renderer/src/components/onboarding/stages/initial-space/create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,23 @@ export function OnboardingCreateSpace({
}, []);

// Create the space in the main profile
const createSpace = async () => {
const createSpace = async (name?: string) => {
if (!mainProfile || isCreating || createSuccess) return;

setIsCreating(true);
setErrorMessage(null);

try {
// Use the provided name or the current spaceName
const spaceToCreate = name || spaceName;

// Create the space with just the name
const created = await flow.spaces.createSpace(mainProfile.id, spaceName);
const created = await flow.spaces.createSpace(mainProfile.id, spaceToCreate);

if (created) {
// Get all spaces to find the one we just created
const spaces = await flow.spaces.getSpacesFromProfile(mainProfile.id);
const newSpace = spaces.find((s) => s.name === spaceName);
const newSpace = spaces.find((s) => s.name === spaceToCreate);

if (newSpace) {
// Save the space ID for the next steps
Expand All @@ -96,6 +99,17 @@ export function OnboardingCreateSpace({
}
};

// Handle skip action
const handleSkip = async () => {
if (mainProfile && !hasSpaces) {
// If we have a main profile but no spaces, create a default one
await createSpace(DEFAULT_SPACE_NAME);
} else {
// Otherwise just advance
advance();
}
};

return (
<>
<motion.div
Expand Down Expand Up @@ -129,7 +143,7 @@ export function OnboardingCreateSpace({
<div className="text-white text-lg font-medium mb-1">Something went wrong</div>
<div className="text-gray-400 max-w-md mb-4">{errorMessage}</div>
<Button
onClick={advance}
onClick={handleSkip}
className="remove-app-drag cursor-pointer px-6 py-2 bg-[#0066FF]/10 hover:bg-[#0066FF]/20 text-white backdrop-blur-md border border-[#0066FF]/30"
>
Skip & Continue
Expand All @@ -143,7 +157,7 @@ export function OnboardingCreateSpace({
{"We couldn't find the main profile for space creation. You can create spaces later from settings."}
</div>
<Button
onClick={advance}
onClick={handleSkip}
className="remove-app-drag cursor-pointer px-6 py-2 bg-[#0066FF]/10 hover:bg-[#0066FF]/20 text-white backdrop-blur-md border border-[#0066FF]/30"
>
Skip & Continue
Expand All @@ -157,7 +171,7 @@ export function OnboardingCreateSpace({
You already have spaces in your main profile. You can manage them in settings.
</div>
<Button
onClick={advance}
onClick={handleSkip}
className="remove-app-drag cursor-pointer px-6 py-2 bg-[#0066FF]/10 hover:bg-[#0066FF]/20 text-white backdrop-blur-md border border-[#0066FF]/30"
>
Continue
Expand Down Expand Up @@ -188,7 +202,7 @@ export function OnboardingCreateSpace({
{/* Create Button */}
<div className="pt-4 flex justify-center">
<Button
onClick={createSpace}
onClick={() => createSpace()}
disabled={isCreating || !spaceName.trim()}
className="remove-app-drag cursor-pointer px-8 py-3 bg-[#0066FF] hover:bg-[#0055DD] text-white backdrop-blur-md border border-[#0066FF]/50"
>
Expand Down Expand Up @@ -216,7 +230,7 @@ export function OnboardingCreateSpace({
transition={{ duration: 0.4, delay: 0.3, ease: "easeOut" }}
>
<Button
onClick={advance}
onClick={handleSkip}
variant="ghost"
className="remove-app-drag cursor-pointer text-white/70 hover:text-white"
>
Expand All @@ -227,4 +241,4 @@ export function OnboardingCreateSpace({
)}
</>
);
}
}