Merge remote-tracking branch 'origin/master'

This commit is contained in:
geek 2017-07-21 14:09:56 +09:00
commit 5c28e542c7
3 changed files with 37 additions and 6 deletions

View File

@ -0,0 +1,19 @@
import { connect, Dispatch } from 'react-redux';
import {
TargetDetail,
StateProps as StateProps,
DispatchProps as DispatchProps,
} from './components/TargetDetail';
export function mapStateToProps(state: any): StateProps {
return {
probe: state.probe,
};
}
export function mapDispatchToProps(dispatch: Dispatch<any>): DispatchProps {
return {
};
}
export default connect(mapStateToProps, mapDispatchToProps)(TargetDetail);

View File

@ -6,20 +6,33 @@ import { DetailContainer } from '@overflow/commons/react/component/DetailContain
import Probe from '@overflow/probe/api/model/Probe';
import Target from '@overflow/target/api/model/Target';
export interface TargetDetailsProps {
export interface StateProps {
probe?: Probe;
target?: Target;
}
export interface TargetDetailsState {
export interface DispatchProps {
}
export class TargetDetails extends React.Component<TargetDetailsProps, TargetDetailsState> {
export type Props = StateProps & DispatchProps;
constructor(props: TargetDetailsProps, context: TargetDetailsState) {
export interface State {
selected: Probe;
isDetail: boolean;
list: Probe[];
}
export class TargetDetail extends React.Component<Props, State> {
constructor(props: Props, context: State) {
super(props, context);
this.state = {
selected: null,
isDetail: false,
list: null,
};
}
@ -43,7 +56,6 @@ export class TargetDetails extends React.Component<TargetDetailsProps, TargetDet
];
return (
// <DetailContainer panes={items}/>
<Container fluid>
<TargetBasicInfo probe={this.props.probe} />
<SensorList target={this.props.target} />

View File

@ -1,6 +1,6 @@
import * as React from 'react';
import { Table, Button, Modal, Input, Header, Container, InputOnChangeData, ButtonProps } from 'semantic-ui-react';
import { TargetDetails } from './TargetDetail';
import { TargetDetail } from './TargetDetail';
import Target from '@overflow/target/api/model/Target';
import Probe from '@overflow/probe/api/model/Probe';
import { ListContainer } from '@overflow/commons/react/component/ListContainer';