Skip to content

fix(desktop): clean up review sidebar UI and remove redundant states #2989

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
Mar 29, 2026
Merged

fix(desktop): clean up review sidebar UI and remove redundant states #2989

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
d235332
fix(desktop): clean up review sidebar UI and remove redundant states
Kitenite Mar 29, 2026
c5ae344
Update apps/desktop/src/renderer/screens/main/components/WorkspaceVie…
Kitenite Mar 29, 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
104 changes: 21 additions & 83 deletions ...c/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/ChangesView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
import {
AlertDialog,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@superset/ui/alert-dialog";
import { Button } from "@superset/ui/button";
import { toast } from "@superset/ui/sonner";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@superset/ui/tabs";
import { cn } from "@superset/ui/utils";
Expand Down Expand Up @@ -36,6 +27,7 @@ import { sidebarHeaderTabTriggerClassName } from "../headerTabStyles";
import { CategorySection } from "./components/CategorySection";
import { ChangesHeader } from "./components/ChangesHeader";
import { CommitInput } from "./components/CommitInput";
import { DiscardConfirmDialog } from "./components/DiscardConfirmDialog";
import { ReviewPanel } from "./components/ReviewPanel";
import { useOrderedSections } from "./hooks";
import { getPRActionState, shouldAutoCreatePRAfterPublish } from "./utils";
Expand Down Expand Up @@ -834,85 +826,31 @@ export function ChangesView({
</TabsContent>
</Tabs>

<AlertDialog
<DiscardConfirmDialog
open={showDiscardUnstagedDialog}
onOpenChange={setShowDiscardUnstagedDialog}
>
<AlertDialogContent className="max-w-[340px] gap-0 p-0">
<AlertDialogHeader className="px-4 pt-4 pb-2">
<AlertDialogTitle className="font-medium">
Discard all unstaged changes?
</AlertDialogTitle>
<AlertDialogDescription>
This will revert all unstaged modifications and delete untracked
files. This action cannot be undone.
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
<Button
variant="ghost"
size="sm"
className="h-7 px-3 text-xs"
onClick={() => setShowDiscardUnstagedDialog(false)}
>
Cancel
</Button>
<Button
variant="destructive"
size="sm"
className="h-7 px-3 text-xs"
onClick={() => {
setShowDiscardUnstagedDialog(false);
discardAllUnstagedMutation.mutate({
worktreePath: worktreePath || "",
});
}}
>
Discard All
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
title="Discard all unstaged changes?"
description="This will revert all unstaged modifications and delete untracked files. This action cannot be undone."
onConfirm={() =>
discardAllUnstagedMutation.mutate({
worktreePath: worktreePath || "",
})
}
confirmLabel="Discard All"
/>

<AlertDialog
<DiscardConfirmDialog
open={showDiscardStagedDialog}
onOpenChange={setShowDiscardStagedDialog}
>
<AlertDialogContent className="max-w-[340px] gap-0 p-0">
<AlertDialogHeader className="px-4 pt-4 pb-2">
<AlertDialogTitle className="font-medium">
Discard all staged changes?
</AlertDialogTitle>
<AlertDialogDescription>
This will unstage and revert all staged changes. Staged new files
will be deleted. This action cannot be undone.
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
<Button
variant="ghost"
size="sm"
className="h-7 px-3 text-xs"
onClick={() => setShowDiscardStagedDialog(false)}
>
Cancel
</Button>
<Button
variant="destructive"
size="sm"
className="h-7 px-3 text-xs"
onClick={() => {
setShowDiscardStagedDialog(false);
discardAllStagedMutation.mutate({
worktreePath: worktreePath || "",
});
}}
>
Discard All
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
title="Discard all staged changes?"
description="This will unstage and revert all staged changes. Staged new files will be deleted. This action cannot be undone."
onConfirm={() =>
discardAllStagedMutation.mutate({
worktreePath: worktreePath || "",
})
}
confirmLabel="Discard All"
/>
</div>
);
}
Loading
Loading