Merge branch 'master' of softwarepublico.gov.br:noosfero-themes/angular-theme

Victor Costa
2 parents 3f648f6e 811f695c
Showing 8 changed files with 91 additions and 25 deletions Show diff stats
src/app/article/comment/comments.component.spec.ts
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.spec.ts
src/plugins/comment_paragraph/allow-comment/allow-comment.component.ts
src/plugins/comment_paragraph/models/comment_paragraph.ts
src/spec/mocks.ts
@@ -19,7 +19,6 @@ describe(&quot;Components&quot;, () =&gt; {
  
         let properties = { article: { id: 1 }, parent: <any>null };
         function createComponent() {
-            // postCommentEventService = jasmine.createSpyObj("postCommentEventService", ["subscribe"]);
             let providers = [
                 helpers.createProviderToValue('CommentService', commentService),
                 helpers.createProviderToValue('NotificationService', helpers.mocks.notificationService),
@@ -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[];
@@ -3,7 +3,6 @@ import {ComponentTestHelper, createClass} from &#39;../../../spec/component-test-hel
 import * as helpers from "../../../spec/helpers";
 import {Provider} from 'ng-forward';
 import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
-
 let htmlTemplate = '<comment-paragraph-plugin-allow-comment [content]="ctrl.content" [paragraph-uuid]="ctrl.paragraphUuid" [article]="ctrl.article"></comment-paragraph-plugin-allow-comment>';
  
 describe("Components", () => {
@@ -23,6 +22,7 @@ describe(&quot;Components&quot;, () =&gt; {
         };
  
         let providers = [
+            new Provider('CommentService', { useValue: helpers.mocks.commentService } ),
             new Provider('CommentParagraphService', { useValue: serviceMock }),
             new Provider('CommentParagraphEventService', { useValue: eventServiceMock })
         ];
@@ -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
@@ -85,24 +85,24 @@ export var mocks: any = {
             mocks.articleService.articleAddedFn = fn;
         },
         modelRemovedEventEmitter:
-            {
-                subscribe: (fn: Function) => {
-                    mocks.articleService.articleRemovedFn = fn;
-                },
-                next: (param: any) => {
-                    mocks.articleService.articleRemovedFn(param);
-                }
+        {
+            subscribe: (fn: Function) => {
+                mocks.articleService.articleRemovedFn = fn;
+            },
+            next: (param: any) => {
+                mocks.articleService.articleRemovedFn(param);
             }
+        }
         ,
         modelAddedEventEmitter:
-            {
-                subscribe: (fn: Function) => {
-                    mocks.articleService.articleAddedFn = fn;
-                },
-                next: (param: any) => {
-                    mocks.articleService.articleAddedFn(param);
-                }
+        {
+            subscribe: (fn: Function) => {
+                mocks.articleService.articleAddedFn = fn;
+            },
+            next: (param: any) => {
+                mocks.articleService.articleAddedFn(param);
             }
+        }
         ,
         remove: (article: noosfero.Article) => {
             return {
@@ -156,6 +156,34 @@ export var mocks: any = {
         instant: () => { }
     },
     commentService: {
+        commentRemovedFn: null,
+        commentAddedFn: null,
+        subscribeToModelRemoved: (fn: Function) => {
+            mocks.commentService.commentRemovedFn = fn;
+        },
+        subscribeToModelAdded: (fn: Function) => {
+            mocks.commentService.commentAddedFn = fn;
+        },
+        modelRemovedEventEmitter:
+        {
+            subscribe: (fn: Function) => {
+                mocks.commentService.commentRemovedFn = fn;
+            },
+            next: (param: any) => {
+                mocks.commentService.commentRemovedFn(param);
+            }
+        }
+        ,
+        modelAddedEventEmitter:
+        {
+            subscribe: (fn: Function) => {
+                mocks.articleService.commentAddedFn = fn;
+            },
+            next: (param: any) => {
+                mocks.articleService.commentAddedFn(param);
+            }
+        }
+        ,
         getByArticle: (article: noosfero.Article) => {
             return Promise.resolve({ data: {} });
         }
...	...	@@ -19,7 +19,6 @@ describe("Components", () => {
19	19
20	20	let properties = { article: { id: 1 }, parent: <any>null };
21	21	function createComponent() {
22		- // postCommentEventService = jasmine.createSpyObj("postCommentEventService", ["subscribe"]);
23	22	let providers = [
24	23	helpers.createProviderToValue('CommentService', commentService),
25	24	helpers.createProviderToValue('NotificationService', helpers.mocks.notificationService),
...	...
...	...	@@ -9,7 +9,7 @@ import { CommentComponent } from "./comment.component";
9	9	directives: [PostCommentComponent, CommentComponent],
10	10	outputs: ['commentAdded']
11	11	})
12		-@Inject(CommentService, "$element")
	12	+@Inject(CommentService, "$scope")
13	13	export class CommentsComponent {
14	14
15	15	comments: noosfero.CommentViewModel[] = [];
...	...	@@ -32,9 +32,22 @@ export class CommentsComponent {
32	32	}
33	33	}
34	34
35		- commentAdded(comment: noosfero.Comment): void {
	35	+ commentAdded(comment: noosfero.CommentViewModel): void {
	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	+ }
36	48	this.comments.push(comment);
37	49	this.resetShowReply();
	50	+ this.$scope.$apply();
38	51	}
39	52
40	53	commentRemoved(comment: noosfero.Comment): void {
...	...	@@ -51,6 +64,7 @@ export class CommentsComponent {
51	64	if (this.parent) {
52	65	this.parent.__show_reply = false;
53	66	}
	67	+
54	68	}
55	69
56	70	loadComments() {
...	...
...	...	@@ -223,7 +223,7 @@ export abstract class RestangularService<T extends noosfero.RestModel> {
223	223	restRequest = restangularObj.remove(queryParams, headers);
224	224
225	225	restRequest
226		- .then(this.getHandleSuccessFunction(deferred, this.modelRemovedEventEmitter))
	226	+ .then(this.getHandleSuccessFunction(deferred, this.modelRemovedEventEmitter, obj))
227	227	.catch(this.getHandleErrorFunction(deferred));
228	228
229	229	return deferred.promise;
...	...	@@ -311,7 +311,7 @@ export abstract class RestangularService<T extends noosfero.RestModel> {
311	311	}
312	312
313	313	/** HANDLERS */
314		- protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<noosfero.RestResult<C \| T \| any>>, successEmitter: EventEmitter<T> = null): (response: restangular.IResponse) => void {
	314	+ protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<noosfero.RestResult<C \| T \| any>>, successEmitter: EventEmitter<T> = null, currentModel: T = null): (response: restangular.IResponse) => void {
315	315	let self = this;
316	316
317	317	/**
...	...	@@ -328,7 +328,11 @@ export abstract class RestangularService<T extends noosfero.RestModel> {
328	328	deferred.resolve(resultModel);
329	329	// emits the event if a successEmiter was provided in the successEmitter parameter
330	330	if (successEmitter !== null) {
331		- successEmitter.next(resultModel);
	331	+ if (successEmitter !== this.modelRemovedEventEmitter) {
	332	+ successEmitter.next(resultModel.data);
	333	+ } else {
	334	+ successEmitter.next(currentModel !== null ? currentModel : resultModel.data);
	335	+ }
332	336	}
333	337	};
334	338	return successFunction;
...	...
1	1	namespace noosfero {
2	2	export interface Comment extends RestModel {
	3	+ source_id: number;
3	4	reply_of_id: number;
4	5	reply_of: Comment;
5	6	replies: Comment[];
...	...
...	...	@@ -3,7 +3,6 @@ import {ComponentTestHelper, createClass} from '../../../spec/component-test-hel
3	3	import * as helpers from "../../../spec/helpers";
4	4	import {Provider} from 'ng-forward';
5	5	import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
6		-
7	6	let htmlTemplate = '<comment-paragraph-plugin-allow-comment [content]="ctrl.content" [paragraph-uuid]="ctrl.paragraphUuid" [article]="ctrl.article"></comment-paragraph-plugin-allow-comment>';
8	7
9	8	describe("Components", () => {
...	...	@@ -23,6 +22,7 @@ describe("Components", () => {
23	22	};
24	23
25	24	let providers = [
	25	+ new Provider('CommentService', { useValue: helpers.mocks.commentService } ),
26	26	new Provider('CommentParagraphService', { useValue: serviceMock }),
27	27	new Provider('CommentParagraphEventService', { useValue: eventServiceMock })
28	28	];
...	...
...	...	@@ -2,24 +2,27 @@ import {Component, Input, Inject} from "ng-forward";
2	2	import {SideCommentsComponent} from "../side-comments/side-comments.component";
3	3	import {CommentParagraphEventService} from "../events/comment-paragraph-event.service";
4	4	import {CommentParagraphService} from "../http/comment-paragraph.service";
	5	+import {CommentService} from "./../../../lib/ng-noosfero-api/http/comment.service";
5	6
6	7	@Component({
7	8	selector: "comment-paragraph-plugin-allow-comment",
8	9	templateUrl: "plugins/comment_paragraph/allow-comment/allow-comment.html",
9	10	directives: [SideCommentsComponent]
10	11	})
11		-@Inject("$scope", CommentParagraphEventService, CommentParagraphService)
	12	+@Inject("$scope", CommentParagraphEventService, CommentParagraphService, CommentService)
12	13	export class AllowCommentComponent {
13	14
14	15	@Input() content: string;
15	16	@Input() paragraphUuid: string;
16	17	@Input() article: noosfero.Article;
17		- commentsCount: number;
	18	+ commentsCount: number = 0;
18	19	display = false;
19	20
20	21	constructor(private $scope: ng.IScope,
21	22	private commentParagraphEventService: CommentParagraphEventService,
22		- private commentParagraphService: CommentParagraphService) { }
	23	+ private commentParagraphService: CommentParagraphService,
	24	+ private commentService: CommentService
	25	+ ) { }
23	26
24	27	ngOnInit() {
25	28	this.commentParagraphEventService.subscribeToggleCommentParagraph((article: noosfero.Article) => {
...	...	@@ -27,7 +30,19 @@ export class AllowCommentComponent {
27	30	this.$scope.$apply();
28	31	});
29	32	this.commentParagraphService.commentParagraphCount(this.article, this.paragraphUuid).then((count: number) => {
30		- this.commentsCount = count;
	33	+ this.commentsCount = count ? count : 0;
	34	+ });
	35	+
	36	+ this.commentService.subscribeToModelAdded((comment: noosfero.CommentParagraph) => {
	37	+ if (comment.paragraph_uuid === this.paragraphUuid) {
	38	+ this.commentsCount += 1;
	39	+ };
	40	+ });
	41	+
	42	+ this.commentService.subscribeToModelRemoved((comment: noosfero.CommentParagraph) => {
	43	+ if (comment.paragraph_uuid === this.paragraphUuid) {
	44	+ this.commentsCount -= (comment.replies) ? 1 + comment.replies.length : 1;
	45	+ };
31	46	});
32	47	}
33	48
...	...
...	...	@@ -0,0 +1,5 @@
	1	+namespace noosfero {
	2	+ export interface CommentParagraph extends noosfero.Comment {
	3	+ paragraph_uuid?: string;
	4	+ }
	5	+}
0	6	\ No newline at end of file
...	...
...	...	@@ -85,24 +85,24 @@ export var mocks: any = {
85	85	mocks.articleService.articleAddedFn = fn;
86	86	},
87	87	modelRemovedEventEmitter:
88		- {
89		- subscribe: (fn: Function) => {
90		- mocks.articleService.articleRemovedFn = fn;
91		- },
92		- next: (param: any) => {
93		- mocks.articleService.articleRemovedFn(param);
94		- }
	88	+ {
	89	+ subscribe: (fn: Function) => {
	90	+ mocks.articleService.articleRemovedFn = fn;
	91	+ },
	92	+ next: (param: any) => {
	93	+ mocks.articleService.articleRemovedFn(param);
95	94	}
	95	+ }
96	96	,
97	97	modelAddedEventEmitter:
98		- {
99		- subscribe: (fn: Function) => {
100		- mocks.articleService.articleAddedFn = fn;
101		- },
102		- next: (param: any) => {
103		- mocks.articleService.articleAddedFn(param);
104		- }
	98	+ {
	99	+ subscribe: (fn: Function) => {
	100	+ mocks.articleService.articleAddedFn = fn;
	101	+ },
	102	+ next: (param: any) => {
	103	+ mocks.articleService.articleAddedFn(param);
105	104	}
	105	+ }
106	106	,
107	107	remove: (article: noosfero.Article) => {
108	108	return {
...	...	@@ -156,6 +156,34 @@ export var mocks: any = {
156	156	instant: () => { }
157	157	},
158	158	commentService: {
	159	+ commentRemovedFn: null,
	160	+ commentAddedFn: null,
	161	+ subscribeToModelRemoved: (fn: Function) => {
	162	+ mocks.commentService.commentRemovedFn = fn;
	163	+ },
	164	+ subscribeToModelAdded: (fn: Function) => {
	165	+ mocks.commentService.commentAddedFn = fn;
	166	+ },
	167	+ modelRemovedEventEmitter:
	168	+ {
	169	+ subscribe: (fn: Function) => {
	170	+ mocks.commentService.commentRemovedFn = fn;
	171	+ },
	172	+ next: (param: any) => {
	173	+ mocks.commentService.commentRemovedFn(param);
	174	+ }
	175	+ }
	176	+ ,
	177	+ modelAddedEventEmitter:
	178	+ {
	179	+ subscribe: (fn: Function) => {
	180	+ mocks.articleService.commentAddedFn = fn;
	181	+ },
	182	+ next: (param: any) => {
	183	+ mocks.articleService.commentAddedFn(param);
	184	+ }
	185	+ }
	186	+ ,
159	187	getByArticle: (article: noosfero.Article) => {
160	188	return Promise.resolve({ data: {} });
161	189	}
...	...