From 7e2d9eee3919f2b9390bce54e9500cb3bd2b4186 Mon Sep 17 00:00:00 2001 From: geek Date: Fri, 21 Jul 2017 13:31:50 +0900 Subject: [PATCH] discovery view --- src/ts/@overflow/app/router/index.tsx | 3 +++ .../@overflow/app/views/layout/LeftMenu.tsx | 2 +- .../discovery/react/components/Discovery.tsx | 3 --- .../react/components/DiscoveryProbe.tsx | 8 +++--- .../react/components/DiscoveryTable.tsx | 2 +- .../temp/react/components/Discovery.tsx | 26 +++++++++++++++++++ 6 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 src/ts/@overflow/temp/react/components/Discovery.tsx diff --git a/src/ts/@overflow/app/router/index.tsx b/src/ts/@overflow/app/router/index.tsx index 1b87ff5..f0e31f0 100644 --- a/src/ts/@overflow/app/router/index.tsx +++ b/src/ts/@overflow/app/router/index.tsx @@ -8,6 +8,7 @@ import SensorList from '../views/monitoring/sensor/List'; import SensorSetup from '../views/monitoring/sensor/Setup'; import ProbeList from '../views/monitoring/probe/List'; import TargetList from '../views/infrastructure/target/List'; +import Discovery from '../../temp/react/components/Discovery'; // import { SignUp } from '@overflow/member/react/components/SignUp'; // import { SignIn } from '@overflow/member/react/components/SignIn'; @@ -52,6 +53,8 @@ const routes = ( + + diff --git a/src/ts/@overflow/app/views/layout/LeftMenu.tsx b/src/ts/@overflow/app/views/layout/LeftMenu.tsx index 96f9269..96c5adc 100644 --- a/src/ts/@overflow/app/views/layout/LeftMenu.tsx +++ b/src/ts/@overflow/app/views/layout/LeftMenu.tsx @@ -79,7 +79,7 @@ export class LeftMenu extends React.Component { PWChange ProbeDown Insanity - DiscoveryDetails + Discovery Tree TableExampleSortable SensorList diff --git a/src/ts/@overflow/discovery/react/components/Discovery.tsx b/src/ts/@overflow/discovery/react/components/Discovery.tsx index 28f89d0..4dafff3 100644 --- a/src/ts/@overflow/discovery/react/components/Discovery.tsx +++ b/src/ts/@overflow/discovery/react/components/Discovery.tsx @@ -13,7 +13,6 @@ export interface StateProps { } export interface DispatchProps { - } export type Props = StateProps & DispatchProps; @@ -58,8 +57,6 @@ export class Discovery extends React.Component { } public componentWillMount():void { - super.componentWillMount(); - } diff --git a/src/ts/@overflow/discovery/react/components/DiscoveryProbe.tsx b/src/ts/@overflow/discovery/react/components/DiscoveryProbe.tsx index 93dae9d..37fd430 100644 --- a/src/ts/@overflow/discovery/react/components/DiscoveryProbe.tsx +++ b/src/ts/@overflow/discovery/react/components/DiscoveryProbe.tsx @@ -23,10 +23,10 @@ export class DiscoveryProbe extends React.Component { this.state = {}; } - public componentWillMount():void { - super.componentWillMount(); - console.log(this.props.probe); - } + // public componentWillMount():void { + // super.componentWillMount(); + // console.log(this.props.probe); + // } public handle():void { this.props.onProbeChange(this.state); diff --git a/src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx b/src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx index de2edf4..ee3e17d 100644 --- a/src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx +++ b/src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx @@ -39,7 +39,7 @@ export class DiscoveryTable extends React.Component { } public componentWillMount():void { - super.componentWillMount(); + // super.componentWillMount(); this.serviceTemp = [ { key: 'http', text: 'HTTP', value: 'http' }, { key: 'ftp', text: 'FTP', value: 'ftp' }, diff --git a/src/ts/@overflow/temp/react/components/Discovery.tsx b/src/ts/@overflow/temp/react/components/Discovery.tsx new file mode 100644 index 0000000..bbda650 --- /dev/null +++ b/src/ts/@overflow/temp/react/components/Discovery.tsx @@ -0,0 +1,26 @@ +import * as React from 'react'; +import { RouteComponentProps } from 'react-router'; +import DiscoveryContainer from '@overflow/discovery/react/Discovery'; +import WebSocketRPC from '@overflow/commons/websocket/WebSocketRPC'; +import AppContext from '@overflow/commons/context'; +import inject from '@overflow/commons/context/decorator/inject'; + +class Discovery extends React.Component, object> { + @inject() + private client: WebSocketRPC; + + public constructor(props?: RouteComponentProps, context?: object) { + super(props, context); + + let con = AppContext.get(); + } + + public render(): JSX.Element { + return ( + + ); + } +} + + +export default Discovery;