diff --git a/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml b/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml index 8b3a5103e8633..e18ef75ed02db 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml +++ b/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml @@ -97,7 +97,7 @@ paths: /ui/dags/recent_dag_runs: get: tags: - - Dags + - DAG summary: Recent Dag Runs description: Get recent DAG runs. operationId: recent_dag_runs diff --git a/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dags.py b/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dags.py index da57a6fc02f11..6e2640ca18696 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dags.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dags.py @@ -54,7 +54,7 @@ ) from airflow.models import DagModel, DagRun -dags_router = AirflowRouter(prefix="/dags", tags=["Dags"]) +dags_router = AirflowRouter(prefix="/dags", tags=["DAG"]) @dags_router.get( diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts index b623f927865f3..5af1938bea09a 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts @@ -15,7 +15,6 @@ import { DagStatsService, DagVersionService, DagWarningService, - DagsService, DashboardService, DependenciesService, EventLogService, @@ -690,6 +689,60 @@ export const UseDagServiceGetDagTagsKeyFn = ( } = {}, queryKey?: Array, ) => [useDagServiceGetDagTagsKey, ...(queryKey ?? [{ limit, offset, orderBy, tagNamePattern }])]; +export type DagServiceRecentDagRunsDefaultResponse = Awaited>; +export type DagServiceRecentDagRunsQueryResult< + TData = DagServiceRecentDagRunsDefaultResponse, + TError = unknown, +> = UseQueryResult; +export const useDagServiceRecentDagRunsKey = "DagServiceRecentDagRuns"; +export const UseDagServiceRecentDagRunsKeyFn = ( + { + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }: { + dagDisplayNamePattern?: string; + dagIdPattern?: string; + dagIds?: string[]; + dagRunsLimit?: number; + excludeStale?: boolean; + lastDagRunState?: DagRunState; + limit?: number; + offset?: number; + owners?: string[]; + paused?: boolean; + tags?: string[]; + tagsMatchMode?: "any" | "all"; + } = {}, + queryKey?: Array, +) => [ + useDagServiceRecentDagRunsKey, + ...(queryKey ?? [ + { + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }, + ]), +]; export type EventLogServiceGetEventLogDefaultResponse = Awaited< ReturnType >; @@ -1623,60 +1676,6 @@ export const UseAuthLinksServiceGetAuthMenusKeyFn = (queryKey?: Array) useAuthLinksServiceGetAuthMenusKey, ...(queryKey ?? []), ]; -export type DagsServiceRecentDagRunsDefaultResponse = Awaited>; -export type DagsServiceRecentDagRunsQueryResult< - TData = DagsServiceRecentDagRunsDefaultResponse, - TError = unknown, -> = UseQueryResult; -export const useDagsServiceRecentDagRunsKey = "DagsServiceRecentDagRuns"; -export const UseDagsServiceRecentDagRunsKeyFn = ( - { - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }: { - dagDisplayNamePattern?: string; - dagIdPattern?: string; - dagIds?: string[]; - dagRunsLimit?: number; - excludeStale?: boolean; - lastDagRunState?: DagRunState; - limit?: number; - offset?: number; - owners?: string[]; - paused?: boolean; - tags?: string[]; - tagsMatchMode?: "any" | "all"; - } = {}, - queryKey?: Array, -) => [ - useDagsServiceRecentDagRunsKey, - ...(queryKey ?? [ - { - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }, - ]), -]; export type DependenciesServiceGetDependenciesDefaultResponse = Awaited< ReturnType >; diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts index fa4c7e0a31de3..1ec386a67f906 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts @@ -14,7 +14,6 @@ import { DagStatsService, DagVersionService, DagWarningService, - DagsService, DashboardService, DependenciesService, EventLogService, @@ -924,6 +923,86 @@ export const ensureUseDagServiceGetDagTagsData = ( queryKey: Common.UseDagServiceGetDagTagsKeyFn({ limit, offset, orderBy, tagNamePattern }), queryFn: () => DagService.getDagTags({ limit, offset, orderBy, tagNamePattern }), }); +/** + * Recent Dag Runs + * Get recent DAG runs. + * @param data The data for the request. + * @param data.dagRunsLimit + * @param data.limit + * @param data.offset + * @param data.tags + * @param data.tagsMatchMode + * @param data.owners + * @param data.dagIds + * @param data.dagIdPattern + * @param data.dagDisplayNamePattern + * @param data.excludeStale + * @param data.paused + * @param data.lastDagRunState + * @returns DAGWithLatestDagRunsCollectionResponse Successful Response + * @throws ApiError + */ +export const ensureUseDagServiceRecentDagRunsData = ( + queryClient: QueryClient, + { + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }: { + dagDisplayNamePattern?: string; + dagIdPattern?: string; + dagIds?: string[]; + dagRunsLimit?: number; + excludeStale?: boolean; + lastDagRunState?: DagRunState; + limit?: number; + offset?: number; + owners?: string[]; + paused?: boolean; + tags?: string[]; + tagsMatchMode?: "any" | "all"; + } = {}, +) => + queryClient.ensureQueryData({ + queryKey: Common.UseDagServiceRecentDagRunsKeyFn({ + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }), + queryFn: () => + DagService.recentDagRuns({ + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }), + }); /** * Get Event Log * @param data The data for the request. @@ -2259,86 +2338,6 @@ export const ensureUseAuthLinksServiceGetAuthMenusData = (queryClient: QueryClie queryKey: Common.UseAuthLinksServiceGetAuthMenusKeyFn(), queryFn: () => AuthLinksService.getAuthMenus(), }); -/** - * Recent Dag Runs - * Get recent DAG runs. - * @param data The data for the request. - * @param data.dagRunsLimit - * @param data.limit - * @param data.offset - * @param data.tags - * @param data.tagsMatchMode - * @param data.owners - * @param data.dagIds - * @param data.dagIdPattern - * @param data.dagDisplayNamePattern - * @param data.excludeStale - * @param data.paused - * @param data.lastDagRunState - * @returns DAGWithLatestDagRunsCollectionResponse Successful Response - * @throws ApiError - */ -export const ensureUseDagsServiceRecentDagRunsData = ( - queryClient: QueryClient, - { - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }: { - dagDisplayNamePattern?: string; - dagIdPattern?: string; - dagIds?: string[]; - dagRunsLimit?: number; - excludeStale?: boolean; - lastDagRunState?: DagRunState; - limit?: number; - offset?: number; - owners?: string[]; - paused?: boolean; - tags?: string[]; - tagsMatchMode?: "any" | "all"; - } = {}, -) => - queryClient.ensureQueryData({ - queryKey: Common.UseDagsServiceRecentDagRunsKeyFn({ - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }), - queryFn: () => - DagsService.recentDagRuns({ - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }), - }); /** * Get Dependencies * Dependencies graph. diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts index 191e76bc27441..c67b0e525cb18 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts @@ -14,7 +14,6 @@ import { DagStatsService, DagVersionService, DagWarningService, - DagsService, DashboardService, DependenciesService, EventLogService, @@ -924,6 +923,86 @@ export const prefetchUseDagServiceGetDagTags = ( queryKey: Common.UseDagServiceGetDagTagsKeyFn({ limit, offset, orderBy, tagNamePattern }), queryFn: () => DagService.getDagTags({ limit, offset, orderBy, tagNamePattern }), }); +/** + * Recent Dag Runs + * Get recent DAG runs. + * @param data The data for the request. + * @param data.dagRunsLimit + * @param data.limit + * @param data.offset + * @param data.tags + * @param data.tagsMatchMode + * @param data.owners + * @param data.dagIds + * @param data.dagIdPattern + * @param data.dagDisplayNamePattern + * @param data.excludeStale + * @param data.paused + * @param data.lastDagRunState + * @returns DAGWithLatestDagRunsCollectionResponse Successful Response + * @throws ApiError + */ +export const prefetchUseDagServiceRecentDagRuns = ( + queryClient: QueryClient, + { + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }: { + dagDisplayNamePattern?: string; + dagIdPattern?: string; + dagIds?: string[]; + dagRunsLimit?: number; + excludeStale?: boolean; + lastDagRunState?: DagRunState; + limit?: number; + offset?: number; + owners?: string[]; + paused?: boolean; + tags?: string[]; + tagsMatchMode?: "any" | "all"; + } = {}, +) => + queryClient.prefetchQuery({ + queryKey: Common.UseDagServiceRecentDagRunsKeyFn({ + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }), + queryFn: () => + DagService.recentDagRuns({ + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }), + }); /** * Get Event Log * @param data The data for the request. @@ -2259,86 +2338,6 @@ export const prefetchUseAuthLinksServiceGetAuthMenus = (queryClient: QueryClient queryKey: Common.UseAuthLinksServiceGetAuthMenusKeyFn(), queryFn: () => AuthLinksService.getAuthMenus(), }); -/** - * Recent Dag Runs - * Get recent DAG runs. - * @param data The data for the request. - * @param data.dagRunsLimit - * @param data.limit - * @param data.offset - * @param data.tags - * @param data.tagsMatchMode - * @param data.owners - * @param data.dagIds - * @param data.dagIdPattern - * @param data.dagDisplayNamePattern - * @param data.excludeStale - * @param data.paused - * @param data.lastDagRunState - * @returns DAGWithLatestDagRunsCollectionResponse Successful Response - * @throws ApiError - */ -export const prefetchUseDagsServiceRecentDagRuns = ( - queryClient: QueryClient, - { - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }: { - dagDisplayNamePattern?: string; - dagIdPattern?: string; - dagIds?: string[]; - dagRunsLimit?: number; - excludeStale?: boolean; - lastDagRunState?: DagRunState; - limit?: number; - offset?: number; - owners?: string[]; - paused?: boolean; - tags?: string[]; - tagsMatchMode?: "any" | "all"; - } = {}, -) => - queryClient.prefetchQuery({ - queryKey: Common.UseDagsServiceRecentDagRunsKeyFn({ - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }), - queryFn: () => - DagsService.recentDagRuns({ - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }), - }); /** * Get Dependencies * Dependencies graph. diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts index e1b770b8e7dac..1c532823f25fc 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts @@ -15,7 +15,6 @@ import { DagStatsService, DagVersionService, DagWarningService, - DagsService, DashboardService, DependenciesService, EventLogService, @@ -1146,6 +1145,95 @@ export const useDagServiceGetDagTags = < queryFn: () => DagService.getDagTags({ limit, offset, orderBy, tagNamePattern }) as TData, ...options, }); +/** + * Recent Dag Runs + * Get recent DAG runs. + * @param data The data for the request. + * @param data.dagRunsLimit + * @param data.limit + * @param data.offset + * @param data.tags + * @param data.tagsMatchMode + * @param data.owners + * @param data.dagIds + * @param data.dagIdPattern + * @param data.dagDisplayNamePattern + * @param data.excludeStale + * @param data.paused + * @param data.lastDagRunState + * @returns DAGWithLatestDagRunsCollectionResponse Successful Response + * @throws ApiError + */ +export const useDagServiceRecentDagRuns = < + TData = Common.DagServiceRecentDagRunsDefaultResponse, + TError = unknown, + TQueryKey extends Array = unknown[], +>( + { + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }: { + dagDisplayNamePattern?: string; + dagIdPattern?: string; + dagIds?: string[]; + dagRunsLimit?: number; + excludeStale?: boolean; + lastDagRunState?: DagRunState; + limit?: number; + offset?: number; + owners?: string[]; + paused?: boolean; + tags?: string[]; + tagsMatchMode?: "any" | "all"; + } = {}, + queryKey?: TQueryKey, + options?: Omit, "queryKey" | "queryFn">, +) => + useQuery({ + queryKey: Common.UseDagServiceRecentDagRunsKeyFn( + { + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }, + queryKey, + ), + queryFn: () => + DagService.recentDagRuns({ + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }) as TData, + ...options, + }); /** * Get Event Log * @param data The data for the request. @@ -2710,95 +2798,6 @@ export const useAuthLinksServiceGetAuthMenus = < queryFn: () => AuthLinksService.getAuthMenus() as TData, ...options, }); -/** - * Recent Dag Runs - * Get recent DAG runs. - * @param data The data for the request. - * @param data.dagRunsLimit - * @param data.limit - * @param data.offset - * @param data.tags - * @param data.tagsMatchMode - * @param data.owners - * @param data.dagIds - * @param data.dagIdPattern - * @param data.dagDisplayNamePattern - * @param data.excludeStale - * @param data.paused - * @param data.lastDagRunState - * @returns DAGWithLatestDagRunsCollectionResponse Successful Response - * @throws ApiError - */ -export const useDagsServiceRecentDagRuns = < - TData = Common.DagsServiceRecentDagRunsDefaultResponse, - TError = unknown, - TQueryKey extends Array = unknown[], ->( - { - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }: { - dagDisplayNamePattern?: string; - dagIdPattern?: string; - dagIds?: string[]; - dagRunsLimit?: number; - excludeStale?: boolean; - lastDagRunState?: DagRunState; - limit?: number; - offset?: number; - owners?: string[]; - paused?: boolean; - tags?: string[]; - tagsMatchMode?: "any" | "all"; - } = {}, - queryKey?: TQueryKey, - options?: Omit, "queryKey" | "queryFn">, -) => - useQuery({ - queryKey: Common.UseDagsServiceRecentDagRunsKeyFn( - { - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }, - queryKey, - ), - queryFn: () => - DagsService.recentDagRuns({ - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }) as TData, - ...options, - }); /** * Get Dependencies * Dependencies graph. diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts index 405a2093211b9..767004d466379 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts @@ -14,7 +14,6 @@ import { DagStatsService, DagVersionService, DagWarningService, - DagsService, DashboardService, DependenciesService, EventLogService, @@ -1123,6 +1122,95 @@ export const useDagServiceGetDagTagsSuspense = < queryFn: () => DagService.getDagTags({ limit, offset, orderBy, tagNamePattern }) as TData, ...options, }); +/** + * Recent Dag Runs + * Get recent DAG runs. + * @param data The data for the request. + * @param data.dagRunsLimit + * @param data.limit + * @param data.offset + * @param data.tags + * @param data.tagsMatchMode + * @param data.owners + * @param data.dagIds + * @param data.dagIdPattern + * @param data.dagDisplayNamePattern + * @param data.excludeStale + * @param data.paused + * @param data.lastDagRunState + * @returns DAGWithLatestDagRunsCollectionResponse Successful Response + * @throws ApiError + */ +export const useDagServiceRecentDagRunsSuspense = < + TData = Common.DagServiceRecentDagRunsDefaultResponse, + TError = unknown, + TQueryKey extends Array = unknown[], +>( + { + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }: { + dagDisplayNamePattern?: string; + dagIdPattern?: string; + dagIds?: string[]; + dagRunsLimit?: number; + excludeStale?: boolean; + lastDagRunState?: DagRunState; + limit?: number; + offset?: number; + owners?: string[]; + paused?: boolean; + tags?: string[]; + tagsMatchMode?: "any" | "all"; + } = {}, + queryKey?: TQueryKey, + options?: Omit, "queryKey" | "queryFn">, +) => + useSuspenseQuery({ + queryKey: Common.UseDagServiceRecentDagRunsKeyFn( + { + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }, + queryKey, + ), + queryFn: () => + DagService.recentDagRuns({ + dagDisplayNamePattern, + dagIdPattern, + dagIds, + dagRunsLimit, + excludeStale, + lastDagRunState, + limit, + offset, + owners, + paused, + tags, + tagsMatchMode, + }) as TData, + ...options, + }); /** * Get Event Log * @param data The data for the request. @@ -2687,95 +2775,6 @@ export const useAuthLinksServiceGetAuthMenusSuspense = < queryFn: () => AuthLinksService.getAuthMenus() as TData, ...options, }); -/** - * Recent Dag Runs - * Get recent DAG runs. - * @param data The data for the request. - * @param data.dagRunsLimit - * @param data.limit - * @param data.offset - * @param data.tags - * @param data.tagsMatchMode - * @param data.owners - * @param data.dagIds - * @param data.dagIdPattern - * @param data.dagDisplayNamePattern - * @param data.excludeStale - * @param data.paused - * @param data.lastDagRunState - * @returns DAGWithLatestDagRunsCollectionResponse Successful Response - * @throws ApiError - */ -export const useDagsServiceRecentDagRunsSuspense = < - TData = Common.DagsServiceRecentDagRunsDefaultResponse, - TError = unknown, - TQueryKey extends Array = unknown[], ->( - { - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }: { - dagDisplayNamePattern?: string; - dagIdPattern?: string; - dagIds?: string[]; - dagRunsLimit?: number; - excludeStale?: boolean; - lastDagRunState?: DagRunState; - limit?: number; - offset?: number; - owners?: string[]; - paused?: boolean; - tags?: string[]; - tagsMatchMode?: "any" | "all"; - } = {}, - queryKey?: TQueryKey, - options?: Omit, "queryKey" | "queryFn">, -) => - useSuspenseQuery({ - queryKey: Common.UseDagsServiceRecentDagRunsKeyFn( - { - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }, - queryKey, - ), - queryFn: () => - DagsService.recentDagRuns({ - dagDisplayNamePattern, - dagIdPattern, - dagIds, - dagRunsLimit, - excludeStale, - lastDagRunState, - limit, - offset, - owners, - paused, - tags, - tagsMatchMode, - }) as TData, - ...options, - }); /** * Get Dependencies * Dependencies graph. diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts b/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts index 711c91093d8c0..1c5847ae8d05b 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts @@ -106,6 +106,8 @@ import type { GetDagDetailsResponse, GetDagTagsData, GetDagTagsResponse, + RecentDagRunsData, + RecentDagRunsResponse, GetEventLogData, GetEventLogResponse, GetEventLogsData, @@ -205,8 +207,6 @@ import type { LogoutData, LogoutResponse, GetAuthMenusResponse, - RecentDagRunsData, - RecentDagRunsResponse, GetDependenciesData, GetDependenciesResponse, HistoricalMetricsData, @@ -1737,6 +1737,49 @@ export class DagService { }, }); } + + /** + * Recent Dag Runs + * Get recent DAG runs. + * @param data The data for the request. + * @param data.dagRunsLimit + * @param data.limit + * @param data.offset + * @param data.tags + * @param data.tagsMatchMode + * @param data.owners + * @param data.dagIds + * @param data.dagIdPattern + * @param data.dagDisplayNamePattern + * @param data.excludeStale + * @param data.paused + * @param data.lastDagRunState + * @returns DAGWithLatestDagRunsCollectionResponse Successful Response + * @throws ApiError + */ + public static recentDagRuns(data: RecentDagRunsData = {}): CancelablePromise { + return __request(OpenAPI, { + method: "GET", + url: "/ui/dags/recent_dag_runs", + query: { + dag_runs_limit: data.dagRunsLimit, + limit: data.limit, + offset: data.offset, + tags: data.tags, + tags_match_mode: data.tagsMatchMode, + owners: data.owners, + dag_ids: data.dagIds, + dag_id_pattern: data.dagIdPattern, + dag_display_name_pattern: data.dagDisplayNamePattern, + exclude_stale: data.excludeStale, + paused: data.paused, + last_dag_run_state: data.lastDagRunState, + }, + errors: { + 422: "Validation Error", + }, + }); + } } export class EventLogService { @@ -3407,51 +3450,6 @@ export class AuthLinksService { } } -export class DagsService { - /** - * Recent Dag Runs - * Get recent DAG runs. - * @param data The data for the request. - * @param data.dagRunsLimit - * @param data.limit - * @param data.offset - * @param data.tags - * @param data.tagsMatchMode - * @param data.owners - * @param data.dagIds - * @param data.dagIdPattern - * @param data.dagDisplayNamePattern - * @param data.excludeStale - * @param data.paused - * @param data.lastDagRunState - * @returns DAGWithLatestDagRunsCollectionResponse Successful Response - * @throws ApiError - */ - public static recentDagRuns(data: RecentDagRunsData = {}): CancelablePromise { - return __request(OpenAPI, { - method: "GET", - url: "/ui/dags/recent_dag_runs", - query: { - dag_runs_limit: data.dagRunsLimit, - limit: data.limit, - offset: data.offset, - tags: data.tags, - tags_match_mode: data.tagsMatchMode, - owners: data.owners, - dag_ids: data.dagIds, - dag_id_pattern: data.dagIdPattern, - dag_display_name_pattern: data.dagDisplayNamePattern, - exclude_stale: data.excludeStale, - paused: data.paused, - last_dag_run_state: data.lastDagRunState, - }, - errors: { - 422: "Validation Error", - }, - }); - } -} - export class DependenciesService { /** * Get Dependencies diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts b/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts index caca462b5831b..9e28ab66aac20 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts @@ -2146,6 +2146,23 @@ export type GetDagTagsData = { export type GetDagTagsResponse = DAGTagCollectionResponse; +export type RecentDagRunsData = { + dagDisplayNamePattern?: string | null; + dagIdPattern?: string | null; + dagIds?: Array | null; + dagRunsLimit?: number; + excludeStale?: boolean; + lastDagRunState?: DagRunState | null; + limit?: number; + offset?: number; + owners?: Array; + paused?: boolean | null; + tags?: Array; + tagsMatchMode?: "any" | "all" | null; +}; + +export type RecentDagRunsResponse = DAGWithLatestDagRunsCollectionResponse; + export type GetEventLogData = { eventLogId: number; }; @@ -2609,23 +2626,6 @@ export type LogoutResponse = unknown; export type GetAuthMenusResponse = MenuItemCollectionResponse; -export type RecentDagRunsData = { - dagDisplayNamePattern?: string | null; - dagIdPattern?: string | null; - dagIds?: Array | null; - dagRunsLimit?: number; - excludeStale?: boolean; - lastDagRunState?: DagRunState | null; - limit?: number; - offset?: number; - owners?: Array; - paused?: boolean | null; - tags?: Array; - tagsMatchMode?: "any" | "all" | null; -}; - -export type RecentDagRunsResponse = DAGWithLatestDagRunsCollectionResponse; - export type GetDependenciesData = { nodeId?: string | null; }; @@ -4083,6 +4083,21 @@ export type $OpenApiTs = { }; }; }; + "/ui/dags/recent_dag_runs": { + get: { + req: RecentDagRunsData; + res: { + /** + * Successful Response + */ + 200: DAGWithLatestDagRunsCollectionResponse; + /** + * Validation Error + */ + 422: HTTPValidationError; + }; + }; + }; "/api/v2/eventLogs/{event_log_id}": { get: { req: GetEventLogData; @@ -5401,21 +5416,6 @@ export type $OpenApiTs = { }; }; }; - "/ui/dags/recent_dag_runs": { - get: { - req: RecentDagRunsData; - res: { - /** - * Successful Response - */ - 200: DAGWithLatestDagRunsCollectionResponse; - /** - * Validation Error - */ - 422: HTTPValidationError; - }; - }; - }; "/ui/dependencies": { get: { req: GetDependenciesData; diff --git a/airflow-core/src/airflow/ui/src/pages/Asset/CreateAssetEventModal.tsx b/airflow-core/src/airflow/ui/src/pages/Asset/CreateAssetEventModal.tsx index 71e6f542e462f..c4f485a13d018 100644 --- a/airflow-core/src/airflow/ui/src/pages/Asset/CreateAssetEventModal.tsx +++ b/airflow-core/src/airflow/ui/src/pages/Asset/CreateAssetEventModal.tsx @@ -27,7 +27,7 @@ import { useAssetServiceMaterializeAsset, UseDagRunServiceGetDagRunsKeyFn, useDagServiceGetDagDetails, - useDagsServiceRecentDagRunsKey, + useDagServiceRecentDagRunsKey, useDependenciesServiceGetDependencies, UseGridServiceGridDataKeyFn, UseTaskInstanceServiceGetTaskInstancesKeyFn, @@ -100,7 +100,7 @@ export const CreateAssetEventModal = ({ asset, onClose, open }: Props) => { queryKeys = [ ...queryKeys, - [useDagsServiceRecentDagRunsKey], + [useDagServiceRecentDagRunsKey], UseDagRunServiceGetDagRunsKeyFn({ dagId }, [{ dagId }]), UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId: "~" }, [{ dagId, dagRunId: "~" }]), UseGridServiceGridDataKeyFn({ dagId }, [{ dagId }]), diff --git a/airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx b/airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx index 9d8e3ed403bdb..d68a1fa27fff9 100644 --- a/airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx +++ b/airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx @@ -24,7 +24,7 @@ import { MdDetails, MdOutlineEventNote } from "react-icons/md"; import { RiArrowGoBackFill } from "react-icons/ri"; import { useParams } from "react-router-dom"; -import { useDagServiceGetDagDetails, useDagsServiceRecentDagRuns } from "openapi/queries"; +import { useDagServiceGetDagDetails, useDagServiceRecentDagRuns } from "openapi/queries"; import type { DAGWithLatestDagRunsResponse } from "openapi/requests/types.gen"; import { TaskIcon } from "src/assets/TaskIcon"; import { DetailsLayout } from "src/layouts/Details/DetailsLayout"; @@ -62,7 +62,7 @@ export const Dag = () => { data: runsData, error: runsError, isLoading: isLoadingRuns, - } = useDagsServiceRecentDagRuns({ dagIds: [dagId], dagRunsLimit: 1 }, undefined, { + } = useDagServiceRecentDagRuns({ dagIds: [dagId], dagRunsLimit: 1 }, undefined, { enabled: Boolean(dagId), refetchInterval: (query) => { setHasPendingRuns( diff --git a/airflow-core/src/airflow/ui/src/queries/useDags.tsx b/airflow-core/src/airflow/ui/src/queries/useDags.tsx index 608ccedd5b84d..ce01bdb789ad8 100644 --- a/airflow-core/src/airflow/ui/src/queries/useDags.tsx +++ b/airflow-core/src/airflow/ui/src/queries/useDags.tsx @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { useDagServiceGetDags, useDagsServiceRecentDagRuns } from "openapi/queries"; +import { useDagServiceGetDags, useDagServiceRecentDagRuns } from "openapi/queries"; import type { DagRunState, DAGWithLatestDagRunsResponse } from "openapi/requests/types.gen"; import { isStatePending, useAutoRefresh } from "src/utils"; @@ -49,7 +49,7 @@ export const useDags = ( error: runsError, isFetching: isRunsFetching, isLoading: isRunsLoading, - } = useDagsServiceRecentDagRuns( + } = useDagServiceRecentDagRuns( { ...runsParams, dagRunsLimit, diff --git a/airflow-core/src/airflow/ui/src/queries/useRefreshOnNewDagRuns.ts b/airflow-core/src/airflow/ui/src/queries/useRefreshOnNewDagRuns.ts index 4c792993da5b9..ec7736824c1e4 100644 --- a/airflow-core/src/airflow/ui/src/queries/useRefreshOnNewDagRuns.ts +++ b/airflow-core/src/airflow/ui/src/queries/useRefreshOnNewDagRuns.ts @@ -24,7 +24,7 @@ import { useDagServiceGetDagDetailsKey, UseDagRunServiceGetDagRunsKeyFn, UseDagServiceGetDagDetailsKeyFn, - useDagsServiceRecentDagRunsKey, + useDagServiceRecentDagRunsKey, UseGridServiceGridDataKeyFn, UseTaskInstanceServiceGetTaskInstancesKeyFn, } from "openapi/queries"; @@ -50,7 +50,7 @@ export const useRefreshOnNewDagRuns = (dagId: string, hasPendingRuns: boolean | previousDagRunIdRef.current = latestDagRunId; const queryKeys = [ - [useDagsServiceRecentDagRunsKey], + [useDagServiceRecentDagRunsKey], [useDagServiceGetDagDetailsKey], UseDagServiceGetDagDetailsKeyFn({ dagId }, [{ dagId }]), UseDagRunServiceGetDagRunsKeyFn({ dagId }, [{ dagId }]), diff --git a/airflow-core/src/airflow/ui/src/queries/useTogglePause.ts b/airflow-core/src/airflow/ui/src/queries/useTogglePause.ts index c4e378e7932bc..eb4d751c5222c 100644 --- a/airflow-core/src/airflow/ui/src/queries/useTogglePause.ts +++ b/airflow-core/src/airflow/ui/src/queries/useTogglePause.ts @@ -24,7 +24,7 @@ import { UseDagServiceGetDagKeyFn, useDagServiceGetDagsKey, useDagServicePatchDag, - useDagsServiceRecentDagRunsKey, + useDagServiceRecentDagRunsKey, UseTaskInstanceServiceGetTaskInstancesKeyFn, } from "openapi/queries"; @@ -34,7 +34,7 @@ export const useTogglePause = ({ dagId }: { dagId: string }) => { const onSuccess = async () => { const queryKeys = [ [useDagServiceGetDagsKey], - [useDagsServiceRecentDagRunsKey], + [useDagServiceRecentDagRunsKey], UseDagServiceGetDagKeyFn({ dagId }, [{ dagId }]), UseDagServiceGetDagDetailsKeyFn({ dagId }, [{ dagId }]), UseDagRunServiceGetDagRunsKeyFn({ dagId }, [{ dagId }]), diff --git a/airflow-core/src/airflow/ui/src/queries/useTrigger.ts b/airflow-core/src/airflow/ui/src/queries/useTrigger.ts index a9aaf9f099d62..cce546e0ad320 100644 --- a/airflow-core/src/airflow/ui/src/queries/useTrigger.ts +++ b/airflow-core/src/airflow/ui/src/queries/useTrigger.ts @@ -23,7 +23,7 @@ import { UseDagRunServiceGetDagRunsKeyFn, useDagRunServiceTriggerDagRun, useDagServiceGetDagsKey, - useDagsServiceRecentDagRunsKey, + useDagServiceRecentDagRunsKey, UseGridServiceGridDataKeyFn, UseTaskInstanceServiceGetTaskInstancesKeyFn, } from "openapi/queries"; @@ -37,7 +37,7 @@ export const useTrigger = ({ dagId, onSuccessConfirm }: { dagId: string; onSucce const onSuccess = async () => { const queryKeys = [ [useDagServiceGetDagsKey], - [useDagsServiceRecentDagRunsKey], + [useDagServiceRecentDagRunsKey], UseDagRunServiceGetDagRunsKeyFn({ dagId }, [{ dagId }]), UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId: "~" }, [{ dagId, dagRunId: "~" }]), UseGridServiceGridDataKeyFn({ dagId }, [{ dagId }]),