Merge pull request #947 from openedx/cag/dashboard-updates

feat: import dasboard changes for UI de-clutter
openedx · Sep 24, 2024 · 93d1f78 · 93d1f78
2 parents 8a08eae + 7265658
commit 93d1f78
Show file tree

Hide file tree

Showing 67 changed files with 3,221 additions and 1,557 deletions.
diff --git a/tutoraspects/asset_command_helpers.py b/tutoraspects/asset_command_helpers.py
@@ -214,8 +214,10 @@ def process(self, content: dict, existing: dict):
             if not metric.get("verbose_name"):
                 metric["verbose_name"] = metric["metric_name"].replace("_", " ").title()
 
-        content["sql"] = format_string(
-            content["sql"], mode=Mode(dialect_name="clickhouse")
+        content["sql"] = (
+            format_string(content["sql"], mode=Mode(dialect_name="clickhouse"))
+            if "filter indent" not in content["sql"]
+            else content["sql"]
         )
 
 

diff --git a/...lates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_b2fff8.yaml b/...lates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_b2fff8.yaml
@@ -29,6 +29,10 @@ params:
   groupby:
   - course_name
   - org
+  - expressionType: SQL
+    label: More details
+    sqlExpression: |-
+      {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_name', 'IfS-Rd0ZS') }}{% endraw %}
   metrics:
   - enrollees
   - active_count
@@ -38,15 +42,14 @@ params:
   percent_metrics: []
   query_mode: aggregate
   row_limit: 50000
-  server_page_length: 10
   show_cell_bars: false
   table_timestamp_format: smart_date
   temporal_columns_lookup: {}
   time_grain_sqla: P1M
   viz_type: table
 query_context:
   datasource:
-    id: 221
+    id: 651
     type: table
   force: false
   form_data:
@@ -71,13 +74,17 @@ query_context:
         truncateLongCells: true
     conditional_formatting: []
     dashboards:
-    - 3141
-    datasource: 221__table
+    - 355
+    datasource: 651__table
     extra_form_data: {}
     force: false
     groupby:
     - course_name
     - org
+    - expressionType: SQL
+      label: More details
+      sqlExpression: |-
+        {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_name', 'IfS-Rd0ZS') }}{% endraw %}
     metrics:
     - enrollees
     - active_count
@@ -89,9 +96,8 @@ query_context:
     result_format: json
     result_type: full
     row_limit: 50000
-    server_page_length: 10
     show_cell_bars: false
-    slice_id: 1181
+    slice_id: 1298
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     time_grain_sqla: P1M
@@ -102,6 +108,10 @@ query_context:
     columns:
     - course_name
     - org
+    - expressionType: SQL
+      label: More details
+      sqlExpression: |-
+        {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_name', 'IfS-Rd0ZS') }}{% endraw %}
     custom_form_data: {}
     custom_params: {}
     extras:

diff --git a/...lates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml b/...lates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml
@@ -29,6 +29,10 @@ params:
   groupby:
   - course_run
   - course_name
+  - expressionType: SQL
+    label: More details
+    sqlExpression: |
+      {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }}{% endraw %}
   metrics:
   - active_count
   - tag_list
@@ -38,15 +42,14 @@ params:
   percent_metrics: []
   query_mode: aggregate
   row_limit: 50000
-  server_page_length: 10
   show_cell_bars: false
   table_timestamp_format: smart_date
   temporal_columns_lookup: {}
   time_grain_sqla: P1M
   viz_type: table
 query_context:
   datasource:
-    id: 221
+    id: 651
     type: table
   force: false
   form_data:
@@ -71,13 +74,17 @@ query_context:
         truncateLongCells: true
     conditional_formatting: []
     dashboards:
-    - 3141
-    datasource: 221__table
+    - 355
+    datasource: 651__table
     extra_form_data: {}
     force: false
     groupby:
     - course_run
     - course_name
+    - expressionType: SQL
+      label: More details
+      sqlExpression: |
+        {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }}{% endraw %}
     metrics:
     - active_count
     - tag_list
@@ -89,9 +96,8 @@ query_context:
     result_format: json
     result_type: full
     row_limit: 50000
-    server_page_length: 10
     show_cell_bars: false
-    slice_id: 1381
+    slice_id: 1286
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     time_grain_sqla: P1M
@@ -102,6 +108,10 @@ query_context:
     columns:
     - course_run
     - course_name
+    - expressionType: SQL
+      label: More details
+      sqlExpression: |
+        {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }}{% endraw %}
     custom_form_data: {}
     custom_params: {}
     extras:

diff --git a/...spects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_fa249d.yaml b/...spects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_fa249d.yaml
@@ -2,7 +2,7 @@ _file_name: Course_Information_fa249d.yaml
 cache_timeout: null
 certification_details: null
 certified_by: null
-dataset_uuid: 633a1d4e-cd40-482f-a5dc-d5901c2181c2
+dataset_uuid: f25fdc4e-ce79-4f4c-9fc6-3dfe91690493
 description: null
 params:
   adhoc_filters:
@@ -12,6 +12,7 @@ params:
     operator: TEMPORAL_RANGE
     subject: enrolled_at
   all_columns: []
+  annotation_layers: []
   color_pn: true
   column_config:
     Avg Course Grade:
@@ -22,14 +23,9 @@ params:
       d3SmallNumberFormat: ~g
   conditional_formatting:
   - colorScheme: '#ACE1C4'
-    column: graded_learners
-    operator: '>'
+    column: active_within
+    operator: "\u2265"
     targetValue: 0
-  - colorScheme: '#FDE380'
-    column: avg_course_grade
-    operator: "\u2264 x \u2264"
-    targetValueLeft: '50'
-    targetValueRight: '70'
   - colorScheme: '#EFA1AA'
     column: avg_course_grade
     operator: <
@@ -58,6 +54,7 @@ params:
   - course_name
   - course_run
   metrics:
+  - active_within
   - avg_course_grade
   - median_course_grade
   order_by_cols: []
@@ -74,7 +71,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 54
+    id: 38
     type: table
   force: false
   form_data:
@@ -95,14 +92,9 @@ query_context:
         d3SmallNumberFormat: ~g
     conditional_formatting:
     - colorScheme: '#ACE1C4'
-      column: graded_learners
-      operator: '>'
+      column: active_within
+      operator: "\u2265"
       targetValue: 0
-    - colorScheme: '#FDE380'
-      column: avg_course_grade
-      operator: "\u2264 x \u2264"
-      targetValueLeft: '50'
-      targetValueRight: '70'
     - colorScheme: '#EFA1AA'
       column: avg_course_grade
       operator: <
@@ -125,8 +117,8 @@ query_context:
       operator: <
       targetValue: 50
     dashboards:
-    - 28
-    datasource: 54__table
+    - 17
+    datasource: 38__table
     extra_form_data: {}
     force: false
     groupby:
@@ -135,6 +127,7 @@ query_context:
     - course_name
     - course_run
     metrics:
+    - active_within
     - avg_course_grade
     - median_course_grade
     order_by_cols: []
@@ -146,7 +139,7 @@ query_context:
     row_limit: 1000
     server_page_length: 10
     show_cell_bars: true
-    slice_id: 5
+    slice_id: 49
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       enrolled_at: true
@@ -171,11 +164,12 @@ query_context:
       op: TEMPORAL_RANGE
       val: No filter
     metrics:
+    - active_within
     - avg_course_grade
     - median_course_grade
     order_desc: true
     orderby:
-    - - avg_course_grade
+    - - active_within
       - false
     post_processing: []
     row_limit: 1000

diff --git a/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_7eaf5b.yaml b/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_7eaf5b.yaml
@@ -12,6 +12,7 @@ params:
     operator: TEMPORAL_RANGE
     subject: emission_time
   aggregateFunction: Sum
+  annotation_layers: []
   colOrder: key_a_to_z
   colSubTotals: false
   conditional_formatting: []

diff --git a/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml b/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml
@@ -12,6 +12,7 @@ params:
     operator: TEMPORAL_RANGE
     subject: emission_time
   aggregateFunction: Sum
+  annotation_layers: []
   colOrder: key_a_to_z
   colSubTotals: false
   conditional_formatting: []

diff --git a/...assets/charts/Last_visit_date_6c2b10.yaml → ...assets/charts/Last_Visit_Date_6c2b10.yaml b/...assets/charts/Last_visit_date_6c2b10.yaml → ...assets/charts/Last_Visit_Date_6c2b10.yaml
@@ -8,10 +8,7 @@ params:
   adhoc_filters: []
   annotation_layers: []
   color_scheme: supersetColors
-  comparison_type: values
   extra_form_data: {}
-  forecastInterval: 0.8
-  forecastPeriods: 10
   groupby: []
   legendOrientation: top
   legendType: scroll
@@ -41,23 +38,18 @@ params:
     optionName: metric_orthejcnotd_6ealxq45fqk
     sqlExpression: null
   only_total: true
-  order_desc: true
   orientation: vertical
   rich_tooltip: true
   row_limit: 10000
   show_empty_columns: true
   show_legend: true
   sort_series_type: sum
-  time_grain_sqla: P1D
   tooltipTimeFormat: smart_date
   truncateXAxis: true
   truncate_metric: true
   viz_type: echarts_timeseries_bar
   xAxisLabelRotation: 45
   x_axis: last_visited
-  x_axis_sort_asc: true
-  x_axis_sort_series: name
-  x_axis_sort_series_ascending: true
   x_axis_time_format: '%Y-%m-%d'
   x_axis_title: Date Visited
   x_axis_title_margin: 100
@@ -69,21 +61,18 @@ params:
   y_axis_title_position: Left
 query_context:
   datasource:
-    id: 94
+    id: 33
     type: table
   force: false
   form_data:
     adhoc_filters: []
     annotation_layers: []
     color_scheme: supersetColors
-    comparison_type: values
     dashboards:
-    - 30
-    datasource: 94__table
+    - 364
+    datasource: 33__table
     extra_form_data: {}
     force: false
-    forecastInterval: 0.8
-    forecastPeriods: 10
     groupby: []
     legendOrientation: top
     legendType: scroll
@@ -113,26 +102,21 @@ query_context:
       optionName: metric_orthejcnotd_6ealxq45fqk
       sqlExpression: null
     only_total: true
-    order_desc: true
     orientation: vertical
     result_format: json
     result_type: full
     rich_tooltip: true
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 171
+    slice_id: 52
     sort_series_type: sum
-    time_grain_sqla: P1D
     tooltipTimeFormat: smart_date
     truncateXAxis: true
     truncate_metric: true
     viz_type: echarts_timeseries_bar
     xAxisLabelRotation: 45
     x_axis: last_visited
-    x_axis_sort_asc: true
-    x_axis_sort_series: name
-    x_axis_sort_series_ascending: true
     x_axis_time_format: '%Y-%m-%d'
     x_axis_title: Date Visited
     x_axis_title_margin: 100
@@ -150,12 +134,10 @@ query_context:
       expressionType: SQL
       label: last_visited
       sqlExpression: last_visited
-      timeGrain: P1D
     custom_form_data: {}
     custom_params: {}
     extras:
       having: ''
-      time_grain_sqla: P1D
       where: ''
     filters: []
     metrics:

diff --git a/...pects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_b0e170.yaml b/...pects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_b0e170.yaml
@@ -22,6 +22,7 @@ params:
     subject: emission_time
   all_columns:
   - success
+  annotation_layers: []
   color_pn: true
   column_config:
     avg_course_grade:

diff --git a/...pects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_b518f3.yaml b/...pects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_b518f3.yaml
@@ -12,6 +12,7 @@ params:
   adhoc_filters: []
   all_columns:
   - success
+  annotation_layers: []
   color_pn: true
   column_config:
     avg_course_grade: