fix(bootstrap-data): always check flashes

apache · Jan 10, 2023 · eaf7a3d · eaf7a3d
1 parent 5b2ca97
commit eaf7a3d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/superset/embedded/view.py b/superset/embedded/view.py
@@ -17,7 +17,7 @@
 import json
 from typing import Callable
 
-from flask import abort, g, request
+from flask import abort, request
 from flask_appbuilder import expose
 from flask_login import AnonymousUserMixin, LoginManager
 from flask_wtf.csrf import same_origin
@@ -77,7 +77,7 @@ def embedded(
         )
 
         bootstrap_data = {
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
             "embedded": {
                 "dashboard_id": embedded.dashboard_id,
             },

diff --git a/superset/views/base.py b/superset/views/base.py
@@ -316,7 +316,7 @@ def json_response(obj: Any, status: int = 200) -> FlaskResponse:
     def render_app_template(self) -> FlaskResponse:
         payload = {
             "user": bootstrap_user_data(g.user, include_perms=True),
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
         }
         return self.render_template(
             "superset/spa.html",
@@ -387,13 +387,12 @@ def menu_data(user: User) -> Dict[str, Any]:
 
 
 @cache_manager.cache.memoize(timeout=60)
-def common_bootstrap_payload(user: User) -> Dict[str, Any]:
+def cached_common_bootstrap_data(user: User) -> Dict[str, Any]:
     """Common data always sent to the client
 
-    The function is memoized as the return value only changes based
-    on configuration and feature flag values.
+    The function is memoized as the return value only changes when user permissions
+    or configuration values change.
     """
-    messages = get_flashed_messages(with_categories=True)
     locale = str(get_locale())
 
     # should not expose API TOKEN to frontend
@@ -417,7 +416,6 @@ def common_bootstrap_payload(user: User) -> Dict[str, Any]:
     frontend_config["HAS_GSHEETS_INSTALLED"] = bool(available_specs[GSheetsEngineSpec])
 
     bootstrap_data = {
-        "flash_messages": messages,
         "conf": frontend_config,
         "locale": locale,
         "language_pack": get_language_pack(locale),
@@ -431,6 +429,13 @@ def common_bootstrap_payload(user: User) -> Dict[str, Any]:
     return bootstrap_data
 
 
+def common_bootstrap_payload() -> Dict[str, Any]:
+    return {
+        **(cached_common_bootstrap_data(g.user)),
+        "flash_messages": get_flashed_messages(with_categories=True),
+    }
+
+
 def get_error_level_from_status_code(  # pylint: disable=invalid-name
     status: int,
 ) -> ErrorLevel:
@@ -536,7 +541,7 @@ def show_unexpected_exception(ex: Exception) -> FlaskResponse:
 def get_common_bootstrap_data() -> Dict[str, Any]:
     def serialize_bootstrap_data() -> str:
         return json.dumps(
-            {"common": common_bootstrap_payload(g.user)},
+            {"common": common_bootstrap_payload()},
             default=utils.pessimistic_json_iso_dttm_ser,
         )
 
@@ -554,7 +559,7 @@ class SupersetModelView(ModelView):
     def render_app_template(self) -> FlaskResponse:
         payload = {
             "user": bootstrap_user_data(g.user, include_perms=True),
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
         }
         return self.render_template(
             "superset/spa.html",

diff --git a/superset/views/core.py b/superset/views/core.py
@@ -968,7 +968,7 @@ def explore(
             "force": force,
             "user": bootstrap_user_data(g.user, include_perms=True),
             "forced_height": request.args.get("height"),
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
         }
         if slc:
             title = slc.slice_name
@@ -1960,7 +1960,7 @@ def dashboard(
 
         bootstrap_data = {
             "user": bootstrap_user_data(g.user, include_perms=True),
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
         }
 
         return self.render_template(
@@ -2691,7 +2691,7 @@ def welcome(self) -> FlaskResponse:
 
         payload = {
             "user": bootstrap_user_data(g.user, include_perms=True),
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
         }
 
         return self.render_template(
@@ -2720,7 +2720,7 @@ def profile(self, username: str) -> FlaskResponse:
 
         payload = {
             "user": bootstrap_user_data(user, include_perms=True),
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
         }
 
         return self.render_template(
@@ -2784,7 +2784,7 @@ def sqllab(self) -> FlaskResponse:
         """SQL Editor"""
         payload = {
             "defaultDbId": config["SQLLAB_DEFAULT_DBID"],
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
             **self._get_sqllab_tabs(get_user_id()),
         }
 

diff --git a/superset/views/dashboard/views.py b/superset/views/dashboard/views.py
@@ -158,7 +158,7 @@ def embedded(
         )
 
         bootstrap_data = {
-            "common": common_bootstrap_payload(g.user),
+            "common": common_bootstrap_payload(),
             "embedded": {"dashboard_id": dashboard_id_or_slug},
         }