Skip to content

Commit 10b84fb

Browse files
pratyush369ayush3singh
authored andcommitted
make dag_run nullable in Details page
1 parent baf5fae commit 10b84fb

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed

airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class DAGRunResponse(BaseModel):
7373
run_type: DagRunType
7474
state: DagRunState
7575
triggered_by: DagRunTriggeredByType | None
76-
conf: dict
76+
conf: dict | None
7777
note: str | None
7878
dag_versions: list[DagVersionResponse]
7979
bundle_version: str | None

airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -955,8 +955,10 @@ components:
955955
- $ref: '#/components/schemas/DagRunTriggeredByType'
956956
- type: 'null'
957957
conf:
958-
additionalProperties: true
959-
type: object
958+
anyOf:
959+
- additionalProperties: true
960+
type: object
961+
- type: 'null'
960962
title: Conf
961963
note:
962964
anyOf:

airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8464,8 +8464,10 @@ components:
84648464
- $ref: '#/components/schemas/DagRunTriggeredByType'
84658465
- type: 'null'
84668466
conf:
8467-
additionalProperties: true
8468-
type: object
8467+
anyOf:
8468+
- additionalProperties: true
8469+
type: object
8470+
- type: 'null'
84698471
title: Conf
84708472
note:
84718473
anyOf:

airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2275,8 +2275,15 @@ export const $DAGRunResponse = {
22752275
],
22762276
},
22772277
conf: {
2278-
additionalProperties: true,
2279-
type: "object",
2278+
anyOf: [
2279+
{
2280+
additionalProperties: true,
2281+
type: "object",
2282+
},
2283+
{
2284+
type: "null",
2285+
},
2286+
],
22802287
title: "Conf",
22812288
},
22822289
note: {

airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ export type DAGRunResponse = {
582582
triggered_by: DagRunTriggeredByType | null;
583583
conf: {
584584
[key: string]: unknown;
585-
};
585+
} | null;
586586
note: string | null;
587587
dag_versions: Array<DagVersionResponse>;
588588
bundle_version: string | null;

airflow-core/src/airflow/ui/src/pages/Run/Details.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export const Details = () => {
151151
<Table.Row>
152152
<Table.Cell>Run Config</Table.Cell>
153153
<Table.Cell>
154-
<RenderedJsonField content={dagRun.conf} />
154+
<RenderedJsonField content={dagRun.conf ?? {}} />
155155
</Table.Cell>
156156
</Table.Row>
157157
</Table.Body>

airflow-ctl/src/airflowctl/api/datamodels/generated.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ class DAGRunResponse(BaseModel):
12451245
run_type: DagRunType
12461246
state: DagRunState
12471247
triggered_by: DagRunTriggeredByType | None = None
1248-
conf: Annotated[dict[str, Any], Field(title="Conf")]
1248+
conf: Annotated[dict[str, Any] | None, Field(title="Conf")] = None
12491249
note: Annotated[str | None, Field(title="Note")] = None
12501250
dag_versions: Annotated[list[DagVersionResponse], Field(title="Dag Versions")]
12511251
bundle_version: Annotated[str | None, Field(title="Bundle Version")] = None

0 commit comments

Comments
 (0)