Fix run_type and state param not working due to naming and include re…

…maining filter in unit test, make tests use params and parametrize test methods
apache · Dec 21, 2024 · 69a0e73 · 69a0e73
1 parent 89771aa
commit 69a0e73
Show file tree

Hide file tree

Showing 7 changed files with 863 additions and 21 deletions.
diff --git a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
@@ -391,6 +391,14 @@ paths:
           - type: string
           - type: 'null'
           title: Root
+      - name: offset
+        in: query
+        required: false
+        schema:
+          type: integer
+          minimum: 0
+          default: 0
+          title: Offset
       - name: run_type
         in: query
         required: false
@@ -407,14 +415,6 @@ paths:
           items:
             type: string
           title: State
-      - name: offset
-        in: query
-        required: false
-        schema:
-          type: integer
-          minimum: 0
-          default: 0
-          title: Offset
       - name: limit
         in: query
         required: false

diff --git a/airflow/api_fastapi/core_api/routes/ui/grid.py b/airflow/api_fastapi/core_api/routes/ui/grid.py
@@ -60,11 +60,11 @@
 )
 def grid_data(
     dag_id: str,
-    run_types: QueryDagRunRunTypesFilter,
-    run_states: QueryDagRunStateFilter,
     session: SessionDep,
     offset: QueryOffset,
     request: Request,
+    run_type: QueryDagRunRunTypesFilter,
+    state: QueryDagRunStateFilter,
     limit: QueryLimit,
     order_by: Annotated[
         SortParam,
@@ -99,8 +99,8 @@ def grid_data(
     dag_runs_select_filter, _ = paginated_select(
         statement=base_query,
         filters=[
-            run_types,
-            run_states,
+            run_type,
+            state,
             date_filter,
         ],
         order_by=order_by

diff --git a/airflow/ui/openapi-gen/queries/prefetch.ts b/airflow/ui/openapi-gen/queries/prefetch.ts
@@ -638,9 +638,9 @@ export const prefetchUseBackfillServiceGetBackfill = (
  * @param data.logicalDateGte
  * @param data.logicalDateLte
  * @param data.root
+ * @param data.offset
  * @param data.runType
  * @param data.state
- * @param data.offset
  * @param data.limit
  * @param data.orderBy
  * @returns GridResponse Successful Response

diff --git a/airflow/ui/openapi-gen/queries/queries.ts b/airflow/ui/openapi-gen/queries/queries.ts
@@ -792,9 +792,9 @@ export const useBackfillServiceGetBackfill = <
  * @param data.logicalDateGte
  * @param data.logicalDateLte
  * @param data.root
+ * @param data.offset
  * @param data.runType
  * @param data.state
- * @param data.offset
  * @param data.limit
  * @param data.orderBy
  * @returns GridResponse Successful Response

diff --git a/airflow/ui/openapi-gen/queries/suspense.ts b/airflow/ui/openapi-gen/queries/suspense.ts
@@ -767,9 +767,9 @@ export const useBackfillServiceGetBackfillSuspense = <
  * @param data.logicalDateGte
  * @param data.logicalDateLte
  * @param data.root
+ * @param data.offset
  * @param data.runType
  * @param data.state
- * @param data.offset
  * @param data.limit
  * @param data.orderBy
  * @returns GridResponse Successful Response

diff --git a/airflow/ui/openapi-gen/requests/services.gen.ts b/airflow/ui/openapi-gen/requests/services.gen.ts
@@ -975,9 +975,9 @@ export class GridService {
    * @param data.logicalDateGte
    * @param data.logicalDateLte
    * @param data.root
+   * @param data.offset
    * @param data.runType
    * @param data.state
-   * @param data.offset
    * @param data.limit
    * @param data.orderBy
    * @returns GridResponse Successful Response
@@ -998,9 +998,9 @@ export class GridService {
         logical_date_gte: data.logicalDateGte,
         logical_date_lte: data.logicalDateLte,
         root: data.root,
+        offset: data.offset,
         run_type: data.runType,
         state: data.state,
-        offset: data.offset,
         limit: data.limit,
         order_by: data.orderBy,
       },