Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dataset conditions to next run datasets modal #38123

Merged
merged 2 commits into from
Mar 14, 2024
Merged

Add dataset conditions to next run datasets modal #38123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c17960
Add dataset conditions to next run datasets modal
bbovenzi Mar 13, 2024
f094db3
Fix test
bbovenzi Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions airflow/www/static/js/datasetUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,18 @@

import { getMetaValue } from "./utils";

export function openDatasetModal(
dagId,
summary = "",
nextDatasets = [],
error = null
) {
export function openDatasetModal(dagId, summary, nextDatasets, error) {
const datasetEvents = nextDatasets.events || [];
const expression = nextDatasets.dataset_expression;
const datasetsUrl = getMetaValue("datasets_url");
$("#dataset_expression").empty();
$("#datasets_tbody").empty();
$("#datasets_error").hide();
$("#dag_id").text(dagId);
$("#dataset_expression").text(JSON.stringify(expression, null, 2));
$("#datasetNextRunModal").modal({});
$("#next_run_summary").text(summary);
nextDatasets.forEach((d) => {
if (summary) $("#next_run_summary").text(summary);
datasetEvents.forEach((d) => {
const row = document.createElement("tr");

const uriCell = document.createElement("td");
Expand Down Expand Up @@ -63,11 +62,12 @@ export function getDatasetTooltipInfo(dagId, run, setNextDatasets) {
nextRunUrl = nextRunUrl.replace("__DAG_ID__", dagId);
}
$.get(nextRunUrl)
.done((datasets) => {
.done((nextDatasets) => {
const datasetEvents = nextDatasets.events;
let count = 0;
let title = "<strong>Pending datasets:</strong><br>";
setNextDatasets(datasets);
datasets.forEach((d) => {
setNextDatasets(nextDatasets);
datasetEvents.forEach((d) => {
if (!d.created_at) {
if (count < 4) title += `${d.uri}<br>`;
count += 1;
Expand Down
2 changes: 2 additions & 0 deletions airflow/www/templates/airflow/dataset_next_run_modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ <h4 class="modal-title" id="datasetNextRunModalLabel">
</h4>
</div>
<div class="modal-body">
<strong>Conditions</strong>
<p><pre id="dataset_expression"></pre></p>
<p id="next_run_summary"></p>
{{ loading_dots(id='datasets-loading-dots', classes='refresh-loading') }}
<div id="datasets_error" style="display: none; margin-top: 10px;" class="alert alert-danger" role="alert">
Expand Down
5 changes: 4 additions & 1 deletion airflow/www/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3693,7 +3693,9 @@ def next_run_datasets(self, dag_id):
return {"error": f"can't find dag {dag_id}"}, 404

with create_session() as session:
data = [
dag_model = DagModel.get_dagmodel(dag_id, session=session)

events = [
dict(info)
for info in session.execute(
select(
Expand Down Expand Up @@ -3722,6 +3724,7 @@ def next_run_datasets(self, dag_id):
.order_by(DatasetModel.uri)
)
]
data = {"dataset_expression": dag_model.dataset_expression, "events": events}
return (
htmlsafe_json_dumps(data, separators=(",", ":"), dumps=flask.json.dumps),
{"Content-Type": "application/json; charset=utf-8"},
Expand Down
11 changes: 7 additions & 4 deletions tests/www/views/test_views_grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,13 @@ def test_next_run_datasets(admin_client, dag_maker, session, app, monkeypatch):
resp = admin_client.get(f"/object/next_run_datasets/{DAG_ID}", follow_redirects=True)

assert resp.status_code == 200, resp.json
assert resp.json == [
{"id": ds1_id, "uri": "s3://bucket/key/1", "lastUpdate": "2022-08-02T02:00:00+00:00"},
{"id": ds2_id, "uri": "s3://bucket/key/2", "lastUpdate": None},
]
assert resp.json == {
"dataset_expression": {"all": ["s3://bucket/key/1", "s3://bucket/key/2"]},
"events": [
{"id": ds1_id, "uri": "s3://bucket/key/1", "lastUpdate": "2022-08-02T02:00:00+00:00"},
{"id": ds2_id, "uri": "s3://bucket/key/2", "lastUpdate": None},
],
}


def test_next_run_datasets_404(admin_client):
Expand Down