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

Leandro Santos
2 parents 45120939 6574dcf0
Showing 5 changed files with 21 additions and 3 deletions Show diff stats
src/app/layout/boxes/display-blocks.filter.spec.ts
src/app/layout/boxes/display-blocks.filter.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
@@ -82,5 +82,19 @@ describe(&quot;Filters&quot;, () =&gt; {
             expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
             done();
         });
+
+        it("filter blocks when hide is true", done => {
+            let blocks = [{ hide: true }];
+            let filter = new DisplayBlocks(translatorService);
+            expect(filter.transform(<any>blocks, true, null)).toEqual([]);
+            done();
+        });
+
+        it("not filter blocks when hide is not true", done => {
+            let blocks = [{ id: 1, hide: false }, { id: 2 }];
+            let filter = new DisplayBlocks(translatorService);
+            expect(filter.transform(<any>blocks, true, null)).toEqual(blocks);
+            done();
+        });
     });
 });
@@ -12,7 +12,8 @@ export class DisplayBlocks {
         blocks = blocks || [];
         for (let block of blocks) {
             if (this.visible(block, isHomepage) && this.displayToUser(block, currentUser) &&
-                this.displayOnLanguage(block, this.translatorService.currentLanguage())) {
+                this.displayOnLanguage(block, this.translatorService.currentLanguage())
+                && !block.hide) {
                 selected.push(block);
             }
         }
@@ -4,5 +4,6 @@ namespace noosfero {
         settings: Settings;
         limit: number;
         api_content: any;
+        hide: boolean;
     }
 }
@@ -14,7 +14,7 @@ describe(&quot;Components&quot;, () =&gt; {
         let helper: ComponentTestHelper<DiscussionBlockComponent>;
         let settingsObj = {};
         let mockedBlockService = {
-            getApiContent: (block: noosfero.Block): any => {
+            getApiContent: (content: any): any => {
                 return Promise.resolve({ articles: [{ name: "article1" }], headers: (name: string) => { return name; } });
             }
         };
@@ -36,13 +36,14 @@ describe(&quot;Components&quot;, () =&gt; {
                 template: htmlTemplate,
                 directives: [DiscussionBlockComponent],
                 providers: providers,
-                properties: {}
+                properties: { block: {} }
             });
             helper = new ComponentTestHelper<DiscussionBlockComponent>(cls, done);
         });
         it("get discussions from the block service", () => {
             expect(helper.component.documents).toEqual([{ name: "article1" }]);
+            expect(helper.component.block.hide).toEqual(false);
         });
         it("go to article page when open a document", () => {
@@ -20,6 +20,7 @@ export class DiscussionBlockComponent {
         this.profile = this.owner;
         this.blockService.getApiContent(this.block).then((content: any) => {
             this.documents = content.articles;
+            this.block.hide = !this.documents || this.documents.length === 0;
         });
     }
	@@ -82,5 +82,19 @@ describe("Filters", () => {		@@ -82,5 +82,19 @@ describe("Filters", () => {
82	expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);	82	expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
83	done();	83	done();
84	});	84	});
		85	+
		86	+ it("filter blocks when hide is true", done => {
		87	+ let blocks = [{ hide: true }];
		88	+ let filter = new DisplayBlocks(translatorService);
		89	+ expect(filter.transform(<any>blocks, true, null)).toEqual([]);
		90	+ done();
		91	+ });
		92	+
		93	+ it("not filter blocks when hide is not true", done => {
		94	+ let blocks = [{ id: 1, hide: false }, { id: 2 }];
		95	+ let filter = new DisplayBlocks(translatorService);
		96	+ expect(filter.transform(<any>blocks, true, null)).toEqual(blocks);
		97	+ done();
		98	+ });
85	});	99	});
86	});	100	});
	@@ -4,5 +4,6 @@ namespace noosfero {		@@ -4,5 +4,6 @@ namespace noosfero {
4	settings: Settings;	4	settings: Settings;
5	limit: number;	5	limit: number;
6	api_content: any;	6	api_content: any;
		7	+ hide: boolean;
7	}	8	}
8	}	9	}
	@@ -20,6 +20,7 @@ export class DiscussionBlockComponent {		@@ -20,6 +20,7 @@ export class DiscussionBlockComponent {
20	this.profile = this.owner;	20	this.profile = this.owner;
21	this.blockService.getApiContent(this.block).then((content: any) => {	21	this.blockService.getApiContent(this.block).then((content: any) => {
22	this.documents = content.articles;	22	this.documents = content.articles;
		23	+ this.block.hide = !this.documents \|\| this.documents.length === 0;
23	});	24	});
24	}	25	}
25		26