Skip to content

UI: Make dialogs consistent and fix their dark mode background #71806

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
bbovenzi merged 1 commit into from
Aug 19, 2026
Merged

UI: Make dialogs consistent and fix their dark mode background #71806

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
151 changes: 70 additions & 81 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 @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Button, Flex, Heading, VStack } from "@chakra-ui/react";
import { Button, Flex } from "@chakra-ui/react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { CgRedo } from "react-icons/cg";
Expand All @@ -26,7 +26,7 @@ import type { DAGRunResponse } from "openapi/requests/types.gen";
import { ActionAccordion } from "src/components/ActionAccordion";
import { getRunOnLatestVersionState } from "src/components/Clear/TaskInstance/runOnLatestVersion";
import { useRerunWithLatestVersion } from "src/components/Clear/useRerunWithLatestVersion";
import { Checkbox, Dialog } from "src/components/ui";
import { Checkbox, Modal } from "src/components/ui";
import SegmentedControl from "src/components/ui/SegmentedControl";
import { useClearRunDefaultOptions } from "src/hooks/useUserSettings";
import { useClearDagRunDryRun } from "src/queries/useClearDagRunDryRun";
Expand Down Expand Up @@ -108,93 +108,82 @@ const ClearRunDialog = ({ dagRun, onClose, open }: Props) => {
const shouldShowBundleVersionOption = shouldShowRunOnLatestOption && !onlyNew;

return (
<Dialog.Root
<Modal
footerActions={
<>
<Button
disabled={affectedTasks.total_entries === 0}
loading={isPending}
onClick={() => {
mutate({
dagId,
dagRunId,
requestBody: {
dry_run: false,
note: note === dagRun.note ? undefined : note,
only_failed: onlyFailed,
only_new: onlyNew,
run_on_latest_version: runOnLatestVersion,
},
});
}}
>
<CgRedo /> {translate("modal.confirm")}
</Button>
{shouldShowBundleVersionOption ? (
<Checkbox
checked={runOnLatestVersionForced || runOnLatestVersion}
disabled={runOnLatestVersionForced}
onCheckedChange={(event) => setRunOnLatestVersion(Boolean(event.checked))}
title={
runOnLatestVersionForced
? translate("dags:runAndTaskActions.options.runOnLatestVersionForced")
: undefined
}
>
{translate("dags:runAndTaskActions.options.runOnLatestVersion")}
</Checkbox>
) : undefined}
</>
}
lazyMount
onOpenChange={(details) => {
if (!details.open) {
handleClose();
}
}}
open={open}
title={
<>
<strong>
{translate("dags:runAndTaskActions.clear.title", { type: translate("dagRun_one") })}:{" "}
</strong>{" "}
{dagRunId}
</>
}
>
<Dialog.Content backdrop>
<Dialog.Header>
<VStack align="start" gap={4}>
<Heading size="xl">
<strong>
{translate("dags:runAndTaskActions.clear.title", { type: translate("dagRun_one") })}:{" "}
</strong>{" "}
{dagRunId}
</Heading>
</VStack>
</Dialog.Header>

<Dialog.CloseTrigger />

<Dialog.Body width="full">
<Flex justifyContent="center">
<SegmentedControl
defaultValues={clearRunDefaultOptions}
onChange={setSelectedOptions}
options={[
{
label: translate("dags:runAndTaskActions.options.existingTasks"),
value: "existingTasks",
},
{
label: translate("dags:runAndTaskActions.options.onlyFailed"),
value: "onlyFailed",
},
{
label: translate("dags:runAndTaskActions.options.queueNew"),
value: "newTasks",
},
]}
/>
</Flex>
<ActionAccordion affectedTasks={affectedTasks} note={note} setNote={setNote} />
<Flex
{...(shouldShowBundleVersionOption ? { alignItems: "center" } : {})}
justifyContent={shouldShowBundleVersionOption ? "space-between" : "end"}
mt={3}
>
{shouldShowBundleVersionOption ? (
<Checkbox
checked={runOnLatestVersionForced || runOnLatestVersion}
disabled={runOnLatestVersionForced}
onCheckedChange={(event) => setRunOnLatestVersion(Boolean(event.checked))}
title={
runOnLatestVersionForced
? translate("dags:runAndTaskActions.options.runOnLatestVersionForced")
: undefined
}
>
{translate("dags:runAndTaskActions.options.runOnLatestVersion")}
</Checkbox>
) : undefined}
<Button
disabled={affectedTasks.total_entries === 0}
loading={isPending}
onClick={() => {
mutate({
dagId,
dagRunId,
requestBody: {
dry_run: false,
note: note === dagRun.note ? undefined : note,
only_failed: onlyFailed,
only_new: onlyNew,
run_on_latest_version: runOnLatestVersion,
},
});
}}
>
<CgRedo /> {translate("modal.confirm")}
</Button>
</Flex>
</Dialog.Body>
</Dialog.Content>
</Dialog.Root>
<Flex justifyContent="center">
<SegmentedControl
defaultValues={clearRunDefaultOptions}
onChange={setSelectedOptions}
options={[
{
label: translate("dags:runAndTaskActions.options.existingTasks"),
value: "existingTasks",
},
{
label: translate("dags:runAndTaskActions.options.onlyFailed"),
value: "onlyFailed",
},
{
label: translate("dags:runAndTaskActions.options.queueNew"),
value: "newTasks",
},
]}
/>
</Flex>
<ActionAccordion affectedTasks={affectedTasks} note={note} setNote={setNote} />
</Modal>
);
};

Expand Down
179 changes: 84 additions & 95 deletions ...ow-core/src/airflow/ui/src/components/Clear/TaskInstance/ClearGroupTaskInstanceDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Button, Flex, Heading, VStack } from "@chakra-ui/react";
import { Button, Flex } from "@chakra-ui/react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { CgRedo } from "react-icons/cg";
Expand All @@ -30,7 +30,7 @@ import {
import type { LightGridTaskInstanceSummary, TaskInstanceResponse } from "openapi/requests/types.gen";
import { ActionAccordion } from "src/components/ActionAccordion";
import { useRerunWithLatestVersion } from "src/components/Clear/useRerunWithLatestVersion";
import { Checkbox, Dialog } from "src/components/ui";
import { Checkbox, Modal } from "src/components/ui";
import SegmentedControl from "src/components/ui/SegmentedControl";
import { useClearTaskInstanceDefaultOptions } from "src/hooks/useUserSettings";
import { useClearTaskInstances } from "src/queries/useClearTaskInstances";
Expand Down Expand Up @@ -135,101 +135,90 @@ export const ClearGroupTaskInstanceDialog = ({ onClose, open, taskInstance }: Pr
};

return (
<Dialog.Root lazyMount onOpenChange={onClose} open={open}>
<Dialog.Content backdrop>
<Dialog.Header>
<VStack align="start" gap={4}>
<Heading size="xl">
<strong>
{translate("dags:runAndTaskActions.clear.title", {
type: translate("taskInstance", { count: affectedTasks.total_entries ?? 0 }),
})}
:
</strong>{" "}
{groupId}
</Heading>
</VStack>
</Dialog.Header>

<Dialog.CloseTrigger />

<Dialog.Body width="full">
<Flex justifyContent="center">
<SegmentedControl
defaultValues={clearTaskInstanceDefaultOptions}
multiple
onChange={setSelectedOptions}
options={[
{
label: translate("dags:runAndTaskActions.options.past"),
value: "past",
<Modal
footerActions={
<>
<Button
disabled={affectedTasks.total_entries === 0 || groupTaskIds.length === 0}
loading={isPending}
onClick={() => {
mutate({
dagId,
requestBody: {
dag_run_id: runId,
dry_run: false,
include_downstream: downstream,
include_future: future,
include_past: past,
include_upstream: upstream,
...(note === null ? {} : { note }),
only_failed: onlyFailed,
run_on_latest_version: runOnLatestVersion,
task_ids: groupTaskIds,
},
{
label: translate("dags:runAndTaskActions.options.future"),
value: "future",
},
{
label: translate("dags:runAndTaskActions.options.upstream"),
value: "upstream",
},
{
label: translate("dags:runAndTaskActions.options.downstream"),
value: "downstream",
},
{
label: translate("dags:runAndTaskActions.options.onlyFailed"),
value: "onlyFailed",
},
]}
/>
</Flex>
<ActionAccordion affectedTasks={affectedTasks} note={note} setNote={setNote} />
<Flex
{...(shouldShowRunOnLatestOption ? { alignItems: "center" } : {})}
gap={3}
justifyContent={shouldShowRunOnLatestOption ? "space-between" : "end"}
mt={3}
});
}}
>
{shouldShowRunOnLatestOption ? (
<Checkbox
checked={runOnLatestVersionForced || runOnLatestVersion}
disabled={runOnLatestVersionForced}
onCheckedChange={(event) => setRunOnLatestVersion(Boolean(event.checked))}
title={
runOnLatestVersionForced
? translate("dags:runAndTaskActions.options.runOnLatestVersionForced")
: undefined
}
>
{translate("dags:runAndTaskActions.options.runOnLatestVersion")}
</Checkbox>
) : undefined}
<Button
disabled={affectedTasks.total_entries === 0 || groupTaskIds.length === 0}
loading={isPending}
onClick={() => {
mutate({
dagId,
requestBody: {
dag_run_id: runId,
dry_run: false,
include_downstream: downstream,
include_future: future,
include_past: past,
include_upstream: upstream,
...(note === null ? {} : { note }),
only_failed: onlyFailed,
run_on_latest_version: runOnLatestVersion,
task_ids: groupTaskIds,
},
});
}}
<CgRedo /> {translate("modal.confirm")}
</Button>
{shouldShowRunOnLatestOption ? (
<Checkbox
checked={runOnLatestVersionForced || runOnLatestVersion}
disabled={runOnLatestVersionForced}
onCheckedChange={(event) => setRunOnLatestVersion(Boolean(event.checked))}
title={
runOnLatestVersionForced
? translate("dags:runAndTaskActions.options.runOnLatestVersionForced")
: undefined
}
>
<CgRedo /> {translate("modal.confirm")}
</Button>
</Flex>
</Dialog.Body>
</Dialog.Content>
</Dialog.Root>
{translate("dags:runAndTaskActions.options.runOnLatestVersion")}
</Checkbox>
) : undefined}
</>
}
lazyMount
onOpenChange={onClose}
open={open}
title={
<>
{translate("dags:runAndTaskActions.clear.title", {
type: translate("taskInstance", { count: affectedTasks.total_entries ?? 0 }),
})}
: {groupId}
</>
}
>
<Flex justifyContent="center">
<SegmentedControl
defaultValues={clearTaskInstanceDefaultOptions}
multiple
onChange={setSelectedOptions}
options={[
{
label: translate("dags:runAndTaskActions.options.past"),
value: "past",
},
{
label: translate("dags:runAndTaskActions.options.future"),
value: "future",
},
{
label: translate("dags:runAndTaskActions.options.upstream"),
value: "upstream",
},
{
label: translate("dags:runAndTaskActions.options.downstream"),
value: "downstream",
},
{
label: translate("dags:runAndTaskActions.options.onlyFailed"),
value: "onlyFailed",
},
]}
/>
</Flex>
<ActionAccordion affectedTasks={affectedTasks} note={note} setNote={setNote} />
</Modal>
);
};
Loading
Loading