Skip to content

fix(desktop): remove redundant open project button from workspace modal #573

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
Kitenite merged 2 commits into from
Jan 1, 2026
Merged

fix(desktop): remove redundant open project button from workspace modal #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50b18d2
fix(desktop): remove redundant open project button from workspace modal
Kitenite Jan 1, 2026
29d75a2
New ws button
Kitenite Jan 1, 2026
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
95 changes: 17 additions & 78 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 @@ -27,22 +27,12 @@ import {
SelectValue,
} from "@superset/ui/select";
import { toast } from "@superset/ui/sonner";
import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
import { useEffect, useMemo, useRef, useState } from "react";
import { GoGitBranch } from "react-icons/go";
import {
HiCheck,
HiChevronDown,
HiChevronUpDown,
HiFolderOpen,
} from "react-icons/hi2";
import { HiCheck, HiChevronDown, HiChevronUpDown } from "react-icons/hi2";
import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
import { trpc } from "renderer/lib/trpc";
import { useOpenNew } from "renderer/react-query/projects";
import {
useCreateBranchWorkspace,
useCreateWorkspace,
} from "renderer/react-query/workspaces";
import { useCreateWorkspace } from "renderer/react-query/workspaces";
import {
useCloseNewWorkspaceModal,
useNewWorkspaceModalOpen,
Expand Down Expand Up @@ -91,8 +81,6 @@ export function NewWorkspaceModal() {
{ enabled: !!selectedProjectId },
);
const createWorkspace = useCreateWorkspace();
const createBranchWorkspace = useCreateBranchWorkspace();
const openNew = useOpenNew();

const currentProjectId = activeWorkspace?.projectId;

Expand Down Expand Up @@ -198,36 +186,6 @@ export function NewWorkspaceModal() {
);
};

const handleOpenNewProject = async () => {
try {
const result = await openNew.mutateAsync(undefined);
if (result.canceled) {
return;
}
if ("error" in result) {
toast.error("Failed to open project", {
description: result.error,
});
return;
}
if ("needsGitInit" in result) {
toast.error("Selected folder is not a git repository", {
description:
"Please use 'Open project' from the start view to initialize git.",
});
return;
}
// Create a main workspace on the current branch for the new project
await createBranchWorkspace.mutateAsync({ projectId: result.project.id });
setSelectedProjectId(result.project.id);
} catch (error) {
toast.error("Failed to open project", {
description:
error instanceof Error ? error.message : "An unknown error occurred",
});
}
};

return (
<Dialog modal open={isOpen} onOpenChange={(open) => !open && handleClose()}>
<DialogContent
Expand All @@ -239,40 +197,21 @@ export function NewWorkspaceModal() {
</DialogHeader>

<div className="px-4 pb-3">
<div className="flex items-center gap-2">
<Select
value={selectedProjectId ?? ""}
onValueChange={setSelectedProjectId}
>
<SelectTrigger className="flex-1 h-8 text-sm">
<SelectValue placeholder="Select project" />
</SelectTrigger>
<SelectContent>
{recentProjects.map((project) => (
<SelectItem key={project.id} value={project.id}>
{project.name}
</SelectItem>
))}
</SelectContent>
</Select>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="sm"
className="h-8 shrink-0 gap-1 text-xs"
onClick={handleOpenNewProject}
disabled={openNew.isPending}
>
<HiFolderOpen className="h-4 w-4" />
Open
</Button>
</TooltipTrigger>
<TooltipContent side="bottom" sideOffset={4}>
Open a new project
</TooltipContent>
</Tooltip>
</div>
<Select
value={selectedProjectId ?? ""}
onValueChange={setSelectedProjectId}
>
<SelectTrigger className="w-full h-8 text-sm">
<SelectValue placeholder="Select project" />
</SelectTrigger>
<SelectContent>
{recentProjects.map((project) => (
<SelectItem key={project.id} value={project.id}>
{project.name}
</SelectItem>
))}
</SelectContent>
</Select>
</div>

{selectedProjectId && (
Expand Down
2 changes: 1 addition & 1 deletion ...sktop/src/renderer/screens/main/components/TopBar/WorkspaceTabs/CreateWorkspaceButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export function CreateWorkspaceButton({
className="flex h-6 items-center gap-1 rounded-l-md pl-1.5 pr-1 text-[12px] font-medium transition-all duration-150 hover:bg-foreground/[0.06] hover:text-foreground active:scale-[0.98] disabled:pointer-events-none disabled:opacity-40"
>
<HiMiniPlus className="size-[14px] stroke-[0.5]" />
<span>Create</span>
<span>Workspace</span>
</button>
</TooltipTrigger>
<TooltipContent side="bottom" sideOffset={4}>
Expand Down
Loading