This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-8-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 5e853bae9860fcf2e5b1172b86c37123789cedf7 Author: Muhammad Luqman <[email protected]> AuthorDate: Tue Jan 23 00:19:07 2024 +0700 fix: disable dryrun autofetch (#36941) set useQuery to be enabled after action button is clicked instead of automatically closes issue #36119 (cherry picked from commit e0f8c6e0ec29a9df6a99a0beccb14874926d7383) --- airflow/www/static/js/api/useClearTaskDryRun.ts | 5 ++++- airflow/www/static/js/api/useMarkTaskDryRun.ts | 5 ++++- .../static/js/dag/details/taskInstance/taskActions/ClearInstance.tsx | 1 + .../js/dag/details/taskInstance/taskActions/MarkInstanceAs.tsx | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/airflow/www/static/js/api/useClearTaskDryRun.ts b/airflow/www/static/js/api/useClearTaskDryRun.ts index 7f068a001f..33986a9b48 100644 --- a/airflow/www/static/js/api/useClearTaskDryRun.ts +++ b/airflow/www/static/js/api/useClearTaskDryRun.ts @@ -39,6 +39,7 @@ const useClearTaskDryRun = ({ recursive, failed, mapIndexes = [], + enabled = false, }: { dagId: string; runId: string; @@ -52,6 +53,7 @@ const useClearTaskDryRun = ({ recursive: boolean; failed: boolean; mapIndexes?: number[]; + enabled?: boolean; }) => useQuery( [ @@ -101,7 +103,8 @@ const useClearTaskDryRun = ({ }, } ); - } + }, + { enabled } ); export default useClearTaskDryRun; diff --git a/airflow/www/static/js/api/useMarkTaskDryRun.ts b/airflow/www/static/js/api/useMarkTaskDryRun.ts index 4a4441819d..5147829941 100644 --- a/airflow/www/static/js/api/useMarkTaskDryRun.ts +++ b/airflow/www/static/js/api/useMarkTaskDryRun.ts @@ -36,6 +36,7 @@ const useMarkTaskDryRun = ({ upstream, downstream, mapIndexes = [], + enabled = false, }: { dagId: string; runId: string; @@ -47,6 +48,7 @@ const useMarkTaskDryRun = ({ upstream: boolean; downstream: boolean; mapIndexes?: number[]; + enabled?: boolean; }) => useQuery( [ @@ -84,7 +86,8 @@ const useMarkTaskDryRun = ({ return axios.get<AxiosResponse, MinimalTaskInstance[]>(confirmUrl, { params, }); - } + }, + { enabled } ); export default useMarkTaskDryRun; 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 d935f99e65..746ba9ca92 100644 --- a/airflow/www/static/js/dag/details/taskInstance/taskActions/ClearInstance.tsx +++ b/airflow/www/static/js/dag/details/taskInstance/taskActions/ClearInstance.tsx @@ -102,6 +102,7 @@ const ClearModal = ({ recursive, failed, mapIndexes, + enabled: isOpen, }); const { mutateAsync: clearTask, isLoading } = useClearTask({ diff --git a/airflow/www/static/js/dag/details/taskInstance/taskActions/MarkInstanceAs.tsx b/airflow/www/static/js/dag/details/taskInstance/taskActions/MarkInstanceAs.tsx index 778fb4e3e2..512b15931c 100644 --- a/airflow/www/static/js/dag/details/taskInstance/taskActions/MarkInstanceAs.tsx +++ b/airflow/www/static/js/dag/details/taskInstance/taskActions/MarkInstanceAs.tsx @@ -107,6 +107,7 @@ const MarkAsModal = ({ upstream, downstream, mapIndexes, + enabled: isOpen, } );
