From ab814829b296f2d64a5c5ea7f842d8f88c913e7a Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Fri, 20 May 2016 18:22:20 -0300
Subject: [PATCH] Hide discussion block when it have nothing to display

---
 src/app/layout/boxes/display-blocks.filter.spec.ts                                | 14 ++++++++++++++
 src/app/layout/boxes/display-blocks.filter.ts                                     |  3 ++-
 src/lib/ng-noosfero-api/interfaces/block.ts                                       |  1 +
 src/plugins/comment_paragraph/block/discussion/discussion-block.component.spec.ts |  5 +++--
 src/plugins/comment_paragraph/block/discussion/discussion-block.component.ts      |  1 +
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/app/layout/boxes/display-blocks.filter.spec.ts b/src/app/layout/boxes/display-blocks.filter.spec.ts
index dd21a24..3c988ca 100644
--- a/src/app/layout/boxes/display-blocks.filter.spec.ts
+++ b/src/app/layout/boxes/display-blocks.filter.spec.ts
@@ -82,5 +82,19 @@ describe("Filters", () => {
             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();
+        });
     });
 });
diff --git a/src/app/layout/boxes/display-blocks.filter.ts b/src/app/layout/boxes/display-blocks.filter.ts
index aec09b8..d691eeb 100644
--- a/src/app/layout/boxes/display-blocks.filter.ts
+++ b/src/app/layout/boxes/display-blocks.filter.ts
@@ -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);
             }
         }
diff --git a/src/lib/ng-noosfero-api/interfaces/block.ts b/src/lib/ng-noosfero-api/interfaces/block.ts
index fea2aca..f20b1b3 100644
--- a/src/lib/ng-noosfero-api/interfaces/block.ts
+++ b/src/lib/ng-noosfero-api/interfaces/block.ts
@@ -4,5 +4,6 @@ namespace noosfero {
         settings: Settings;
         limit: number;
         api_content: any;
+        hide: boolean;
     }
 }
diff --git a/src/plugins/comment_paragraph/block/discussion/discussion-block.component.spec.ts b/src/plugins/comment_paragraph/block/discussion/discussion-block.component.spec.ts
index bdd24cf..b9e9299 100644
--- a/src/plugins/comment_paragraph/block/discussion/discussion-block.component.spec.ts
+++ b/src/plugins/comment_paragraph/block/discussion/discussion-block.component.spec.ts
@@ -14,7 +14,7 @@ describe("Components", () => {
         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("Components", () => {
                 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", () => {
diff --git a/src/plugins/comment_paragraph/block/discussion/discussion-block.component.ts b/src/plugins/comment_paragraph/block/discussion/discussion-block.component.ts
index afceacc..854c9c5 100644
--- a/src/plugins/comment_paragraph/block/discussion/discussion-block.component.ts
+++ b/src/plugins/comment_paragraph/block/discussion/discussion-block.component.ts
@@ -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;
         });
     }
 
--
libgit2 0.21.2