Skip to content

fix(desktop): add tooltip to NewWorkspace modal new project button & make sure default selected #461

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

Merged
AviPeltz merged 2 commits into from
Dec 22, 2025
Merged

fix(desktop): add tooltip to NewWorkspace modal new project button & make sure default selected #461

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eca89c
add tooltip to NewWorkspace modal new project button
AviPeltz Dec 22, 2025
f77929e
lint fix
AviPeltz Dec 22, 2025
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
43 changes: 24 additions & 19 deletions apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
SelectValue,
} from "@superset/ui/select";
import { toast } from "@superset/ui/sonner";
import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
import { useEffect, useMemo, useState } from "react";
import { GoGitBranch } from "react-icons/go";
import { HiCheck, HiChevronUpDown, HiPlus } from "react-icons/hi2";
Expand Down Expand Up @@ -101,12 +102,8 @@ export function NewWorkspaceModal() {
}
}, [isOpen, currentProjectId, selectedProjectId]);

// Auto-select default branch when branches load
useEffect(() => {
if (branchData?.defaultBranch && !baseBranch) {
setBaseBranch(branchData.defaultBranch);
}
}, [branchData?.defaultBranch, baseBranch]);
// Effective base branch - use explicit selection or fall back to default
const effectiveBaseBranch = baseBranch ?? branchData?.defaultBranch ?? null;

// Reset base branch when project changes
// biome-ignore lint/correctness/useExhaustiveDependencies: intentionally reset when project changes
Expand Down Expand Up @@ -152,7 +149,7 @@ export function NewWorkspaceModal() {
projectId: selectedProjectId,
name: workspaceName,
branchName: customBranchName,
baseBranch: baseBranch || undefined,
baseBranch: effectiveBaseBranch || undefined,
}),
{
loading: "Creating workspace...",
Expand Down Expand Up @@ -221,15 +218,22 @@ export function NewWorkspaceModal() {
))}
</SelectContent>
</Select>
<Button
variant="ghost"
size="icon"
className="h-8 w-8 shrink-0"
onClick={handleOpenNewProject}
disabled={openNew.isPending}
>
<HiPlus className="h-4 w-4" />
</Button>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon"
className="h-8 w-8 shrink-0"
onClick={handleOpenNewProject}
disabled={openNew.isPending}
>
<HiPlus className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom" sideOffset={4}>
Add new project
</TooltipContent>
</Tooltip>
</div>
</div>

Expand Down Expand Up @@ -329,9 +333,10 @@ export function NewWorkspaceModal() {
<span className="flex items-center gap-2 truncate">
<GoGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
<span className="truncate font-mono text-sm">
{baseBranch || "Select branch..."}
{effectiveBaseBranch || "Select branch..."}
</span>
{baseBranch === branchData?.defaultBranch && (
{effectiveBaseBranch ===
branchData?.defaultBranch && (
<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded">
default
</span>
Expand Down Expand Up @@ -383,7 +388,7 @@ export function NewWorkspaceModal() {
)}
</span>
)}
{baseBranch === branch.name && (
{effectiveBaseBranch === branch.name && (
<HiCheck className="size-4 text-primary" />
)}
</span>
Expand Down