From 33a450bb621de36517c7943d261a063b3accf4a4 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Fri, 9 Aug 2019 15:02:02 +0300 Subject: [PATCH] refactor(core): rename actions and service functions --- .../packages/core/src/lib/actions/config.actions.ts | 2 +- .../packages/core/src/lib/actions/loader.actions.ts | 4 ++-- .../packages/core/src/lib/actions/profile.actions.ts | 6 +++--- .../packages/core/src/lib/actions/session.actions.ts | 4 ++-- .../core/src/lib/interceptors/api.interceptor.ts | 6 +++--- .../packages/core/src/lib/states/config.state.ts | 10 ++++------ .../packages/core/src/lib/states/profile.state.ts | 12 ++++++------ .../packages/core/src/lib/states/session.state.ts | 10 +++++----- .../packages/core/src/lib/utils/initial-utils.ts | 4 ++-- 9 files changed, 28 insertions(+), 30 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/actions/config.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/config.actions.ts index 1251436c07..3e33420578 100644 --- a/npm/ng-packs/packages/core/src/lib/actions/config.actions.ts +++ b/npm/ng-packs/packages/core/src/lib/actions/config.actions.ts @@ -5,6 +5,6 @@ export class PatchRouteByName { constructor(public name: string, public newValue: Partial) {} } -export class ConfigGetAppConfiguration { +export class GetAppConfiguration { static readonly type = '[Config] Get App Configuration'; } diff --git a/npm/ng-packs/packages/core/src/lib/actions/loader.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/loader.actions.ts index 6338172a6e..0bf5207dca 100644 --- a/npm/ng-packs/packages/core/src/lib/actions/loader.actions.ts +++ b/npm/ng-packs/packages/core/src/lib/actions/loader.actions.ts @@ -1,11 +1,11 @@ import { HttpRequest } from '@angular/common/http'; -export class LoaderStart { +export class StartLoader { static readonly type = '[Loader] Start'; constructor(public payload: HttpRequest) {} } -export class LoaderStop { +export class StopLoader { static readonly type = '[Loader] Stop'; constructor(public payload: HttpRequest) {} } diff --git a/npm/ng-packs/packages/core/src/lib/actions/profile.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/profile.actions.ts index 235e587bf9..03baceda8a 100644 --- a/npm/ng-packs/packages/core/src/lib/actions/profile.actions.ts +++ b/npm/ng-packs/packages/core/src/lib/actions/profile.actions.ts @@ -1,15 +1,15 @@ import { Profile } from '../models'; -export class ProfileGet { +export class GetProfile { static readonly type = '[Profile] Get'; } -export class ProfileUpdate { +export class UpdateProfile { static readonly type = '[Profile] Update'; constructor(public payload: Profile.Response) {} } -export class ProfileChangePassword { +export class ChangePassword { static readonly type = '[Profile] Change Password'; constructor(public payload: Profile.ChangePasswordRequest) {} } diff --git a/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts index 61a69b00fc..7a89be4de3 100644 --- a/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts +++ b/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts @@ -1,10 +1,10 @@ import { ABP } from '../models'; -export class SessionSetLanguage { +export class SetLanguage { static readonly type = '[Session] Set Language'; constructor(public payload: string) {} } -export class SessionSetTenant { +export class SetTenant { static readonly type = '[Session] Set Tenant'; constructor(public payload: ABP.BasicItem) {} } diff --git a/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts b/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts index 64e4701f82..de01335058 100644 --- a/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts +++ b/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts @@ -3,7 +3,7 @@ import { HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http' import { OAuthService } from 'angular-oauth2-oidc'; import { Store } from '@ngxs/store'; import { SessionState } from '../states'; -import { LoaderStart, LoaderStop } from '../actions/loader.actions'; +import { StartLoader, StopLoader } from '../actions/loader.actions'; import { finalize } from 'rxjs/operators'; @Injectable() @@ -11,7 +11,7 @@ export class ApiInterceptor implements HttpInterceptor { constructor(private oAuthService: OAuthService, private store: Store) {} intercept(request: HttpRequest, next: HttpHandler) { - this.store.dispatch(new LoaderStart(request)); + this.store.dispatch(new StartLoader(request)); const headers = {} as any; @@ -36,6 +36,6 @@ export class ApiInterceptor implements HttpInterceptor { setHeaders: headers, }), ) - .pipe(finalize(() => this.store.dispatch(new LoaderStop(request)))); + .pipe(finalize(() => this.store.dispatch(new StopLoader(request)))); } } diff --git a/npm/ng-packs/packages/core/src/lib/states/config.state.ts b/npm/ng-packs/packages/core/src/lib/states/config.state.ts index b1926e3c26..ccad1a6439 100644 --- a/npm/ng-packs/packages/core/src/lib/states/config.state.ts +++ b/npm/ng-packs/packages/core/src/lib/states/config.state.ts @@ -1,10 +1,10 @@ import { State, Selector, createSelector, Action, StateContext, Store } from '@ngxs/store'; import { Config, ABP } from '../models'; -import { ConfigGetAppConfiguration, PatchRouteByName } from '../actions/config.actions'; +import { GetAppConfiguration, PatchRouteByName } from '../actions/config.actions'; import { ApplicationConfigurationService } from '../services/application-configuration.service'; import { tap, switchMap } from 'rxjs/operators'; import snq from 'snq'; -import { SessionSetLanguage } from '../actions'; +import { SetLanguage } from '../actions'; import { SessionState } from './session.state'; import { of } from 'rxjs'; import { setChildRoute, sortRoutes, organizeRoutes } from '../utils/route-utils'; @@ -161,7 +161,7 @@ export class ConfigState { constructor(private appConfigurationService: ApplicationConfigurationService, private store: Store) {} - @Action(ConfigGetAppConfiguration) + @Action(GetAppConfiguration) addData({ patchState, dispatch }: StateContext) { return this.appConfigurationService.getConfiguration().pipe( tap(configuration => @@ -172,9 +172,7 @@ export class ConfigState { switchMap(configuration => this.store.selectSnapshot(SessionState.getLanguage) ? of(null) - : dispatch( - new SessionSetLanguage(snq(() => configuration.setting.values['Abp.Localization.DefaultLanguage'])), - ), + : dispatch(new SetLanguage(snq(() => configuration.setting.values['Abp.Localization.DefaultLanguage']))), ), ); } diff --git a/npm/ng-packs/packages/core/src/lib/states/profile.state.ts b/npm/ng-packs/packages/core/src/lib/states/profile.state.ts index d162c19032..cce9788f09 100644 --- a/npm/ng-packs/packages/core/src/lib/states/profile.state.ts +++ b/npm/ng-packs/packages/core/src/lib/states/profile.state.ts @@ -1,5 +1,5 @@ import { State, Action, StateContext, Selector } from '@ngxs/store'; -import { ProfileGet, ProfileChangePassword, ProfileUpdate } from '../actions/profile.actions'; +import { GetProfile, ChangePassword, UpdateProfile } from '../actions/profile.actions'; import { Profile } from '../models/profile'; import { ProfileService } from '../services/profile.service'; import { tap } from 'rxjs/operators'; @@ -16,7 +16,7 @@ export class ProfileState { constructor(private profileService: ProfileService) {} - @Action(ProfileGet) + @Action(GetProfile) profileGet({ patchState }: StateContext) { return this.profileService.get().pipe( tap(profile => @@ -27,8 +27,8 @@ export class ProfileState { ); } - @Action(ProfileUpdate) - profileUpdate({ patchState }: StateContext, { payload }: ProfileUpdate) { + @Action(UpdateProfile) + profileUpdate({ patchState }: StateContext, { payload }: UpdateProfile) { return this.profileService.update(payload).pipe( tap(profile => patchState({ @@ -38,8 +38,8 @@ export class ProfileState { ); } - @Action(ProfileChangePassword) - changePassword(_, { payload }: ProfileChangePassword) { + @Action(ChangePassword) + changePassword(_, { payload }: ChangePassword) { return this.profileService.changePassword(payload, true); } } diff --git a/npm/ng-packs/packages/core/src/lib/states/session.state.ts b/npm/ng-packs/packages/core/src/lib/states/session.state.ts index f009f7a574..58d0eddcfa 100644 --- a/npm/ng-packs/packages/core/src/lib/states/session.state.ts +++ b/npm/ng-packs/packages/core/src/lib/states/session.state.ts @@ -1,5 +1,5 @@ import { Action, Selector, State, StateContext } from '@ngxs/store'; -import { SessionSetLanguage, SessionSetTenant } from '../actions/session.actions'; +import { SetLanguage, SetTenant } from '../actions/session.actions'; import { ABP, Session } from '../models'; @State({ @@ -19,15 +19,15 @@ export class SessionState { constructor() {} - @Action(SessionSetLanguage) - sessionSetLanguage({ patchState }: StateContext, { payload }: SessionSetLanguage) { + @Action(SetLanguage) + setLanguage({ patchState }: StateContext, { payload }: SetLanguage) { patchState({ language: payload, }); } - @Action(SessionSetTenant) - sessionSetTenantId({ patchState }: StateContext, { payload }: SessionSetTenant) { + @Action(SetTenant) + setTenantId({ patchState }: StateContext, { payload }: SetTenant) { patchState({ tenant: payload, }); diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts index dc1e403612..6efba1e19b 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts @@ -1,12 +1,12 @@ import { Injector } from '@angular/core'; import { Store } from '@ngxs/store'; -import { ConfigGetAppConfiguration } from '../actions/config.actions'; +import { GetAppConfiguration } from '../actions/config.actions'; export function getInitialData(injector: Injector) { const fn = function() { const store: Store = injector.get(Store); - return store.dispatch(new ConfigGetAppConfiguration()).toPromise(); + return store.dispatch(new GetAppConfiguration()).toPromise(); }; return fn;