Merge branch 'block-service' into 'master'

Use block endpoint to get the block content See merge request !17

Merge branch 'block-service' into 'master'
Use block endpoint to get the block content See merge request !17
Carlos Purificação
2 parents a4fb50e2 0f9e6899
Showing 7 changed files with 151 additions and 65 deletions Show diff stats
src/app/layout/blocks/recent-documents/recent-documents-block.component.spec.ts
src/app/layout/blocks/recent-documents/recent-documents-block.component.ts
src/lib/ng-noosfero-api/http/block.service.spec.ts
src/lib/ng-noosfero-api/http/block.service.ts
src/lib/ng-noosfero-api/interfaces/block.ts
src/plugins/comment_paragraph/block/discussion/discussion-block.component.spec.ts
src/plugins/comment_paragraph/block/discussion/discussion-block.component.ts
@@ -11,9 +11,9 @@ describe(&quot;Components&quot;, () =&gt; {
     describe("Recent Documents Block Component", () => {
         let settingsObj = {};
-        let mockedArticleService = {
-            getByProfile: (profile: noosfero.Profile, filters: any): any => {
-                return Promise.resolve({ data: [{ name: "article1" }], headers: (name: string) => { return name; } });
+        let mockedBlockService = {
+            getApiContent: (block: noosfero.Block): any => {
+                return Promise.resolve({ articles: [{ name: "article1" }], headers: (name: string) => { return name; } });
             }
         };
         let profile = { name: 'profile-name' };
@@ -25,8 +25,8 @@ describe(&quot;Components&quot;, () =&gt; {
         function getProviders() {
             return [
                 new Provider('$state', { useValue: state }),
-                new Provider('ArticleService', {
-                    useValue: mockedArticleService
+                new Provider('BlockService', {
+                    useValue: mockedBlockService
                 }),
             ].concat(provideFilters("truncateFilter", "stripTagsFilter"));
         }
@@ -44,7 +44,7 @@ describe(&quot;Components&quot;, () =&gt; {
         }
-        it("get recent documents from the article service", done => {
+        it("get recent documents from the block service", done => {
             tcb.createAsync(getComponent()).then(fixture => {
                 let recentDocumentsBlock: RecentDocumentsBlockComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
                 expect(recentDocumentsBlock.documents).toEqual([{ name: "article1" }]);
@@ -61,20 +61,5 @@ describe(&quot;Components&quot;, () =&gt; {
             });
         });
-        it("it uses default limit 5 if not defined on block", done => {
-            settingsObj = null;
-            mockedArticleService = jasmine.createSpyObj("mockedArticleService", ["getByProfile"]);
-            (<any>mockedArticleService).mocked = true;
-            let thenMocked = jasmine.createSpy("then");
-            mockedArticleService.getByProfile = jasmine.createSpy("getByProfile").and.returnValue({then: thenMocked});
-            let getByProfileFunct = mockedArticleService.getByProfile;
-            tcb.createAsync(getComponent()).then(fixture => {
-                let recentDocumentsBlock: RecentDocumentsBlockComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
-                recentDocumentsBlock.openDocument({ path: "path", profile: { identifier: "identifier" } });
-                expect(getByProfileFunct).toHaveBeenCalledWith(profile, { content_type: 'TinyMceArticle', per_page: 5 });
-                done();
-            });
-        });
-
     });
 });
 import {Component, Inject, Input} from "ng-forward";
-import {ArticleService} from "../../../../lib/ng-noosfero-api/http/article.service";
+import {BlockService} from "../../../../lib/ng-noosfero-api/http/block.service";
 @Component({
     selector: "noosfero-recent-documents-block",
     templateUrl: 'app/layout/blocks/recent-documents/recent-documents-block.html'
 })
-@Inject(ArticleService, "$state")
+@Inject(BlockService, "$state")
 export class RecentDocumentsBlockComponent {
     @Input() block: any;
@@ -13,23 +13,15 @@ export class RecentDocumentsBlockComponent {
     profile: any;
     documents: any;
-
     documentsLoaded: boolean = false;
-    constructor(private articleService: ArticleService, private $state: any) {
-    }
+    constructor(private blockService: BlockService, private $state: any) { }
     ngOnInit() {
         this.profile = this.owner;
         this.documents = [];
-
-        let limit = ((this.block && this.block.settings) ? this.block.settings.limit : null) || 5;
-        // FIXME get all text articles
-        // FIXME make the getByProfile a generic method where we tell the type passing a class TinyMceArticle
-        //       and the promise should be of type TinyMceArticle[], per example
-        this.articleService.getByProfile(this.profile, { content_type: 'TinyMceArticle', per_page: limit })
-        .then((result: noosfero.RestResult<noosfero.Article[]>) => {
-            this.documents = <noosfero.Article[]>result.data;
+        this.blockService.getApiContent(this.block).then((content: any) => {
+            this.documents = content.articles;
             this.documentsLoaded = true;
         });
     }
@@ -0,0 +1,36 @@
+import {BlockService} from "./block.service";
+
+
+describe("Services", () => {
+
+    describe("Block Service", () => {
+
+        let $httpBackend: ng.IHttpBackendService;
+        let blockService: BlockService;
+
+        beforeEach(angular.mock.module("noosferoApp", ($translateProvider: angular.translate.ITranslateProvider) => {
+            $translateProvider.translations('en', {});
+        }));
+
+        beforeEach(inject((_$httpBackend_: ng.IHttpBackendService, _BlockService_: BlockService) => {
+            $httpBackend = _$httpBackend_;
+            blockService = _BlockService_;
+        }));
+
+
+        describe("Succesfull requests", () => {
+
+            it("should return api content of a block", (done) => {
+                let blockId = 1;
+                $httpBackend.expectGET(`/api/v1/blocks/${blockId}`).respond(200, { block: { api_content: [{ name: "article1" }] } });
+                blockService.getApiContent(<noosfero.Block>{ id: blockId }).then((content: any) => {
+                    expect(content).toEqual([{ name: "article1" }]);
+                    done();
+                });
+                $httpBackend.flush();
+            });
+        });
+
+
+    });
+});
@@ -0,0 +1,40 @@
+import { Injectable, Inject } from "ng-forward";
+import {RestangularService} from "./restangular_service";
+import {ProfileService} from "./profile.service";
+
+@Injectable()
+@Inject("Restangular", "$q", "$log")
+export class BlockService extends RestangularService<noosfero.Block> {
+
+    constructor(Restangular: restangular.IService, $q: ng.IQService, $log: ng.ILogService) {
+        super(Restangular, $q, $log);
+    }
+
+    getResourcePath() {
+        return "blocks";
+    }
+
+    getDataKeys() {
+        return {
+            singular: 'block',
+            plural: 'blocks'
+        };
+    }
+
+    getApiContent(block: noosfero.Block) {
+        let apiContentPromise = this.$q.defer();
+        if (block) {
+            if (block.api_content) {
+                apiContentPromise.resolve(block.api_content);
+            } else {
+                this.get(block.id)
+                    .then((result: noosfero.RestResult<noosfero.Block>) => {
+                        block = result.data;
+                        apiContentPromise.resolve(block.api_content);
+                    });
+            }
+        }
+        return apiContentPromise.promise;
+    }
+
+}
 namespace noosfero {
-    export interface Block {
+    export interface Block extends RestModel {
         id: number;
         settings: any;
+        api_content: any;
     }
 }
@@ -0,0 +1,54 @@
+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
+import {Provider, Input, provide, Component} from 'ng-forward';
+import {provideFilters} from '../../../../spec/helpers';
+import {DiscussionBlockComponent} from './discussion-block.component';
+import {ComponentTestHelper, createClass} from './../../../../spec/component-test-helper';
+
+const htmlTemplate: string = '<noosfero-comment-paragraph-plugin-discussion-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-comment-paragraph-plugin-discussion-block>';
+
+const tcb = new TestComponentBuilder();
+
+describe("Components", () => {
+    describe("Discussion Block Component", () => {
+
+        let helper: ComponentTestHelper<DiscussionBlockComponent>;
+        let settingsObj = {};
+        let mockedBlockService = {
+            getApiContent: (block: noosfero.Block): any => {
+                return Promise.resolve({ articles: [{ name: "article1" }], headers: (name: string) => { return name; } });
+            }
+        };
+        let profile = { name: 'profile-name' };
+
+        let state = jasmine.createSpyObj("state", ["go"]);
+
+        let providers = [
+            new Provider('$state', { useValue: state }),
+            new Provider('BlockService', {
+                useValue: mockedBlockService
+            }),
+        ].concat(provideFilters("truncateFilter", "stripTagsFilter", "translateFilter", "amDateFormatFilter"));
+
+        beforeEach(angular.mock.module("templates"));
+
+        beforeEach((done) => {
+            let cls = createClass({
+                template: htmlTemplate,
+                directives: [DiscussionBlockComponent],
+                providers: providers,
+                properties: {}
+            });
+            helper = new ComponentTestHelper<DiscussionBlockComponent>(cls, done);
+        });
+
+        it("get discussions from the block service", () => {
+            expect(helper.component.documents).toEqual([{ name: "article1" }]);
+        });
+
+        it("go to article page when open a document", () => {
+            let block = helper.component;
+            block.openDocument({ path: "path", profile: { identifier: "identifier" } });
+            expect(state.go).toHaveBeenCalledWith("main.profile.page", { page: "path", profile: "identifier" });
+        });
+    });
+});
 import {Component, Inject, Input} from "ng-forward";
-import {ArticleService} from "../../../../lib/ng-noosfero-api/http/article.service";
+import {BlockService} from "../../../../lib/ng-noosfero-api/http/block.service";
 @Component({
     selector: "noosfero-comment-paragraph-plugin-discussion-block",
     templateUrl: 'plugins/comment_paragraph/block/discussion/discussion-block.html'
 })
-@Inject(ArticleService, "$state")
+@Inject(BlockService, "$state")
 export class DiscussionBlockComponent {
     @Input() block: any;
     @Input() owner: any;
-    profile: any;
-    documents: any;
+    profile: noosfero.Profile;
+    documents: Array<noosfero.Article>;
-    documentsLoaded: boolean = false;
-
-    constructor(private articleService: ArticleService, private $state: any) { }
+    constructor(private blockService: BlockService, private $state: any) { }
     ngOnInit() {
         this.profile = this.owner;
-        this.documents = [];
-
-        let limit = ((this.block && this.block.settings) ? this.block.settings.limit : null) || 50;
-        let params: any = { content_type: 'CommentParagraphPlugin::Discussion', per_page: limit, order: 'start_date DESC' };
-        let now = new Date().toISOString();
-        switch (this.block.settings['discussion_status']) {
-            case 0:
-                params['from_start_date'] = now;
-                break;
-            case 1:
-                params['until_start_date'] = now;
-                params['from_end_date'] = now;
-                break;
-            case 2:
-                params['until_end_date'] = now;
-                break;
-        }
-        console.log(this.block.settings['discussion_status']);
-        this.articleService.getByProfile(this.profile, params)
-            .then((result: noosfero.RestResult<noosfero.Article[]>) => {
-                this.documents = <noosfero.Article[]>result.data;
-                this.documentsLoaded = true;
-            });
+        this.blockService.getApiContent(this.block).then((content: any) => {
+            this.documents = content.articles;
+        });
     }
     openDocument(article: any) {
@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
	1	+import {BlockService} from "./block.service";
	2	+
	3	+
	4	+describe("Services", () => {
	5	+
	6	+ describe("Block Service", () => {
	7	+
	8	+ let $httpBackend: ng.IHttpBackendService;
	9	+ let blockService: BlockService;
	10	+
	11	+ beforeEach(angular.mock.module("noosferoApp", ($translateProvider: angular.translate.ITranslateProvider) => {
	12	+ $translateProvider.translations('en', {});
	13	+ }));
	14	+
	15	+ beforeEach(inject((_$httpBackend_: ng.IHttpBackendService, _BlockService_: BlockService) => {
	16	+ $httpBackend = _$httpBackend_;
	17	+ blockService = _BlockService_;
	18	+ }));
	19	+
	20	+
	21	+ describe("Succesfull requests", () => {
	22	+
	23	+ it("should return api content of a block", (done) => {
	24	+ let blockId = 1;
	25	+ $httpBackend.expectGET(`/api/v1/blocks/${blockId}`).respond(200, { block: { api_content: [{ name: "article1" }] } });
	26	+ blockService.getApiContent(<noosfero.Block>{ id: blockId }).then((content: any) => {
	27	+ expect(content).toEqual([{ name: "article1" }]);
	28	+ done();
	29	+ });
	30	+ $httpBackend.flush();
	31	+ });
	32	+ });
	33	+
	34	+
	35	+ });
	36	+});
@@ -0,0 +1,40 @@		@@ -0,0 +1,40 @@
	1	+import { Injectable, Inject } from "ng-forward";
	2	+import {RestangularService} from "./restangular_service";
	3	+import {ProfileService} from "./profile.service";
	4	+
	5	+@Injectable()
	6	+@Inject("Restangular", "$q", "$log")
	7	+export class BlockService extends RestangularService<noosfero.Block> {
	8	+
	9	+ constructor(Restangular: restangular.IService, $q: ng.IQService, $log: ng.ILogService) {
	10	+ super(Restangular, $q, $log);
	11	+ }
	12	+
	13	+ getResourcePath() {
	14	+ return "blocks";
	15	+ }
	16	+
	17	+ getDataKeys() {
	18	+ return {
	19	+ singular: 'block',
	20	+ plural: 'blocks'
	21	+ };
	22	+ }
	23	+
	24	+ getApiContent(block: noosfero.Block) {
	25	+ let apiContentPromise = this.$q.defer();
	26	+ if (block) {
	27	+ if (block.api_content) {
	28	+ apiContentPromise.resolve(block.api_content);
	29	+ } else {
	30	+ this.get(block.id)
	31	+ .then((result: noosfero.RestResult<noosfero.Block>) => {
	32	+ block = result.data;
	33	+ apiContentPromise.resolve(block.api_content);
	34	+ });
	35	+ }
	36	+ }
	37	+ return apiContentPromise.promise;
	38	+ }
	39	+
	40	+}
1	namespace noosfero {	1	namespace noosfero {
2	- export interface Block {	2	+ export interface Block extends RestModel {
3	id: number;	3	id: number;
4	settings: any;	4	settings: any;
		5	+ api_content: any;
5	}	6	}
6	}	7	}
@@ -0,0 +1,54 @@		@@ -0,0 +1,54 @@
	1	+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
	2	+import {Provider, Input, provide, Component} from 'ng-forward';
	3	+import {provideFilters} from '../../../../spec/helpers';
	4	+import {DiscussionBlockComponent} from './discussion-block.component';
	5	+import {ComponentTestHelper, createClass} from './../../../../spec/component-test-helper';
	6	+
	7	+const htmlTemplate: string = '<noosfero-comment-paragraph-plugin-discussion-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-comment-paragraph-plugin-discussion-block>';
	8	+
	9	+const tcb = new TestComponentBuilder();
	10	+
	11	+describe("Components", () => {
	12	+ describe("Discussion Block Component", () => {
	13	+
	14	+ let helper: ComponentTestHelper<DiscussionBlockComponent>;
	15	+ let settingsObj = {};
	16	+ let mockedBlockService = {
	17	+ getApiContent: (block: noosfero.Block): any => {
	18	+ return Promise.resolve({ articles: [{ name: "article1" }], headers: (name: string) => { return name; } });
	19	+ }
	20	+ };
	21	+ let profile = { name: 'profile-name' };
	22	+
	23	+ let state = jasmine.createSpyObj("state", ["go"]);
	24	+
	25	+ let providers = [
	26	+ new Provider('$state', { useValue: state }),
	27	+ new Provider('BlockService', {
	28	+ useValue: mockedBlockService
	29	+ }),
	30	+ ].concat(provideFilters("truncateFilter", "stripTagsFilter", "translateFilter", "amDateFormatFilter"));
	31	+
	32	+ beforeEach(angular.mock.module("templates"));
	33	+
	34	+ beforeEach((done) => {
	35	+ let cls = createClass({
	36	+ template: htmlTemplate,
	37	+ directives: [DiscussionBlockComponent],
	38	+ providers: providers,
	39	+ properties: {}
	40	+ });
	41	+ helper = new ComponentTestHelper<DiscussionBlockComponent>(cls, done);
	42	+ });
	43	+
	44	+ it("get discussions from the block service", () => {
	45	+ expect(helper.component.documents).toEqual([{ name: "article1" }]);
	46	+ });
	47	+
	48	+ it("go to article page when open a document", () => {
	49	+ let block = helper.component;
	50	+ block.openDocument({ path: "path", profile: { identifier: "identifier" } });
	51	+ expect(state.go).toHaveBeenCalledWith("main.profile.page", { page: "path", profile: "identifier" });
	52	+ });
	53	+ });
	54	+});