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

Properly fetch activities for board and fix refresh of lists

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-09-05 14:38:48 +02:00
parent 3319f9c3b3
commit bc15b48ea2
2 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
js/controller/ActivityController.js
View File

@@ -29,14 +29,18 @@ class ActivityController {
this.activityservice = ActivityService;
this.$scope = $scope;
this.type = '';
var self = this;
this.$scope.$watch(function() {
this.loading = false;
const self = this;
this.$scope.$watch(function () {
return self.element.id;
}, function (params) {
self.activityservice.fetchMoreActivities(self.type, self.element.id);
self.activityservice.fetchNewerActivities(self.type, self.element.id);
if (self.getData(self.element.id).length === 0) {
self.loading = true;
self.fetchUntilResults();
}
self.activityservice.fetchNewerActivities(self.type, self.element.id).then(function () {});
}, true);
console.log('constructor');
}
getData(id) {
@@ -48,8 +52,40 @@ class ActivityController {
return OCA.Activity.RichObjectStringParser.parseMessage(subject, parameters);
}
fetchUntilResults () {
const self = this;
let dataLengthBefore = self.getData(self.element.id).length;
let _executeFetch = function() {
let promise = self.activityservice.fetchMoreActivities(self.type, self.element.id);
if (Promise.resolve(promise) === promise) {
promise.then(function (data) {
let dataLengthAfter = self.getData(self.element.id).length;
if (data !== null || dataLengthAfter <= dataLengthBefore || dataLengthAfter < 5) {
_executeFetch();
} else {
self.loading = false;
self.$scope.$apply();
}
}, function () {
self.loading = false;
self.$scope.$apply();
});
}
};
_executeFetch();
};
page() {
this.activityservice.fetchMoreActivities(this.type, this.element.id);
if (!this.activityservice.since[this.type][this.element.id].finished) {
this.loading = true;
this.fetchUntilResults();
} else {
this.loading = false;
}
}
loadingNewer() {
return this.activityservice.runningNewer;
}
}

36
js/service/ActivityService.js
View File

@@ -30,6 +30,7 @@ class ActivityService {
constructor ($rootScope, $filter, $http, $q) {
this.running = false;
this.runningNewer = false;
this.$filter = $filter;
this.$http = $http;
this.$q = $q;
@@ -50,18 +51,18 @@ class ActivityService {
if (type === DECK_ACTIVITY_TYPE_CARD)
return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'filter?format=json&object_type=deck_card&object_id=' + id + '&limit=5&since=' + since;
if (type === DECK_ACTIVITY_TYPE_BOARD)
return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'filter?format=json&object_type=deck_board&object_id=' + id + '&limit=5&since=' + since;
return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'deck?format=json&limit=5&since=' + since;
}
fetchCardActivities(type, id, since) {
var deferred = this.$q.defer();
this.running = true;
this.checkData(type, id);
var self = this;
this.$http.get(ActivityService.getUrl(type, id, since)).then(function (response) {
return this.$http.get(ActivityService.getUrl(type, id, since)).then(function (response) {
var objects = response.data.ocs.data;
var dataLengthBefore = self.data[type][id].length;
for (let index in objects) {
let item = objects[index];
self.addItem(type, id, item);
@@ -69,30 +70,30 @@ class ActivityService {
self.since[type][id].latest = item.activity_id;
}
}
var dataLengthAfter = self.data[type][id].length;
self.data[type][id].sort(function(a, b) {
return b.activity_id - a.activity_id;
});
self.since[type][id].oldest = response.headers('X-Activity-Last-Given');
self.running = false;
deferred.resolve(objects);
}, function (error) {
if (error.status === 304) {
self.since[type][id].finished = true;
}
self.running = false;
});
return deferred.promise;
}
fetchMoreActivities(type, id) {
this.checkData(type, id);
if (this.running === true) {
return;
return this.runningPromise;
}
if (!this.since[type][id].finished) {
return this.fetchCardActivities(type, id, this.since[type][id].oldest);
this.runningPromise = this.fetchCardActivities(type, id, this.since[type][id].oldest);
return this.runningPromise;
}
return Promise.reject();
}
checkData(type, id) {
if (!Array.isArray(this.data[type][id])) {
this.data[type][id] = [];
@@ -108,8 +109,13 @@ class ActivityService {
}
addItem(type, id, item) {
console.log(id);
if (this.data[type][id].findIndex((entry) => { return entry.activity_id === item.activity_id; }) === -1) {
if (type === DECK_ACTIVITY_TYPE_BOARD && (
(item.object_type === DECK_ACTIVITY_TYPE_CARD && item.subject_rich[1].board && item.subject_rich[1].board.id !== id)
|| (item.object_type === DECK_ACTIVITY_TYPE_BOARD && item.object_id !== id)
)) {
return;
}
item.timestamp = new Date(item.datetime).getTime();
this.data[type][id].push(item);
}
@@ -123,17 +129,18 @@ class ActivityService {
*/
fetchNewerActivities(type, id) {
if (this.since[type][id].latest === 0) {
return;
return Promise.resolve();
}
let self = this;
this.fetchNewer(type, id).then(function() {
self.fetchNewerActivities(type, id);
return this.fetchNewer(type, id).then(function() {
return self.fetchNewerActivities(type, id);
});
}
fetchNewer(type, id) {
var deferred = this.$q.defer();
this.running = true;
this.runningNewer = true;
var self = this;
this.$http.get(ActivityService.getUrl(type, id, this.since[type][id].latest) + '&sort=asc').then(function (response) {
var objects = response.data.ocs.data;
@@ -149,14 +156,19 @@ class ActivityService {
self.since[type][id].latest = response.headers('X-Activity-Last-Given');
self.data[type][id] = data.concat(self.data[type][id]);
self.running = false;
self.runningNewer = false;
deferred.resolve(objects);
}, function (error) {
self.runningNewer = false;
self.running = false;
});
return deferred.promise;
}
getData(type, id) {
if (!Array.isArray(this.data[type][id])) {
return [];
}
return this.data[type][id];
}