Merge pull request #642 from openedx/jill/plugin-xblock

Upgrades platform-plugin-aspects and enables Instructor Dashboard plugin

.github/workflows/release.yaml

@@ -81,7 +81,7 @@ jobs:
       - name: Build Aspects Docker Images
         if: github.event.action == 'opened' || github.event.action == 'synchronize'
         run: |
-          tutor images build ${{ matrix.service.name }} --cache-to-registry
+          tutor images build ${{ matrix.service.name }}
           tutor images push ${{ matrix.service.name }}
       - name: Build Aspects Docker Images Latest
         if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'bot/v')

tutoraspects/patches/openedx-common-settings

@@ -7,10 +7,24 @@ EVENT_SINK_CLICKHOUSE_BACKEND_CONFIG = {
 	"timeout_secs": {{ ASPECTS_EVENT_SINK_CLICKHOUSE_TIMEOUT_SECS }}
 }
 SUPERSET_CONFIG = {
-	"service_url": "http://superset:{{ SUPERSET_PORT }}/",
-	"host": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ SUPERSET_HOST }}",
+	"internal_service_url": "http://superset:{{ SUPERSET_PORT }}/",
+	"service_url": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ SUPERSET_HOST }}",
 	"username": "{{ SUPERSET_LMS_USERNAME }}",
 	"password": "{{ SUPERSET_LMS_PASSWORD }}",
-	"email": "{{ SUPERSET_LMS_EMAIL }}",
 }
 EVENT_SINK_CLICKHOUSE_PII_MODELS = {{ EVENT_SINK_PII_MODELS }}
+
+ASPECTS_INSTRUCTOR_DASHBOARD_UUID = "{{ ASPECTS_INSTRUCTOR_DASHBOARD_UUID }}"
+SUPERSET_EXTRA_FILTERS_FORMAT = {{ ASPECTS_SUPERSET_EXTRA_FILTERS_FORMAT }}
+{% if ASPECTS_ENABLE_INSTRUCTOR_DASHBOARD_PLUGIN %}
+try:
+    not OPEN_EDX_FILTERS_CONFIG
+except NameError:  # OPEN_EDX_FILTERS_CONFIG is not defined
+    OPEN_EDX_FILTERS_CONFIG = {}
+if not OPEN_EDX_FILTERS_CONFIG.get("org.openedx.learning.instructor.dashboard.render.started.v1"):
+    OPEN_EDX_FILTERS_CONFIG["org.openedx.learning.instructor.dashboard.render.started.v1"] = {
+        "fail_silently": False,
+        "pipeline": [],
+    }
+OPEN_EDX_FILTERS_CONFIG["org.openedx.learning.instructor.dashboard.render.started.v1"]["pipeline"].append("platform_plugin_aspects.extensions.filters.AddSupersetTab")
+{% endif %}

tutoraspects/patches/openedx-development-settings

@@ -1,7 +1,6 @@
 SUPERSET_CONFIG = {
-    "service_url": "http://superset:{{ SUPERSET_PORT }}/",
-	"host": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ SUPERSET_HOST }}:{{ SUPERSET_PORT }}",
-	"username": "{{ SUPERSET_LMS_USERNAME }}",
-	"password": "{{ SUPERSET_LMS_PASSWORD }}",
-	"email": "{{ SUPERSET_LMS_EMAIL }}",
+    "internal_service_url": "http://superset:{{ SUPERSET_PORT }}/",
+    "service_url": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ SUPERSET_HOST }}:{{ SUPERSET_PORT }}",
+    "username": "{{ SUPERSET_LMS_USERNAME }}",
+    "password": "{{ SUPERSET_LMS_PASSWORD }}",
 }

tutoraspects/plugin.py

@@ -41,7 +41,7 @@
         (
             "OPENEDX_EXTRA_PIP_REQUIREMENTS",
             [
-                "platform-plugin-aspects==0.2.0",
+                "platform-plugin-aspects==0.3.0",
                 "edx-event-routing-backends==v8.1.1",
             ],
         ),
@@ -76,6 +76,10 @@
             "reference/operator_reports.html)\\n"
             "* [Superset Resources](https://github.com/apache/superset#resources)\\n",
         ),
+        ("ASPECTS_ENABLE_INSTRUCTOR_DASHBOARD_PLUGIN", True),
+        # Use the base Instructor Dashboard uuid by default. TODO use locale
+        ("ASPECTS_INSTRUCTOR_DASHBOARD_UUID", "1d6bf904-f53f-47fd-b1c9-6cd7e284d286"),
+        ("ASPECTS_SUPERSET_EXTRA_FILTERS_FORMAT", []),
         # ClickHouse xAPI settings
         ("ASPECTS_XAPI_DATABASE", "xapi"),
         ("ASPECTS_RAW_XAPI_TABLE", "xapi_events_all"),