changed to get environment name using the environment object. changed to use res…

…olve to only render mainComponent if an environment is found

changed to get environment name using the environment object. changed to use res…
…olve to only render mainComponent if an environment is found
Ábner Oliveira
1 parent 0456e67c
Showing 9 changed files with 59 additions and 34 deletions Show diff stats
src/app/article/comment/comments.component.ts
src/app/environment/environment-home.component.ts
src/app/environment/environment.component.spec.ts
src/app/environment/environment.component.ts
src/app/layout/navbar/navbar.html
src/app/layout/navbar/navbar.spec.ts
src/app/layout/navbar/navbar.ts
src/app/main/main.component.ts
src/lib/ng-noosfero-api/http/environment.service.ts
@@ -36,7 +36,7 @@ export class CommentsComponent {
         comment.__show_reply = false;
         if (comment.reply_of) {
             this.comments.forEach((commentOnList) => {
-                if (commentOnList.id == comment.reply_of.id) {
+                if (commentOnList.id === comment.reply_of.id) {
                     if (commentOnList.replies) {
                         commentOnList.replies.push(comment);
                     } else {
@@ -22,7 +22,7 @@ export class EnvironmentHomeComponent {
     environment: noosfero.Environment;
     constructor(private environmentService: EnvironmentService, private $sce: ng.ISCEService) {
-        environmentService.getByIdentifier("default").then((result: noosfero.Environment) => {
+        environmentService.get().then((result: noosfero.Environment) => {
             this.environment = result;
         });
     }
@@ -9,6 +9,7 @@ describe(&quot;Components&quot;, () =&gt; {
         let environmentServiceMock: any;
         let notificationMock: any;
         let $state: any;
+        let defaultEnvironment = <any> {id: 1, name: 'Noosfero' };
         beforeEach(inject((_$rootScope_: ng.IRootScopeService, _$q_: ng.IQService) => {
             $rootScope = _$rootScope_;
@@ -17,44 +18,40 @@ describe(&quot;Components&quot;, () =&gt; {
         beforeEach(() => {
             $state = jasmine.createSpyObj("$state", ["transitionTo"]);
-            environmentServiceMock = jasmine.createSpyObj("environmentServiceMock", ["getByIdentifier", "getBoxes"]);
+            environmentServiceMock = jasmine.createSpyObj("environmentServiceMock", ["get", "getBoxes"]);
             notificationMock = jasmine.createSpyObj("notificationMock", ["error"]);
-            let environmentResponse = $q.defer();
-            environmentResponse.resolve({ id: 1 });
             let getBoxesResponse = $q.defer();
             getBoxesResponse.resolve({ data: { boxes: [{ id: 2 }] } });
-            environmentServiceMock.getByIdentifier = jasmine.createSpy('getByIdentifier').and.returnValue(environmentResponse.promise);
             environmentServiceMock.getBoxes = jasmine.createSpy("getBoxes").and.returnValue(getBoxesResponse.promise);
         });
         it("get the default environment", done => {
-            let component: EnvironmentComponent = new EnvironmentComponent(environmentServiceMock, $state, notificationMock);
+            let component: EnvironmentComponent = new EnvironmentComponent(environmentServiceMock, $state, notificationMock, defaultEnvironment);
             $rootScope.$apply();
-            expect(component.environment).toEqual({ id: 1 });
+            expect(component.environment).toEqual({ id: 1, name: 'Noosfero' });
             done();
         });
         it("get the environment boxes", done => {
-            let component: EnvironmentComponent = new EnvironmentComponent(environmentServiceMock, $state, notificationMock);
+            let component: EnvironmentComponent = new EnvironmentComponent(environmentServiceMock, $state, notificationMock, defaultEnvironment);
             $rootScope.$apply();
             expect(environmentServiceMock.getBoxes).toHaveBeenCalled();
             expect(component.boxes).toEqual({ data: { boxes: [{ id: 2 }] } });
             done();
         });
-        it("display notification error when the environment wasn't found", done => {
+        it("display notification error when does not find boxes to the environment", done => {
             let environmentResponse = $q.defer();
             environmentResponse.reject();
-            environmentServiceMock.getByIdentifier = jasmine.createSpy('getByIdentifier').and.returnValue(environmentResponse.promise);
+            environmentServiceMock.getBoxes = jasmine.createSpy('getBoxes').and.returnValue(environmentResponse.promise);
-            let component: EnvironmentComponent = new EnvironmentComponent(environmentServiceMock, $state, notificationMock);
+            let component: EnvironmentComponent = new EnvironmentComponent(environmentServiceMock, $state, notificationMock, defaultEnvironment);
             $rootScope.$apply();
             expect(notificationMock.error).toHaveBeenCalled();
-            expect(component.environment).toBeUndefined();
             done();
         });
@@ -31,21 +31,23 @@ import {EnvironmentHomeComponent} from &quot;./environment-home.component&quot;;
         }
     }
 ])
-@Inject(EnvironmentService, "$state")
+@Inject(EnvironmentService, "$state", "currentEnvironment")
 export class EnvironmentComponent {
     boxes: noosfero.Box[];
     environment: noosfero.Environment;
-    constructor(environmentService: EnvironmentService, $state: ng.ui.IStateService, notificationService: NotificationService) {
-        let boxesPromisse = environmentService.getByIdentifier("default").then((environment: noosfero.Environment) => {
-            this.environment = environment;
-            return environmentService.getBoxes(this.environment.id);
-        }).then((boxes: noosfero.Box[]) => {
-            this.boxes = boxes;
-        }).catch(() => {
-            $state.transitionTo('main');
-            notificationService.error({ message: "notification.environment.not_found" });
-        });
+    constructor(private environmentService: EnvironmentService, private $state: ng.ui.IStateService, private notificationService: NotificationService, currentEnvironment: noosfero.Environment) {
+        this.environment = currentEnvironment;
+
+        this.environmentService.getBoxes(this.environment.id)
+            .then((boxes: noosfero.Box[]) => {
+                this.boxes = boxes;
+            }).catch(() => {
+                this.$state.transitionTo('main');
+                this.notificationService.error({ message: "notification.environment.not_found" });
+            });
+
     }
+
 }
@@ -7,7 +7,7 @@
       </button>
       <a class="navbar-brand" ui-sref="main.environment.home">
         <span class="noosfero-logo"> </span>
-        <span class="noosfero-name">{{"noosfero.name" | translate}}</span>
+        <span class="noosfero-name">{{ ctrl.currentEnvironment.name }}</span>
       </a>
     </div>
@@ -69,6 +69,11 @@ describe(&quot;Components&quot;, () =&gt; {
                             AuthEvents
                         }
                     }),
+                    provide('EnvironmentService', {
+                        useValue: {
+                            getCurrentEnviroment: () => { return { id: 1, name: 'Nosofero' }; }
+                        }
+                    }),
                     provide('TranslatorService', {
                         useValue: helpers.mocks.translatorService
                     })
 import {Component, Inject, EventEmitter, Input} from "ng-forward";
 import {LanguageSelectorComponent} from "../language-selector/language-selector.component";
 import {SessionService, AuthService, AuthController, AuthEvents} from "./../../login";
+import {EnvironmentService} from "./../../../lib/ng-noosfero-api/http/environment.service";
 import {SidebarNotificationService} from "../sidebar/sidebar.notification.service";
 import {BodyStateClassesService} from '../services/body-state-classes.service';
@@ -8,15 +9,15 @@ import {BodyStateClassesService} from &#39;../services/body-state-classes.service&#39;;
     selector: "acme-navbar",
     templateUrl: "app/layout/navbar/navbar.html",
     directives: [LanguageSelectorComponent],
-    providers: [AuthService, SessionService, SidebarNotificationService]
+    providers: [AuthService, SessionService, SidebarNotificationService, EnvironmentService]
 })
-@Inject("$uibModal", AuthService, "SessionService", "$state", SidebarNotificationService, BodyStateClassesService)
+@Inject("$uibModal", AuthService, "SessionService", "$state", SidebarNotificationService, BodyStateClassesService, EnvironmentService)
 export class Navbar {
     private currentUser: noosfero.User;
     private modalInstance: any = null;
-
     public showHamburguer: boolean = false;
+    public currentEnvironment: noosfero.Environment = <any>{ name: '' };
     /**
      *
@@ -27,9 +28,11 @@ export class Navbar {
         private session: SessionService,
         private $state: ng.ui.IStateService,
         private sidebarNotificationService: SidebarNotificationService,
-        private bodyStateService: BodyStateClassesService
+        private bodyStateService: BodyStateClassesService,
+        private environmentService: EnvironmentService
     ) {
         this.currentUser = this.session.currentUser();
+        this.currentEnvironment = environmentService.getCurrentEnviroment();
         this.showHamburguer = this.authService.isAuthenticated();
         this.bodyStateService.addContentClass(!this.sidebarNotificationService.sidebarVisible);
@@ -28,7 +28,7 @@ import {DateFormat} from &quot;../shared/pipes/date-format.filter&quot;;
 import {AuthService} from "../login/auth.service";
 import {SessionService} from "../login/session.service";
-
+import {EnvironmentService} from "./../../lib/ng-noosfero-api/http/environment.service";
 import {NotificationService} from "../shared/services/notification.service";
 import {BodyStateClassesService} from "./../layout/services/body-state-classes.service";
@@ -113,7 +113,12 @@ export class EnvironmentContent {
         name: 'main',
         resolve: {
             currentUser: function(AuthService: AuthService) {
+                console.log("RESOLVING USER...");
                 return AuthService.loginFromCookie();
+            },
+            currentEnvironment: function(EnvironmentService: EnvironmentService) {
+                console.log("RESOLVING ENVIRONMENT...");
+                return EnvironmentService.get();
             }
         }
     },
@@ -4,12 +4,16 @@ import { Injectable, Inject } from &quot;ng-forward&quot;;
 @Inject("Restangular", "$q")
 export class EnvironmentService {
-    private _currentEnvironmentPromise: ng.IDeferred<noosfero.Environment>;
+    private currentEnvironment: noosfero.Environment = null;
     constructor(private restangular: restangular.IService, private $q: ng.IQService) {
     }
+    getCurrentEnviroment(): noosfero.Environment {
+        return this.currentEnvironment;
+    }
+
     getEnvironmentPeople(params: any): ng.IPromise<noosfero.Person[]> {
         let p = this.restangular.one('people').get(params);
         let deferred = this.$q.defer<noosfero.Person[]>();
@@ -18,10 +22,19 @@ export class EnvironmentService {
         return deferred.promise;
     }
-    getByIdentifier(identifier: string): ng.IPromise<noosfero.Environment> {
+    get(identifier: string = 'default'): ng.IPromise<noosfero.Environment> {
         let p = this.restangular.one('environment').customGET(identifier);
         let deferred = this.$q.defer<noosfero.Environment>();
-        p.then(this.getHandleSuccessFunction<noosfero.Environment>(deferred));
+        if (identifier === 'default') {
+            p.then((response) => {
+                let data = this.restangular.stripRestangular(response.data);
+                this.currentEnvironment = data;
+                this.getHandleSuccessFunction<noosfero.Environment>(deferred).bind(this)(response);
+            });
+        } else {
+            p.then(this.getHandleSuccessFunction<noosfero.Environment>(deferred));
+        }
+
         p.catch(this.getHandleErrorFunction<noosfero.Environment>(deferred));
         return deferred.promise;
     }
@@ -37,7 +50,7 @@ export class EnvironmentService {
     /** TODO - Please, use the base class RestangularService
      * (description)
      * 
-     * @template T
+     * @template T_currentEnvironmentPromise
      * @param {ng.IDeferred<T>} deferred (description)
      * @returns {(response: restangular.IResponse) => void} (description)
      */
	@@ -36,7 +36,7 @@ export class CommentsComponent {		@@ -36,7 +36,7 @@ export class CommentsComponent {
36	comment.__show_reply = false;	36	comment.__show_reply = false;
37	if (comment.reply_of) {	37	if (comment.reply_of) {
38	this.comments.forEach((commentOnList) => {	38	this.comments.forEach((commentOnList) => {
39	- if (commentOnList.id == comment.reply_of.id) {	39	+ if (commentOnList.id === comment.reply_of.id) {
40	if (commentOnList.replies) {	40	if (commentOnList.replies) {
41	commentOnList.replies.push(comment);	41	commentOnList.replies.push(comment);
42	} else {	42	} else {
	@@ -22,7 +22,7 @@ export class EnvironmentHomeComponent {		@@ -22,7 +22,7 @@ export class EnvironmentHomeComponent {
22	environment: noosfero.Environment;	22	environment: noosfero.Environment;
23		23
24	constructor(private environmentService: EnvironmentService, private $sce: ng.ISCEService) {	24	constructor(private environmentService: EnvironmentService, private $sce: ng.ISCEService) {
25	- environmentService.getByIdentifier("default").then((result: noosfero.Environment) => {	25	+ environmentService.get().then((result: noosfero.Environment) => {
26	this.environment = result;	26	this.environment = result;
27	});	27	});
28	}	28	}
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	</button>	7	</button>
8	<a class="navbar-brand" ui-sref="main.environment.home">	8	<a class="navbar-brand" ui-sref="main.environment.home">
9	<span class="noosfero-logo"> </span>	9	<span class="noosfero-logo"> </span>
10	- <span class="noosfero-name">{{"noosfero.name" \| translate}}</span>	10	+ <span class="noosfero-name">{{ ctrl.currentEnvironment.name }}</span>
11	</a>	11	</a>
12	</div>	12	</div>
13		13