biest #657

lib/classes/JsonApi/Routes/ActivityStreamShow.php

@@ -27,7 +27,7 @@ class ActivityStreamShow extends JsonApiController
 {
     protected $allowedIncludePaths = ['actor', 'context', 'object'];
 
-    protected $allowedFilteringParameters = ['start', 'end', 'activity-type'];
+    protected $allowedFilteringParameters = ['start', 'end', 'activity-type', 'context-type', 'context-id', 'object-type', 'object-id'];
 
     protected $allowedPagingParameters = ['offset', 'limit'];
 
@@ -69,13 +69,21 @@ class ActivityStreamShow extends JsonApiController
             'start' => strtotime('-6 months'),
             'end' => time(),
             'activity-type' => null,
+            'context-type' => null,
+            'context-id' => null,
+            'object-type' => null,
+            'object-id' => null
         ];
 
         $filter = array_reduce(
-            words('start end'),
+            words('start end activity-type context-type context-id object-type object-id'),
             function ($filter, $key) use ($filtering) {
                 if (isset($filtering[$key])) {
+                    if ($key === 'start' || $key === 'end') {
                         $filter[$key] = (int) $filtering[$key];
+                    } else {
+                        $filter[$key] = $filtering[$key];
+                    }
                 }
 
                 return $filter;
@@ -83,10 +91,6 @@ class ActivityStreamShow extends JsonApiController
             $filter
         );
 
-        if (isset($filtering['activity-type'])) {
-            $filter['activity-type'] = $filtering['activity-type'];
-        }
-
         return $filter;
     }
 
@@ -133,7 +137,8 @@ class ActivityStreamShow extends JsonApiController
                             'news',
                             'participants',
                             'schedule',
-                            'wiki'
+                            'wiki',
+                            'courseware'
                         ]
                     );
                 }
@@ -146,6 +151,10 @@ class ActivityStreamShow extends JsonApiController
 
         $filter->setStartDate($urlFilter['start']);
         $filter->setEndDate($urlFilter['end']);
+        $filter->setContext($urlFilter['context-type']);
+        $filter->setContextId($urlFilter['context-id']);
+        $filter->setObjectType($urlFilter['object-type']);
+        $filter->setObjectId($urlFilter['object-id']);
 
         return $filter;
     }

resources/vue/store/courseware/courseware.module.js

@@ -245,9 +245,9 @@ export const actions = {
         const relationship = 'activitystream';
 
         const options = {
-            'filter[context_type]': 'course',
-            'filter[context_id]': courseId,
-            'filter[object_type]': 'courseware',
+            'filter[context-type]': 'course',
+            'filter[context-id]': courseId,
+            'filter[object-type]': 'courseware',
             include: 'actor, context, object',
         };