Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 17.7k
Add bulk TI deletion UI#51564
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Closed
Add bulk TI deletion UI #51564
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7c49615
Add bulk TI deletion UI
guan404ming d8529be
Separate translation descriptions for each action
guan404ming 8e2eff5
Handle cross dag bulk deletion
guan404ming 1898b9c
Add bulk mark as UI
guan404ming d599a72
Add incremental success msg
guan404ming 4071206
Update warning to more detailed version
guan404ming a581742
Remove unused eslint-disable
guan404ming 9c0611e
Update to use wildcard supported endpoint
guan404ming File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13 airflow-core/src/airflow/ui/public/i18n/locales/en/common.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12 airflow-core/src/airflow/ui/public/i18n/locales/zh-TW/common.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 37 additions & 35 deletions
72 airflow-core/src/airflow/ui/src/components/ActionAccordion/ActionAccordion.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106 ...low-core/src/airflow/ui/src/components/MarkAs/TaskInstances/MarkTaskInstancesAsButton.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /*! | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import { useDisclosure } from "@chakra-ui/react"; | ||
| import type { TaskInstanceResponse, TaskInstanceState } from "openapi-gen/requests/types.gen"; | ||
| import { useState } from "react"; | ||
| import { useTranslation } from "react-i18next"; | ||
| import { MdArrowDropDown } from "react-icons/md"; | ||
| import { StateBadge } from "src/components/StateBadge"; | ||
| import { Menu, Tooltip } from "src/components/ui"; | ||
| import ActionButton from "src/components/ui/ActionButton"; | ||
| import PatchTaskInstancesDialog from "./MarkTaskInstancesAsDialog"; | ||
| type Props = { | ||
| readonly clearSelections: () => void; | ||
| readonly dagId: string; | ||
| readonly dagRunId: string; | ||
| readonly patchKeys: Array<TaskInstanceResponse>; | ||
| }; | ||
| const MarkTaskInstancesAsButton = ({ clearSelections, dagId, dagRunId, patchKeys }: Props) => { | ||
| const { onClose, onOpen, open } = useDisclosure(); | ||
| const [selectedState, setSelectedState] = useState<TaskInstanceState>("success"); | ||
| const allowedStates: Array<TaskInstanceState> = ["success", "failed"]; | ||
| const { t: translate } = useTranslation(); | ||
| if (patchKeys.length === 0) { | ||
| return undefined; | ||
| } | ||
| const type = translate("common:taskInstance_other"); | ||
| const patchButtonText = translate("dags:runAndTaskActions.markAs.button", { type }); | ||
| return ( | ||
| <> | ||
| <Menu.Root positioning={{ gutter: 0, placement: "bottom" }}> | ||
| <Menu.Trigger asChild> | ||
| <ActionButton | ||
| actionName={patchButtonText} | ||
| colorPalette="blue" | ||
| flexDirection="row-reverse" | ||
| icon={<MdArrowDropDown />} | ||
| text={patchButtonText} | ||
| variant="outline" | ||
| withText | ||
| /> | ||
| </Menu.Trigger> | ||
| <Menu.Content> | ||
| {allowedStates.map((menuState) => { | ||
| const content = translate( | ||
| `dags:runAndTaskActions.markAs.buttonTooltip.${menuState === "success" ? "success" : "failed"}`, | ||
| ); | ||
| return ( | ||
| <Tooltip closeDelay={100} content={content} key={menuState} openDelay={100}> | ||
| <Menu.Item | ||
| asChild | ||
| key={menuState} | ||
| onClick={() => { | ||
| setSelectedState(menuState); | ||
| onOpen(); | ||
| }} | ||
| value={menuState} | ||
| > | ||
| <StateBadge my={1} state={menuState}> | ||
| {translate(`common:states.${menuState}`)} | ||
| </StateBadge> | ||
| </Menu.Item> | ||
| </Tooltip> | ||
| ); | ||
| })} | ||
| </Menu.Content> | ||
| </Menu.Root> | ||
| <PatchTaskInstancesDialog | ||
| clearSelections={clearSelections} | ||
| dagId={dagId} | ||
| dagRunId={dagRunId} | ||
| onClose={onClose} | ||
| open={open} | ||
| patchKeys={patchKeys} | ||
| selectedState={selectedState} | ||
| /> | ||
| </> | ||
| ); | ||
| }; | ||
| export default MarkTaskInstancesAsButton; |
109 changes: 109 additions & 0 deletions
109 ...low-core/src/airflow/ui/src/components/MarkAs/TaskInstances/MarkTaskInstancesAsDialog.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /*! | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import { Button, Flex, Heading, VStack } from "@chakra-ui/react"; | ||
| import type { | ||
| TaskInstanceCollectionResponse, | ||
| TaskInstanceResponse, | ||
| TaskInstanceState, | ||
| } from "openapi-gen/requests/types.gen"; | ||
| import { useState } from "react"; | ||
| import { useTranslation } from "react-i18next"; | ||
| import { ActionAccordion } from "src/components/ActionAccordion"; | ||
| import { StateBadge } from "src/components/StateBadge"; | ||
| import { Dialog } from "src/components/ui/Dialog"; | ||
| import { useBulkPatchTaskInstances } from "src/queries/useBulkPatchTaskInstances"; | ||
| type Props = { | ||
| readonly clearSelections: () => void; | ||
| readonly dagId: string; | ||
| readonly dagRunId: string; | ||
| readonly onClose: () => void; | ||
| readonly open: boolean; | ||
| readonly patchKeys: Array<TaskInstanceResponse>; | ||
| readonly selectedState: TaskInstanceState; | ||
| }; | ||
| const MarkTaskInstancesAsDialog = ({ | ||
| clearSelections, | ||
| dagId, | ||
| dagRunId, | ||
| onClose, | ||
| open, | ||
| patchKeys, | ||
| selectedState, | ||
| }: Props) => { | ||
| const [note, setNote] = useState<string | null>(); | ||
| const { isPending, patchTaskInstances } = useBulkPatchTaskInstances({ | ||
| dagId, | ||
| dagRunId, | ||
| onSuccessConfirm: () => { | ||
| clearSelections(); | ||
| onClose(); | ||
| }, | ||
| }); | ||
| const { t: translate } = useTranslation(); | ||
| const affectedTasks = { | ||
| task_instances: patchKeys, | ||
| total_entries: patchKeys.length, | ||
| } as TaskInstanceCollectionResponse; | ||
| const handlePatch = (state: TaskInstanceState) => { | ||
| const actionValue = state === "failed" ? "set_failed" : "set_success"; | ||
| patchTaskInstances(patchKeys, actionValue, { note }); | ||
| onClose(); | ||
| }; | ||
| return ( | ||
| <Dialog.Root lazyMount onOpenChange={onClose} open={open} size="xl"> | ||
| <Dialog.Content backdrop> | ||
| <Dialog.Header> | ||
| <VStack align="start" gap={4}> | ||
| <Heading size="xl"> | ||
| <strong> | ||
| {translate("dags:runAndTaskActions.markAs.title", { | ||
| state: selectedState, | ||
| type: translate("common:taskInstance_other"), | ||
| })} | ||
| : | ||
| </strong>{" "} | ||
| <StateBadge state={selectedState} /> | ||
| </Heading> | ||
| </VStack> | ||
| </Dialog.Header> | ||
| <Dialog.CloseTrigger /> | ||
| <Dialog.Body width="full"> | ||
| <ActionAccordion affectedTasks={affectedTasks} note={note} setNote={setNote} /> | ||
| <Flex justifyContent="end" mt={3}> | ||
| <Button colorPalette="blue" loading={isPending} onClick={() => handlePatch(selectedState)}> | ||
| {translate("modal.confirm")} | ||
| </Button> | ||
| </Flex> | ||
| </Dialog.Body> | ||
| </Dialog.Content> | ||
| </Dialog.Root> | ||
| ); | ||
| }; | ||
| export default MarkTaskInstancesAsDialog; | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are missing the selector,
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it's fine for now since we use the 'bulk' endpoint.