format entries, do not load on end, loading by click on another card/board
Signed-off-by: Jakob <jakob.roehrl@web.de>
This commit is contained in:
@@ -55,7 +55,8 @@ export default new Vuex.Store({
|
||||
sharees: [],
|
||||
assignableUsers: [],
|
||||
boardFilter: BOARD_FILTERS.ALL,
|
||||
activity: []
|
||||
activity: [],
|
||||
activityLoadMore: true
|
||||
},
|
||||
getters: {
|
||||
boards: state => {
|
||||
@@ -64,9 +65,6 @@ export default new Vuex.Store({
|
||||
sharees: state => {
|
||||
return state.sharees
|
||||
},
|
||||
activity: state => {
|
||||
return state.activity
|
||||
},
|
||||
noneArchivedBoards: state => {
|
||||
return state.boards.filter(board => {
|
||||
return board.archived === false && !board.deletedAt
|
||||
@@ -152,6 +150,12 @@ export default new Vuex.Store({
|
||||
})
|
||||
|
||||
},
|
||||
clearActivity(state) {
|
||||
state.activity = []
|
||||
},
|
||||
setActivityLoadMore(state, value) {
|
||||
state.activityLoadMore = value
|
||||
},
|
||||
setAssignableUsers(state, users) {
|
||||
state.assignableUsers = users
|
||||
},
|
||||
@@ -288,12 +292,20 @@ export default new Vuex.Store({
|
||||
params.append('object_type', obj.object_type)
|
||||
params.append('object_id', obj.object_id)
|
||||
|
||||
if (obj.since === 0) {
|
||||
commit('clearActivity')
|
||||
}
|
||||
|
||||
let keyword = 'deck'
|
||||
if (obj.type === 'filter') {
|
||||
keyword = 'filter'
|
||||
}
|
||||
axios.get(OC.linkToOCS('apps/activity/api/v2/activity') + keyword, { params }).then((response) => {
|
||||
commit('setActivity', response.data.ocs.data)
|
||||
commit('setActivityLoadMore', true)
|
||||
if (response.data.ocs.meta.statuscode === 304) {
|
||||
commit('setActivityLoadMore', false)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user