Skip to content

Fix dialog unmounting and unpin @chakra-ui/react (#67647) #67648

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

Closed
prattik-wav wants to merge 1 commit into from
+13 −4
Closed

Fix dialog unmounting and unpin @chakra-ui/react (#67647) #67648

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
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/ui/src/components/Clear/Run/ClearRunButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const ClearRunButton = ({ dagRun, isHotkeyEnabled = false }: Props) => {
>
<CgRedo />
</IconButton>
{open ? <ClearRunDialog dagRun={dagRun} onClose={onClose} open={open} /> : undefined}
<ClearRunDialog dagRun={dagRun} onClose={onClose} open={open} />
</>
);
};
Expand Down
15 changes: 12 additions & 3 deletions airflow-core/src/airflow/ui/src/components/Clear/Run/ClearRunDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ const ClearRunDialog = ({ dagRun, onClose, open }: Props) => {

const [note, setNote] = useState<string | null>(dagRun.note);
const [selectedOptions, setSelectedOptions] = useState<Array<string>>(["existingTasks"]);

const handleClose = () => {
setNote(dagRun.note);
setSelectedOptions(["existingTasks"]);
onClose();
};


const onlyFailed = selectedOptions.includes("onlyFailed");
const onlyNew = selectedOptions.includes("newTasks");

Expand All @@ -62,6 +70,7 @@ const ClearRunDialog = ({ dagRun, onClose, open }: Props) => {
dagId,
dagRunId,
options: {
enabled: open,
refetchInterval: (query) =>
query.state.data?.task_instances.some((ti) => "state" in ti && isStatePending(ti.state))
? refetchInterval
Expand All @@ -77,13 +86,13 @@ const ClearRunDialog = ({ dagRun, onClose, open }: Props) => {
const { isPending, mutate } = useClearDagRun({
dagId,
dagRunId,
onSuccessConfirm: onClose,
onSuccessConfirm: handleClose,
});

const { isPending: isPendingPatchDagRun, mutate: mutatePatchDagRun } = usePatchDagRun({
dagId,
dagRunId,
onSuccess: onClose,
onSuccess: handleClose,
});

// Check if DAG versions differ (works for both bundle-versioned and local bundles)
Expand All @@ -96,7 +105,7 @@ const ClearRunDialog = ({ dagRun, onClose, open }: Props) => {
const shouldShowBundleVersionOption = versionsDiffer && !onlyNew;

return (
<Dialog.Root lazyMount onOpenChange={onClose} open={open}>
<Dialog.Root lazyMount onOpenChange={handleClose} open={open}>
<Dialog.Content backdrop>
<Dialog.Header>
<VStack align="start" gap={4}>
Expand Down