Skip to content

Enable clicking on DAG owner in autocomplete dropdown #23804

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

Merged
ashb merged 2 commits into from
May 24, 2022
Merged

Enable clicking on DAG owner in autocomplete dropdown #23804

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
452df69
Fix selecting typeahead results containg owners
norm May 19, 2022
f7b28b8
Update airflow/www/static/js/dags.js
norm May 24, 2022
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
11 changes: 7 additions & 4 deletions airflow/www/static/js/dags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,13 @@ $('.typeahead').typeahead({
},
autoSelect: false,
afterSelect(value) {
const dagId = value.trim();
if (dagId) {
const query = new URLSearchParams(window.location.search);
window.location = `${gridUrl.replace('__DAG_ID__', dagId)}?${query}`;
const query = new URLSearchParams(window.location.search);
query.set('search', value.name);
if (value.type === 'owner') {
window.location = `${DAGS_INDEX}?${query}`;
}
if (value.type === 'dag') {
window.location = `${gridUrl.replace('__DAG_ID__', value.name)}?${query}`;
}
},
});
Expand Down
21 changes: 14 additions & 7 deletions airflow/www/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5127,12 +5127,18 @@ def autocomplete(self, session=None):
return wwwutils.json_response([])

# Provide suggestions of dag_ids and owners
dag_ids_query = session.query(DagModel.dag_id.label('item')).filter(
~DagModel.is_subdag, DagModel.is_active, DagModel.dag_id.ilike('%' + query + '%')
)
dag_ids_query = session.query(
sqla.literal('dag').label('type'),
DagModel.dag_id.label('name'),
).filter(~DagModel.is_subdag, DagModel.is_active, DagModel.dag_id.ilike('%' + query + '%'))

owners_query = session.query(func.distinct(DagModel.owners).label('item')).filter(
~DagModel.is_subdag, DagModel.is_active, DagModel.owners.ilike('%' + query + '%')
owners_query = (
session.query(
sqla.literal('owner').label('type'),
DagModel.owners.label('name'),
)
.distinct()
.filter(~DagModel.is_subdag, DagModel.is_active, DagModel.owners.ilike('%' + query + '%'))
)

# Hide DAGs if not showing status: "all"
Expand All @@ -5149,8 +5155,9 @@ def autocomplete(self, session=None):
dag_ids_query = dag_ids_query.filter(DagModel.dag_id.in_(filter_dag_ids))
owners_query = owners_query.filter(DagModel.dag_id.in_(filter_dag_ids))

payload = [row[0] for row in dag_ids_query.union(owners_query).limit(10).all()]

payload = [
row._asdict() for row in dag_ids_query.union(owners_query).order_by('name').limit(10).all()
]
return wwwutils.json_response(payload)


Expand Down
10 changes: 7 additions & 3 deletions tests/www/views/test_views_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,15 @@ def test_index_failure(dag_test_client):

def test_dag_autocomplete_success(client_all_dags):
resp = client_all_dags.get(
'dagmodel/autocomplete?query=example_bash',
'dagmodel/autocomplete?query=flow',
follow_redirects=False,
)
check_content_in_response('example_bash_operator', resp)
check_content_not_in_response('example_subdag_operator', resp)
assert resp.json == [
{'name': 'airflow', 'type': 'owner'},
{'name': 'test_mapped_taskflow', 'type': 'dag'},
{'name': 'tutorial_taskflow_api_etl', 'type': 'dag'},
{'name': 'tutorial_taskflow_api_etl_virtualenv', 'type': 'dag'},
]


@pytest.mark.parametrize(
Expand Down