Filter blocks by language in display blocks filter

Victor Costa
1 parent 57499aeb
Showing 3 changed files with 35 additions and 12 deletions Show diff stats
src/app/layout/boxes/boxes.component.spec.ts
src/app/layout/boxes/display-blocks.filter.spec.ts
src/app/layout/boxes/display-blocks.filter.ts
@@ -33,12 +33,14 @@ describe(&quot;Boxes Component&quot;, () =&gt; {
             providers: [
                 helpers.createProviderToValue('SessionService', helpers.mocks.sessionWithCurrentUser({})),
                 helpers.createProviderToValue('AuthService', helpers.mocks.authService),
-                helpers.createProviderToValue('$state', state)
+                helpers.createProviderToValue('$state', state),
+                helpers.createProviderToValue('TranslatorService', translatorService)
             ]
         });
         helper = new ComponentTestHelper<BoxesComponent>(cls, done);
     });
+    let translatorService = jasmine.createSpyObj("translatorService", ["currentLanguage"]);
     let state = jasmine.createSpyObj("state", ["current"]);
     state.current = { name: "" };
@@ -4,71 +4,81 @@ import {DisplayBlocks} from &#39;./display-blocks.filter&#39;;
 describe("Filters", () => {
     describe("Display Blocks Filter", () => {
+        let translatorService = jasmine.createSpyObj("translatorService", ["currentLanguage"]);
+
         it("not fail when blocks is null", done => {
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(null, true, <noosfero.User>{})).toEqual([]);
             done();
         });
         it("return blocks when no setting is passed", done => {
             let blocks = [{}];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual(blocks);
             done();
         });
         it("return blocks when no display is passed", done => {
             let blocks = [{ setting: {} }];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual(blocks);
             done();
         });
         it("filter invisible blocks", done => {
             let blocks = [{ settings: { display: "never" } }];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
             done();
         });
         it("filter blocks with except_home_page in homepage", done => {
             let blocks = [{ settings: { display: "except_home_page" } }];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
             done();
         });
         it("filter blocks with home_page_only outside homepage", done => {
             let blocks = [{ settings: { display: "home_page_only" } }];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, false, <noosfero.User>{})).toEqual([]);
             done();
         });
         it("show all blocks when display_user is all for logged user", done => {
             let blocks = [{ settings: { display_user: "all" } }];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual(blocks);
             done();
         });
         it("show all blocks when display_user is all for not logged user", done => {
             let blocks = [{ settings: { display_user: "all" } }];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, true, null)).toEqual(blocks);
             done();
         });
         it("filter blocks when display_user is logged for not logged user", done => {
             let blocks = [{ settings: { display_user: "logged" } }];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, true, null)).toEqual([]);
             done();
         });
         it("filter blocks when display_user is not_logged for logged user", done => {
             let blocks = [{ settings: { display_user: "not_logged" } }];
-            let filter = new DisplayBlocks();
+            let filter = new DisplayBlocks(translatorService);
+            expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
+            done();
+        });
+
+        it("filter blocks with different language", done => {
+            let blocks = [{ settings: { language: "en" } }];
+            translatorService.currentLanguage = jasmine.createSpy("currentLanguage").and.returnValue("pt");
+            let filter = new DisplayBlocks(translatorService);
             expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
             done();
         });
 import {Pipe, Inject} from "ng-forward";
+import {TranslatorService} from "../../shared/services/translator.service";
 @Pipe("displayBlocks")
+@Inject(TranslatorService)
 export class DisplayBlocks {
+    constructor(private translatorService: TranslatorService) { }
+
     transform(blocks: noosfero.Block[], isHomepage: boolean, currentUser: noosfero.User) {
         let selected: noosfero.Block[] = [];
         blocks = blocks || [];
         for (let block of blocks) {
-            if (this.visible(block, isHomepage) && this.displayToUser(block, currentUser)) {
+            if (this.visible(block, isHomepage) && this.displayToUser(block, currentUser) &&
+                this.displayOnLanguage(block, this.translatorService.currentLanguage())) {
                 selected.push(block);
             }
         }
@@ -24,4 +29,10 @@ export class DisplayBlocks {
         return !displayUser || displayUser === "all" ||
             (currentUser ? displayUser === "logged" : displayUser === "not_logged");
     }
+
+    private displayOnLanguage(block: noosfero.Block, language: string) {
+        let displayLanguage = block.settings ? (<any>block.settings)['language'] : null;
+        return !displayLanguage || displayLanguage === "all" ||
+            language === displayLanguage;
+    }
 }