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

Conflicts: src/app/main/main.component.ts

Merge branch 'master' of softwarepublico.gov.br:noosfero-themes/angular-theme
Conflicts: src/app/main/main.component.ts
Victor Costa
2 parents 0ae45e2e 9651aab1
Showing 7 changed files with 248 additions and 5 deletions Show diff stats
src/app/environment/environment-home.component.ts
src/app/environment/environment-home.html
src/app/environment/environment.component.ts
src/app/environment/environment.html
src/app/main/main.component.ts
src/lib/ng-noosfero-api/http/environment.service.ts
src/lib/ng-noosfero-api/interfaces/environment.ts
@@ -0,0 +1,41 @@
+import {Component, Inject, provide} from 'ng-forward';
+import {EnvironmentService} from "../../lib/ng-noosfero-api/http/environment.service";
+import {NotificationService} from "../shared/services/notification.service";
+
+/**
+ * @ngdoc controller
+ * @name environment.Environment
+ * @description
+ *  This is the environment controller.
+ */
+@Component({
+    selector: 'environment-home',
+    templateUrl: "app/environment/environment-home.html",
+    providers: [
+        provide('environmentService', { useClass: EnvironmentService }),
+        provide('notificationService', { useClass: NotificationService })
+    ]
+})
+@Inject(EnvironmentService, "$log", "$sce")
+export class EnvironmentHomeComponent {
+    
+    environment: noosfero.Environment;
+    
+    constructor(private environmentService: EnvironmentService, private $sce: ng.ISCEService) {
+        console.debug("Constructor from EnvironmentHomeComponent");
+        
+        environmentService.getByIdentifier("default").then((result: noosfero.Environment) => {
+            this.environment = result;
+            console.debug("Environment ::", result);
+        })
+    }
+    
+    getEnvironmentDescription() {
+        if(this.environment && this.environment.settings && this.environment.settings.description){
+            return this.$sce.trustAsHtml(this.environment.settings.description);    
+        }
+        else {
+            return "";
+        }
+    }
+}
 \ No newline at end of file
@@ -0,0 +1,2 @@
+<div id="environment-description" ng-bind-html="vm.getEnvironmentDescription()" class="environment-description">    
+</div>
 \ No newline at end of file
@@ -0,0 +1,54 @@
+import {StateConfig, Component, Inject, provide} from 'ng-forward';
+import {EnvironmentService} from "../../lib/ng-noosfero-api/http/environment.service";
+import {NotificationService} from "../shared/services/notification.service";
+import {EnvironmentHomeComponent} from "./environment-home.component";
+
+/**
+ * @ngdoc controller
+ * @name environment.Environment
+ * @description
+ *  This is the environment controller.
+ */
+@Component({
+    selector: 'environment',
+    templateUrl: "app/environment/environment.html",
+    providers: [
+        provide('environmentService', { useClass: EnvironmentService }),
+        provide('notificationService', { useClass: NotificationService })
+    ]
+})
+@StateConfig([
+    {
+        name: 'main.environment.home',
+        url: "",
+        component: EnvironmentHomeComponent,
+        views: {
+            "mainBlockContent": {
+                templateUrl: "app/environment/environment-home.html",
+                controller: EnvironmentHomeComponent,
+                controllerAs: "vm"
+            }
+        }
+    }   
+])
+@Inject(EnvironmentService, "$state")
+export class EnvironmentComponent {
+
+    boxes: noosfero.Box[];
+    environment: noosfero.Environment;
+
+    constructor(environmentService: EnvironmentService, $state: ng.ui.IStateService, notificationService: NotificationService) {
+        //console.debug("Creating EnvironmentComponent...");
+        let boxesPromisse = environmentService.getByIdentifier("default").then((environment: noosfero.Environment) => {
+            //console.debug("Set current environment by identifier callback.: ", environment);
+            this.environment = environment;
+            return environmentService.getBoxes(this.environment.id);
+        }).then((boxes: noosfero.Box[]) => {
+            //console.debug("Set environment boxes in callback: ", boxes);
+            this.boxes = boxes;
+        }).catch(() => {
+            $state.transitionTo('main');
+            notificationService.error({ message: "notification.environment.not_found" });
+        });
+    }
+}
@@ -0,0 +1,5 @@
+<div class="environment-container">
+  <div class="row">
+    <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.environment"></noosfero-boxes>
+  </div>
+</div>
@@ -6,12 +6,16 @@ import {ArticleViewComponent} from &quot;./../article/article-default-view.component&quot;
 import {ProfileComponent} from "../profile/profile.component";
 import {BoxesComponent} from "../layout/boxes/boxes.component";
 import {BlockComponent} from "../layout/blocks/block.component";
+import {EnvironmentComponent} from "../environment/environment.component";
+import {EnvironmentHomeComponent} from "../environment/environment-home.component";
+
 import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list.component";
 import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component";
 import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component";
 import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html.component";
 import {MembersBlockComponent} from "./../layout/blocks/members-block/members-block.component";
+import {PeopleBlockComponent} from "./../layout/blocks/people-block/people-block.component";
 import {CommunitiesBlockComponent} from "./../layout/blocks/communities-block/communities-block.component";
 import {NoosferoTemplate} from "../shared/pipes/noosfero-template.filter";
 import {DateFormat} from "../shared/pipes/date-format.filter";
@@ -36,7 +40,7 @@ import {MainBlockComponent} from &quot;../layout/blocks/main-block/main-block.compone
  *  This controller actually contains the main content of Noosfero Angular Theme:
  *  - the navbar
  *  - the {@link Main} view content
- * 
+ *
  */
 @Component({
     selector: 'main-content',
@@ -50,6 +54,15 @@ export class MainContentComponent {
     }
 }
+@Component({
+    selector: 'environment-content',
+    templateUrl: "app/main/main.html",
+    providers: [AuthService, SessionService]
+})
+export class EnvironmentContent {
+
+}
+
 /**
  * @ngdoc controller
  * @name main.Main
@@ -68,19 +81,35 @@ export class MainContentComponent {
     selector: 'main',
     template: '<div ng-view></div>',
     directives: [
-        ArticleBlogComponent, ArticleViewComponent, BoxesComponent, BlockComponent, LinkListBlockComponent,
+        ArticleBlogComponent, ArticleViewComponent, BoxesComponent, BlockComponent,
+        EnvironmentComponent,
+        LinkListBlockComponent, CommunitiesBlockComponent
         MainBlockComponent, RecentDocumentsBlockComponent, Navbar, ProfileImageBlockComponent,
-        MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, CommunitiesBlockComponent
+        MembersBlockComponent, PeopleBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent
     ],
     providers: [AuthService, SessionService, NotificationService, BodyStateClassesService]
 })
 @StateConfig([
     {
-        url: '/',
-        component: MainContentComponent,
+        url: '',
+        component: MainContentComponent,        
+        abstract: true,
         name: 'main',
     },
     {
+        url: '/',
+        component: EnvironmentComponent,
+        name: 'main.environment',
+        abstract: true,
+        views: {
+            "content": {
+                templateUrl: "app/environment/environment.html",
+                controller: EnvironmentComponent,
+                controllerAs: "vm"
+            }
+        }
+    },
+    {
         url: "^/:profile",
         abstract: true,
         component: ProfileComponent,
@@ -0,0 +1,98 @@
+import { Injectable, Inject } from "ng-forward";
+
+@Injectable()
+@Inject("Restangular", "$q")
+export class EnvironmentService {
+
+    private _currentEnvironmentPromise: ng.IDeferred<noosfero.Environment>;
+
+    constructor(private restangular: restangular.IService, private $q: ng.IQService) {
+        
+    }
+
+    getEnvironmentPeople(params: any) : ng.IPromise<noosfero.Person[]> {
+        let p = this.restangular.one('people').get(params);
+        let deferred = this.$q.defer<noosfero.Person[]>();
+        p.then(this.getHandleSuccessFunctionKeyArray<noosfero.Person[]>("people", deferred));
+        p.catch(this.getHandleErrorFunction<noosfero.Person[]>(deferred));
+        return deferred.promise;        
+    }
+
+    getByIdentifier(identifier: string): ng.IPromise<noosfero.Environment> {
+        console.debug("Getting the current environment by identifier in service: " + identifier);
+        let p = this.restangular.one('environment').customGET(identifier);
+        console.debug("Return promise: ", p);
+                
+        let deferred = this.$q.defer<noosfero.Environment>();
+        p.then(this.getHandleSuccessFunction<noosfero.Environment>(deferred));
+        p.catch(this.getHandleErrorFunction<noosfero.Environment>(deferred));
+        return deferred.promise;
+    }
+    
+    getBoxes(id: number) {
+        console.debug("Getting the environment [${id}] boxes in service", id);
+        let p = this.restangular.one('environments', id).customGET("boxes");
+        console.debug("Return boxes promise in service: ", p);
+                
+        let deferred = this.$q.defer<noosfero.Box[]>();
+        p.then(this.getHandleSuccessFunctionKeyArray<noosfero.Box[]>("boxes", deferred));
+        p.catch(this.getHandleErrorFunction<noosfero.Box[]>(deferred));
+        return deferred.promise;
+    }
+    
+    /** TODO - Please, use the base class RestangularService
+     * (description)
+     * 
+     * @template T
+     * @param {ng.IDeferred<T>} deferred (description)
+     * @returns {(response: restangular.IResponse) => void} (description)
+     */
+    getHandleErrorFunction<T>(deferred: ng.IDeferred<T>): (response: restangular.IResponse) => void {
+        let self = this;
+        /**
+         * (description)
+         * 
+         * @param {restangular.IResponse} response (description)
+         */
+        let errorFunction = (response: restangular.IResponse): void => {
+            deferred.reject(response);
+        };
+        return errorFunction;
+    }
+
+    /**
+     * TODO - use restangular service as base class, and this will not be necessary here anymore
+     */
+    protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<C>, responseKey?: string): (response: restangular.IResponse) => void {
+        let self = this;
+
+        /**
+         * (description)
+         * 
+         * @param {restangular.IResponse} response (description)
+         */
+        let successFunction = (response: restangular.IResponse): void => {
+            let data = this.restangular.stripRestangular(response.data)
+            deferred.resolve(data);
+        };
+        return successFunction;
+    }
+    
+    /**
+     * TODO - use restangular service as base class, and this will not be necessary here anymore
+     */
+    protected getHandleSuccessFunctionKeyArray<C>(key: string, deferred: ng.IDeferred<C>, responseKey?: string): (response: restangular.IResponse) => void {
+        let self = this;
+
+        /**
+         * (description)
+         * 
+         * @param {restangular.IResponse} response (description)
+         */
+        let successFunction = (response: restangular.IResponse): void => {
+            let data = this.restangular.stripRestangular(response.data[key]);
+            deferred.resolve(data);
+        };
+        return successFunction;
+    }    
+}
 namespace noosfero {
+    /**
+     * @ngdoc interface
+     * @name noofero.Environment
+     * @description
+     *  A representation of a Noosfero Environment.
+     */    
     export interface Environment extends RestModel {
+        /**
+         * @ngdoc property
+         * @name id
+         * @propertyOf noofero.Environment
+         * @returns {number} The Environment id
+         */
+        id: number;
+        settings: any
     }
 }
 \ No newline at end of file
	@@ -0,0 +1,41 @@		@@ -0,0 +1,41 @@
		1	+import {Component, Inject, provide} from 'ng-forward';
		2	+import {EnvironmentService} from "../../lib/ng-noosfero-api/http/environment.service";
		3	+import {NotificationService} from "../shared/services/notification.service";
		4	+
		5	+/**
		6	+ * @ngdoc controller
		7	+ * @name environment.Environment
		8	+ * @description
		9	+ * This is the environment controller.
		10	+ */
		11	+@Component({
		12	+ selector: 'environment-home',
		13	+ templateUrl: "app/environment/environment-home.html",
		14	+ providers: [
		15	+ provide('environmentService', { useClass: EnvironmentService }),
		16	+ provide('notificationService', { useClass: NotificationService })
		17	+ ]
		18	+})
		19	+@Inject(EnvironmentService, "$log", "$sce")
		20	+export class EnvironmentHomeComponent {
		21	+
		22	+ environment: noosfero.Environment;
		23	+
		24	+ constructor(private environmentService: EnvironmentService, private $sce: ng.ISCEService) {
		25	+ console.debug("Constructor from EnvironmentHomeComponent");
		26	+
		27	+ environmentService.getByIdentifier("default").then((result: noosfero.Environment) => {
		28	+ this.environment = result;
		29	+ console.debug("Environment ::", result);
		30	+ })
		31	+ }
		32	+
		33	+ getEnvironmentDescription() {
		34	+ if(this.environment && this.environment.settings && this.environment.settings.description){
		35	+ return this.$sce.trustAsHtml(this.environment.settings.description);
		36	+ }
		37	+ else {
		38	+ return "";
		39	+ }
		40	+ }
		41	+}
0	\ No newline at end of file	42	\ No newline at end of file
	@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
		1	+<div id="environment-description" ng-bind-html="vm.getEnvironmentDescription()" class="environment-description">
		2	+</div>
0	\ No newline at end of file	3	\ No newline at end of file
@@ -0,0 +1,54 @@		@@ -0,0 +1,54 @@
	1	+import {StateConfig, Component, Inject, provide} from 'ng-forward';
	2	+import {EnvironmentService} from "../../lib/ng-noosfero-api/http/environment.service";
	3	+import {NotificationService} from "../shared/services/notification.service";
	4	+import {EnvironmentHomeComponent} from "./environment-home.component";
	5	+
	6	+/**
	7	+ * @ngdoc controller
	8	+ * @name environment.Environment
	9	+ * @description
	10	+ * This is the environment controller.
	11	+ */
	12	+@Component({
	13	+ selector: 'environment',
	14	+ templateUrl: "app/environment/environment.html",
	15	+ providers: [
	16	+ provide('environmentService', { useClass: EnvironmentService }),
	17	+ provide('notificationService', { useClass: NotificationService })
	18	+ ]
	19	+})
	20	+@StateConfig([
	21	+ {
	22	+ name: 'main.environment.home',
	23	+ url: "",
	24	+ component: EnvironmentHomeComponent,
	25	+ views: {
	26	+ "mainBlockContent": {
	27	+ templateUrl: "app/environment/environment-home.html",
	28	+ controller: EnvironmentHomeComponent,
	29	+ controllerAs: "vm"
	30	+ }
	31	+ }
	32	+ }
	33	+])
	34	+@Inject(EnvironmentService, "$state")
	35	+export class EnvironmentComponent {
	36	+
	37	+ boxes: noosfero.Box[];
	38	+ environment: noosfero.Environment;
	39	+
	40	+ constructor(environmentService: EnvironmentService, $state: ng.ui.IStateService, notificationService: NotificationService) {
	41	+ //console.debug("Creating EnvironmentComponent...");
	42	+ let boxesPromisse = environmentService.getByIdentifier("default").then((environment: noosfero.Environment) => {
	43	+ //console.debug("Set current environment by identifier callback.: ", environment);
	44	+ this.environment = environment;
	45	+ return environmentService.getBoxes(this.environment.id);
	46	+ }).then((boxes: noosfero.Box[]) => {
	47	+ //console.debug("Set environment boxes in callback: ", boxes);
	48	+ this.boxes = boxes;
	49	+ }).catch(() => {
	50	+ $state.transitionTo('main');
	51	+ notificationService.error({ message: "notification.environment.not_found" });
	52	+ });
	53	+ }
	54	+}
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<div class="environment-container">
	2	+ <div class="row">
	3	+ <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.environment"></noosfero-boxes>
	4	+ </div>
	5	+</div>
@@ -0,0 +1,98 @@		@@ -0,0 +1,98 @@
	1	+import { Injectable, Inject } from "ng-forward";
	2	+
	3	+@Injectable()
	4	+@Inject("Restangular", "$q")
	5	+export class EnvironmentService {
	6	+
	7	+ private _currentEnvironmentPromise: ng.IDeferred<noosfero.Environment>;
	8	+
	9	+ constructor(private restangular: restangular.IService, private $q: ng.IQService) {
	10	+
	11	+ }
	12	+
	13	+ getEnvironmentPeople(params: any) : ng.IPromise<noosfero.Person[]> {
	14	+ let p = this.restangular.one('people').get(params);
	15	+ let deferred = this.$q.defer<noosfero.Person[]>();
	16	+ p.then(this.getHandleSuccessFunctionKeyArray<noosfero.Person[]>("people", deferred));
	17	+ p.catch(this.getHandleErrorFunction<noosfero.Person[]>(deferred));
	18	+ return deferred.promise;
	19	+ }
	20	+
	21	+ getByIdentifier(identifier: string): ng.IPromise<noosfero.Environment> {
	22	+ console.debug("Getting the current environment by identifier in service: " + identifier);
	23	+ let p = this.restangular.one('environment').customGET(identifier);
	24	+ console.debug("Return promise: ", p);
	25	+
	26	+ let deferred = this.$q.defer<noosfero.Environment>();
	27	+ p.then(this.getHandleSuccessFunction<noosfero.Environment>(deferred));
	28	+ p.catch(this.getHandleErrorFunction<noosfero.Environment>(deferred));
	29	+ return deferred.promise;
	30	+ }
	31	+
	32	+ getBoxes(id: number) {
	33	+ console.debug("Getting the environment [${id}] boxes in service", id);
	34	+ let p = this.restangular.one('environments', id).customGET("boxes");
	35	+ console.debug("Return boxes promise in service: ", p);
	36	+
	37	+ let deferred = this.$q.defer<noosfero.Box[]>();
	38	+ p.then(this.getHandleSuccessFunctionKeyArray<noosfero.Box[]>("boxes", deferred));
	39	+ p.catch(this.getHandleErrorFunction<noosfero.Box[]>(deferred));
	40	+ return deferred.promise;
	41	+ }
	42	+
	43	+ /** TODO - Please, use the base class RestangularService
	44	+ * (description)
	45	+ *
	46	+ * @template T
	47	+ * @param {ng.IDeferred<T>} deferred (description)
	48	+ * @returns {(response: restangular.IResponse) => void} (description)
	49	+ */
	50	+ getHandleErrorFunction<T>(deferred: ng.IDeferred<T>): (response: restangular.IResponse) => void {
	51	+ let self = this;
	52	+ /**
	53	+ * (description)
	54	+ *
	55	+ * @param {restangular.IResponse} response (description)
	56	+ */
	57	+ let errorFunction = (response: restangular.IResponse): void => {
	58	+ deferred.reject(response);
	59	+ };
	60	+ return errorFunction;
	61	+ }
	62	+
	63	+ /**
	64	+ * TODO - use restangular service as base class, and this will not be necessary here anymore
	65	+ */
	66	+ protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<C>, responseKey?: string): (response: restangular.IResponse) => void {
	67	+ let self = this;
	68	+
	69	+ /**
	70	+ * (description)
	71	+ *
	72	+ * @param {restangular.IResponse} response (description)
	73	+ */
	74	+ let successFunction = (response: restangular.IResponse): void => {
	75	+ let data = this.restangular.stripRestangular(response.data)
	76	+ deferred.resolve(data);
	77	+ };
	78	+ return successFunction;
	79	+ }
	80	+
	81	+ /**
	82	+ * TODO - use restangular service as base class, and this will not be necessary here anymore
	83	+ */
	84	+ protected getHandleSuccessFunctionKeyArray<C>(key: string, deferred: ng.IDeferred<C>, responseKey?: string): (response: restangular.IResponse) => void {
	85	+ let self = this;
	86	+
	87	+ /**
	88	+ * (description)
	89	+ *
	90	+ * @param {restangular.IResponse} response (description)
	91	+ */
	92	+ let successFunction = (response: restangular.IResponse): void => {
	93	+ let data = this.restangular.stripRestangular(response.data[key]);
	94	+ deferred.resolve(data);
	95	+ };
	96	+ return successFunction;
	97	+ }
	98	+}
1		1
2	namespace noosfero {	2	namespace noosfero {
		3	+ /**
		4	+ * @ngdoc interface
		5	+ * @name noofero.Environment
		6	+ * @description
		7	+ * A representation of a Noosfero Environment.
		8	+ */
3	export interface Environment extends RestModel {	9	export interface Environment extends RestModel {
		10	+ /**
		11	+ * @ngdoc property
		12	+ * @name id
		13	+ * @propertyOf noofero.Environment
		14	+ * @returns {number} The Environment id
		15	+ */
		16	+ id: number;
		17	+ settings: any
4	}	18	}
5	}	19	}
6	\ No newline at end of file	20	\ No newline at end of file