Merge pull request #991 from saraburns1/tagfilter

fix: video engagement updates
openedx · Nov 26, 2024 · ac2af93 · ac2af93
2 parents d24ba2b + 8a1e2f6
commit ac2af93
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 74 deletions.
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
@@ -386,7 +386,7 @@
         # For now we are pulling this from github, which should allow maximum
         # flexibility for forking, running branches, specific versions, etc.
         ("DBT_REPOSITORY", "https://github.com/openedx/aspects-dbt"),
-        ("DBT_BRANCH", "v3.33.7"),
+        ("DBT_BRANCH", "v3.33.8"),
         ("DBT_SSH_KEY", ""),
         ("DBT_STATE_DIR", "/app/aspects-dbt/state"),
         ("DBT_PROFILES_DIR", "/app/aspects/dbt/"),

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
@@ -50,7 +50,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 651
+    id: 261
     type: table
   force: false
   form_data:
@@ -61,6 +61,7 @@ query_context:
       operator: TEMPORAL_RANGE
       subject: emission_time
     all_columns: []
+    annotation_layers: []
     color_pn: false
     column_config:
       active_count:
@@ -74,9 +75,7 @@ query_context:
       tag_list:
         truncateLongCells: true
     conditional_formatting: []
-    dashboards:
-    - 355
-    datasource: 651__table
+    datasource: 261__table
     extra_form_data: {}
     force: false
     groupby:
@@ -98,7 +97,7 @@ query_context:
     result_type: full
     row_limit: 50000
     show_cell_bars: false
-    slice_id: 1298
+    slice_id: 561
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     time_grain_sqla: P1M

diff --git a/.../aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_5b00f7.yaml b/.../aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_5b00f7.yaml
@@ -7,6 +7,7 @@ description: null
 params:
   adhoc_filters: []
   all_columns: []
+  annotation_layers: []
   color_pn: true
   column_config:
     rewatched_percent:
@@ -20,9 +21,10 @@ params:
   - org
   metrics:
   - num_videos
+  - avg_video_length
+  - num_videos_watched
   - watched_percent
   - rewatched_percent
-  - avg_video_length
   order_by_cols: []
   order_desc: true
   percent_metrics: []
@@ -34,32 +36,32 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 65
+    id: 161
     type: table
   force: false
   form_data:
     adhoc_filters: []
     all_columns: []
+    annotation_layers: []
     color_pn: true
     column_config:
       rewatched_percent:
         d3NumberFormat: ',.1%'
       watched_percent:
         d3NumberFormat: ',.1%'
     conditional_formatting: []
-    dashboards:
-    - 22
-    datasource: 65__table
+    datasource: 161__table
     extra_form_data: {}
     force: false
     groupby:
     - course_name
     - org
     metrics:
     - num_videos
+    - avg_video_length
+    - num_videos_watched
     - watched_percent
     - rewatched_percent
-    - avg_video_length
     order_by_cols: []
     order_desc: true
     percent_metrics: []
@@ -68,7 +70,7 @@ query_context:
     result_type: full
     row_limit: 50000
     show_cell_bars: false
-    slice_id: 82
+    slice_id: 1121
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     viz_type: table
@@ -86,9 +88,10 @@ query_context:
     filters: []
     metrics:
     - num_videos
+    - avg_video_length
+    - num_videos_watched
     - watched_percent
     - rewatched_percent
-    - avg_video_length
     order_desc: true
     orderby:
     - - num_videos

diff --git a/.../aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml b/.../aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml
@@ -7,6 +7,7 @@ description: null
 params:
   adhoc_filters: []
   all_columns: []
+  annotation_layers: []
   color_pn: true
   column_config:
     rewatched_percent:
@@ -20,21 +21,23 @@ params:
   - course_name
   metrics:
   - num_videos
+  - avg_video_length
+  - num_videos_watched
   - watched_percent
   - rewatched_percent
-  - avg_video_length
   order_by_cols: []
   order_desc: true
   percent_metrics: []
   query_mode: aggregate
   row_limit: 50000
+  server_page_length: 10
   show_cell_bars: false
   table_timestamp_format: smart_date
   temporal_columns_lookup: {}
   viz_type: table
 query_context:
   datasource:
-    id: 65
+    id: 161
     type: table
   force: false
   form_data:
@@ -48,27 +51,29 @@ query_context:
         d3NumberFormat: ',.1%'
     conditional_formatting: []
     dashboards:
-    - 22
-    datasource: 65__table
+    - 241
+    datasource: 161__table
     extra_form_data: {}
     force: false
     groupby:
     - course_run
     - course_name
     metrics:
     - num_videos
+    - avg_video_length
+    - num_videos_watched
     - watched_percent
     - rewatched_percent
-    - avg_video_length
     order_by_cols: []
     order_desc: true
     percent_metrics: []
     query_mode: aggregate
     result_format: json
     result_type: full
     row_limit: 50000
+    server_page_length: 10
     show_cell_bars: false
-    slice_id: 145
+    slice_id: 641
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     viz_type: table
@@ -86,9 +91,10 @@ query_context:
     filters: []
     metrics:
     - num_videos
+    - avg_video_length
+    - num_videos_watched
     - watched_percent
     - rewatched_percent
-    - avg_video_length
     order_desc: true
     orderby:
     - - num_videos

diff --git a/.../build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml b/.../build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml
@@ -171,12 +171,11 @@ metadata:
   - '#9EE5E5'
   - '#D1C6BC'
   cross_filters_enabled: true
-  default_filters: '{}'
   expanded_slices:
-    '1252': true
-    '399': true
-    '422': true
-    '776': true
+    '101': true
+    '1461': true
+    '461': true
+    '61': true
   global_chart_configuration:
     chartsInScope:
     - 314
@@ -350,7 +349,7 @@ position:
     children: []
     id: CHART-explore-1467-1
     meta:
-      chartId: 963
+      chartId: 1121
       height: 50
       sliceName: Video Engagement
       uuid: 5b00f792-233c-4ee6-9411-7df49f4b5061
@@ -365,7 +364,7 @@ position:
     children: []
     id: CHART-explore-1500-1
     meta:
-      chartId: 314
+      chartId: 541
       height: 50
       sliceName: Course Info
       uuid: b2fff8a7-3ace-4075-9a3f-5fa5b99f81bb
@@ -380,7 +379,7 @@ position:
     children: []
     id: CHART-explore-1501-1
     meta:
-      chartId: 757
+      chartId: 201
       height: 50
       sliceName: Course Info
       uuid: ccdd7d98-4722-490b-a0b2-077380a7c7eb
@@ -395,7 +394,7 @@ position:
     children: []
     id: CHART-explore-1502-1
     meta:
-      chartId: 1154
+      chartId: 161
       height: 50
       sliceName: Enrollment Counts
       uuid: 7eaf5bc2-0067-424b-a50b-607cf54c086a
@@ -410,7 +409,7 @@ position:
     children: []
     id: CHART-explore-1503-1
     meta:
-      chartId: 407
+      chartId: 1141
       height: 50
       sliceName: Enrollment Counts
       uuid: 8230a366-957d-4667-a2ff-3cbcb2f25f60
@@ -425,7 +424,7 @@ position:
     children: []
     id: CHART-explore-1504-1
     meta:
-      chartId: 399
+      chartId: 461
       height: 50
       sliceName: Learner Performance Breakdown
       uuid: b73b0a5c-4861-402e-a39c-d73333a4d911
@@ -440,7 +439,7 @@ position:
     children: []
     id: CHART-explore-1505-1
     meta:
-      chartId: 776
+      chartId: 101
       height: 50
       sliceName: Learner Performance Breakdown
       uuid: d414b144-467b-456b-b899-9cfb3579faba
@@ -455,7 +454,7 @@ position:
     children: []
     id: CHART-explore-1506-1
     meta:
-      chartId: 1252
+      chartId: 61
       height: 50
       sliceName: Learner Performance
       uuid: b518f341-9ed4-4c23-bb88-6c1d497aa260
@@ -470,7 +469,7 @@ position:
     children: []
     id: CHART-explore-1507-1
     meta:
-      chartId: 422
+      chartId: 1461
       height: 50
       sliceName: Learner Performance
       uuid: b0e170ce-26f1-4452-a3c0-49b41fa6e529
@@ -485,7 +484,7 @@ position:
     children: []
     id: CHART-explore-1508-1
     meta:
-      chartId: 1407
+      chartId: 641
       height: 50
       sliceName: Video Engagement
       uuid: 6b7610a7-41d0-4d14-be81-62a5a8f22d62

diff --git a/...s/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/tag_filter.yaml b/...s/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/tag_filter.yaml
@@ -2,6 +2,18 @@ _file_name: tag_filter.yaml
 always_filter_main_dttm: false
 cache_timeout: null
 columns:
+- advanced_data_type: null
+  column_name: course_key
+  description: null
+  expression: null
+  extra: {}
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: Course Key
 - advanced_data_type: null
   column_name: id
   description: null
@@ -38,18 +50,6 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Tag
-- advanced_data_type: null
-  column_name: course_key
-  description: null
-  expression: null
-  extra: {}
-  filterable: true
-  groupby: true
-  is_active: true
-  is_dttm: false
-  python_date_format: null
-  type: String
-  verbose_name: Course Key
 database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6
 default_endpoint: null
 description: null