Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades platform-plugin-aspects and enables Instructor Dashboard plugin #642

Merged
merged 6 commits into from
Mar 13, 2024
Merged

Upgrades platform-plugin-aspects and enables Instructor Dashboard plugin #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eed3f66
feat: uses platform-plugin-aspects 0.3.0
pomegranited Mar 10, 2024
082a6c4
feat: adds ASPECTS_ENABLE_INSTRUCTOR_DASHBOARD_PLUGIN
pomegranited Mar 10, 2024
1d8bec1
fix: ASPECTS_ENABLE_INSTRUCTOR_DASHBOARD_PLUGIN config
pomegranited Mar 11, 2024
7648807
fix: quality
pomegranited Mar 11, 2024
9ffd73f
chore: install platform-plugin-aspects v0.3.0
Ian2012 Mar 13, 2024
8bf4076
build: don't cache PR images to registry
Ian2012 Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
20 changes: 17 additions & 3 deletions tutoraspects/patches/openedx-common-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
pomegranited marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 4 additions & 5 deletions tutoraspects/patches/openedx-development-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}",
}
6 changes: 5 additions & 1 deletion tutoraspects/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
),
Expand Down Expand Up @@ -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"),
Expand Down