This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 270aa1138b Enhance User Experience by Opening external UI Links in new
Tab on browser. (#40635)
270aa1138b is described below
commit 270aa1138bbd263a912c15bf1e451f4731f34af8
Author: VICIWUOHA <[email protected]>
AuthorDate: Tue Jul 9 16:37:43 2024 +0100
Enhance User Experience by Opening external UI Links in new Tab on browser.
(#40635)
---
airflow/www/templates/airflow/providers.html | 2 +-
airflow/www/templates/appbuilder/navbar_menu.html | 14 +++++++++++++-
airflow/www/views.py | 4 ++--
chart/values.yaml | 3 ++-
tests/www/views/test_views.py | 17 +++++++++++------
5 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/airflow/www/templates/airflow/providers.html
b/airflow/www/templates/airflow/providers.html
index a1fcb30ba7..30af832559 100644
--- a/airflow/www/templates/airflow/providers.html
+++ b/airflow/www/templates/airflow/providers.html
@@ -40,7 +40,7 @@ under the License.
{% for provider in providers %}
<tr>
- <td><a href="{{ provider['documentation_url'] }}">{{
provider["package_name"] }}</a></td>
+ <td><a href="{{ provider['documentation_url'] }}" target="_blank"
rel="noopener noreferrer">{{ provider["package_name"] }}</a></td>
<td>{{ provider["version"] }}</td>
<td>{{ provider["description"]}}</td>
</tr>
diff --git a/airflow/www/templates/appbuilder/navbar_menu.html
b/airflow/www/templates/appbuilder/navbar_menu.html
index d7abc8472f..db2de352d3 100644
--- a/airflow/www/templates/appbuilder/navbar_menu.html
+++ b/airflow/www/templates/appbuilder/navbar_menu.html
@@ -17,8 +17,20 @@
under the License.
#}
+{% set external_menu_url_prefixes = [
+ 'https://github.com',
+ 'https://airflow.apache.org',
+ 'http://apache-airflow-docs.s3-website.eu-central-1.amazonaws.com']
+%}
+
{% macro menu_item(item) %}
- <a href="{{item.get_url()}}">{{_(item.label)}}</a>
+ {% set url = item.get_url() %}
+ {% set prefix = "/".join(url.split("/")[:3]) %}
+ {% if prefix in external_menu_url_prefixes %}
+ <a href="{{ url }}" target="_blank" rel="noopener noreferrer">{{
item.label }}</a>
+ {% else %}
+ <a href="{{ url }}">{{ item.label }}</a>
+ {% endif %}
{% endmacro %}
{% for item1 in auth_manager.filter_permitted_menu_items(menu.get_list()) %}
diff --git a/airflow/www/views.py b/airflow/www/views.py
index c0fb881c85..7ffd5ec17c 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -4514,13 +4514,13 @@ class ProviderView(AirflowBaseView):
text = match_obj.group(1)
url = match_obj.group(2)
- # parsing the url to check if ita a valid url
+ # parsing the url to check if it's a valid url
parsed_url = urlparse(url)
if not (parsed_url.scheme == "http" or parsed_url.scheme ==
"https"):
# returning the original raw text
return escape(match_obj.group(0))
- return Markup(f'<a href="{url}">{text}</a>')
+ return Markup(f'<a href="{url}" target="_blank" rel="noopener
noreferrer">{text}</a>')
cd = escape(description)
cd = re2.sub(r"`(.*)[\s+]+<(.*)>`__", _build_link, cd)
diff --git a/chart/values.yaml b/chart/values.yaml
index ed4aabb090..5fdfc63a9a 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -245,7 +245,8 @@ airflowLocalSettings: |-
UIAlert(
'Usage of a dynamic webserver secret key detected. We recommend a static
webserver secret key instead.'
' See the <a href='
-
'"https://airflow.apache.org/docs/helm-chart/stable/production-guide.html#webserver-secret-key";>'
+
'"https://airflow.apache.org/docs/helm-chart/stable/production-guide.html#webserver-secret-key";
'
+ 'target="_blank" rel="noopener noreferrer">'
'Helm Chart Production Guide</a> for more details.',
category="warning",
roles=["Admin"],
diff --git a/tests/www/views/test_views.py b/tests/www/views/test_views.py
index 4c8ccdc0a8..5cf425e99f 100644
--- a/tests/www/views/test_views.py
+++ b/tests/www/views/test_views.py
@@ -137,7 +137,9 @@ def
test_should_list_providers_on_page_with_details(admin_client):
resp = admin_client.get("/provider")
beam_href = '<a
href="https://airflow.apache.org/docs/apache-airflow-providers-apache-beam/'
beam_text = "apache-airflow-providers-apache-beam</a>"
- beam_description = '<a href="https://beam.apache.org/";>Apache Beam</a>'
+ beam_description = (
+ '<a href="https://beam.apache.org/"; target="_blank" rel="noopener
noreferrer">Apache Beam</a>'
+ )
check_content_in_response(beam_href, resp)
check_content_in_response(beam_text, resp)
check_content_in_response(beam_description, resp)
@@ -147,20 +149,23 @@ def
test_should_list_providers_on_page_with_details(admin_client):
@pytest.mark.parametrize(
"provider_description, expected",
[
- ("`Airbyte <https://airbyte.com/>`__", Markup('<a
href="https://airbyte.com/";>Airbyte</a>')),
+ (
+ "`Airbyte <https://airbyte.com/>`__",
+ Markup('<a href="https://airbyte.com/"; target="_blank"
rel="noopener noreferrer">Airbyte</a>'),
+ ),
(
"Amazon integration (including `Amazon Web Services (AWS)
<https://aws.amazon.com/>`__).",
Markup(
- 'Amazon integration (including <a
href="https://aws.amazon.com/";>Amazon Web Services ('
- "AWS)</a>)."
+ 'Amazon integration (including <a
href="https://aws.amazon.com/"; '
+ 'target="_blank" rel="noopener noreferrer">Amazon Web Services
(AWS)</a>).'
),
),
(
"`Java Database Connectivity (JDBC)
<https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc";
"/>`__",
Markup(
- '<a
href="https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/";>Java '
- "Database Connectivity (JDBC)</a>"
+ '<a
href="https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/"; '
+ 'target="_blank" rel="noopener noreferrer">Java Database
Connectivity (JDBC)</a>'
),
),
(
