Merge branch 'comment-count-update_2' into 'master'

Comment Paragraph - Comment count update Added a simple solution to the count updates and lists. A solution more simple than the proposed in the merge request https://softwarepublico.gov.br/gitlab/noosfero-themes/angular-theme/merge_requests/30 See merge request !32

Merge branch 'comment-count-update_2' into 'master'
Comment Paragraph - Comment count update Added a simple solution to the count updates and lists. A solution more simple than the proposed in the merge request https://softwarepublico.gov.br/gitlab/noosfero-themes/angular-theme/merge_requests/30 See merge request !32
Ábner Oliveira
2 parents d5a304a4 3c3870cc
Showing 5 changed files with 48 additions and 9 deletions Show diff stats
src/app/article/comment/comments.component.ts
src/lib/ng-noosfero-api/http/restangular_service.ts
src/lib/ng-noosfero-api/interfaces/comment.ts
src/plugins/comment_paragraph/allow-comment/allow-comment.component.ts
src/plugins/comment_paragraph/models/comment_paragraph.ts
@@ -9,7 +9,7 @@ import { CommentComponent } from &quot;./comment.component&quot;;
     directives: [PostCommentComponent, CommentComponent],
     outputs: ['commentAdded']
 })
-@Inject(CommentService, "$element")
+@Inject(CommentService, "$scope")
 export class CommentsComponent {
     comments: noosfero.CommentViewModel[] = [];
@@ -32,9 +32,22 @@ export class CommentsComponent {
         }
     }
-    commentAdded(comment: noosfero.Comment): void {
+    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();
     }
     commentRemoved(comment: noosfero.Comment): void {
@@ -51,6 +64,7 @@ export class CommentsComponent {
         if (this.parent) {
             this.parent.__show_reply = false;
         }
+
     }
     loadComments() {
@@ -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);
+                if (successEmitter !== this.modelRemovedEventEmitter) {
+                    successEmitter.next(resultModel.data);
+                } else {
+                    successEmitter.next(currentModel !== null ? currentModel : resultModel.data);
+                }
             }
         };
         return successFunction;
 namespace noosfero {
     export interface Comment extends RestModel {
+        source_id: number;
         reply_of_id: number;
         reply_of: Comment;
         replies: Comment[];
@@ -2,24 +2,27 @@ import {Component, Input, Inject} from &quot;ng-forward&quot;;
 import {SideCommentsComponent} from "../side-comments/side-comments.component";
 import {CommentParagraphEventService} from "../events/comment-paragraph-event.service";
 import {CommentParagraphService} from "../http/comment-paragraph.service";
+import {CommentService} from "./../../../lib/ng-noosfero-api/http/comment.service";
 @Component({
     selector: "comment-paragraph-plugin-allow-comment",
     templateUrl: "plugins/comment_paragraph/allow-comment/allow-comment.html",
     directives: [SideCommentsComponent]
 })
-@Inject("$scope", CommentParagraphEventService, CommentParagraphService)
+@Inject("$scope", CommentParagraphEventService, CommentParagraphService, CommentService)
 export class AllowCommentComponent {
     @Input() content: string;
     @Input() paragraphUuid: string;
     @Input() article: noosfero.Article;
-    commentsCount: number;
+    commentsCount: number = 0;
     display = false;
     constructor(private $scope: ng.IScope,
         private commentParagraphEventService: CommentParagraphEventService,
-        private commentParagraphService: CommentParagraphService) { }
+        private commentParagraphService: CommentParagraphService,
+        private commentService: CommentService
+    ) { }
     ngOnInit() {
         this.commentParagraphEventService.subscribeToggleCommentParagraph((article: noosfero.Article) => {
@@ -27,7 +30,19 @@ export class AllowCommentComponent {
             this.$scope.$apply();
         });
         this.commentParagraphService.commentParagraphCount(this.article, this.paragraphUuid).then((count: number) => {
-            this.commentsCount = count;
+            this.commentsCount = count ? count : 0;
+        });
+
+        this.commentService.subscribeToModelAdded((comment: noosfero.CommentParagraph) => {
+            if (comment.paragraph_uuid === this.paragraphUuid) {
+                this.commentsCount += 1;
+            };
+        });
+
+        this.commentService.subscribeToModelRemoved((comment: noosfero.CommentParagraph) => {
+            if (comment.paragraph_uuid === this.paragraphUuid) {
+                this.commentsCount -= (comment.replies) ? 1 + comment.replies.length : 1;
+            };
         });
     }
@@ -0,0 +1,5 @@
+namespace noosfero {
+    export interface CommentParagraph extends noosfero.Comment {
+        paragraph_uuid?: string;
+    }
+}
 \ No newline at end of file
1	namespace noosfero {	1	namespace noosfero {
2	export interface Comment extends RestModel {	2	export interface Comment extends RestModel {
		3	+ source_id: number;
3	reply_of_id: number;	4	reply_of_id: number;
4	reply_of: Comment;	5	reply_of: Comment;
5	replies: Comment[];	6	replies: Comment[];
	@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
		1	+namespace noosfero {
		2	+ export interface CommentParagraph extends noosfero.Comment {
		3	+ paragraph_uuid?: string;
		4	+ }
		5	+}
0	\ No newline at end of file	6	\ No newline at end of file