added eventemitters to restangular_service base class. add getBlock method to bl…

…ock.service. change on statistics block to make it refresh after add or remove an article

added eventemitters to restangular_service base class. add getBlock method to bl…
…ock.service. change on statistics block to make it refresh after add or remove an article
ABNER SILVA DE OLIVEIRA
1 parent 4f1e59c1
Showing 6 changed files with 85 additions and 37 deletions Show diff stats
src/app/article/article-default-view.component.ts
src/app/layout/blocks/recent-documents/recent-documents-block.component.ts
src/app/layout/blocks/statistics/statistics-block.component.ts
src/lib/ng-noosfero-api/http/article.service.ts
src/lib/ng-noosfero-api/http/block.service.ts
src/lib/ng-noosfero-api/http/restangular_service.ts
@@ -5,7 +5,7 @@ import {MacroDirective} from &quot;./macro/macro.directive&quot;;
 import {ArticleToolbarHotspotComponent} from "../hotspot/article-toolbar-hotspot.component";
 import {ArticleContentHotspotComponent} from "../hotspot/article-content-hotspot.component";
 import {ArticleService} from "./../../lib/ng-noosfero-api/http/article.service";
-
+import {NotificationService} from "./../shared/services/notification.service";
 /**
  * @ngdoc controller
  * @name ArticleDefaultView
@@ -17,15 +17,15 @@ import {ArticleService} from &quot;./../../lib/ng-noosfero-api/http/article.service&quot;;
     selector: 'noosfero-default-article',
     templateUrl: 'app/article/article.html'
 })
-@Inject("$state", ArticleService)
+@Inject("$state", ArticleService, NotificationService)
 export class ArticleDefaultViewComponent {
     @Input() article: noosfero.Article;
     @Input() profile: noosfero.Profile;
-    constructor(private $state: ng.ui.IStateService, public articleService: ArticleService) {
+    constructor(private $state: ng.ui.IStateService, public articleService: ArticleService, protected notificationService: NotificationService) {
         // Subscribe to the Article Removed Event
-        this.articleService.subscribeToArticleRemoved((article: noosfero.Article) => {
+        this.articleService.subscribeToModelRemoved((article: noosfero.Article) => {
             if (this.article.parent) {
                 this.$state.transitionTo('main.profile.page', { page: this.article.parent.path, profile: this.article.profile.identifier });
             } else {
@@ -35,8 +35,9 @@ export class ArticleDefaultViewComponent {
     }
     delete() {
-        this.articleService.removeArticle(this.article).catch((cause: any) => {
-            throw new Error(`Problem removing the article: ${cause}`);
+        this.articleService.remove(this.article).catch((cause: any) => {
+            // TODO - Montar mensagem de erro com a causa 
+            this.notificationService.error({ message: "article.default_view.remove.failed"});
         });
     }
 import {Component, Inject, Input} from "ng-forward";
 import {BlockService} from "../../../../lib/ng-noosfero-api/http/block.service";
-import {ArticleService} from "./../../../../lib/ng-noosfero-api/http/article.service"
-import {Arrays} from "./../../../../lib/util/arrays"
+import {ArticleService} from "./../../../../lib/ng-noosfero-api/http/article.service";
+import {Arrays} from "./../../../../lib/util/arrays";
 @Component({
     selector: "noosfero-recent-documents-block",
@@ -28,12 +28,12 @@ export class RecentDocumentsBlockComponent {
         });
         this.watchArticles();
     }
-    
+
     watchArticles() {
         this.articleService.subscribeToArticleRemoved((article: noosfero.Article) => {
             Arrays.remove(this.documents, article);
         });
-    }    
+    }
     openDocument(article: any) {
         this.$state.go("main.profile.page", { page: article.path, profile: article.profile.identifier });
-import {Input, Inject, Component} from "ng-forward";
-
+import {Input, Inject, Component, provide} from "ng-forward";
+import {ArticleService} from "./../../../../lib/ng-noosfero-api/http/article.service";
+import {BlockService} from "./../../../../lib/ng-noosfero-api/http/block.service";
 @Component({
     selector: "noosfero-statistics-block",
     templateUrl: 'app/layout/blocks/statistics/statistics-block.html'
 })
+@Inject(ArticleService, BlockService)
 export class StatisticsBlockComponent {
     @Input() block: noosfero.StatisticsBlock;
     @Input() owner: any;
+
+    constructor(articleService: ArticleService, blockService: BlockService) {
+        // watches for article being removed
+        // to update comments and tag statistics, which would
+        // changed after removing an article 
+        articleService.subscribeToModelRemoved(() => {
+            blockService.getBlock<noosfero.StatisticsBlock>(this.block.id)
+                .then(blockFromAPI => this.block = blockFromAPI);
+        });
+
+        articleService.subscribeToModelAdded(() => {
+            blockService.getBlock<noosfero.StatisticsBlock>(this.block.id)
+                .then(blockFromAPI => this.block = blockFromAPI);
+        });
+    }
 }
@@ -7,8 +7,6 @@ import {NoosferoRootScope} from &quot;./../../../app/shared/models/interfaces&quot;;
 @Inject("Restangular", "$q", "$log", ProfileService)
 export class ArticleService extends RestangularService<noosfero.Article> {
-    private articleRemoved: EventEmitter<noosfero.Article> = new EventEmitter<noosfero.Article>();
-
     constructor(Restangular: restangular.IService, $q: ng.IQService, $log: ng.ILogService, protected profileService: ProfileService) {
         super(Restangular, $q, $log);
     }
@@ -24,28 +22,22 @@ export class ArticleService extends RestangularService&lt;noosfero.Article&gt; {
         };
     }
-    removeArticle(article: noosfero.Article) {
-        let restRequest: ng.IPromise<noosfero.RestResult<noosfero.Article>> = this.remove(article);
-        let deferred = this.$q.defer<noosfero.RestResult<noosfero.Article>>();
-        restRequest.then((result: any) => {
-            this.notifyArticleRemovedListeners(article);
-        }).catch(this.getHandleErrorFunction(deferred));
-        return deferred.promise;
-    }
+    // removeArticle(article: noosfero.Article) {
+    //     // let restRequest: ng.IPromise<noosfero.RestResult<noosfero.Article>> = this.remove(article);
+    //     // let deferred = this.$q.defer<noosfero.RestResult<noosfero.Article>>();
+    //     // restRequest.then((result: any) => {
+    //     //     this.notifyArticleRemovedListeners(article);
+    //     // }).catch(this.getHandleErrorFunction(deferred));
+    //     // return deferred.promise;
+    // }
     /**
      * Notify listeners that this article has been removed
      */
-    private notifyArticleRemovedListeners(article: noosfero.Article) {
-        this.articleRemoved.next(article);
-    }
+    // private notifyArticleRemovedListeners(article: noosfero.Article) {
+    //     this.modelRemovedEventEmitter.next(article);
+    // }
-    /**
-     * subscribes to the ArticleRemoved event emitter
-     */
-    subscribeToArticleRemoved(fn: Function) {
-        this.articleRemoved.subscribe(fn);
-    }
     updateArticle(article: noosfero.Article) {
         let headers = {
@@ -37,4 +37,14 @@ export class BlockService extends RestangularService&lt;noosfero.Block&gt; {
         return apiContentPromise.promise;
     }
+    getBlock<T extends noosfero.Block>(blockId: number): ng.IPromise<T> {
+        let deferred = this.$q.defer<T>();
+        this.get(blockId)
+            .then((result: noosfero.RestResult<T>) => {
+                deferred.resolve(result.data);
+            })
+            .catch(reason => deferred.reject(reason));
+        return deferred.promise;
+    }
+
 }
+import {EventEmitter} from "ng-forward";
 /**
  * @name RestangularService
  * Base class to be extended by classes which will provide access
@@ -13,6 +14,11 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
     private baseResource: restangular.IElement;
     private currentPromise: ng.IDeferred<T>;
+    protected modelFoundEventEmitter: EventEmitter<T> = new EventEmitter<any>();
+    protected modelAddedEventEmitter: EventEmitter<T> = new EventEmitter<any>();
+    protected modelRemovedEventEmitter: EventEmitter<T> = new EventEmitter<any>();
+    protected modelUpdatedEventEmitter: EventEmitter<T> = new EventEmitter<any>();
+
     /**
      * Creates an instance of RestangularService.
      * 
@@ -35,6 +41,22 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         // });
     }
+    subscribeToModelRemoved(fn: ((model: T) => void)) {
+        this.modelRemovedEventEmitter.subscribe(fn);
+    }
+
+    subscribeToModelAdded(fn: ((model: T) => void)) {
+        this.modelAddedEventEmitter.subscribe(fn);
+    }
+
+    subscribeToModelUpdated(fn: ((model: T) => void)) {
+        this.modelUpdatedEventEmitter.subscribe(fn);
+    }
+
+    subscribeToModelFound(fn: ((model: T) => void)) {
+        this.modelFoundEventEmitter.subscribe(fn);
+    }
+
     public resetCurrent() {
         this.currentPromise = this.$q.defer();
     }
@@ -107,7 +129,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
             restRequest = this.restangularService.one(this.getResourcePath(), id).get(queryParams, headers);
         }
-        restRequest.then(this.getHandleSuccessFunction(deferred))
+        restRequest.then(this.getHandleSuccessFunction(deferred, this.modelFoundEventEmitter))
             .catch(this.getHandleErrorFunction(deferred));
@@ -201,7 +223,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         restRequest = restangularObj.remove(queryParams, headers);
         restRequest
-            .then(this.getHandleSuccessFunction(deferred))
+            .then(this.getHandleSuccessFunction(deferred, this.modelRemovedEventEmitter))
             .catch(this.getHandleErrorFunction(deferred));
         return deferred.promise;
@@ -226,7 +248,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         restRequest = restangularObj.put(queryParams, headers);
-        restRequest.then(this.getHandleSuccessFunction(deferred))
+        restRequest.then(this.getHandleSuccessFunction(deferred, this.modelUpdatedEventEmitter))
             .catch(this.getHandleErrorFunction(deferred));
         return deferred.promise;
@@ -255,7 +277,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
             restRequest = this.baseResource.post(data, queryParams, headers);
         }
-        restRequest.then(this.getHandleSuccessFunction(deferred))
+        restRequest.then(this.getHandleSuccessFunction(deferred, this.modelAddedEventEmitter))
             .catch(this.getHandleErrorFunction(deferred));
         return deferred.promise;
@@ -289,7 +311,7 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
     }
     /** HANDLERS */
-    protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<noosfero.RestResult<C | T | any>>, responseKey?: string): (response: restangular.IResponse) => void {
+    protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<noosfero.RestResult<C | T | any>>, successEmitter: EventEmitter<T> = null): (response: restangular.IResponse) => void {
         let self = this;
         /**
@@ -301,7 +323,13 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
             if (self.$log) {
                 self.$log.debug("Request successfull executed", response.data, self, response);
             }
-            deferred.resolve(<any>this.extractData(response));
+            let resultModel: noosfero.RestResult<T> = <any>this.extractData(response);
+            // resolve the promise with the model returned from the Noosfero API
+            deferred.resolve(resultModel);
+            // emits the event if a successEmiter was provided in the successEmitter parameter
+            if (successEmitter !== null) {
+                successEmitter.next(resultModel);
+            }
         };
         return successFunction;
     }
1	-import {Input, Inject, Component} from "ng-forward";
2	-	1	+import {Input, Inject, Component, provide} from "ng-forward";
		2	+import {ArticleService} from "./../../../../lib/ng-noosfero-api/http/article.service";
		3	+import {BlockService} from "./../../../../lib/ng-noosfero-api/http/block.service";
3	@Component({	4	@Component({
4	selector: "noosfero-statistics-block",	5	selector: "noosfero-statistics-block",
5	templateUrl: 'app/layout/blocks/statistics/statistics-block.html'	6	templateUrl: 'app/layout/blocks/statistics/statistics-block.html'
6	})	7	})
7		8
		9	+@Inject(ArticleService, BlockService)
8	export class StatisticsBlockComponent {	10	export class StatisticsBlockComponent {
9	@Input() block: noosfero.StatisticsBlock;	11	@Input() block: noosfero.StatisticsBlock;
10	@Input() owner: any;	12	@Input() owner: any;
		13	+
		14	+ constructor(articleService: ArticleService, blockService: BlockService) {
		15	+ // watches for article being removed
		16	+ // to update comments and tag statistics, which would
		17	+ // changed after removing an article
		18	+ articleService.subscribeToModelRemoved(() => {
		19	+ blockService.getBlock<noosfero.StatisticsBlock>(this.block.id)
		20	+ .then(blockFromAPI => this.block = blockFromAPI);
		21	+ });
		22	+
		23	+ articleService.subscribeToModelAdded(() => {
		24	+ blockService.getBlock<noosfero.StatisticsBlock>(this.block.id)
		25	+ .then(blockFromAPI => this.block = blockFromAPI);
		26	+ });
		27	+ }
11	}	28	}
	@@ -37,4 +37,14 @@ export class BlockService extends RestangularService<noosfero.Block> {		@@ -37,4 +37,14 @@ export class BlockService extends RestangularService<noosfero.Block> {
37	return apiContentPromise.promise;	37	return apiContentPromise.promise;
38	}	38	}
39		39
		40	+ getBlock<T extends noosfero.Block>(blockId: number): ng.IPromise<T> {
		41	+ let deferred = this.$q.defer<T>();
		42	+ this.get(blockId)
		43	+ .then((result: noosfero.RestResult<T>) => {
		44	+ deferred.resolve(result.data);
		45	+ })
		46	+ .catch(reason => deferred.reject(reason));
		47	+ return deferred.promise;
		48	+ }
		49	+
40	}	50	}