Skip to content

fix: skip duplicate Analysis stage in approve & upgrade flow #12

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
jrangelramos wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −3
Open

fix: skip duplicate Analysis stage in approve & upgrade flow #12

Show file tree
Hide file tree
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
12 changes: 9 additions & 3 deletions src/components/update-plan/DecisionActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ const DecisionActions: React.FC<DecisionActionsProps> = ({ proposal, clusterVers
[approvals, proposal.metadata?.name, proposal.metadata?.namespace],
);

const { approveStage, denyStage, error, clearError, inProgress } =
useApprovalActions(approval);
const { approveStage, denyStage, error, clearError, inProgress } = useApprovalActions(approval);

const [confirmingApprove, setConfirmingApprove] = React.useState(false);
const [confirmingDeny, setConfirmingDeny] = React.useState(false);
Expand Down Expand Up @@ -109,7 +108,14 @@ const DecisionActions: React.FC<DecisionActionsProps> = ({ proposal, clusterVers
setConfirmingApprove(false);
}, CONFIRM_TIMEOUT_MS);
}
}, [confirmingApprove, approveStage, proposal, clusterVersion, history, t]);
}, [
confirmingApprove,
approveStage,
proposal,
clusterVersion,
history,
t,
]);

const handleDenyClick = React.useCallback(async () => {
if (confirmingDeny) {
Expand Down
2 changes: 2 additions & 0 deletions src/hooks/useApprovalActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export const useApprovalActions = (approval?: LightspeedProposalApproval) => {
setError(null);
try {
const existingStages = currentApproval.spec?.stages ?? [];
if (existingStages.some((s) => s.type === stageType)) return true; // already approved

const stageEntry: Record<string, unknown> = {
type: stageType,
decision: 'Approved',
Expand Down