ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Properly use filtered activities to check for last received

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-02-06 09:58:04 +01:00
parent 2a4b2b7d49
commit 729d728694
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/ActivityList.vue
View File

@@ -85,18 +85,17 @@ export default {
params.append('limit', ACTIVITY_FETCH_LIMIT) params.append('limit', ACTIVITY_FETCH_LIMIT)
const response = await axios.get(generateOcsUrl('apps/activity/api/v2/activity') + this.filter + '?' + params) 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') { if (this.filter === 'deck') {
// We need to manually filter activities here, since currently we use two different types and there is no way // 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 // 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) return (activity.object_type === 'deck_board' && activity.object_id === this.objectId)
|| (activity.object_type === 'deck_card' && activity.subject_rich[1].board.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 this.endReached = true
return [] return []
} }