embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-11 06:16:01 +00:00
Code Issues Projects Releases Wiki Activity

fix(ui): switch aside

Browse Source
This commit is contained in:
Anthony Laibe 2018-11-19 13:18:43 +00:00
parent cabfa939e7
commit 66e431cf13
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
embark-ui/src/containers/EditorContainer.js
View File

@ -3,6 +3,9 @@ import PropTypes from 'prop-types';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import {withRouter} from "react-router-dom"; import {withRouter} from "react-router-dom";
import {Row, Col} from 'reactstrap'; import {Row, Col} from 'reactstrap';
import classnames from 'classnames';
import Resizable from 're-resizable';
import TextEditorAsideContainer from './TextEditorAsideContainer'; import TextEditorAsideContainer from './TextEditorAsideContainer';
import TextEditorContainer from './TextEditorContainer'; import TextEditorContainer from './TextEditorContainer';
import FileExplorerContainer from './FileExplorerContainer'; import FileExplorerContainer from './FileExplorerContainer';
@ -15,9 +18,8 @@ import {
} from '../actions'; } from '../actions';
import {getCurrentFile, getContracts, getTransaction} from '../reducers/selectors'; import {getCurrentFile, getContracts, getTransaction} from '../reducers/selectors';
import {getDebuggerTransactionHash} from '../utils/utils'; import {getDebuggerTransactionHash} from '../utils/utils';
import classnames from 'classnames';
import Resizable from 're-resizable';
import {OPERATIONS} from '../constants'; import {OPERATIONS} from '../constants';
import { TextEditorToolbarTabs } from '../components/TextEditorToolbar';
import './EditorContainer.css'; import './EditorContainer.css';
@ -69,10 +71,10 @@ class EditorContainer extends React.Component {
this.setState({currentFile: this.props.currentFile}); this.setState({currentFile: this.props.currentFile});
} }
if(this.props.contracts && this.props.transaction !== prevProps.transaction) { if(this.props.contracts && this.props.transaction !== prevProps.transaction && this.props.transaction) {
const debuggingContract = this.props.contracts.find(contract => contract.address === this.props.transaction.to) const debuggingContract = this.props.contracts.find(contract => contract.address === this.props.transaction.to)
if (debuggingContract) { if (debuggingContract) {
this.setState({currentAsideTab: 'debugger'}) this.setState({currentAsideTab: TextEditorToolbarTabs.Debugger})
this.props.fetchFile({path: debuggingContract.path}); this.props.fetchFile({path: debuggingContract.path});
} }
} }

4
embark-ui/src/containers/TextEditorAsideContainer.js
View File

@ -13,7 +13,7 @@ import { TextEditorToolbarTabs } from '../components/TextEditorToolbar';
class TextEditorAsideContainer extends Component { class TextEditorAsideContainer extends Component {
renderContent(contract, index) { renderContent(contract, index) {
switch (this.props.currentAsideTab) { switch (this.props.currentAsideTab.label) {
case TextEditorToolbarTabs.Details.label: case TextEditorToolbarTabs.Details.label:
return ( return (
<React.Fragment> <React.Fragment>
@ -71,7 +71,7 @@ function mapStateToProps(state, props) {
TextEditorAsideContainer.propTypes = { TextEditorAsideContainer.propTypes = {
currentFile: PropTypes.object, currentFile: PropTypes.object,
debuggerTransactionHash: PropTypes.string, debuggerTransactionHash: PropTypes.string,
currentAsideTab: PropTypes.string, currentAsideTab: PropTypes.object,
contracts: PropTypes.array contracts: PropTypes.array
}; };