Merge pull request #959 from openedx/cag/non-embed

fix(embedded): remove course-comparison dashboard from embeddables
openedx · Oct 3, 2024 · 88fd0ed · 88fd0ed
2 parents 0a00530 + 2866b3e
commit 88fd0ed
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
@@ -146,7 +146,15 @@
                 "course-dashboard": "c0e64194-33d1-4d5a-8c10-4f51530c5ee9",
                 "learner-groups": "8661d20c-cee6-4245-9fcc-610daea5fd24",
                 "individual-learner": "abae8a25-1ba4-4653-81bd-d3937a162a11",
+            },
+        ),
+        (
+            "SUPERSET_DASHBOARDS",
+            {
                 "course-comparison": "c6c7062d-dd90-4292-b9cf-84f7b9f38e73",
+                # Leaving this out for now while query context is generated
+                # for operator-dashboard slices.
+                # "operator-dashboard": "02c0121c-40e9-4d8a-b86a-6b996a1cc6fe",
             },
         ),
         # ClickHouse xAPI settings

diff --git a/tutoraspects/templates/aspects/apps/superset/pythonpath/performance_metrics.py b/tutoraspects/templates/aspects/apps/superset/pythonpath/performance_metrics.py
@@ -33,6 +33,8 @@
 UUID = str(uuid.uuid4())[0:6]
 RUN_ID = f"aspects-{ASPECTS_VERSION}-{UUID}"
 CHART_PATH = "/app/openedx-assets/assets/charts/"
+DASHBOARDS = {{SUPERSET_EMBEDDABLE_DASHBOARDS}}
+DASHBOARDS.update({{SUPERSET_DASHBOARDS}})
 
 report_format = "{i}. {dashboard} - {slice}\n" "Superset time: {superset_time} (s).\n"
 
@@ -86,7 +88,7 @@ def performance_metrics(
     with patch("clickhouse_connect.common.build_client_name") as mock_build_client_name:
         mock_build_client_name.return_value = RUN_ID
         target_dashboards = (
-            [dashboard_slug] if dashboard_slug else {{SUPERSET_EMBEDDABLE_DASHBOARDS}}
+            [dashboard_slug] if dashboard_slug else DASHBOARDS
         )
 
         dashboards = (