fixed issue when removing comment with replies

Ábner Oliveira
1 parent 1af26816
Showing 3 changed files with 19 additions and 6 deletions Show diff stats
src/app/article/comment/comments.component.ts
src/lib/ng-noosfero-api/http/restangular_service.ts
src/plugins/comment_paragraph/allow-comment/allow-comment.component.ts
@@ -34,6 +34,17 @@ export class CommentsComponent {
     commentAdded(comment: noosfero.CommentViewModel): void {
         comment.__show_reply = false;
+        if (comment.reply_of) {
+            this.comments.forEach((commentOnList) => {
+                if (commentOnList.id == comment.reply_of.id) {
+                    if (commentOnList.replies) {
+                        commentOnList.replies.push(comment);
+                    } else {
+                        commentOnList.replies = [comment];
+                    }
+                }
+            });
+        }
         this.comments.push(comment);
         this.resetShowReply();
         this.$scope.$apply();
@@ -223,7 +223,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         restRequest = restangularObj.remove(queryParams, headers);
         restRequest
-            .then(this.getHandleSuccessFunction(deferred, this.modelRemovedEventEmitter))
+            .then(this.getHandleSuccessFunction(deferred, this.modelRemovedEventEmitter, obj))
             .catch(this.getHandleErrorFunction(deferred));
         return deferred.promise;
@@ -311,7 +311,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
     }
     /** HANDLERS */
-    protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<noosfero.RestResult<C | T | any>>, successEmitter: EventEmitter<T> = null): (response: restangular.IResponse) => void {
+    protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<noosfero.RestResult<C | T | any>>, successEmitter: EventEmitter<T> = null, currentModel: T = null): (response: restangular.IResponse) => void {
         let self = this;
         /**
@@ -328,7 +328,11 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
             deferred.resolve(resultModel);
             // emits the event if a successEmiter was provided in the successEmitter parameter
             if (successEmitter !== null) {
-                successEmitter.next(resultModel.data);
+                if (successEmitter !== this.modelRemovedEventEmitter) {
+                    successEmitter.next(resultModel.data);
+                } else {
+                    successEmitter.next(currentModel !== null ? currentModel : resultModel.data);
+                }
             }
         };
         return successFunction;
@@ -36,14 +36,12 @@ export class AllowCommentComponent {
         this.commentService.subscribeToModelAdded((comment: noosfero.CommentParagraph) => {
             if (comment.paragraph_uuid === this.paragraphUuid) {
                 this.commentsCount += 1;
-                this.$scope.$apply();
             };
         });
         this.commentService.subscribeToModelRemoved((comment: noosfero.CommentParagraph) => {
             if (comment.paragraph_uuid === this.paragraphUuid) {
-                this.commentsCount -= 1;
-                this.$scope.$apply();
+                this.commentsCount -= (comment.replies) ? 1 + comment.replies.length : 1;
             };
         });
     }
	@@ -34,6 +34,17 @@ export class CommentsComponent {		@@ -34,6 +34,17 @@ export class CommentsComponent {
34		34
35	commentAdded(comment: noosfero.CommentViewModel): void {	35	commentAdded(comment: noosfero.CommentViewModel): void {
36	comment.__show_reply = false;	36	comment.__show_reply = false;
		37	+ if (comment.reply_of) {
		38	+ this.comments.forEach((commentOnList) => {
		39	+ if (commentOnList.id == comment.reply_of.id) {
		40	+ if (commentOnList.replies) {
		41	+ commentOnList.replies.push(comment);
		42	+ } else {
		43	+ commentOnList.replies = [comment];
		44	+ }
		45	+ }
		46	+ });
		47	+ }
37	this.comments.push(comment);	48	this.comments.push(comment);
38	this.resetShowReply();	49	this.resetShowReply();
39	this.$scope.$apply();	50	this.$scope.$apply();