From 729d728694c2375983b1095a47510823c8dc99de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 6 Feb 2020 09:58:04 +0100 Subject: [PATCH] Properly use filtered activities to check for last received MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/components/ActivityList.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/ActivityList.vue b/src/components/ActivityList.vue index e9144bf35..7e976bd58 100644 --- a/src/components/ActivityList.vue +++ b/src/components/ActivityList.vue @@ -85,18 +85,17 @@ export default { params.append('limit', ACTIVITY_FETCH_LIMIT) const response = await axios.get(generateOcsUrl('apps/activity/api/v2/activity') + this.filter + '?' + params) - const activities = response.data.ocs.data + let activities = response.data.ocs.data if (this.filter === 'deck') { // We need to manually filter activities here, since currently we use two different types and there is no way // to tell the backend to fetch all activites related to cards of a given board - this.activities.push(...activities.filter((activity) => { + activities = activities.filter((activity) => { return (activity.object_type === 'deck_board' && activity.object_id === this.objectId) || (activity.object_type === 'deck_card' && activity.subject_rich[1].board.id === this.objectId) - })) - } else { - this.activities.push(...activities) + }) } - if (response.data.ocs.meta.statuscode === 304) { + this.activities.push(...activities) + if (response.data.ocs.meta.statuscode === 304 || activities.length === 0) { this.endReached = true return [] }