From 442b2c213df5efaffaafa40ff2e9230c3767b599 Mon Sep 17 00:00:00 2001
From: snoop <snoop@loafle.com>
Date: Thu, 24 Aug 2017 14:16:20 +0900
Subject: [PATCH] target / sensor

---
 src/ts/@overflow/app/config/index.ts          |  6 +++++
 .../@overflow/app/views/layout/AppLayout.tsx  |  1 +
 .../app/views/monitoring/sensor/List.tsx      |  2 +-
 .../app/views/monitoring/sensor/Setup.tsx     |  2 +-
 .../meta/react/components/CrawlerSelector.tsx | 18 -------------
 .../sensor/react/SensorConfiguration.tsx      |  3 ++-
 src/ts/@overflow/sensor/react/SensorList.tsx  | 12 ++++++---
 .../react/components/SensorConfiguration.tsx  |  6 ++---
 .../sensor/react/components/SensorList.tsx    |  4 ++-
 .../sensor/redux/action/read_all_by_infra.ts  |  8 ++++++
 .../sensor/redux/reducer/read_all_by_infra.ts | 26 +++++++++++++++++++
 .../redux/reducer/read_all_by_target.ts       |  2 +-
 .../sensor/redux/state/ReadAllByInfra.ts      | 13 ++++++++++
 src/ts/@overflow/target/react/TargetList.tsx  |  4 +--
 14 files changed, 76 insertions(+), 31 deletions(-)
 create mode 100644 src/ts/@overflow/sensor/redux/action/read_all_by_infra.ts
 create mode 100644 src/ts/@overflow/sensor/redux/reducer/read_all_by_infra.ts
 create mode 100644 src/ts/@overflow/sensor/redux/state/ReadAllByInfra.ts

diff --git a/src/ts/@overflow/app/config/index.ts b/src/ts/@overflow/app/config/index.ts
index 2c785bc..514f45d 100644
--- a/src/ts/@overflow/app/config/index.ts
+++ b/src/ts/@overflow/app/config/index.ts
@@ -17,12 +17,14 @@ import noauthDenyReducer from '@overflow/noauthprobe/redux/reducer/deny';
 
 import readAllTargetByProbeReducer from '@overflow/target/redux/reducer/readAllByProbe';
 import readAllTargetByDomainReducer from '@overflow/target/redux/reducer/read_all_by_domain';
+
 import readTargetReducer from '@overflow/target/redux/reducer/read';
 
 import sensorReadAllByTargetReducer from '@overflow/sensor/redux/reducer/read_all_by_target';
 import sensorReadAllByDomainReducer from '@overflow/sensor/redux/reducer/read_all_by_domain';
 import SensorReadReducer from '@overflow/sensor/redux/reducer/read';
 import SensorItemReadAllBySensorReducer from '@overflow/sensor/redux/reducer/item_read_all_by_sensor';
+import readAllTargetByInfraReducer from '@overflow/sensor/redux/reducer/read_all_by_infra';
 
 import readMachineReducer from '@overflow/infra/redux/reducer/machine_read';
 import readHostReducer from '@overflow/infra/redux/reducer/host_read';
@@ -102,7 +104,11 @@ const reduxConfig: ReduxConfig = {
     modifyProbeReducer,
     DiscoveryInfraTargetRegistAllReducer,
     HistoryReadAllByProbeReducer,
+<<<<<<< 15ea4947a2911a013b4ba1377088e49bd993a7fa
     HistoryReadAllByProbeAndTypeReducer,
+=======
+    readAllTargetByInfraReducer,
+>>>>>>> fixed target / sensor
   ],
   sagaWatchers: [
     AsyncRequest,
diff --git a/src/ts/@overflow/app/views/layout/AppLayout.tsx b/src/ts/@overflow/app/views/layout/AppLayout.tsx
index 8672470..80c9be2 100644
--- a/src/ts/@overflow/app/views/layout/AppLayout.tsx
+++ b/src/ts/@overflow/app/views/layout/AppLayout.tsx
@@ -46,6 +46,7 @@ export class AppLayout extends React.Component<Props, State> {
                 <Route exact={true} path={`${this.props.match.url}probe_setup`} component={ProbeSetup}/>
                 <Route exact={true} path={`${this.props.match.url}histories`} component={HistoryList}/>
                 <Route exact={true} path={`${this.props.match.url}sensor_setup`} component={SensorSetup}/>
+                <Route exact={true} path={`${this.props.match.url}sensor_setup/:id`} component={SensorSetup}/>
                 <Redirect to='/error/404' />
               </Switch>
             </Segment>
diff --git a/src/ts/@overflow/app/views/monitoring/sensor/List.tsx b/src/ts/@overflow/app/views/monitoring/sensor/List.tsx
index db226ee..4e47374 100644
--- a/src/ts/@overflow/app/views/monitoring/sensor/List.tsx
+++ b/src/ts/@overflow/app/views/monitoring/sensor/List.tsx
@@ -10,7 +10,7 @@ class SensorList extends React.Component<RouteComponentProps<object>, object> {
 
   public render(): JSX.Element {
     return (
-        <SensorListContainer />
+        <SensorListContainer params={this.props.match.params}/>
     );
   }
 }
diff --git a/src/ts/@overflow/app/views/monitoring/sensor/Setup.tsx b/src/ts/@overflow/app/views/monitoring/sensor/Setup.tsx
index 3c312a2..cce3ba6 100644
--- a/src/ts/@overflow/app/views/monitoring/sensor/Setup.tsx
+++ b/src/ts/@overflow/app/views/monitoring/sensor/Setup.tsx
@@ -10,7 +10,7 @@ class SensorSetup extends React.Component<RouteComponentProps<object>, object> {
 
   public render(): JSX.Element {
     return (
-        <SensorSetupContainer />
+        <SensorSetupContainer params={this.props.match.params}/>
     );
   }
 }
diff --git a/src/ts/@overflow/meta/react/components/CrawlerSelector.tsx b/src/ts/@overflow/meta/react/components/CrawlerSelector.tsx
index c81163a..9258e11 100644
--- a/src/ts/@overflow/meta/react/components/CrawlerSelector.tsx
+++ b/src/ts/@overflow/meta/react/components/CrawlerSelector.tsx
@@ -59,24 +59,6 @@ export class CrawlerSelector extends React.Component<CrawlerSelectorProps, Crawl
   // }
 
   public convertCrawler(): void {
-    // todo. getting MetaCrawler list
-    // let crawlers = [
-    //   {
-    //     'id': '1',
-    //     'name': 'WMI',
-    //     'description': 'WMI DESCRIPTION',
-    //   },
-    //   {
-    //     'id': '2',
-    //     'name': 'SNMP',
-    //     'description': 'SNMP DESCRIPTION',
-    //   },
-    //   {
-    //     'id': '3',
-    //     'name': 'JMX',
-    //     'description': 'JMX DESCRIPTION',
-    //   },
-    // ];
 
     let crawlerOptions = [];
     let crawler: MetaCrawler;
diff --git a/src/ts/@overflow/sensor/react/SensorConfiguration.tsx b/src/ts/@overflow/sensor/react/SensorConfiguration.tsx
index 207467d..9125dbf 100644
--- a/src/ts/@overflow/sensor/react/SensorConfiguration.tsx
+++ b/src/ts/@overflow/sensor/react/SensorConfiguration.tsx
@@ -18,8 +18,9 @@ import * as asyncRequestActions from '@overflow/commons/redux/action/asyncReques
 
 // FIXME::....
 
-export function mapStateToProps(state: any): SensorConfigurationStateProps {
+export function mapStateToProps(state: any, props: any): SensorConfigurationStateProps {
   return {
+    targetId: props.params.id,
   };
 }
 
diff --git a/src/ts/@overflow/sensor/react/SensorList.tsx b/src/ts/@overflow/sensor/react/SensorList.tsx
index fc7d1f2..9f0a603 100644
--- a/src/ts/@overflow/sensor/react/SensorList.tsx
+++ b/src/ts/@overflow/sensor/react/SensorList.tsx
@@ -12,16 +12,19 @@ import State from '../redux/state/ReadAllByTarget';
 import * as ReadAllByTargetActions from '../redux/action/read_all_by_target';
 import * as ReadAllByProbeActions from '../redux/action/read_all_by_probe';
 import * as ReadAllByDomainActions from '../redux/action/read_all_by_domain';
+import * as ReadAllByInfraActions from '../redux/action/read_all_by_infra';
 import Target from '@overflow/target/api/model/Target';
 import Sensor from '@overflow/sensor/api/model/Sensor';
 import Probe from '@overflow/probe/api/model/Probe';
 import Domain from '@overflow/domain/api/model/Domain';
+import Infra from '@overflow/infra/api/model/Infra';
 
 import * as asyncRequestActions from '@overflow/commons/redux/action/asyncRequest';
 
-export function mapStateToProps(state: any): SensorListStateProps {
+export function mapStateToProps(state: any, props: any): SensorListStateProps {
   return {
     sensorList:state.SensorList,
+    targetId: props.params.id,
   };
 }
 
@@ -30,6 +33,9 @@ export function mapDispatchToProps(dispatch: Dispatch<any>): SensorListDispatchP
     onReadAllByTarget: (target: Target) => {
       dispatch(asyncRequestActions.request('SensorService', 'readAllByTarget', ReadAllByTargetActions.REQUEST, JSON.stringify(target)));
     },
+    onReadAllByInfra: (infra: Infra) => {
+      dispatch(asyncRequestActions.request('SensorService', 'readAllByInfra', ReadAllByInfraActions.REQUEST, JSON.stringify(infra)));
+    },
     onReadAllByProbe: (probe: Probe) => {
       dispatch(ReadAllByProbeActions.request(probe));
     },
@@ -39,8 +45,8 @@ export function mapDispatchToProps(dispatch: Dispatch<any>): SensorListDispatchP
     onSelectSensor: (id: number) => {
       dispatch(routerPush('/sensor/' + String(id)));
     },
-    onAddSensor: (target: Target) => {
-      dispatch(routerPush('/sensor/setup'));
+    onAddSensor: (targetId: string) => {
+      dispatch(routerPush('/sensor_setup/' + String(targetId)));
     },
   };
 }
diff --git a/src/ts/@overflow/sensor/react/components/SensorConfiguration.tsx b/src/ts/@overflow/sensor/react/components/SensorConfiguration.tsx
index b0554f9..c676984 100644
--- a/src/ts/@overflow/sensor/react/components/SensorConfiguration.tsx
+++ b/src/ts/@overflow/sensor/react/components/SensorConfiguration.tsx
@@ -8,7 +8,7 @@ import SensorItemTree from '@overflow/meta/react/SensorItemTree';
 import CrawlerSelectorContainer from '@overflow/meta/react/CrawlerSelector';
 
 export interface SensorConfigurationStateProps {
-
+  targetId: number;
 }
 
 export interface SensorConfigurationDispatchProps {
@@ -38,8 +38,8 @@ export class SensorConfiguration extends React.Component<SensorConfigurationProp
 
 
   public render(): JSX.Element {
-    let steps = [<CrawlerSelectorContainer onSelectCrawlerId={this.onSelectCrawlerId.bind(this)}/>,
-     <Segment vertical><SensorItemTree crawlerId={this.state.selectedCrawlerId}/></Segment>, <ETCSelector />];
+    let steps = [<CrawlerSelectorContainer onSelectCrawlerId={this.onSelectCrawlerId.bind(this)} />,
+    <Segment vertical><SensorItemTree crawlerId={this.state.selectedCrawlerId} /></Segment>, <ETCSelector />];
 
     return (
       <ConfigStepper steps={steps} />
diff --git a/src/ts/@overflow/sensor/react/components/SensorList.tsx b/src/ts/@overflow/sensor/react/components/SensorList.tsx
index d9beb85..5425dcb 100644
--- a/src/ts/@overflow/sensor/react/components/SensorList.tsx
+++ b/src/ts/@overflow/sensor/react/components/SensorList.tsx
@@ -6,6 +6,7 @@ import Probe from '@overflow/probe/api/model/Probe';
 import Sensor from '@overflow/sensor/api/model/Sensor';
 import Target from '@overflow/target/api/model/Target';
 import Domain from '@overflow/domain/api/model/Domain';
+import Infra from '@overflow/infra/api/model/Infra';
 
 export interface StateProps {
   probe?: Probe;
@@ -20,6 +21,7 @@ export interface DispatchProps {
   onReadAllByDomain?(domain: Domain): void;
   onSelectSensor?(id: number): void;
   onAddSensor?(target: Target): void;
+  onReadAllByInfra?(infra: Infra): void;
 }
 
 export type SensorListProps = StateProps & DispatchProps;
@@ -83,7 +85,7 @@ export class SensorList extends React.Component<SensorListProps, SensorListState
     console.log(event);
   }
   public handleAddSensor(): void {
-    this.props.onAddSensor(this.props.target);
+    this.props.onAddSensor(this.props.targetId ? this.props.targetId : '');
   }
 
   public render(): JSX.Element {
diff --git a/src/ts/@overflow/sensor/redux/action/read_all_by_infra.ts b/src/ts/@overflow/sensor/redux/action/read_all_by_infra.ts
new file mode 100644
index 0000000..ed75973
--- /dev/null
+++ b/src/ts/@overflow/sensor/redux/action/read_all_by_infra.ts
@@ -0,0 +1,8 @@
+// Action Type
+export type REQUEST = '@overflow/sensor/read_all_by_infra/REQUEST';
+export type REQUEST_SUCCESS = '@overflow/sensor/read_all_by_infra/REQUEST/SUCCESS';
+export type REQUEST_FAILURE = '@overflow/sensor/read_all_by_infra/REQUEST/FAILURE';
+
+export const REQUEST: REQUEST = '@overflow/sensor/read_all_by_infra/REQUEST';
+export const REQUEST_SUCCESS: REQUEST_SUCCESS = '@overflow/sensor/read_all_by_infra/REQUEST/SUCCESS';
+export const REQUEST_FAILURE: REQUEST_FAILURE = '@overflow/sensor/read_all_by_infra/REQUEST/FAILURE';
diff --git a/src/ts/@overflow/sensor/redux/reducer/read_all_by_infra.ts b/src/ts/@overflow/sensor/redux/reducer/read_all_by_infra.ts
new file mode 100644
index 0000000..4f535bc
--- /dev/null
+++ b/src/ts/@overflow/sensor/redux/reducer/read_all_by_infra.ts
@@ -0,0 +1,26 @@
+
+
+import Action from '@overflow/commons/redux/Action';
+import { ReducersMapObject } from 'redux';
+import Sensor from '@overflow/sensor/api/model/Sensor';
+
+import * as ReadAllByInfraActionTypes from '../action/read_all_by_infra';
+import ReadAllByInfraState, { defaultState as readAllByInfraDefaultState } from '../state/ReadAllByInfra';
+
+const reducer: ReducersMapObject = {
+  [ReadAllByInfraActionTypes.REQUEST_SUCCESS]:
+  (state: ReadAllByInfraState = readAllByInfraDefaultState, action: Action<Sensor[]>): ReadAllByInfraState => {
+    console.log(action);
+    return {
+      ...state,
+      SensorList:<Sensor[]>action.payload,
+    };
+  },
+  [ReadAllByInfraActionTypes.REQUEST_FAILURE]:
+  (state: ReadAllByInfraState = readAllByInfraDefaultState, action: Action<Error>):
+  ReadAllByInfraState => {
+    return state;
+  },
+};
+
+export default reducer;
diff --git a/src/ts/@overflow/sensor/redux/reducer/read_all_by_target.ts b/src/ts/@overflow/sensor/redux/reducer/read_all_by_target.ts
index 14b0888..acebd70 100644
--- a/src/ts/@overflow/sensor/redux/reducer/read_all_by_target.ts
+++ b/src/ts/@overflow/sensor/redux/reducer/read_all_by_target.ts
@@ -11,7 +11,7 @@ import ReadAllByTargetState, { defaultState as readAllByTargetDefaultState } fro
 
 const reducer: ReducersMapObject = {
   [ReadAllByTargetActionTypes.REQUEST_SUCCESS]:
-  (state: ReadAllByTargetState = readAllByTargetDefaultState, action: Action<Sensor>): ReadAllByTargetState => {
+  (state: ReadAllByTargetState = readAllByTargetDefaultState, action: Action<Sensor[]>): ReadAllByTargetState => {
     console.log(action);
     return {
       ...state,
diff --git a/src/ts/@overflow/sensor/redux/state/ReadAllByInfra.ts b/src/ts/@overflow/sensor/redux/state/ReadAllByInfra.ts
new file mode 100644
index 0000000..bc8898d
--- /dev/null
+++ b/src/ts/@overflow/sensor/redux/state/ReadAllByInfra.ts
@@ -0,0 +1,13 @@
+import Sensor from '../../api/model/Sensor';
+
+export interface State {
+  readonly SensorList: Sensor[];
+  readonly error?: Error;
+}
+
+export const defaultState: State = {
+  SensorList: undefined,
+  error: undefined,
+};
+
+export default State;
diff --git a/src/ts/@overflow/target/react/TargetList.tsx b/src/ts/@overflow/target/react/TargetList.tsx
index b365901..4dbc2f3 100644
--- a/src/ts/@overflow/target/react/TargetList.tsx
+++ b/src/ts/@overflow/target/react/TargetList.tsx
@@ -26,8 +26,8 @@ export function mapDispatchToProps(dispatch: Dispatch<any>): DispatchProps {
     onReadAllByDomain: (domain: Domain) => {
        dispatch(asyncRequestActions.request('InfraService', 'readAllByDomain', targetListActions.REQUEST, JSON.stringify(domain)));
     },
-    onTargetSelection: (id: string) => {
-      dispatch(routerPush('/target/' + id));
+    onTargetSelection: (infraId: string) => {
+      dispatch(routerPush('/target/' + infraId));
     },
   };
 }