feat(embedded): resolve a uuid as either an embedded dashboard or chart

The embed view now falls back to EmbeddedChartDAO and passes resource_type
plus chart_id into the bootstrap payload.

superset/embedded/view.py

@@ -22,6 +22,7 @@ from flask_login import AnonymousUserMixin, login_user
 from flask_wtf.csrf import same_origin
 
 from superset import event_logger, is_feature_enabled
+from superset.daos.chart import EmbeddedChartDAO
 from superset.daos.dashboard import EmbeddedDashboardDAO
 from superset.superset_typing import FlaskResponse
 from superset.utils import json
@@ -45,21 +46,31 @@ class EmbeddedView(BaseSupersetView):
         add_extra_log_payload: Callable[..., None] = lambda **kwargs: None,
     ) -> FlaskResponse:
         """
-        Server side rendering for the embedded dashboard page
-        :param uuid: identifier for embedded dashboard
+        Server side rendering for the embedded dashboard or chart page
+        :param uuid: identifier for the embedded dashboard or chart
         :param add_extra_log_payload: added by `log_this_with_manual_updates`, set a
             default value to appease pylint
         """
         if not is_feature_enabled("EMBEDDED_SUPERSET"):
             abort(404)
 
+        # A uuid identifies either an embedded dashboard or an embedded chart.
+        # Dashboards are looked up first since they are the older, more common
+        # resource; the two id spaces are distinct so ordering is not ambiguous.
+        resource_type = "dashboard"
         embedded = EmbeddedDashboardDAO.find_by_id(uuid)
 
+        if not embedded:
+            embedded = EmbeddedChartDAO.find_by_id(uuid)
+            resource_type = "chart"
+
         if not embedded:
             abort(404)
 
         assert embedded is not None
-        dashboard = embedded.dashboard
+        resource = (
+            embedded.dashboard if resource_type == "dashboard" else embedded.slice
+        )
 
         # validate request referrer in allowed domains
         is_referrer_allowed = not embedded.allowed_domains
@@ -91,7 +102,8 @@ class EmbeddedView(BaseSupersetView):
         login_user(AnonymousUserMixin(), force=True)
 
         add_extra_log_payload(
-            embedded_dashboard_id=uuid,
+            embedded_id=uuid,
+            resource_type=resource_type,
             dashboard_version="v2",
         )
 
@@ -101,7 +113,11 @@ class EmbeddedView(BaseSupersetView):
             },
             "common": common_bootstrap_payload(),
             "embedded": {
-                "dashboard_id": embedded.dashboard_id,
+                "resource_type": resource_type,
+                "dashboard_id": (
+                    embedded.dashboard_id if resource_type == "dashboard" else None
+                ),
+                "chart_id": embedded.slice_id if resource_type == "chart" else None,
                 # The list of domains allowed to embed this dashboard. An empty
                 # list means any domain is allowed (no restriction). The frontend
                 # uses this to validate the origin of incoming postMessage events.
@@ -112,8 +128,12 @@ class EmbeddedView(BaseSupersetView):
         return self.render_template(
             "superset/spa.html",
             entry="embedded",
-            title=dashboard.dashboard_title,
-            dashboard_description=dashboard.description,
+            title=(
+                resource.dashboard_title
+                if resource_type == "dashboard"
+                else resource.slice_name
+            ),
+            dashboard_description=resource.description,
             bootstrap_data=json.dumps(
                 bootstrap_data, default=json.pessimistic_json_iso_dttm_ser
             ),