Add paragraph uuid in comment form

Victor Costa · Michel Felipe
1 parent f98ac330
Showing 5 changed files with 64 additions and 3 deletions Show diff stats
src/app/article/comment/post-comment/post-comment.html
src/app/hotspot/comment-form-hotspot.component.ts
src/plugins/comment_paragraph/hotspot/comment-paragraph-form.component.ts
src/plugins/comment_paragraph/hotspot/comment-paragraph-from.component.spec.ts
src/plugins/comment_paragraph/index.ts
@@ -8,7 +8,7 @@
       </div>
       <div class="media-body">
         <textarea class="form-control custom-control" rows="1" ng-model="ctrl.comment.body" placeholder="{{'comment.post.placeholder' | translate}}"></textarea>
-        <noosfero-hotspot-comment-form [comment]="ctrl.comment"></noosfero-hotspot-comment-form>
+        <noosfero-hotspot-comment-form [comment]="ctrl.comment" [parent]="ctrl.parent"></noosfero-hotspot-comment-form>
         <button ng-show="ctrl.comment.body" type="submit" class="btn btn-default pull-right ng-hide" ng-click="ctrl.save()">{{"comment.post" | translate}}</button>
       </div>
     </div>
@@ -11,6 +11,7 @@ import {PluginHotspot} from &quot;./plugin-hotspot&quot;;
 export class CommentFormHotspotComponent extends PluginHotspot {
     @Input() comment: noosfero.Comment;
+    @Input() parent: noosfero.Comment;
     constructor(
         private $element: any,
@@ -20,6 +21,6 @@ export class CommentFormHotspotComponent extends PluginHotspot {
     }
     addHotspot(directiveName: string) {
-        this.$element.append(this.$compile('<' + directiveName + ' [comment]="ctrl.comment"></' + directiveName + '>')(this.$scope));
+        this.$element.append(this.$compile('<' + directiveName + ' [comment]="ctrl.comment" [parent]="ctrl.parent"></' + directiveName + '>')(this.$scope));
     }
 }
@@ -0,0 +1,26 @@
+import { Inject, Input, Component } from "ng-forward";
+import {Hotspot} from "../../../app/hotspot/hotspot.decorator";
+
+@Component({
+    selector: "comment-paragraph-form-hotspot",
+    template: "<span></span>",
+})
+@Hotspot("comment_form_extra_contents")
+@Inject("$scope")
+export class CommentParagraphFormHotspotComponent {
+
+    @Input() comment: noosfero.Comment;
+    @Input() parent: noosfero.Comment;
+
+    constructor(private $scope: ng.IScope) { }
+
+    ngOnInit() {
+        this.$scope.$watch(() => {
+            return this.parent;
+        }, () => {
+            if (this.parent && (<any>this.parent).paragraph_uuid) {
+                (<any>this.comment).paragraph_uuid = (<any>this.parent).paragraph_uuid;
+            }
+        });
+    }
+}
@@ -0,0 +1,33 @@
+import {CommentParagraphFormHotspotComponent} from "./comment-paragraph-form.component";
+import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
+import * as helpers from "../../../spec/helpers";
+import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
+
+let htmlTemplate = '<comment-paragraph-form-hotspot [comment]="ctrl.comment" [parent]="ctrl.parent"></comment-paragraph-form-hotspot>';
+
+describe("Components", () => {
+    describe("Comment Paragraph Form Hotspot Component", () => {
+
+        let helper: ComponentTestHelper;
+
+        beforeEach(angular.mock.module("templates"));
+
+        beforeEach((done) => {
+            let cls = createClass({
+                template: htmlTemplate,
+                directives: [CommentParagraphFormHotspotComponent],
+                providers: [],
+                properties: {
+                    comment: {}
+                }
+            });
+            helper = new ComponentTestHelper(cls, done);
+        });
+
+        it('set paragraph uuid when parent has it setted', () => {
+            helper.component.parent = { paragraph_uuid: 'uuid' };
+            helper.detectChanges();
+            expect((<any>helper.component.comment).paragraph_uuid).toEqual('uuid');
+        });
+    });
+});
 import {AllowCommentComponent} from "./allow-comment/allow-comment.component";
 import {CommentParagraphArticleButtonHotspotComponent} from "./hotspot/comment-paragraph-article-button.component";
+import {CommentParagraphFormHotspotComponent} from "./hotspot/comment-paragraph-form.component";
 export let mainComponents: any = [AllowCommentComponent];
-export let hotspots: any = [CommentParagraphArticleButtonHotspotComponent];
+export let hotspots: any = [CommentParagraphArticleButtonHotspotComponent, CommentParagraphFormHotspotComponent];
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	</div>	8	</div>
9	<div class="media-body">	9	<div class="media-body">
10	<textarea class="form-control custom-control" rows="1" ng-model="ctrl.comment.body" placeholder="{{'comment.post.placeholder' \| translate}}"></textarea>	10	<textarea class="form-control custom-control" rows="1" ng-model="ctrl.comment.body" placeholder="{{'comment.post.placeholder' \| translate}}"></textarea>
11	- <noosfero-hotspot-comment-form [comment]="ctrl.comment"></noosfero-hotspot-comment-form>	11	+ <noosfero-hotspot-comment-form [comment]="ctrl.comment" [parent]="ctrl.parent"></noosfero-hotspot-comment-form>
12	<button ng-show="ctrl.comment.body" type="submit" class="btn btn-default pull-right ng-hide" ng-click="ctrl.save()">{{"comment.post" \| translate}}</button>	12	<button ng-show="ctrl.comment.body" type="submit" class="btn btn-default pull-right ng-hide" ng-click="ctrl.save()">{{"comment.post" \| translate}}</button>
13	</div>	13	</div>
14	</div>	14	</div>
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+import { Inject, Input, Component } from "ng-forward";
	2	+import {Hotspot} from "../../../app/hotspot/hotspot.decorator";
	3	+
	4	+@Component({
	5	+ selector: "comment-paragraph-form-hotspot",
	6	+ template: "<span></span>",
	7	+})
	8	+@Hotspot("comment_form_extra_contents")
	9	+@Inject("$scope")
	10	+export class CommentParagraphFormHotspotComponent {
	11	+
	12	+ @Input() comment: noosfero.Comment;
	13	+ @Input() parent: noosfero.Comment;
	14	+
	15	+ constructor(private $scope: ng.IScope) { }
	16	+
	17	+ ngOnInit() {
	18	+ this.$scope.$watch(() => {
	19	+ return this.parent;
	20	+ }, () => {
	21	+ if (this.parent && (<any>this.parent).paragraph_uuid) {
	22	+ (<any>this.comment).paragraph_uuid = (<any>this.parent).paragraph_uuid;
	23	+ }
	24	+ });
	25	+ }
	26	+}
@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
	1	+import {CommentParagraphFormHotspotComponent} from "./comment-paragraph-form.component";
	2	+import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
	3	+import * as helpers from "../../../spec/helpers";
	4	+import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
	5	+
	6	+let htmlTemplate = '<comment-paragraph-form-hotspot [comment]="ctrl.comment" [parent]="ctrl.parent"></comment-paragraph-form-hotspot>';
	7	+
	8	+describe("Components", () => {
	9	+ describe("Comment Paragraph Form Hotspot Component", () => {
	10	+
	11	+ let helper: ComponentTestHelper;
	12	+
	13	+ beforeEach(angular.mock.module("templates"));
	14	+
	15	+ beforeEach((done) => {
	16	+ let cls = createClass({
	17	+ template: htmlTemplate,
	18	+ directives: [CommentParagraphFormHotspotComponent],
	19	+ providers: [],
	20	+ properties: {
	21	+ comment: {}
	22	+ }
	23	+ });
	24	+ helper = new ComponentTestHelper(cls, done);
	25	+ });
	26	+
	27	+ it('set paragraph uuid when parent has it setted', () => {
	28	+ helper.component.parent = { paragraph_uuid: 'uuid' };
	29	+ helper.detectChanges();
	30	+ expect((<any>helper.component.comment).paragraph_uuid).toEqual('uuid');
	31	+ });
	32	+ });
	33	+});
1	import {AllowCommentComponent} from "./allow-comment/allow-comment.component";	1	import {AllowCommentComponent} from "./allow-comment/allow-comment.component";
2	import {CommentParagraphArticleButtonHotspotComponent} from "./hotspot/comment-paragraph-article-button.component";	2	import {CommentParagraphArticleButtonHotspotComponent} from "./hotspot/comment-paragraph-article-button.component";
		3	+import {CommentParagraphFormHotspotComponent} from "./hotspot/comment-paragraph-form.component";
3		4
4	export let mainComponents: any = [AllowCommentComponent];	5	export let mainComponents: any = [AllowCommentComponent];
5	-export let hotspots: any = [CommentParagraphArticleButtonHotspotComponent];	6	+export let hotspots: any = [CommentParagraphArticleButtonHotspotComponent, CommentParagraphFormHotspotComponent];