EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2877 comments: Sync comments views

main
Pau Ferrer Ocaña 2019-11-28 12:51:18 +01:00
parent 9f51f547c4
commit 85b4395909
5 changed files with 192 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/comments/components/comments/comments.ts
View File

@ -44,9 +44,12 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
protected updateSiteObserver;
protected refreshCommentsObserver;
protected commentsCountObserver;
constructor(private navCtrl: NavController, private commentsProvider: CoreCommentsProvider,
sitesProvider: CoreSitesProvider, eventsProvider: CoreEventsProvider,
constructor(private navCtrl: NavController,
private commentsProvider: CoreCommentsProvider,
sitesProvider: CoreSitesProvider,
eventsProvider: CoreEventsProvider,
@Optional() private svComponent: CoreSplitViewComponent) {
this.onLoading = new EventEmitter<boolean>();
@ -76,6 +79,19 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
});
}
}, sitesProvider.getCurrentSiteId());
// Refresh comments count if event received.
this.commentsCountObserver = eventsProvider.on(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, (data) => {
// Verify these comments need to be updated.
if (this.undefinedOrEqual(data, 'contextLevel') && this.undefinedOrEqual(data, 'instanceId') &&
this.undefinedOrEqual(data, 'component') && this.undefinedOrEqual(data, 'itemId') &&
this.undefinedOrEqual(data, 'area') && !this.countError) {
if (!this.commentsCount.endsWith('+')) {
// Parse and unparse string.
this.commentsCount = parseInt(this.commentsCount, 10) + data.countChange + '';
}
}
}, sitesProvider.getCurrentSiteId());
}
/**
@ -167,6 +183,7 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
ngOnDestroy(): void {
this.updateSiteObserver && this.updateSiteObserver.off();
this.refreshCommentsObserver && this.refreshCommentsObserver.off();
this.commentsCountObserver && this.commentsCountObserver.off();
}
/**

2
src/core/comments/components/comments/core-comments.html
View File

@ -1,5 +1,5 @@
<core-loading *ngIf="!disabled" [hideUntil]="commentsLoaded || !displaySpinner">
<div (click)="openComments($event)" *ngIf="!countError" [class.core-comments-clickable]="!disabled">
<div *ngIf="!countError" (click)="openComments($event)" [class.core-comments-clickable]="!disabled">
{{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
</div>
<div *ngIf="countError">

217
src/core/comments/pages/viewer/viewer.ts
View File

@ -63,11 +63,18 @@ export class CoreCommentsViewerPage implements OnDestroy {
protected syncObserver: any;
protected currentUser: any;
constructor(navParams: NavParams, private sitesProvider: CoreSitesProvider, private userProvider: CoreUserProvider,
private domUtils: CoreDomUtilsProvider, private translate: TranslateService, private modalCtrl: ModalController,
private commentsProvider: CoreCommentsProvider, private offlineComments: CoreCommentsOfflineProvider,
eventsProvider: CoreEventsProvider, private commentsSync: CoreCommentsSyncProvider,
private textUtils: CoreTextUtilsProvider, private timeUtils: CoreTimeUtilsProvider) {
constructor(navParams: NavParams,
protected sitesProvider: CoreSitesProvider,
protected userProvider: CoreUserProvider,
protected domUtils: CoreDomUtilsProvider,
protected translate: TranslateService,
protected modalCtrl: ModalController,
protected commentsProvider: CoreCommentsProvider,
protected offlineComments: CoreCommentsOfflineProvider,
protected eventsProvider: CoreEventsProvider,
protected commentsSync: CoreCommentsSyncProvider,
protected textUtils: CoreTextUtilsProvider,
protected timeUtils: CoreTimeUtilsProvider) {
this.contextLevel = navParams.get('contextLevel');
this.instanceId = navParams.get('instanceId');
@ -127,31 +134,8 @@ export class CoreCommentsViewerPage implements OnDestroy {
return promise.catch(() => {
// Ignore errors.
}).then(() => {
return this.offlineComments.getComment(this.contextLevel, this.instanceId, this.componentName, this.itemId,
this.area).then((offlineComment) => {
this.offlineComment = offlineComment;
if (offlineComment && !this.currentUser) {
return this.userProvider.getProfile(this.currentUserId, undefined, true).then((user) => {
this.currentUser = user;
this.offlineComment.profileimageurl = user.profileimageurl;
this.offlineComment.fullname = user.fullname;
this.offlineComment.userid = user.id;
}).catch(() => {
// Ignore errors.
});
} else if (offlineComment) {
this.offlineComment.profileimageurl = this.currentUser.profileimageurl;
this.offlineComment.fullname = this.currentUser.fullname;
this.offlineComment.userid = this.currentUser.id;
}
return this.offlineComments.getDeletedComments(this.contextLevel, this.instanceId, this.componentName, this.itemId,
this.area);
});
}).then((deletedComments) => {
this.hasOffline = !!this.offlineComment || deletedComments.length > 0;
return this.loadOfflineData();
}).then(() => {
// Get comments data.
return this.commentsProvider.getComments(this.contextLevel, this.instanceId, this.componentName, this.itemId,
this.area, this.page).then((response) => {
@ -165,30 +149,10 @@ export class CoreCommentsViewerPage implements OnDestroy {
this.canLoadMore = response.comments.length > 0 && response.comments.length >= CoreCommentsProvider.pageSize;
}
return Promise.all(comments.map((comment) => {
// Get the user profile image.
return this.userProvider.getProfile(comment.userid, undefined, true).then((user) => {
comment.profileimageurl = user.profileimageurl;
return comment;
}).catch(() => {
// Ignore errors.
return comment;
});
}));
return Promise.all(comments.map((comment) => this.loadCommentProfile(comment)));
}).then((comments) => {
this.comments = this.comments.concat(comments);
deletedComments && deletedComments.forEach((deletedComment) => {
const comment = this.comments.find((comment) => {
return comment.id == deletedComment.commentid;
});
if (comment) {
comment.deleted = deletedComment.deleted;
}
});
this.canDeleteComments = this.addDeleteCommentsAvailable && (this.hasOffline || this.comments.some((comment) => {
return !!comment.delete;
}));
@ -231,11 +195,11 @@ export class CoreCommentsViewerPage implements OnDestroy {
* @return Resolved when done.
*/
refreshComments(showErrors: boolean, refresher?: any): Promise<any> {
this.commentsLoaded = false;
this.refreshIcon = 'spinner';
this.syncIcon = 'spinner';
return this.commentsProvider.invalidateCommentsData(this.contextLevel, this.instanceId, this.componentName,
this.itemId, this.area).finally(() => {
return this.invalidateComments().finally(() => {
this.page = 0;
this.comments = [];
@ -297,10 +261,25 @@ export class CoreCommentsViewerPage implements OnDestroy {
const modal = this.modalCtrl.create('CoreCommentsAddPage', params);
modal.onDidDismiss((data) => {
if (data && data.comments) {
this.comments = data.comments.concat(this.comments);
this.canDeleteComments = this.addDeleteCommentsAvailable;
this.invalidateComments();
return Promise.all(data.comments.map((comment) => this.loadCommentProfile(comment))).then((addedComments) => {
// Add the comment to the top.
this.comments = addedComments.concat(this.comments);
this.canDeleteComments = this.addDeleteCommentsAvailable;
this.eventsProvider.trigger(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, {
contextLevel: this.contextLevel,
instanceId: this.instanceId,
component: this.componentName,
itemId: this.itemId,
area: this.area,
countChange: addedComments.length,
}, this.sitesProvider.getCurrentSiteId());
});
} else if (data && !data.comments) {
this.fetchComments(false);
// Comments added in offline mode.
return this.loadOfflineData();
}
});
modal.present();
@ -310,26 +289,45 @@ export class CoreCommentsViewerPage implements OnDestroy {
* Delete a comment.
*
* @param e Click event.
* @param comment Comment to delete.
* @param deleteComment Comment to delete.
*/
deleteComment(e: Event, comment: any): void {
deleteComment(e: Event, deleteComment: any): void {
e.preventDefault();
e.stopPropagation();
const time = this.timeUtils.userDate((comment.lastmodified || comment.timecreated) * 1000, 'core.strftimerecentfull');
const time = this.timeUtils.userDate((deleteComment.lastmodified || deleteComment.timecreated) * 1000,
'core.strftimerecentfull');
comment.contextlevel = this.contextLevel;
comment.instanceid = this.instanceId;
comment.component = this.componentName;
comment.itemid = this.itemId;
comment.area = this.area;
deleteComment.contextlevel = this.contextLevel;
deleteComment.instanceid = this.instanceId;
deleteComment.component = this.componentName;
deleteComment.itemid = this.itemId;
deleteComment.area = this.area;
this.domUtils.showDeleteConfirm('core.comments.deletecommentbyon', {$a:
{ user: comment.fullname || '', time: time } }).then(() => {
this.commentsProvider.deleteComment(comment).then(() => {
{ user: deleteComment.fullname || '', time: time } }).then(() => {
this.commentsProvider.deleteComment(deleteComment).then((deletedOnline) => {
this.showDelete = false;
this.refreshComments(true);
if (deletedOnline) {
const index = this.comments.findIndex((comment) => comment.id == deleteComment.id);
if (index >= 0) {
this.comments.splice(index, 1);
}
} else {
this.loadOfflineData();
}
this.eventsProvider.trigger(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, {
contextLevel: this.contextLevel,
instanceId: this.instanceId,
component: this.componentName,
itemId: this.itemId,
area: this.area,
countChange: -1,
}, this.sitesProvider.getCurrentSiteId());
this.invalidateComments();
this.domUtils.showToast('core.comments.eventcommentdeleted', true, 3000);
}).catch((error) => {
@ -340,6 +338,91 @@ export class CoreCommentsViewerPage implements OnDestroy {
});
}
/**
* Invalidate comments.
*
* @return Resolved when done.
*/
protected invalidateComments(): Promise<void> {
return this.commentsProvider.invalidateCommentsData(this.contextLevel, this.instanceId, this.componentName, this.itemId,
this.area);
}
/**
* Loads the profile info onto the comment object.
*
* @param comment Comment object.
* @return Promise resolved with modified comment when done.
*/
protected loadCommentProfile(comment: any): Promise<any> {
// Get the user profile image.
return this.userProvider.getProfile(comment.userid, undefined, true).then((user) => {
comment.profileimageurl = user.profileimageurl;
comment.fullname = user.fullname;
comment.userid = user.id;
return comment;
}).catch(() => {
// Ignore errors.
return comment;
});
}
/**
* Load offline comments.
*
* @return Promise resolved when done.
*/
protected loadOfflineData(): Promise<void> {
const promises = [];
let hasDeletedComments = false;
// Load the only offline comment allowed if any.
promises.push(this.offlineComments.getComment(this.contextLevel, this.instanceId, this.componentName, this.itemId,
this.area).then((offlineComment) => {
if (offlineComment && !this.currentUser) {
offlineComment.userid = this.currentUserId;
this.loadCommentProfile(offlineComment).then((comment) => {
// Save this fields for further requests.
if (comment.fullname) {
this.currentUser = {};
this.currentUser.profileimageurl = comment.profileimageurl;
this.currentUser.fullname = comment.fullname;
this.currentUser.userid = comment.userid;
}
});
} else if (offlineComment) {
offlineComment.profileimageurl = this.currentUser.profileimageurl;
offlineComment.fullname = this.currentUser.fullname;
offlineComment.userid = this.currentUser.id;
}
this.offlineComment = offlineComment;
}));
// Load deleted comments offline.
promises.push(this.offlineComments.getDeletedComments(this.contextLevel, this.instanceId, this.componentName, this.itemId,
this.area).then((deletedComments) => {
hasDeletedComments = deletedComments && deletedComments.length > 0;
hasDeletedComments && deletedComments.forEach((deletedComment) => {
const comment = this.comments.find((comment) => {
return comment.id == deletedComment.commentid;
});
if (comment) {
comment.deleted = deletedComment.deleted;
}
});
}));
return Promise.all(promises).then(() => {
this.hasOffline = !!this.offlineComment || hasDeletedComments;
});
}
/**
* Restore a comment.
*

12
src/core/comments/providers/comments.ts
View File

@ -26,6 +26,7 @@ import { CoreCommentsOfflineProvider } from './offline';
export class CoreCommentsProvider {
static REFRESH_COMMENTS_EVENT = 'core_comments_refresh_comments';
static COMMENTS_COUNT_CHANGED_EVENT = 'core_comments_count_changed';
protected ROOT_CACHE_KEY = 'mmComments:';
static pageSize = 1; // At least it will be one.
@ -162,15 +163,18 @@ export class CoreCommentsProvider {
*
* @param comment Comment object to delete.
* @param siteId Site ID. If not defined, current site.
* @return Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that comments
* have been deleted, the resolve param can contain errors for comments not deleted.
* @return Promise resolved when deleted (with true if deleted in online, false otherwise), rejected otherwise. Promise resolved
* doesn't mean that comments have been deleted, the resolve param can contain errors for comments not deleted.
*/
deleteComment(comment: any, siteId?: string): Promise<void> {
deleteComment(comment: any, siteId?: string): Promise<boolean> {
siteId = siteId || this.sitesProvider.getCurrentSiteId();
// Offline comment, just delete it.
if (!comment.id) {
return this.commentsOffline.removeComment(comment.contextlevel, comment.instanceid, comment.component, comment.itemid,
comment.area, siteId);
comment.area, siteId).then(() => {
return false;
});
}
// Convenience function to store the action to be synchronized later.

14
src/core/comments/providers/sync.ts
View File

@ -159,6 +159,7 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
const errors = [],
promises = [],
deleteCommentIds = [];
let countChange = 0;
comments.forEach((comment) => {
if (comment.commentid) {
@ -166,6 +167,8 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
} else {
promises.push(this.commentsProvider.addCommentOnline(comment.content, contextLevel, instanceId, component,
itemId, area, siteId).then((response) => {
countChange++;
return this.commentsOffline.removeComment(contextLevel, instanceId, component, itemId, area, siteId);
}));
}
@ -174,6 +177,8 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
if (deleteCommentIds.length > 0) {
promises.push(this.commentsProvider.deleteCommentsOnline(deleteCommentIds, contextLevel, instanceId, component,
itemId, area, siteId).then((response) => {
countChange--;
return this.commentsOffline.removeDeletedComments(contextLevel, instanceId, component, itemId, area,
siteId);
}));
@ -181,6 +186,15 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
// Send the comments.
return Promise.all(promises).then(() => {
this.eventsProvider.trigger(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, {
contextLevel: contextLevel,
instanceId: instanceId,
component: component,
itemId: itemId,
area: area,
countChange: countChange,
}, this.sitesProvider.getCurrentSiteId());
// Fetch the comments from server to be sure they're up to date.
return this.commentsProvider.invalidateCommentsData(contextLevel, instanceId, component, itemId, area, siteId)
.then(() => {