From d8536ef011fb88714108a9b9f258fab5ff2806d2 Mon Sep 17 00:00:00 2001 From: insanity Date: Tue, 20 Mar 2018 14:48:56 +0900 Subject: [PATCH] meta arranging --- .../infra/component/map/map.component.ts | 4 +++- src/packages/meta/meta-store.module.ts | 24 +++++++++++++++++++ src/packages/meta/meta.module.ts | 22 +++++++++++++++++ .../meta/service/crawler.service.spec.ts | 15 ------------ src/packages/meta/service/crawler.service.ts | 11 +-------- .../meta/store/crawler-readall/index.ts | 4 ---- src/packages/meta/store/crawler/list/index.ts | 4 ++++ .../list/list.action.ts} | 2 +- .../list/list.effect.spec.ts} | 4 ++-- .../list/list.effect.ts} | 17 +++++-------- .../list/list.reducer.ts} | 6 ++--- .../list/list.state.ts} | 2 +- src/packages/meta/store/index.ts | 16 ++++++------- .../store/list/notification.effect.ts | 1 - .../crawler-selector.component.ts | 8 +++++-- .../component/setting/setting.component.html | 2 +- .../component/setting/setting.component.ts | 12 ++++++++-- .../target-selector.component.html | 4 ++-- .../target-selector.component.ts | 19 ++++++++------- 19 files changed, 105 insertions(+), 72 deletions(-) delete mode 100644 src/packages/meta/service/crawler.service.spec.ts delete mode 100644 src/packages/meta/store/crawler-readall/index.ts create mode 100644 src/packages/meta/store/crawler/list/index.ts rename src/packages/meta/store/{crawler-readall/readall.action.ts => crawler/list/list.action.ts} (94%) rename src/packages/meta/store/{crawler-readall/readall.effect.spec.ts => crawler/list/list.effect.spec.ts} (77%) rename src/packages/meta/store/{crawler-readall/readall.effect.ts => crawler/list/list.effect.ts} (71%) rename src/packages/meta/store/{crawler-readall/readall.reducer.ts => crawler/list/list.reducer.ts} (87%) rename src/packages/meta/store/{crawler-readall/readall.state.ts => crawler/list/list.state.ts} (85%) diff --git a/src/packages/infra/component/map/map.component.ts b/src/packages/infra/component/map/map.component.ts index 8468828..bcb0025 100644 --- a/src/packages/infra/component/map/map.component.ts +++ b/src/packages/infra/component/map/map.component.ts @@ -66,7 +66,9 @@ export class MapComponent implements OnInit, AfterContentInit { const dialogRef = this.dialog.open(SettingComponent, { width: '80%', - data: { } + data: { + 'infra': infra + } }); dialogRef.afterClosed().subscribe(result => { diff --git a/src/packages/meta/meta-store.module.ts b/src/packages/meta/meta-store.module.ts index e69de29..fc47af5 100644 --- a/src/packages/meta/meta-store.module.ts +++ b/src/packages/meta/meta-store.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { StoreModule } from '@ngrx/store'; +import { StoreDevtoolsModule } from '@ngrx/store-devtools'; +import { + StoreRouterConnectingModule, + RouterStateSerializer, +} from '@ngrx/router-store'; +import { EffectsModule } from '@ngrx/effects'; +import { combineReducers, ActionReducer, ActionReducerMap, MetaReducer } from '@ngrx/store'; + +import { + REDUCERS, + EFFECTS, +} from './store'; + +import { MODULE } from './meta.constant'; + +@NgModule({ + imports: [ + StoreModule.forFeature(MODULE.name, REDUCERS), + EffectsModule.forFeature(EFFECTS), + ], +}) +export class MetaStoreModule { } diff --git a/src/packages/meta/meta.module.ts b/src/packages/meta/meta.module.ts index e69de29..300548c 100644 --- a/src/packages/meta/meta.module.ts +++ b/src/packages/meta/meta.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { SERVICES } from './service'; + + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + ], + declarations: [ + ], + exports: [ + ], + providers: [ + SERVICES, + ], +}) +export class MetaModule { } diff --git a/src/packages/meta/service/crawler.service.spec.ts b/src/packages/meta/service/crawler.service.spec.ts deleted file mode 100644 index 2d1aaec..0000000 --- a/src/packages/meta/service/crawler.service.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { CrawlerService } from './crawler.service'; - -describe('MemberService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [CrawlerService] - }); - }); - - it('should be created', inject([CrawlerService], (service: CrawlerService) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/src/packages/meta/service/crawler.service.ts b/src/packages/meta/service/crawler.service.ts index 877b199..6238586 100644 --- a/src/packages/meta/service/crawler.service.ts +++ b/src/packages/meta/service/crawler.service.ts @@ -16,16 +16,7 @@ export class CrawlerService { } - public signin(email: string, password: string): Observable { - const body = { - signinId: email, - signinPw: password, - }; - - return this.rpcClient.call('CrawlerService.', body); - } - public readAll(): Observable { - return this.rpcClient.call('CrawlerService.'); + return this.rpcClient.call('CrawlerService.readAll'); } } diff --git a/src/packages/meta/store/crawler-readall/index.ts b/src/packages/meta/store/crawler-readall/index.ts deleted file mode 100644 index a1cbe91..0000000 --- a/src/packages/meta/store/crawler-readall/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './readall.action'; -export * from './readall.effect'; -export * from './readall.reducer'; -export * from './readall.state'; diff --git a/src/packages/meta/store/crawler/list/index.ts b/src/packages/meta/store/crawler/list/index.ts new file mode 100644 index 0000000..7fd86e0 --- /dev/null +++ b/src/packages/meta/store/crawler/list/index.ts @@ -0,0 +1,4 @@ +export * from './list.action'; +export * from './list.effect'; +export * from './list.reducer'; +export * from './list.state'; diff --git a/src/packages/meta/store/crawler-readall/readall.action.ts b/src/packages/meta/store/crawler/list/list.action.ts similarity index 94% rename from src/packages/meta/store/crawler-readall/readall.action.ts rename to src/packages/meta/store/crawler/list/list.action.ts index e90a6a6..8b1942c 100644 --- a/src/packages/meta/store/crawler-readall/readall.action.ts +++ b/src/packages/meta/store/crawler/list/list.action.ts @@ -3,7 +3,7 @@ import { Action } from '@ngrx/store'; import { RPCError } from 'packages/core/rpc/error'; -import { MetaCrawler } from '../../model'; +import { MetaCrawler } from '../../../model'; export enum ActionType { ReadAll = '[meta.crawler-readall] ReadAll', diff --git a/src/packages/meta/store/crawler-readall/readall.effect.spec.ts b/src/packages/meta/store/crawler/list/list.effect.spec.ts similarity index 77% rename from src/packages/meta/store/crawler-readall/readall.effect.spec.ts rename to src/packages/meta/store/crawler/list/list.effect.spec.ts index 4d528c3..d8f6227 100644 --- a/src/packages/meta/store/crawler-readall/readall.effect.spec.ts +++ b/src/packages/meta/store/crawler/list/list.effect.spec.ts @@ -1,8 +1,8 @@ import { TestBed, inject } from '@angular/core/testing'; -import { Effects } from './readall.effect'; +import { Effects } from './list.effect'; -describe('Auth.Effects', () => { +describe('List.Effects', () => { beforeEach(() => { TestBed.configureTestingModule({ providers: [Effects] diff --git a/src/packages/meta/store/crawler-readall/readall.effect.ts b/src/packages/meta/store/crawler/list/list.effect.ts similarity index 71% rename from src/packages/meta/store/crawler-readall/readall.effect.ts rename to src/packages/meta/store/crawler/list/list.effect.ts index e63d00c..7bb3524 100644 --- a/src/packages/meta/store/crawler-readall/readall.effect.ts +++ b/src/packages/meta/store/crawler/list/list.effect.ts @@ -18,15 +18,15 @@ import { RPCError } from 'packages/core/rpc/error'; import { DomainMember } from 'packages/domain/model'; -import { MetaCrawler } from '../../model'; -import { CrawlerService } from '../../service/crawler.service'; +import { MetaCrawler } from '../../../model'; +import { CrawlerService } from '../../../service/crawler.service'; import { ReadAll, ReadAllSuccess, ReadAllFailure, ActionType, -} from './readall.action'; +} from './list.action'; @Injectable() export class Effects { @@ -38,20 +38,15 @@ export class Effects { ) { } @Effect() - signin$: Observable = this.actions$ + readAll$: Observable = this.actions$ .ofType(ActionType.ReadAll) .map((action: ReadAll) => action.payload) .switchMap(payload => this.crawlerService.readAll()) - .map((metaCrawlerList: MetaCrawler[]) => { - return new ReadAllSuccess(metaCrawlerList); + .map(list => { + return new ReadAllSuccess(list); }) .catch((error: RPCError) => { return of(new ReadAllFailure(error)); }); - @Effect({ dispatch: false }) - signinSuccess$ = this.actions$ - .ofType(ActionType.ReadAllSuccess) - .do(() => this.router.navigate(['/'])); - } diff --git a/src/packages/meta/store/crawler-readall/readall.reducer.ts b/src/packages/meta/store/crawler/list/list.reducer.ts similarity index 87% rename from src/packages/meta/store/crawler-readall/readall.reducer.ts rename to src/packages/meta/store/crawler/list/list.reducer.ts index 5daf4e2..3a5d4de 100644 --- a/src/packages/meta/store/crawler-readall/readall.reducer.ts +++ b/src/packages/meta/store/crawler/list/list.reducer.ts @@ -1,14 +1,14 @@ import { Actions, ActionType, -} from './readall.action'; +} from './list.action'; import { State, initialState, -} from './readall.state'; +} from './list.state'; -import { MetaCrawler } from '../../model'; +import { MetaCrawler } from '../../../model'; export function reducer(state = initialState, action: Actions): State { switch (action.type) { diff --git a/src/packages/meta/store/crawler-readall/readall.state.ts b/src/packages/meta/store/crawler/list/list.state.ts similarity index 85% rename from src/packages/meta/store/crawler-readall/readall.state.ts rename to src/packages/meta/store/crawler/list/list.state.ts index 040196f..2787826 100644 --- a/src/packages/meta/store/crawler-readall/readall.state.ts +++ b/src/packages/meta/store/crawler/list/list.state.ts @@ -1,6 +1,6 @@ import { RPCError } from 'packages/core/rpc/error'; +import { MetaCrawler } from '../../../model'; -import { MetaCrawler } from '../../model'; export interface State { error: RPCError | null; diff --git a/src/packages/meta/store/index.ts b/src/packages/meta/store/index.ts index bfb7db3..73fcb20 100644 --- a/src/packages/meta/store/index.ts +++ b/src/packages/meta/store/index.ts @@ -8,24 +8,24 @@ import { import { MODULE } from '../meta.constant'; - import * as CrawlerReadAllStore from './crawler-readall'; + import * as ListStore from './crawler/list'; export interface State { - readAll: CrawlerReadAllStore.State; + list: ListStore.State; } export const REDUCERS = { - readAll: CrawlerReadAllStore.reducer, + list: ListStore.reducer, }; export const EFFECTS = [ - CrawlerReadAllStore.Effects, + ListStore.Effects, ]; - export const selectCrawlerReadAllState = createFeatureSelector(MODULE.name); + export const selectCrawlerListState = createFeatureSelector(MODULE.name); - export const CrawlerReadAllSelector = new StateSelector(createSelector( - selectCrawlerReadAllState, - (state: State) => state.readAll + export const CrawlerListSelector = new StateSelector(createSelector( + selectCrawlerListState, + (state: State) => state.list )); diff --git a/src/packages/notification/store/list/notification.effect.ts b/src/packages/notification/store/list/notification.effect.ts index 1e57a67..b5dce59 100644 --- a/src/packages/notification/store/list/notification.effect.ts +++ b/src/packages/notification/store/list/notification.effect.ts @@ -58,7 +58,6 @@ export class Effects { return new MarkAllAsReadSuccess(page); }) .catch((error: RPCError) => { - console.log('errrrrrrrrrrrrrr : ' + error.response.message); return of(new MarkAllAsReadFailure(error)); }); } diff --git a/src/packages/sensor/component/setting/crawler-selector/crawler-selector.component.ts b/src/packages/sensor/component/setting/crawler-selector/crawler-selector.component.ts index e166f47..ac44844 100644 --- a/src/packages/sensor/component/setting/crawler-selector/crawler-selector.component.ts +++ b/src/packages/sensor/component/setting/crawler-selector/crawler-selector.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, OnChanges } from '@angular/core'; +import { Component, OnInit, Input, OnChanges, AfterContentInit } from '@angular/core'; import { Router } from '@angular/router'; import { Target } from 'packages/target/model'; import { MetaCrawler } from '../../../../meta/model'; @@ -9,7 +9,7 @@ import { MetaCrawler } from '../../../../meta/model'; templateUrl: './crawler-selector.component.html', styleUrls: ['./crawler-selector.component.scss'] }) -export class CrawlerSelectorComponent implements OnInit, OnChanges { +export class CrawlerSelectorComponent implements OnInit, OnChanges, AfterContentInit { @Input() selectedTarget: Target; crawlers: MetaCrawler[]; @@ -20,6 +20,10 @@ export class CrawlerSelectorComponent implements OnInit, OnChanges { ngOnInit() { } + ngAfterContentInit() { + + } + ngOnChanges() { if (this.selectedTarget) { console.log('Getting valid crawlers for ' + this.selectedTarget.displayName); diff --git a/src/packages/sensor/component/setting/setting.component.html b/src/packages/sensor/component/setting/setting.component.html index bb0dc2a..eec0229 100644 --- a/src/packages/sensor/component/setting/setting.component.html +++ b/src/packages/sensor/component/setting/setting.component.html @@ -3,7 +3,7 @@ - + diff --git a/src/packages/sensor/component/setting/setting.component.ts b/src/packages/sensor/component/setting/setting.component.ts index a3a3320..682ec2a 100644 --- a/src/packages/sensor/component/setting/setting.component.ts +++ b/src/packages/sensor/component/setting/setting.component.ts @@ -1,6 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input, Inject } from '@angular/core'; import { AfterContentInit } from '@angular/core/src/metadata/lifecycle_hooks'; import { Target } from '../../../target/model'; +import { MAT_DIALOG_DATA } from '@angular/material'; +import { Infra } from '../../../infra/model'; @Component({ @@ -13,7 +15,13 @@ export class SettingComponent implements OnInit, AfterContentInit { selectedTarget: Target = null; step = 1; - constructor() { } + constructor( + @Inject(MAT_DIALOG_DATA) public data: any + ) { + if (data !== null) { + this.selectedTarget = data.infra.target; + } + } ngOnInit() { diff --git a/src/packages/sensor/component/setting/target-selector/target-selector.component.html b/src/packages/sensor/component/setting/target-selector/target-selector.component.html index 715f8c8..8ebf1bc 100644 --- a/src/packages/sensor/component/setting/target-selector/target-selector.component.html +++ b/src/packages/sensor/component/setting/target-selector/target-selector.component.html @@ -9,8 +9,8 @@ - - {{target.displayName}} + + {{t.displayName}} diff --git a/src/packages/sensor/component/setting/target-selector/target-selector.component.ts b/src/packages/sensor/component/setting/target-selector/target-selector.component.ts index 3ffbe97..1746647 100644 --- a/src/packages/sensor/component/setting/target-selector/target-selector.component.ts +++ b/src/packages/sensor/component/setting/target-selector/target-selector.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; import { Router } from '@angular/router'; import { MatRadioButton } from '@angular/material'; import { Target } from 'packages/target/model'; @@ -11,6 +11,7 @@ import { Target } from 'packages/target/model'; }) export class TargetSelectorComponent implements OnInit { + @Input() target: Target = null; @Output() targetSelectEvent = new EventEmitter(); targets: Target[] = null; @@ -18,16 +19,18 @@ export class TargetSelectorComponent implements OnInit { ngOnInit() { this.targets = new Array(); - for (let i = 0; i < 10; i++) { - const t: Target = { - id: i, - displayName: 'Target' + i, - }; - this.targets.push(t); - } + this.targets.push(this.target); + // for (let i = 0; i < 10; i++) { + // const t: Target = { + // id: i, + // displayName: 'Target' + i, + // }; + // this.targets.push(t); + // } } targetSelected(t: Target) { this.targetSelectEvent.emit(t); } + }