Fix the name of profile and article services in components

Victor Costa
1 parent 3645c953
Showing 7 changed files with 31 additions and 27 deletions Show diff stats
src/app/cms/cms.component.ts
src/app/components/noosfero-blocks/members-block/members-block.component.ts
src/app/components/noosfero-blocks/recent-documents/recent-documents.component.ts
src/app/content-viewer/content-viewer.component.ts
src/app/profile-info/profile-info.component.ts
src/app/profile/profile-home.component.ts
src/app/profile/profile.component.ts
-import {StateConfig, Component, Inject} from 'ng-forward';
+import {StateConfig, Component, Inject, provide} from 'ng-forward';
 import {Profile} from "./../models/interfaces";
 import {ArticleService} from "../../lib/ng-noosfero-api/http/article.service";
 @Component({
     selector: 'cms',
-    templateUrl: "app/cms/cms.html"
+    templateUrl: "app/cms/cms.html",
+    providers: [provide('articleService', { useClass: ArticleService })]
 })
 @Inject(ArticleService, "noosfero", "$stateParams", "$httpParamSerializer", "$state", "SweetAlert")
 export class Cms {
@@ -12,13 +13,13 @@ export class Cms {
     article: any = {};
     profile: any;
-    constructor(private ArticleService: ArticleService, private noosfero: any/* TODO convert noosferoService */, private $stateParams: ng.ui.IStateParamsService, private $httpParamSerializer: any, private $state: ng.ui.IStateService, private SweetAlert: any) {
+    constructor(private articleService: ArticleService, private noosfero: any/* TODO convert noosferoService */, private $stateParams: ng.ui.IStateParamsService, private $httpParamSerializer: any, private $state: ng.ui.IStateService, private SweetAlert: any) {
     }
     save() {
         this.noosfero.currentProfile.then((profile: Profile) => {
-            return this.ArticleService.create(profile.id, this.article);
+            return this.articleService.create(profile.id, this.article);
         }).then((response: restangular.IResponse) => {
             this.$state.transitionTo('main.profile.page', { page: response.data.article.path, profile: response.data.article.profile.identifier });
             this.SweetAlert.swal({
@@ -13,12 +13,12 @@ export class MembersBlock {
     members: any = [];
-    constructor(private ProfileService: ProfileService) {
+    constructor(private profileService: ProfileService) {
     }
     ngOnInit() {
-        this.ProfileService.getProfileMembers(this.owner.id, { per_page: 6 }).then((response: any) => {
+        this.profileService.getProfileMembers(this.owner.id, { per_page: 6 }).then((response: any) => {
             this.members = response.data.people;
         });
     }
@@ -13,10 +13,10 @@ export class RecentDocumentsBlock {
     profile: any;
     documents: any;
-    
+
     documentsLoaded: boolean = false;
-    constructor(private ArticleService: ArticleService, private $state: any) {
+    constructor(private articleService: ArticleService, private $state: any) {
     }
     ngOnInit() {
@@ -25,7 +25,7 @@ export class RecentDocumentsBlock {
         var limit = (this.block && this.block.settings) ? this.block.settings.limit : null || 5;
         //FIXME get all text articles
-        this.ArticleService.getByProfile(this.profile.id, { content_type: 'TinyMceArticle', per_page: limit }).then((response: any) => {
+        this.articleService.getByProfile(this.profile.id, { content_type: 'TinyMceArticle', per_page: limit }).then((response: any) => {
             this.documents = response.data.articles;
             this.documentsLoaded = true;
         });
@@ -36,4 +36,3 @@ export class RecentDocumentsBlock {
     }
 }
-
@@ -2,7 +2,7 @@ import * as noosfero from &quot;../models/interfaces&quot;;
 import {ArticleView} from "../components/noosfero-articles/article/article_view";
-import {Input, Component, StateConfig, Inject} from "ng-forward";
+import {Input, Component, StateConfig, Inject, provide} from "ng-forward";
 import {ArticleBlog} from "./../components/noosfero-articles/blog/blog.component";
 import {ArticleService} from "../../lib/ng-noosfero-api/http/article.service";
@@ -10,7 +10,8 @@ import {ArticleService} from &quot;../../lib/ng-noosfero-api/http/article.service&quot;;
 @Component({
     selector: "content-viewer",
     templateUrl: "app/content-viewer/page.html",
-    directives: [ArticleBlog, ArticleView]
+    directives: [ArticleBlog, ArticleView],
+    providers: [provide('articleService', { useClass: ArticleService })]
 })
 @Inject(ArticleService, "noosfero", "$log", "$stateParams")
 export class ContentViewer {
@@ -21,14 +22,14 @@ export class ContentViewer {
     @Input()
     profile: noosfero.Profile = null;
-    constructor(private ArticleService: ArticleService, private noosfero: any, private $log: ng.ILogService, private $stateParams: angular.ui.IStateParamsService) {
+    constructor(private articleService: ArticleService, private noosfero: any, private $log: ng.ILogService, private $stateParams: angular.ui.IStateParamsService) {
         this.activate();
     }
     activate() {
         this.noosfero.currentProfile.then((profile: noosfero.Profile) => {
             this.profile = profile;
-            return this.ArticleService.getByProfile(this.profile.id, { path: this.$stateParams["page"] });
+            return this.articleService.getByProfile(this.profile.id, { path: this.$stateParams["page"] });
         }).then((response: restangular.IResponse) => {
             this.article = response.data.article;
         });
-import {StateConfig, Component, Inject} from 'ng-forward';
+import {StateConfig, Component, Inject, provide} from 'ng-forward';
 import {Profile} from "./../models/interfaces";
 import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
 @Component({
     selector: 'profile',
-    templateUrl: "app/profile-info/profile-info.html"
+    templateUrl: "app/profile-info/profile-info.html",
+    providers: [provide('profileService', { useClass: ProfileService })]
 })
 @Inject(ProfileService, "noosfero")
 export class ProfileInfo {
@@ -13,14 +14,14 @@ export class ProfileInfo {
     activities: any
     profile: any
-    constructor(private ProfileService: ProfileService, private noosfero: any) {
+    constructor(private profileService: ProfileService, private noosfero: any) {
         this.activate();
     }
     activate() {
         this.noosfero.currentProfile.then((profile: Profile) => {
             this.profile = profile;
-            return this.ProfileService.getActivities(this.profile.id);
+            return this.profileService.getActivities(this.profile.id);
         }).then((response: restangular.IResponse) => {
             this.activities = response.data.activities;
         });
-import {StateConfig, Component, Inject} from 'ng-forward';
+import {StateConfig, Component, Inject, provide} from 'ng-forward';
 import {Profile} from "./../models/interfaces";
 import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
 @Component({
     selector: 'profile-home',
-    template: "<div></div>"
+    template: "<div></div>",
+    providers: [provide('profileService', { useClass: ProfileService })]
 })
 @Inject(ProfileService, "noosfero", "$log", "$stateParams", "$scope", "$state")
 export class ProfileHome {
     profile: Profile;
-    constructor(ProfileService: ProfileService, noosfero: any, $log: ng.ILogService, $stateParams: ng.ui.IStateParamsService, $scope: ng.IScope, $state: ng.ui.IStateService) {
+    constructor(profileService: ProfileService, noosfero: any, $log: ng.ILogService, $stateParams: ng.ui.IStateParamsService, $scope: ng.IScope, $state: ng.ui.IStateService) {
         noosfero.currentProfile.then((profile: Profile) => {
             this.profile = profile;
-            return ProfileService.get(this.profile.id).customGET('home_page', { fields: 'path' });
+            return profileService.get(this.profile.id).customGET('home_page', { fields: 'path' });
         }).then((response: restangular.IResponse) => {
             if (response.data.article) {
                 $state.transitionTo('main.profile.page', { page: response.data.article.path, profile: this.profile.identifier }, { location: false });
-import {StateConfig, Component, Inject} from 'ng-forward';
+import {StateConfig, Component, Inject, provide} from 'ng-forward';
 import {ProfileInfo} from '../profile-info/profile-info.component';
 import {ProfileHome} from '../profile/profile-home.component';
 import {Cms} from '../cms/cms.component';
@@ -12,7 +12,8 @@ import * as noosferoModels from &quot;./../models/interfaces&quot;;
 @Component({
     selector: 'profile',
     templateUrl: "app/profile/profile.html",
-    directives: [NoosferoActivities]
+    directives: [NoosferoActivities],
+    providers: [provide('profileService', { useClass: ProfileService })]
 })
 @StateConfig([
     {
@@ -74,11 +75,11 @@ export class Profile {
     boxes: noosferoModels.Box[];
     profile: noosferoModels.Profile;
-    constructor(ProfileService: ProfileService, noosfero: any, $log: ng.ILogService, $stateParams: ng.ui.IStateParamsService) {
-        ProfileService.getByIdentifier($stateParams["profile"]).then((response: restangular.IResponse) => {
+    constructor(profileService: ProfileService, noosfero: any, $log: ng.ILogService, $stateParams: ng.ui.IStateParamsService) {
+        profileService.getByIdentifier($stateParams["profile"]).then((response: restangular.IResponse) => {
             this.profile = response.data[0];
             noosfero.setCurrentProfile(this.profile);
-            return ProfileService.getBoxes(this.profile.id);
+            return profileService.getBoxes(this.profile.id);
         }).then((response: restangular.IResponse) => {
             this.boxes = response.data.boxes;
         });
	@@ -13,12 +13,12 @@ export class MembersBlock {		@@ -13,12 +13,12 @@ export class MembersBlock {
13		13
14	members: any = [];	14	members: any = [];
15		15
16	- constructor(private ProfileService: ProfileService) {	16	+ constructor(private profileService: ProfileService) {
17		17
18	}	18	}
19		19
20	ngOnInit() {	20	ngOnInit() {
21	- this.ProfileService.getProfileMembers(this.owner.id, { per_page: 6 }).then((response: any) => {	21	+ this.profileService.getProfileMembers(this.owner.id, { per_page: 6 }).then((response: any) => {
22	this.members = response.data.people;	22	this.members = response.data.people;
23	});	23	});
24	}	24	}