This is an automated email from the ASF dual-hosted git repository.
bbovenzi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 03b04a3d54 Resolving problems with redesigned grid veiw (#31232)
03b04a3d54 is described below
commit 03b04a3d54c0c2aff9873f88de116fad49f90600
Author: Akash Sharma <[email protected]>
AuthorDate: Fri May 12 19:57:03 2023 +0530
Resolving problems with redesigned grid veiw (#31232)
* Update CONTRIBUTING.rst
* Update CONTRIBUTING.rst
* Update STATIC_CODE_CHECKS.rst
* Update STATIC_CODE_CHECKS.rst
* - resolved issue where action items went out of screen
- selected default to recursive and downstream in ClearInstance mmodal
- resetModal back to start state in clearInstance modal
---
airflow/www/static/js/dag/details/FilterTasks.tsx | 1 +
airflow/www/static/js/dag/details/dagRun/ClearRun.tsx | 1 +
airflow/www/static/js/dag/details/dagRun/MarkRunAs.tsx | 1 +
airflow/www/static/js/dag/details/index.tsx | 11 +++++++++--
.../js/dag/details/taskInstance/taskActions/ClearInstance.tsx | 7 +++----
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/airflow/www/static/js/dag/details/FilterTasks.tsx
b/airflow/www/static/js/dag/details/FilterTasks.tsx
index f21e812b3a..33d830b74d 100644
--- a/airflow/www/static/js/dag/details/FilterTasks.tsx
+++ b/airflow/www/static/js/dag/details/FilterTasks.tsx
@@ -72,6 +72,7 @@ const FilterTasks = ({ taskId }: Props) => {
transition="all 0.2s"
title={label}
aria-label={label}
+ mt={2}
>
<Flex>
{!root ? "Filter Tasks " : "Clear Task Filter "}
diff --git a/airflow/www/static/js/dag/details/dagRun/ClearRun.tsx
b/airflow/www/static/js/dag/details/dagRun/ClearRun.tsx
index dbc369799b..1fcb88a37a 100644
--- a/airflow/www/static/js/dag/details/dagRun/ClearRun.tsx
+++ b/airflow/www/static/js/dag/details/dagRun/ClearRun.tsx
@@ -68,6 +68,7 @@ const ClearRun = ({ runId, ...otherProps }: Props) => {
aria-label={clearLabel}
disabled={!canEdit || isClearLoading || isQueueLoading}
{...otherProps}
+ mt={2}
>
<Flex>
Clear
diff --git a/airflow/www/static/js/dag/details/dagRun/MarkRunAs.tsx
b/airflow/www/static/js/dag/details/dagRun/MarkRunAs.tsx
index 276e9a6f05..daafae669c 100644
--- a/airflow/www/static/js/dag/details/dagRun/MarkRunAs.tsx
+++ b/airflow/www/static/js/dag/details/dagRun/MarkRunAs.tsx
@@ -67,6 +67,7 @@ const MarkRunAs = ({ runId, state, ...otherProps }: Props) =>
{
aria-label={markLabel}
disabled={!canEdit || isMarkFailedLoading || isMarkSuccessLoading}
{...otherProps}
+ mt={2}
>
<Flex>
Mark state as...
diff --git a/airflow/www/static/js/dag/details/index.tsx
b/airflow/www/static/js/dag/details/index.tsx
index bf3dc6ccfa..0c23b424a0 100644
--- a/airflow/www/static/js/dag/details/index.tsx
+++ b/airflow/www/static/js/dag/details/index.tsx
@@ -151,9 +151,14 @@ const Details = ({ openGroupIds, onToggleGroups,
hoveredTaskState }: Props) => {
return (
<Flex flexDirection="column" pl={3} height="100%">
- <Flex alignItems="center" justifyContent="space-between" ml={6}>
+ <Flex
+ alignItems="center"
+ justifyContent="space-between"
+ flexWrap="wrap"
+ ml={6}
+ >
<Header />
- <Flex>
+ <Flex flexWrap="wrap">
{runId && !taskId && (
<>
<ClearRun runId={runId} mr={2} />
@@ -169,6 +174,7 @@ const Details = ({ openGroupIds, onToggleGroups,
hoveredTaskState }: Props) => {
isGroup={isGroup}
isMapped={isMapped}
mapIndex={mapIndex}
+ mt={2}
mr={2}
/>
<MarkInstanceAs
@@ -178,6 +184,7 @@ const Details = ({ openGroupIds, onToggleGroups,
hoveredTaskState }: Props) => {
isGroup={isGroup}
isMapped={isMapped}
mapIndex={mapIndex}
+ mt={2}
mr={2}
/>
</>
diff --git
a/airflow/www/static/js/dag/details/taskInstance/taskActions/ClearInstance.tsx
b/airflow/www/static/js/dag/details/taskInstance/taskActions/ClearInstance.tsx
index d16856255f..d2cf302081 100644
---
a/airflow/www/static/js/dag/details/taskInstance/taskActions/ClearInstance.tsx
+++
b/airflow/www/static/js/dag/details/taskInstance/taskActions/ClearInstance.tsx
@@ -68,7 +68,7 @@ const ClearInstance = ({
const [upstream, setUpstream] = useState(false);
const onToggleUpstream = () => setUpstream(!upstream);
- const [downstream, setDownstream] = useState(false);
+ const [downstream, setDownstream] = useState(true);
const onToggleDownstream = () => setDownstream(!downstream);
const [recursive, setRecursive] = useState(true);
@@ -106,11 +106,11 @@ const ClearInstance = ({
const resetModal = () => {
onClose();
- setDownstream(false);
+ setDownstream(true);
setUpstream(false);
setPast(false);
setFuture(false);
- setRecursive(false);
+ setRecursive(true);
setFailed(false);
};
@@ -135,7 +135,6 @@ const ClearInstance = ({
<Button
title={clearLabel}
aria-label={clearLabel}
- ml={2}
isDisabled={!canEdit}
colorScheme="blue"
onClick={onOpen}
