FAB login. Fix asset URLs and missing alert (apache#47586)

vincbeck · nailo2c · commit 99f74a867a2f · 2025-04-04T14:54:23.000-07:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -592,7 +592,6 @@ repos:
           ^airflow/models/baseoperator.py$|
           ^airflow/operators/__init__.py$|
           ^providers/common/sql/tests/provider_tests/common/sql/operators/test_sql_execute.py$|
-          ^providers/fab/src/airflow/providers/fab/www/static/css/bootstrap-theme.css$|
           ^providers/amazon/src/airflow/providers/amazon/aws/hooks/emr.py$|
           ^providers/amazon/src/airflow/providers/amazon/aws/operators/emr.py$|
           ^providers/apache/cassandra/src/airflow/providers/apache/cassandra/hooks/cassandra.py$|
@@ -603,14 +602,14 @@ repos:
           ^providers/apache/spark/src/airflow/providers/apache/spark/operators/|
           ^providers/exasol/src/airflow/providers/exasol/hooks/exasol.py$|
           ^providers/fab/src/airflow/providers/fab/auth_manager/security_manager/|
-          ^providers/fab/src/airflow/providers/fab/www/static/css/bootstrap-theme.css$|
+          ^providers/fab/src/airflow/providers/fab/www/static/|
+          ^providers/fab/src/airflow/providers/fab/www/templates/|
           ^providers/google/src/airflow/providers/google/cloud/hooks/bigquery.py$|
           ^providers/google/src/airflow/providers/google/cloud/operators/cloud_build.py$|
           ^providers/google/src/airflow/providers/google/cloud/operators/dataproc.py$|
           ^providers/google/src/airflow/providers/google/cloud/operators/mlengine.py$|
           ^providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/cosmos.py$|
           ^providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/hooks/winrm.py$|
-          ^airflow/www/fab_security/manager.py$|
           ^docs/.*commits.rst$|
           ^docs/apache-airflow-providers-apache-cassandra/connections/cassandra.rst$|
           ^providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/operators/winrm.py$|
diff --git a/providers/fab/src/airflow/providers/fab/www/package.json b/providers/fab/src/airflow/providers/fab/www/package.json
@@ -46,7 +46,7 @@
     "babel-jest": "^27.3.1",
     "babel-loader": "^9.1.0",
     "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^12.0.2",
+    "copy-webpack-plugin": "^6.0.3",
     "css-loader": "5.2.7",
     "css-minimizer-webpack-plugin": "^4.0.0",
     "eslint": "^8.6.0",
@@ -74,5 +74,8 @@
   "dependencies": {
     "jquery-ui": "^1.14.1",
     "moment-timezone": "^0.5.43"
+  },
+  "resolutions": {
+    "moment-timezone": ">=0.5.35"
   }
 }
diff --git a/providers/fab/src/airflow/providers/fab/www/static/css/flash.css b/providers/fab/src/airflow/providers/fab/www/static/css/flash.css
@@ -0,0 +1,57 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.panel-heading #alerts-accordion-toggle::after {
+  float: right;
+  color: grey;
+}
+
+.panel-heading #alerts-accordion-toggle.collapsed::after {
+  float: right;
+  color: grey;
+}
+
+#errorHeading {
+  background-color: #d6d8d9; /* same color as Bootstrap's Dark Alert */
+}
+
+.dag-import-error {
+  position: relative;
+  white-space: pre;
+  height: 14px;
+  line-height: 14px; /* show only one line of 14px text */
+  overflow: hidden;
+  cursor: pointer;
+}
+
+.expanded-error {
+  height: 100%;
+}
+
+.dag-import-error::after {
+  float: right;
+  color: #e43921;
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+
+.expanded-error .toggle-direction {
+  transform: rotate(180deg);
+}
diff --git a/providers/fab/src/airflow/providers/fab/www/static/dist/flash.137b30cff85b5588e661.css b/providers/fab/src/airflow/providers/fab/www/static/dist/flash.137b30cff85b5588e661.css
@@ -0,0 +1,18 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */.panel-heading #alerts-accordion-toggle.collapsed:after,.panel-heading #alerts-accordion-toggle:after{color:grey;float:right}#errorHeading{background-color:#d6d8d9}.dag-import-error{cursor:pointer;height:14px;line-height:14px;overflow:hidden;position:relative;white-space:pre}.expanded-error{height:100%}.dag-import-error:after{color:#e43921;float:right;position:absolute;right:0;top:0}.expanded-error .toggle-direction{transform:rotate(180deg)}
diff --git a/providers/fab/src/airflow/providers/fab/www/static/dist/flash.137b30cff85b5588e661.js b/providers/fab/src/airflow/providers/fab/www/static/dist/flash.137b30cff85b5588e661.js
diff --git a/providers/fab/src/airflow/providers/fab/www/static/dist/jquery-ui.min.css b/providers/fab/src/airflow/providers/fab/www/static/dist/jquery-ui.min.css
diff --git a/providers/fab/src/airflow/providers/fab/www/static/dist/jquery-ui.min.js b/providers/fab/src/airflow/providers/fab/www/static/dist/jquery-ui.min.js
diff --git a/providers/fab/src/airflow/providers/fab/www/static/dist/jquery-ui.min.js.LICENSE.txt b/providers/fab/src/airflow/providers/fab/www/static/dist/jquery-ui.min.js.LICENSE.txt
@@ -0,0 +1,4 @@
+/*! jQuery UI - v1.14.1 - 2024-10-30
+* https://jqueryui.com
+* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
+* Copyright OpenJS Foundation and other contributors; Licensed MIT */
diff --git a/providers/fab/src/airflow/providers/fab/www/static/dist/manifest.json b/providers/fab/src/airflow/providers/fab/www/static/dist/manifest.json
@@ -0,0 +1,17 @@
+{
+  "airflowDefaultTheme.css": "airflowDefaultTheme.feec4a4075c2f3d6ae01.css",
+  "airflowDefaultTheme.js": "airflowDefaultTheme.feec4a4075c2f3d6ae01.js",
+  "flash.css": "flash.137b30cff85b5588e661.css",
+  "flash.js": "flash.137b30cff85b5588e661.js",
+  "loadingDots.css": "loadingDots.48ab7d5b04e66f2686b0.css",
+  "loadingDots.js": "loadingDots.48ab7d5b04e66f2686b0.js",
+  "main.css": "main.ec1d38d994d72bb083cd.css",
+  "main.js": "main.ec1d38d994d72bb083cd.js",
+  "materialIcons.css": "materialIcons.57390fa60d8f61175334.css",
+  "materialIcons.js": "materialIcons.57390fa60d8f61175334.js",
+  "moment.js": "moment.4d28b37c229bdfc54575.js",
+  "jquery-ui.min.js": "jquery-ui.min.js",
+  "jquery-ui.min.css": "jquery-ui.min.css",
+  "oss-licenses.json": "oss-licenses.json",
+  "../../../../3rd-party-licenses/LICENSES-ui.txt": "../../../../3rd-party-licenses/LICENSES-ui.txt"
+}
diff --git a/providers/fab/src/airflow/providers/fab/www/templates/airflow/main.html b/providers/fab/src/airflow/providers/fab/www/templates/airflow/main.html
@@ -53,6 +53,7 @@
 {% endblock %}
 
 {% block messages %}
+  {% include 'appbuilder/flash.html' %}
   {% if show_plugin_message %}
     {% call show_message(category='warning', dismissible=false) %}
       <p>
diff --git a/providers/fab/src/airflow/providers/fab/www/templates/appbuilder/flash.html b/providers/fab/src/airflow/providers/fab/www/templates/appbuilder/flash.html
@@ -0,0 +1,34 @@
+{#
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+#}
+
+{#-
+  Adapted from: https://github.com/dpgaspar/Flask-AppBuilder/blob/master/flask_appbuilder/templates/appbuilder/flash.html
+-#}
+<link rel="stylesheet" type="text/css" href="{{ url_for_asset('flash.css') }}">
+
+{% with messages = get_flashed_messages(with_categories=true) %}
+  {% if messages %}
+    {% for category, m in messages %}
+      {% if not (request.path == auth_manager.get_url_login() and 'access is denied' in m.lower()) %}
+      {# Don't show 'Access is Denied' alert if user is logged out and on the login page. #}
+        {{ show_message(m, category) }}
+      {% endif %}
+    {% endfor %}
+  {% endif %}
+{% endwith %}
diff --git a/providers/fab/src/airflow/providers/fab/www/webpack.config.js b/providers/fab/src/airflow/providers/fab/www/webpack.config.js
@@ -58,6 +58,7 @@ Foundation (http://www.apache.org/).
 const config = {
   entry: {
     airflowDefaultTheme: `${CSS_DIR}/bootstrap-theme.css`,
+    flash: `${CSS_DIR}/flash.css`,
     loadingDots: `${CSS_DIR}/loading-dots.css`,
     main: [`${CSS_DIR}/main.css`, `${JS_DIR}/main.js`],
     materialIcons: `${CSS_DIR}/material-icons.css`,
@@ -147,6 +148,11 @@ const config = {
     ],
   },
   plugins: [
+    new WebpackManifestPlugin({
+      // d3-tip is named index.js in its dist folder which was confusing the manifest
+      map: (file) =>
+        file.path === "d3-tip.js" ? { ...file, name: "d3-tip.js" } : file,
+    }),
     new cwplg.CleanWebpackPlugin({
       verbose: true,
     }),
@@ -170,11 +176,11 @@ const config = {
       patterns: [
         {
           from: "node_modules/jquery-ui/dist/jquery-ui.min.js",
-          to: path.resolve(__dirname, 'dist', 'assets', '[name][ext]'),
+          flatten: true,
         },
         {
           from: "node_modules/jquery-ui/dist/themes/base/jquery-ui.min.css",
-          to: path.resolve(__dirname, 'dist', 'assets', '[name][ext]'),
+          flatten: true,
         },
       ],
     }),
