ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-24 00:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Address code review comments

Browse Source
This commit is contained in:
gsxdsm
2026-02-17 23:04:42 -08:00
parent 43c19c70ca
commit dd4c738e91
43 changed files with 1128 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/ui/src/components/views/board-view/dialogs/cherry-pick-dialog.tsx
View File

@@ -174,6 +174,7 @@ export function CherryPickDialog({
setCommitsError(null);
setCommitLimit(30);
setHasMoreCommits(false);
setLoadingBranches(false);
}
}, [open]);
@@ -321,9 +322,7 @@ export function CherryPickDialog({
} else {
// Check for conflicts
const errorMessage = result.error || '';
const hasConflicts =
errorMessage.toLowerCase().includes('conflict') ||
(result as { hasConflicts?: boolean }).hasConflicts;
const hasConflicts = errorMessage.toLowerCase().includes('conflict') || result.hasConflicts;
if (hasConflicts && onCreateConflictResolutionFeature) {
setConflictInfo({
@@ -333,7 +332,7 @@ export function CherryPickDialog({
});
setStep('conflict');
toast.error('Cherry-pick conflicts detected', {
description: 'The cherry-pick has conflicts that need to be resolved.',
description: 'The cherry-pick was aborted due to conflicts. No changes were applied.',
});
} else {
toast.error('Cherry-pick failed', {
@@ -359,7 +358,7 @@ export function CherryPickDialog({
});
setStep('conflict');
toast.error('Cherry-pick conflicts detected', {
description: 'The cherry-pick has conflicts that need to be resolved.',
description: 'The cherry-pick was aborted due to conflicts. No changes were applied.',
});
} else {
toast.error('Cherry-pick failed', {
@@ -469,7 +468,7 @@ export function CherryPickDialog({
<DialogContent className="w-full h-full max-w-full max-h-full sm:w-[90vw] sm:max-w-[640px] sm:max-h-[100dvh] sm:h-auto sm:rounded-xl rounded-none flex flex-col">
<DialogHeader>
<DialogTitle className="flex items-center gap-2">
<Cherry className="w-5 h-5 text-black dark:text-black" />
<Cherry className="w-5 h-5 text-foreground" />
Cherry Pick Commits
</DialogTitle>
<DialogDescription>
@@ -673,7 +672,7 @@ export function CherryPickDialog({
<DialogContent>
<DialogHeader>
<DialogTitle className="flex items-center gap-2">
<Cherry className="w-5 h-5 text-black dark:text-black" />
<Cherry className="w-5 h-5 text-foreground" />
Cherry Pick
</DialogTitle>
<DialogDescription asChild>