From 328a7a826bc4085754dd0dd2adeb278b81183e81 Mon Sep 17 00:00:00 2001 From: Abner Oliveira Date: Thu, 14 Jul 2016 13:32:54 -0300 Subject: [PATCH] some small refactoring on class naming and changed to allow EVENTS_HUB_KNOW_EVENT_NAMES to be an array of strings --- src/app/known-events.ts | 2 +- src/app/main/main.component.spec.ts | 13 +++++++++++-- src/app/main/main.component.ts | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------ 3 files changed, 62 insertions(+), 57 deletions(-) diff --git a/src/app/known-events.ts b/src/app/known-events.ts index cb8831e..9a655bd 100644 --- a/src/app/known-events.ts +++ b/src/app/known-events.ts @@ -2,7 +2,7 @@ import { EventsHubKnownEventNames } from './shared/services/events-hub.service'; export class NoosferoKnownEvents implements EventsHubKnownEventNames { IMAGE_PROFILE_UPDATED: string = 'IMAGE_PROFILE_UPDATED'; - PROFILE_INFO_UPDATED: string = 'IMAGE_PROFILE_UPDATED'; + PROFILE_INFO_UPDATED: string = 'PROFILE_INFO_UPDATED'; ARTICLE_UPDATED: string = 'ARTICLE_UPDATED'; constructor() { diff --git a/src/app/main/main.component.spec.ts b/src/app/main/main.component.spec.ts index deefb17..fae1c76 100644 --- a/src/app/main/main.component.spec.ts +++ b/src/app/main/main.component.spec.ts @@ -4,8 +4,9 @@ import {TestComponentBuilder, ComponentFixture} from "ng-forward/cjs/testing/tes import {quickCreateComponent} from "../../spec/helpers"; import {getAngularServiceFactory} from "../../spec/helpers"; +import { EVENTS_HUB_KNOW_EVENT_NAMES } from "../shared/services/events-hub.service"; -describe("MainComponent", function() { +describe("MainComponent", function () { let localFixture: ComponentFixture; let $state: angular.ui.IStateService; @@ -34,6 +35,14 @@ describe("MainComponent", function() { { useValue: environmentService }), + provide(EVENTS_HUB_KNOW_EVENT_NAMES, + { + useValue: [ + 'IMAGE_PROFILE_UPDATED', + 'PROFILE_INFO_UPDATED', + 'ARTICLE_UPDATED' + ] + }), ] }) class MainComponentParent { @@ -57,7 +66,7 @@ describe("MainComponent", function() { // navigates to the environment home $state.go("main.environment.home"); localFixture.detectChanges(); - // after changes were detected it checks the current $state route + // after changes were detected it checks the current $state route expect($state.current.name).toEqual("main.environment.home"); done(); }); diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index ceec544..8a4b1b1 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -1,54 +1,54 @@ import * as plugins from "../../plugins"; -import {bundle, Component, StateConfig, Inject} from "ng-forward"; -import {ArticleBlogComponent} from "./../article/types/blog/blog.component"; - -import {ArticleViewComponent} from "./../article/article-default-view.component"; - -import {ProfileComponent} from "../profile/profile.component"; -import {BoxesComponent} from "../layout/boxes/boxes.component"; -import {BlockContentComponent} from "../layout/blocks/block-content.component"; -import {BlockComponent} from "../layout/blocks/block.component"; -import {EnvironmentComponent} from "../environment/environment.component"; -import {EnvironmentHomeComponent} from "../environment/environment-home.component"; -import {PeopleBlockComponent} from "../layout/blocks/people/people-block.component"; -import {DisplayContentBlockComponent} from "../layout/blocks/display-content/display-content-block.component"; -import {LinkListBlockComponent} from "../layout/blocks/link-list/link-list-block.component"; -import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents-block.component"; -import {ProfileImageBlockComponent} from "../layout/blocks/profile-image/profile-image-block.component"; -import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html-block.component"; -import {StatisticsBlockComponent} from "../layout/blocks/statistics/statistics-block.component"; -import {PersonTagsPluginInterestsBlockComponent} from "../layout/blocks/person-tags-plugin-interests/person-tags-plugin-interests-block.component"; -import {TagsBlockComponent} from "../layout/blocks/tags/tags-block.component"; -import {CustomContentComponent} from "../profile/custom-content/custom-content.component"; -import {RecentActivitiesPluginActivitiesBlockComponent} from "../layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component"; - -import {MembersBlockComponent} from "../layout/blocks/members/members-block.component"; -import {CommunitiesBlockComponent} from "../layout/blocks/communities/communities-block.component"; - -import {LoginBlockComponent} from "../layout/blocks/login-block/login-block.component"; - -import {NoosferoTemplate} from "../shared/pipes/noosfero-template.filter"; -import {DateFormat} from "../shared/pipes/date-format.filter"; - -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"; - -import {Navbar} from "../layout/navbar/navbar"; - -import {SidebarComponent} from "../layout/sidebar/sidebar.component"; - -import {MainBlockComponent} from "../layout/blocks/main/main-block.component"; -import {HtmlEditorComponent} from "../shared/components/html-editor/html-editor.component"; -import {PermissionDirective} from "../shared/components/permission/permission.directive"; -import {SearchComponent} from "../search/search.component"; -import {SearchFormComponent} from "../search/search-form/search-form.component"; +import { bundle, Component, StateConfig, Inject } from "ng-forward"; +import { ArticleBlogComponent } from "./../article/types/blog/blog.component"; + +import { ArticleViewComponent } from "./../article/article-default-view.component"; + +import { ProfileComponent } from "../profile/profile.component"; +import { BoxesComponent } from "../layout/boxes/boxes.component"; +import { BlockContentComponent } from "../layout/blocks/block-content.component"; +import { BlockComponent } from "../layout/blocks/block.component"; +import { EnvironmentComponent } from "../environment/environment.component"; +import { EnvironmentHomeComponent } from "../environment/environment-home.component"; +import { PeopleBlockComponent } from "../layout/blocks/people/people-block.component"; +import { DisplayContentBlockComponent } from "../layout/blocks/display-content/display-content-block.component"; +import { LinkListBlockComponent } from "../layout/blocks/link-list/link-list-block.component"; +import { RecentDocumentsBlockComponent } from "../layout/blocks/recent-documents/recent-documents-block.component"; +import { ProfileImageBlockComponent } from "../layout/blocks/profile-image/profile-image-block.component"; +import { RawHTMLBlockComponent } from "../layout/blocks/raw-html/raw-html-block.component"; +import { StatisticsBlockComponent } from "../layout/blocks/statistics/statistics-block.component"; +import { PersonTagsPluginInterestsBlockComponent } from "../layout/blocks/person-tags-plugin-interests/person-tags-plugin-interests-block.component"; +import { TagsBlockComponent } from "../layout/blocks/tags/tags-block.component"; +import { CustomContentComponent } from "../profile/custom-content/custom-content.component"; +import { RecentActivitiesPluginActivitiesBlockComponent } from "../layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component"; + +import { MembersBlockComponent } from "../layout/blocks/members/members-block.component"; +import { CommunitiesBlockComponent } from "../layout/blocks/communities/communities-block.component"; + +import { LoginBlockComponent } from "../layout/blocks/login-block/login-block.component"; + +import { NoosferoTemplate } from "../shared/pipes/noosfero-template.filter"; +import { DateFormat } from "../shared/pipes/date-format.filter"; + +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"; + +import { Navbar } from "../layout/navbar/navbar"; + +import { SidebarComponent } from "../layout/sidebar/sidebar.component"; + +import { MainBlockComponent } from "../layout/blocks/main/main-block.component"; +import { HtmlEditorComponent } from "../shared/components/html-editor/html-editor.component"; +import { PermissionDirective } from "../shared/components/permission/permission.directive"; +import { SearchComponent } from "../search/search.component"; +import { SearchFormComponent } from "../search/search-form/search-form.component"; import { EVENTS_HUB_KNOW_EVENT_NAMES, EventsHubService } from "../shared/services/events-hub.service"; -import { NoosferoEventsHubKnownEventNames } from "../events-hub-known-events"; +import { NoosferoKnownEvents } from "../known-events"; /** * @ngdoc controller * @name main.MainContentComponent @@ -71,13 +71,9 @@ export class MainContentComponent { constructor( private bodyStateClassesService: BodyStateClassesService, - eventsNames: NoosferoEventsHubKnownEventNames, + eventsNames: NoosferoKnownEvents, eventsHubService: EventsHubService - ) { - try { - console.log('Events Names', eventsNames); - eventsHubService.subscribeToEvent(eventsNames.IMAGE_PROFILE_UPDATED, () => console.log('Event ImageProfileUpdate emitted!')); - } catch (e) { } + ) { bodyStateClassesService.start({ skin: this.themeSkin }); -- libgit2 0.21.2