Merge branch 'master' into staging

Leandro Santos
2 parents 67863d3d c623e86c
Showing 56 changed files with 420 additions and 70 deletions Show diff stats
src/app/environment/environment.html
src/app/layout/boxes/box.html
src/app/layout/boxes/boxes.component.spec.ts
src/app/layout/boxes/boxes.component.ts
src/app/layout/boxes/display-blocks.filter.spec.ts
src/app/layout/boxes/display-blocks.filter.ts
src/app/profile/profile-home.component.ts
src/app/profile/profile.html
src/lib/ng-noosfero-api/interfaces/block.ts
src/lib/ng-noosfero-api/interfaces/profile.ts
src/plugins/comment_paragraph/block/discussion/discussion-block.component.spec.ts
src/plugins/comment_paragraph/block/discussion/discussion-block.component.ts
themes/angular-participa-consulta/app/blocks.scss
themes/angular-participa-consulta/app/navbar.scss
themes/angular-participa-consulta/app/participa-consulta.scss
themes/angular-participa-consulta/assets/fonts/participa-consulta/Ubuntu-B.ttf
themes/angular-participa-consulta/assets/fonts/participa-consulta/Ubuntu-BI.ttf
themes/angular-participa-consulta/assets/fonts/participa-consulta/Ubuntu-C.ttf
themes/angular-participa-consulta/assets/fonts/participa-consulta/Ubuntu-L.ttf
themes/angular-participa-consulta/assets/fonts/participa-consulta/Ubuntu-LI.ttf
 <div class="environment-container">
   <div class="row">
-    <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.environment"></noosfero-boxes>
+    <noosfero-boxes ng-if="vm.boxes" [boxes]="vm.boxes" [owner]="vm.environment"></noosfero-boxes>
   </div>
 </div>
 <div ng-class="{'col-md-2-5': box.position!=1, 'col-md-7': box.position==1}">
-  <div ng-repeat="block in box.blocks | orderBy: 'position'" class="panel panel-default block {{block.type | lowercase}}" >
+  <div ng-repeat="block in box.blocks | displayBlocks:ctrl.isHomepage:ctrl.currentUser  | orderBy: 'position'" class="panel panel-default block {{block.type | lowercase}}" >
     <div class="panel-heading" ng-show="block.title">
       <h3 class="panel-title">{{block.title}}</h3>
     </div>
 import {Component} from 'ng-forward';
-
 import {BoxesComponent} from './boxes.component';
-
-import {
-    createComponentFromClass,
-    quickCreateComponent,
-    provideEmptyObjects,
-    createProviderToValue,
-    provideFilters
-} from "../../../spec/helpers";
+import * as helpers from "../../../spec/helpers";
+import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
  
 // this htmlTemplate will be re-used between the container components in this spec file
 const htmlTemplate: string = '<noosfero-boxes [boxes]="ctrl.boxes" [owner]="ctrl.profile"></noosfero-blog>';
@@ -16,49 +9,79 @@ const htmlTemplate: string = &#39;&lt;noosfero-boxes [boxes]=&quot;ctrl.boxes&quot; [owner]=&quot;ctrl
  
 describe("Boxes Component", () => {
  
+    let helper: ComponentTestHelper<BoxesComponent>;
     beforeEach(() => {
         angular.mock.module("templates");
     });
  
-    @Component({
-        selector: 'test-container-component',
-        template: htmlTemplate,
-        directives: [BoxesComponent],
-        providers: []
-    })
-    class BoxesContainerComponent {
-        boxes: noosfero.Box[] = [
+    let properties = {
+        boxes: [
             { id: 1, position: 1 },
             { id: 2, position: 2 }
-        ];
-
-        owner: noosfero.Profile =  <noosfero.Profile> {
+        ],
+        owner: {
             id: 1,
             identifier: 'profile-name',
             type: 'Person'
-        };
-    }
+        }
+    };
+    beforeEach((done) => {
+        let cls = createClass({
+            template: htmlTemplate,
+            directives: [BoxesComponent],
+            properties: properties,
+            providers: [
+                helpers.createProviderToValue('SessionService', helpers.mocks.sessionWithCurrentUser({})),
+                helpers.createProviderToValue('AuthService', helpers.mocks.authService),
+                helpers.createProviderToValue('$state', state),
+                helpers.createProviderToValue('TranslatorService', translatorService)
+            ]
+        });
+        helper = new ComponentTestHelper<BoxesComponent>(cls, done);
+    });
  
-    it("renders boxes into a container", (done: Function) => {
-        createComponentFromClass(BoxesContainerComponent).then((fixture) => {
-            let boxesHtml = fixture.debugElement;
-            expect(boxesHtml.query('div.col-md-7').length).toEqual(1);
-            expect(boxesHtml.query('div.col-md-2-5').length).toEqual(1);
+    let translatorService = jasmine.createSpyObj("translatorService", ["currentLanguage"]);
+    let state = jasmine.createSpyObj("state", ["current"]);
+    state.current = { name: "" };
  
-            done();
-        });
+    it("renders boxes into a container", () => {
+        expect(helper.find('div.col-md-7').length).toEqual(1);
+        expect(helper.find('div.col-md-2-5').length).toEqual(1);
+    });
+
+    it("check the boxes order", () => {
+        expect(helper.component.boxesOrder(properties['boxes'][0])).toEqual(1);
+        expect(helper.component.boxesOrder(properties['boxes'][1])).toEqual(0);
     });
  
-    it("check the boxes order", (done: Function) => {
-        createComponentFromClass(BoxesContainerComponent).then((fixture) => {
+    it("set isHomepage as false by default", () => {
+        expect(helper.component.isHomepage).toBeFalsy();
+    });
  
-            let boxesComponent: BoxesComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
-            let boxesContainer: BoxesContainerComponent = fixture.componentInstance;
+    it("set isHomepage as true when in profile home page", () => {
+        state.current = { name: "main.profile.home" };
+        helper.component.ngOnInit();
+        expect(helper.component.isHomepage).toBeTruthy();
+    });
  
-            expect(boxesComponent.boxesOrder(boxesContainer.boxes[0])).toEqual(1);
-            expect(boxesComponent.boxesOrder(boxesContainer.boxes[1])).toEqual(0);
+    it("set isHomepage as true when in profile info page", () => {
+        state.current = { name: "main.profile.info" };
+        helper.component.ngOnInit();
+        expect(helper.component.isHomepage).toBeTruthy();
+    });
  
-            done();
-        });
+    it("set isHomepage as true when in profile page", () => {
+        state.current = { name: "main.profile.page" };
+        state.params = { page: "/page" };
+        (<noosfero.Profile>helper.component.owner).homepage = '/page';
+        helper.component.ngOnInit();
+        expect(helper.component.isHomepage).toBeTruthy();
+    });
+
+    it("set isHomepage as true when in environment home page", () => {
+        state.current = { name: "main.environment.home" };
+        helper.component.owner = <noosfero.Environment>{};
+        helper.component.ngOnInit();
+        expect(helper.component.isHomepage).toBeTruthy();
     });
 });
 import {Input, Inject, Component} from 'ng-forward';
+import {SessionService, AuthService, AuthEvents} from "../../login";
+import {DisplayBlocks} from "./display-blocks.filter";
  
 @Component({
     selector: "noosfero-boxes",
-    templateUrl: "app/layout/boxes/boxes.html"
+    templateUrl: "app/layout/boxes/boxes.html",
+    directives: [DisplayBlocks]
 })
+@Inject("SessionService", 'AuthService', "$state", "$rootScope")
 export class BoxesComponent {
  
     @Input() boxes: noosfero.Box[];
-    @Input() owner: noosfero.Profile;
+    @Input() owner: noosfero.Profile | noosfero.Environment;
+
+    currentUser: noosfero.User;
+    isHomepage = true;
+
+    constructor(private session: SessionService,
+        private authService: AuthService,
+        private $state: ng.ui.IStateService,
+        private $rootScope: ng.IRootScopeService) {
+
+        this.currentUser = this.session.currentUser();
+        this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => {
+            this.currentUser = this.session.currentUser();
+            this.verifyHomepage();
+        });
+        this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => {
+            this.currentUser = this.session.currentUser();
+            this.verifyHomepage();
+        });
+        this.$rootScope.$on("$stateChangeSuccess", (event: ng.IAngularEvent, toState: ng.ui.IState) => {
+            this.verifyHomepage();
+        });
+    }
+
+    ngOnInit() {
+        this.verifyHomepage();
+    }
  
     boxesOrder(box: noosfero.Box) {
         if (box.position === 2) return 0;
         return box.position;
     }
+
+    private verifyHomepage() {
+        if (this.owner && ["Profile", "Community", "Person"].indexOf((<any>this.owner)['type']) >= 0) {
+            let profile = <noosfero.Profile>this.owner;
+            this.isHomepage = this.$state.current.name === "main.profile.home";
+            if (profile.homepage) {
+                this.isHomepage = this.isHomepage ||
+                    (this.$state.current.name === "main.profile.page" && profile.homepage === this.$state.params['page']);
+            } else {
+                this.isHomepage = this.isHomepage || this.$state.current.name === "main.profile.info";
+            }
+        } else {
+            this.isHomepage = this.$state.current.name === "main.environment.home";
+        }
+    }
 }
@@ -0,0 +1,100 @@
+import {quickCreateComponent} from "../../../spec/helpers";
+import {DisplayBlocks} from './display-blocks.filter';
+
+describe("Filters", () => {
+    describe("Display Blocks Filter", () => {
+
+        let translatorService = jasmine.createSpyObj("translatorService", ["currentLanguage"]);
+
+        it("not fail when blocks is null", done => {
+            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(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(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(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(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(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(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(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(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(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();
+        });
+
+        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();
+        });
+    });
+});
@@ -0,0 +1,39 @@
+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) &&
+                this.displayOnLanguage(block, this.translatorService.currentLanguage())
+                && !block.hide) {
+                selected.push(block);
+            }
+        }
+        return selected;
+    }
+
+    private visible(block: noosfero.Block, isHomepage: boolean) {
+        let display = block.settings ? (<any>block.settings)['display'] : null;
+        return !display || ((isHomepage ? display !== "except_home_page" : display !== "home_page_only") && display !== "never");
+    }
+
+    private displayToUser(block: noosfero.Block, currentUser: noosfero.User) {
+        let displayUser = block.settings ? (<any>block.settings)['display_user'] : null;
+        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;
+    }
+}
@@ -18,8 +18,10 @@ export class ProfileHomeComponent {
             return profileService.getHomePage(<number>this.profile.id, { fields: 'path' });
         }).then((response: restangular.IResponse) => {
             if (response.data.article) {
+                this.profile.homepage = response.data.article.path;
                 $state.transitionTo('main.profile.page', { page: response.data.article.path, profile: this.profile.identifier }, { location: false });
             } else {
+                this.profile.homepage = null;
                 $state.transitionTo('main.profile.info', { profile: this.profile.identifier }, { location: false });
             }
         });
 <div class="profile-container">
   <div class="profile-header" ng-bind-html="vm.profile.custom_header"></div>
   <div class="row">
-    <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.profile"></noosfero-boxes>
+    <noosfero-boxes ng-if="vm.boxes" [boxes]="vm.boxes" [owner]="vm.profile"></noosfero-boxes>
   </div>
   <div class="profile-footer" ng-bind-html="vm.profile.custom_footer"></div>
 </div>
@@ -4,5 +4,6 @@ namespace noosfero {
         settings: Settings;
         limit: number;
         api_content: any;
+        hide: boolean;
     }
 }
@@ -22,13 +22,13 @@ namespace noosfero {
          * @returns {string} The unque identifier for the Profile
          */
         identifier: string;
-        
+
         /**
          * @ngdoc property
          * @name created_at
          * @propertyOf noofero.Profile
          * @returns {string} The timestamp this object was created
-         */        
+         */
         created_at: string;
  
         /**
@@ -54,5 +54,13 @@ namespace noosfero {
          * @returns {string} A key => value custom fields data of Profile (e.g.: "{'Address':'Street A, Number 102...'}")
          */
         additional_data?: any;
+
+        /**
+         * @ngdoc property
+         * @name homepage
+         * @propertyOf noofero.Profile
+         * @returns {string} The Profile homepage
+         */
+        homepage: string;
     }
 }
@@ -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;
         });
     }
  
@@ -0,0 +1,70 @@
+.block-head-with-icon {
+  padding: 15px 15px 15px 55px;
+}
+
+.content-wrapper .block {
+  .panel-heading {
+    border: none;
+    border-radius: 3px 3px 0 0;
+    font-family: "Ubuntu Medium";
+    font-size: 15px;
+    font-variant: normal;
+    font-weight: normal;
+    line-height: 30px;
+    padding: 15px 15px 15px 15px;
+    text-transform: capitalize;
+    background-size: 30px 30px;
+    background: #DAE1C4;
+    color: #4F9CAC;
+  }
+
+  &.membersblock {
+    .panel-heading {
+      @extend .block-head-with-icon;
+      background: #DAE1C4 url("../assets/icons/participa-consulta/pessoas.png") no-repeat 15px center;
+      color: #4F9CAC;
+    }
+  }
+
+  &.statisticsblock {
+    .panel-heading {
+      @extend .block-head-with-icon;
+      background: #69677C url("../assets/icons/participa-consulta/indicadores.png") no-repeat 15px center;
+      color: #DAE1C4;
+    }
+  }
+}
+
+.col-md-7 {
+  .panel-body.linklistblock {
+    padding: 0px;
+  }
+
+  .link-list-block {
+    font-family: "Ubuntu";
+    font-size: 12px;
+    background: #69677C;
+    border-radius: 0 0 3px 3px;
+    padding: 4px 10px;
+    position: relative;
+
+    div, a {
+      display: inline-block;
+      background: #69677C;
+      border-radius: 0;
+      color: #FFF;
+      font-family: "Ubuntu Medium";
+      font-size: 16px;
+      margin: 0;
+      padding-right: 15px;
+      font-weight: bold;
+    }
+
+    div:first-child {
+      padding: 15px 5px 15px 50px;
+      background: #69677C url("../assets/icons/participa-consulta/home.png") no-repeat 7px center;
+      color: #FFF;
+      background-size: 30px 30px;
+    }
+  }
+}
@@ -0,0 +1,25 @@
+.navbar {
+  min-height: 123px;
+  background-color: #f9c404;
+  background-image: -moz-radial-gradient(center, ellipse cover, #fcdd4e 1%, #f9c404 100%);
+  background-image: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(1%, #fcdd4e), color-stop(100%, #f9c404));
+  background-image: -webkit-radial-gradient(center, ellipse cover, #fcdd4e 1%, #f9c404 100%);
+  background-image: -o-radial-gradient(center, ellipse cover, #fcdd4e 1%, #f9c404 100%);
+  background-image: -ms-radial-gradient(center, ellipse cover, #fcdd4e 1%, #f9c404 100%);
+  background-image: radial-gradient(ellipse at center, #fcdd4e 1%, #f9c404 100%);
+
+  .container-fluid {
+    .navbar-brand {
+      .noosfero-logo {
+        display: none;
+      }
+      .noosfero-name {
+        color: #03316f;
+        font-size: 40px;
+        font-weight: 800;
+        line-height: 1em;
+        letter-spacing: -0.05em;
+      }
+    }
+  }
+}
@@ -0,0 +1,35 @@
+@font-face {
+  font-family: 'Ubuntu';
+  font-weight: 300;
+  font-style: normal;
+  src: url('../assets/fonts/participa-consulta/Ubuntu-R.ttf');
+}
+
+@font-face {
+  font-family: 'Ubuntu Medium';
+  font-weight: 300;
+  font-style: normal;
+  src: url('../assets/fonts/participa-consulta/Ubuntu-M.ttf');
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  font-weight: 300;
+  font-style: italic;
+  src: url('../assets/fonts/participa-consulta/Ubuntu-RI.ttf');
+}
+
+.skin-whbl .notifications-list .item-footer {
+  background: #DAE1C4;
+  color: #4F9CAC;
+}
+
+.profile-header, .profile-footer{
+  text-align: center;
+}
+
+.container-fluid .navbar-header .navbar-toggle{
+  &:hover, &:focus {
+    background-color: #7E7E7E;
+  }
+}
@@ -0,0 +1,16 @@
+.navbar {
+  min-height: 123px;
+  background:url("../assets/images/redebrasil/bg-header.png") repeat-x;
+
+  .container-fluid {
+    .navbar-brand {
+      .noosfero-logo {
+        background:url("../assets/images/redebrasil/header-home.png") no-repeat;
+        padding: 0px 257px 63px 15px;
+      }
+      .noosfero-name {
+        display: none;
+      }
+    }
+  }
+}
@@ -0,0 +1,8 @@
+body > .ng-scope {
+  background:url("../assets/images/redebrasil/fundo-portal.jpg") center top #59666E no-repeat ;
+  min-height: 100%;
+}
+
+html, body {
+  height:100%;
+}
@@ -1,16 +0,0 @@
-.navbar {
-  min-height: 123px;
-  background:url("../assets/images/redebrasil/bg-header.png") repeat-x;
-
-  .container-fluid {
-    .navbar-brand {
-      .noosfero-logo {
-        background:url("../assets/images/redebrasil/header-home.png") no-repeat;
-        padding: 0px 257px 63px 15px;
-      }
-      .noosfero-name {
-        display: none;
-      }
-    }
-  }
-}
@@ -1,8 +0,0 @@
-body > .ng-scope {
-  background:url("../assets/images/redebrasil/fundo-portal.jpg") center top #59666E no-repeat ;
-  min-height: 100%;
-}
-
-html, body {
-  height:100%;
-}
1	1	<div class="environment-container">
2	2	<div class="row">
3		- <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.environment"></noosfero-boxes>
	3	+ <noosfero-boxes ng-if="vm.boxes" [boxes]="vm.boxes" [owner]="vm.environment"></noosfero-boxes>
4	4	</div>
5	5	</div>
...	...
1	1	<div ng-class="{'col-md-2-5': box.position!=1, 'col-md-7': box.position==1}">
2		- <div ng-repeat="block in box.blocks \| orderBy: 'position'" class="panel panel-default block {{block.type \| lowercase}}" >
	2	+ <div ng-repeat="block in box.blocks \| displayBlocks:ctrl.isHomepage:ctrl.currentUser \| orderBy: 'position'" class="panel panel-default block {{block.type \| lowercase}}" >
3	3	<div class="panel-heading" ng-show="block.title">
4	4	<h3 class="panel-title">{{block.title}}</h3>
5	5	</div>
...	...
1	1	import {Component} from 'ng-forward';
2		-
3	2	import {BoxesComponent} from './boxes.component';
4		-
5		-import {
6		- createComponentFromClass,
7		- quickCreateComponent,
8		- provideEmptyObjects,
9		- createProviderToValue,
10		- provideFilters
11		-} from "../../../spec/helpers";
	3	+import * as helpers from "../../../spec/helpers";
	4	+import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
12	5
13	6	// this htmlTemplate will be re-used between the container components in this spec file
14	7	const htmlTemplate: string = '<noosfero-boxes [boxes]="ctrl.boxes" [owner]="ctrl.profile"></noosfero-blog>';
...	...	@@ -16,49 +9,79 @@ const htmlTemplate: string = '<noosfero-boxes [boxes]="ctrl.boxes" [owner]="ctrl
16	9
17	10	describe("Boxes Component", () => {
18	11
	12	+ let helper: ComponentTestHelper<BoxesComponent>;
19	13	beforeEach(() => {
20	14	angular.mock.module("templates");
21	15	});
22	16
23		- @Component({
24		- selector: 'test-container-component',
25		- template: htmlTemplate,
26		- directives: [BoxesComponent],
27		- providers: []
28		- })
29		- class BoxesContainerComponent {
30		- boxes: noosfero.Box[] = [
	17	+ let properties = {
	18	+ boxes: [
31	19	{ id: 1, position: 1 },
32	20	{ id: 2, position: 2 }
33		- ];
34		-
35		- owner: noosfero.Profile = <noosfero.Profile> {
	21	+ ],
	22	+ owner: {
36	23	id: 1,
37	24	identifier: 'profile-name',
38	25	type: 'Person'
39		- };
40		- }
	26	+ }
	27	+ };
	28	+ beforeEach((done) => {
	29	+ let cls = createClass({
	30	+ template: htmlTemplate,
	31	+ directives: [BoxesComponent],
	32	+ properties: properties,
	33	+ providers: [
	34	+ helpers.createProviderToValue('SessionService', helpers.mocks.sessionWithCurrentUser({})),
	35	+ helpers.createProviderToValue('AuthService', helpers.mocks.authService),
	36	+ helpers.createProviderToValue('$state', state),
	37	+ helpers.createProviderToValue('TranslatorService', translatorService)
	38	+ ]
	39	+ });
	40	+ helper = new ComponentTestHelper<BoxesComponent>(cls, done);
	41	+ });
41	42
42		- it("renders boxes into a container", (done: Function) => {
43		- createComponentFromClass(BoxesContainerComponent).then((fixture) => {
44		- let boxesHtml = fixture.debugElement;
45		- expect(boxesHtml.query('div.col-md-7').length).toEqual(1);
46		- expect(boxesHtml.query('div.col-md-2-5').length).toEqual(1);
	43	+ let translatorService = jasmine.createSpyObj("translatorService", ["currentLanguage"]);
	44	+ let state = jasmine.createSpyObj("state", ["current"]);
	45	+ state.current = { name: "" };
47	46
48		- done();
49		- });
	47	+ it("renders boxes into a container", () => {
	48	+ expect(helper.find('div.col-md-7').length).toEqual(1);
	49	+ expect(helper.find('div.col-md-2-5').length).toEqual(1);
	50	+ });
	51	+
	52	+ it("check the boxes order", () => {
	53	+ expect(helper.component.boxesOrder(properties['boxes'][0])).toEqual(1);
	54	+ expect(helper.component.boxesOrder(properties['boxes'][1])).toEqual(0);
50	55	});
51	56
52		- it("check the boxes order", (done: Function) => {
53		- createComponentFromClass(BoxesContainerComponent).then((fixture) => {
	57	+ it("set isHomepage as false by default", () => {
	58	+ expect(helper.component.isHomepage).toBeFalsy();
	59	+ });
54	60
55		- let boxesComponent: BoxesComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
56		- let boxesContainer: BoxesContainerComponent = fixture.componentInstance;
	61	+ it("set isHomepage as true when in profile home page", () => {
	62	+ state.current = { name: "main.profile.home" };
	63	+ helper.component.ngOnInit();
	64	+ expect(helper.component.isHomepage).toBeTruthy();
	65	+ });
57	66
58		- expect(boxesComponent.boxesOrder(boxesContainer.boxes[0])).toEqual(1);
59		- expect(boxesComponent.boxesOrder(boxesContainer.boxes[1])).toEqual(0);
	67	+ it("set isHomepage as true when in profile info page", () => {
	68	+ state.current = { name: "main.profile.info" };
	69	+ helper.component.ngOnInit();
	70	+ expect(helper.component.isHomepage).toBeTruthy();
	71	+ });
60	72
61		- done();
62		- });
	73	+ it("set isHomepage as true when in profile page", () => {
	74	+ state.current = { name: "main.profile.page" };
	75	+ state.params = { page: "/page" };
	76	+ (<noosfero.Profile>helper.component.owner).homepage = '/page';
	77	+ helper.component.ngOnInit();
	78	+ expect(helper.component.isHomepage).toBeTruthy();
	79	+ });
	80	+
	81	+ it("set isHomepage as true when in environment home page", () => {
	82	+ state.current = { name: "main.environment.home" };
	83	+ helper.component.owner = <noosfero.Environment>{};
	84	+ helper.component.ngOnInit();
	85	+ expect(helper.component.isHomepage).toBeTruthy();
63	86	});
64	87	});
...	...
1	1	import {Input, Inject, Component} from 'ng-forward';
	2	+import {SessionService, AuthService, AuthEvents} from "../../login";
	3	+import {DisplayBlocks} from "./display-blocks.filter";
2	4
3	5	@Component({
4	6	selector: "noosfero-boxes",
5		- templateUrl: "app/layout/boxes/boxes.html"
	7	+ templateUrl: "app/layout/boxes/boxes.html",
	8	+ directives: [DisplayBlocks]
6	9	})
	10	+@Inject("SessionService", 'AuthService', "$state", "$rootScope")
7	11	export class BoxesComponent {
8	12
9	13	@Input() boxes: noosfero.Box[];
10		- @Input() owner: noosfero.Profile;
	14	+ @Input() owner: noosfero.Profile \| noosfero.Environment;
	15	+
	16	+ currentUser: noosfero.User;
	17	+ isHomepage = true;
	18	+
	19	+ constructor(private session: SessionService,
	20	+ private authService: AuthService,
	21	+ private $state: ng.ui.IStateService,
	22	+ private $rootScope: ng.IRootScopeService) {
	23	+
	24	+ this.currentUser = this.session.currentUser();
	25	+ this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => {
	26	+ this.currentUser = this.session.currentUser();
	27	+ this.verifyHomepage();
	28	+ });
	29	+ this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => {
	30	+ this.currentUser = this.session.currentUser();
	31	+ this.verifyHomepage();
	32	+ });
	33	+ this.$rootScope.$on("$stateChangeSuccess", (event: ng.IAngularEvent, toState: ng.ui.IState) => {
	34	+ this.verifyHomepage();
	35	+ });
	36	+ }
	37	+
	38	+ ngOnInit() {
	39	+ this.verifyHomepage();
	40	+ }
11	41
12	42	boxesOrder(box: noosfero.Box) {
13	43	if (box.position === 2) return 0;
14	44	return box.position;
15	45	}
	46	+
	47	+ private verifyHomepage() {
	48	+ if (this.owner && ["Profile", "Community", "Person"].indexOf((<any>this.owner)['type']) >= 0) {
	49	+ let profile = <noosfero.Profile>this.owner;
	50	+ this.isHomepage = this.$state.current.name === "main.profile.home";
	51	+ if (profile.homepage) {
	52	+ this.isHomepage = this.isHomepage \|\|
	53	+ (this.$state.current.name === "main.profile.page" && profile.homepage === this.$state.params['page']);
	54	+ } else {
	55	+ this.isHomepage = this.isHomepage \|\| this.$state.current.name === "main.profile.info";
	56	+ }
	57	+ } else {
	58	+ this.isHomepage = this.$state.current.name === "main.environment.home";
	59	+ }
	60	+ }
16	61	}
...	...
...	...	@@ -0,0 +1,100 @@
	1	+import {quickCreateComponent} from "../../../spec/helpers";
	2	+import {DisplayBlocks} from './display-blocks.filter';
	3	+
	4	+describe("Filters", () => {
	5	+ describe("Display Blocks Filter", () => {
	6	+
	7	+ let translatorService = jasmine.createSpyObj("translatorService", ["currentLanguage"]);
	8	+
	9	+ it("not fail when blocks is null", done => {
	10	+ let filter = new DisplayBlocks(translatorService);
	11	+ expect(filter.transform(null, true, <noosfero.User>{})).toEqual([]);
	12	+ done();
	13	+ });
	14	+
	15	+ it("return blocks when no setting is passed", done => {
	16	+ let blocks = [{}];
	17	+ let filter = new DisplayBlocks(translatorService);
	18	+ expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual(blocks);
	19	+ done();
	20	+ });
	21	+
	22	+ it("return blocks when no display is passed", done => {
	23	+ let blocks = [{ setting: {} }];
	24	+ let filter = new DisplayBlocks(translatorService);
	25	+ expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual(blocks);
	26	+ done();
	27	+ });
	28	+
	29	+ it("filter invisible blocks", done => {
	30	+ let blocks = [{ settings: { display: "never" } }];
	31	+ let filter = new DisplayBlocks(translatorService);
	32	+ expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
	33	+ done();
	34	+ });
	35	+
	36	+ it("filter blocks with except_home_page in homepage", done => {
	37	+ let blocks = [{ settings: { display: "except_home_page" } }];
	38	+ let filter = new DisplayBlocks(translatorService);
	39	+ expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
	40	+ done();
	41	+ });
	42	+
	43	+ it("filter blocks with home_page_only outside homepage", done => {
	44	+ let blocks = [{ settings: { display: "home_page_only" } }];
	45	+ let filter = new DisplayBlocks(translatorService);
	46	+ expect(filter.transform(<any>blocks, false, <noosfero.User>{})).toEqual([]);
	47	+ done();
	48	+ });
	49	+
	50	+ it("show all blocks when display_user is all for logged user", done => {
	51	+ let blocks = [{ settings: { display_user: "all" } }];
	52	+ let filter = new DisplayBlocks(translatorService);
	53	+ expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual(blocks);
	54	+ done();
	55	+ });
	56	+
	57	+ it("show all blocks when display_user is all for not logged user", done => {
	58	+ let blocks = [{ settings: { display_user: "all" } }];
	59	+ let filter = new DisplayBlocks(translatorService);
	60	+ expect(filter.transform(<any>blocks, true, null)).toEqual(blocks);
	61	+ done();
	62	+ });
	63	+
	64	+ it("filter blocks when display_user is logged for not logged user", done => {
	65	+ let blocks = [{ settings: { display_user: "logged" } }];
	66	+ let filter = new DisplayBlocks(translatorService);
	67	+ expect(filter.transform(<any>blocks, true, null)).toEqual([]);
	68	+ done();
	69	+ });
	70	+
	71	+ it("filter blocks when display_user is not_logged for logged user", done => {
	72	+ let blocks = [{ settings: { display_user: "not_logged" } }];
	73	+ let filter = new DisplayBlocks(translatorService);
	74	+ expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
	75	+ done();
	76	+ });
	77	+
	78	+ it("filter blocks with different language", done => {
	79	+ let blocks = [{ settings: { language: "en" } }];
	80	+ translatorService.currentLanguage = jasmine.createSpy("currentLanguage").and.returnValue("pt");
	81	+ let filter = new DisplayBlocks(translatorService);
	82	+ expect(filter.transform(<any>blocks, true, <noosfero.User>{})).toEqual([]);
	83	+ done();
	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	+ });
	99	+ });
	100	+});
...	...
...	...	@@ -0,0 +1,39 @@
	1	+import {Pipe, Inject} from "ng-forward";
	2	+import {TranslatorService} from "../../shared/services/translator.service";
	3	+
	4	+@Pipe("displayBlocks")
	5	+@Inject(TranslatorService)
	6	+export class DisplayBlocks {
	7	+
	8	+ constructor(private translatorService: TranslatorService) { }
	9	+
	10	+ transform(blocks: noosfero.Block[], isHomepage: boolean, currentUser: noosfero.User) {
	11	+ let selected: noosfero.Block[] = [];
	12	+ blocks = blocks \|\| [];
	13	+ for (let block of blocks) {
	14	+ if (this.visible(block, isHomepage) && this.displayToUser(block, currentUser) &&
	15	+ this.displayOnLanguage(block, this.translatorService.currentLanguage())
	16	+ && !block.hide) {
	17	+ selected.push(block);
	18	+ }
	19	+ }
	20	+ return selected;
	21	+ }
	22	+
	23	+ private visible(block: noosfero.Block, isHomepage: boolean) {
	24	+ let display = block.settings ? (<any>block.settings)['display'] : null;
	25	+ return !display \|\| ((isHomepage ? display !== "except_home_page" : display !== "home_page_only") && display !== "never");
	26	+ }
	27	+
	28	+ private displayToUser(block: noosfero.Block, currentUser: noosfero.User) {
	29	+ let displayUser = block.settings ? (<any>block.settings)['display_user'] : null;
	30	+ return !displayUser \|\| displayUser === "all" \|\|
	31	+ (currentUser ? displayUser === "logged" : displayUser === "not_logged");
	32	+ }
	33	+
	34	+ private displayOnLanguage(block: noosfero.Block, language: string) {
	35	+ let displayLanguage = block.settings ? (<any>block.settings)['language'] : null;
	36	+ return !displayLanguage \|\| displayLanguage === "all" \|\|
	37	+ language === displayLanguage;
	38	+ }
	39	+}
...	...
...	...	@@ -18,8 +18,10 @@ export class ProfileHomeComponent {
18	18	return profileService.getHomePage(<number>this.profile.id, { fields: 'path' });
19	19	}).then((response: restangular.IResponse) => {
20	20	if (response.data.article) {
	21	+ this.profile.homepage = response.data.article.path;
21	22	$state.transitionTo('main.profile.page', { page: response.data.article.path, profile: this.profile.identifier }, { location: false });
22	23	} else {
	24	+ this.profile.homepage = null;
23	25	$state.transitionTo('main.profile.info', { profile: this.profile.identifier }, { location: false });
24	26	}
25	27	});
...	...
1	1	<div class="profile-container">
2	2	<div class="profile-header" ng-bind-html="vm.profile.custom_header"></div>
3	3	<div class="row">
4		- <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.profile"></noosfero-boxes>
	4	+ <noosfero-boxes ng-if="vm.boxes" [boxes]="vm.boxes" [owner]="vm.profile"></noosfero-boxes>
5	5	</div>
6	6	<div class="profile-footer" ng-bind-html="vm.profile.custom_footer"></div>
7	7	</div>
...	...
...	...	@@ -4,5 +4,6 @@ namespace noosfero {
4	4	settings: Settings;
5	5	limit: number;
6	6	api_content: any;
	7	+ hide: boolean;
7	8	}
8	9	}
...	...
...	...	@@ -22,13 +22,13 @@ namespace noosfero {
22	22	* @returns {string} The unque identifier for the Profile
23	23	*/
24	24	identifier: string;
25		-
	25	+
26	26	/**
27	27	* @ngdoc property
28	28	* @name created_at
29	29	* @propertyOf noofero.Profile
30	30	* @returns {string} The timestamp this object was created
31		- */
	31	+ */
32	32	created_at: string;
33	33
34	34	/**
...	...	@@ -54,5 +54,13 @@ namespace noosfero {
54	54	* @returns {string} A key => value custom fields data of Profile (e.g.: "{'Address':'Street A, Number 102...'}")
55	55	*/
56	56	additional_data?: any;
	57	+
	58	+ /**
	59	+ * @ngdoc property
	60	+ * @name homepage
	61	+ * @propertyOf noofero.Profile
	62	+ * @returns {string} The Profile homepage
	63	+ */
	64	+ homepage: string;
57	65	}
58	66	}
...	...