Commit cc18f9bb authored by Tamas Kecskes's avatar Tamas Kecskes
Browse files

Scraping off components from ContainmentCanvas

parent aa5e8829

demo/demoApp.jsx

+7 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ import DemoConfirmDialog from '../src/components/ConfirmDialog/demo'; 
import DemoUserProfileNavigator from '../src/components/UserProfileNavigator/demo';

import DemoModalSpinner from '../src/components/ModalSpinner/demo';

import DemoContainmentCanvas from '../src/components/ContainmentCanvas/demo';

import DemoSingleConnectedNode from '../src/components/SingleConnectedNode/demo';



/* eslint-disable */

const store = createStore(reducers, window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__());
@@ -52,9 +53,13 @@ class demoApp extends Component { 
                component: <DemoModalSpinner/>,

                title: 'ModalSpinner',

            },

            // {

            //     component: <DemoContainmentCanvas/>,

            //     title: 'ContainmentCanvas',

            // },

            {

                component: <DemoContainmentCanvas/>,

                title: 'ContainmentCanvas',

                component: <DemoSingleConnectedNode/>,

                title: 'SingleConnectedNode',

            },

        ];

src/components/ContainmentCanvas/ContainmentCanvas.jsx

+2 −4
Original line number Diff line number Diff line 
import React from 'react';

import PropTypes from 'prop-types';

import {DropTarget} from 'react-dnd';

import {connect} from 'react-redux';



import SingleConnectedNode from './SingleConnectedNode';

import SingleConnectedNode from '../SingleConnectedNode/SingleConnectedNode';

import DRAG_TYPES from '../../utils/dragTypes';

import ContainmentCanvasItem from './ContainmentCanvasItem';

import SVGRegistryBasedCanvasItem from '../SVGRegistryBasedCanvasItem/SVGRegistryBasedCanvasItem';

import ConnectionManager from './ConnectionManager';

import BasicConnectingComponent from './BasicConnectingComponent';

import BasicEventManager from '../BasicEventManager/BasicEventManager';

import getIndexedName from '../../utils/getIndexedName';



import Z_LEVELS from '../../utils/zLevels';

import ContainmentCanvasInfoCard from './ContainmentCanvasInfoCard';



// TODO we only take loaded children into account

function getChildrenNames(gmeClient, nodeId) {

src/components/ContainmentCanvas/ContainmentCanvasInfoCard.jsx

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
import React from 'react';

import {Link} from 'react-router-dom';



import Card from '@material-ui/core/Card';

import CardActions from '@material-ui/core/CardActions';

import CardContent from '@material-ui/core/CardContent';

import Button from '@material-ui/core/Button';

import Typography from '@material-ui/core/Typography';



const ContainmentCanvasInfoCard = () => (

    <Card style={{

        position: 'absolute',

        maxWidth: 600,

        left: 'calc(50% - 300px)',

        top: '20%',

    }}

    >

        <CardContent>

            <Typography style={{marginBottom: 20}} variant="headline" component="h2">

                This is your canvas

            </Typography>

            <Typography component="p">

                Use the left menu to add components to your system. Locate which components you

                need and drag and drop them onto this Canvas. Based on their interfaces you can wire

                components together by clicking the port icons. <br/><br/>

                To set the parameter simply double-click it and the parameter editor will show up.

                From there you can click the inlined icon and it will take you to the official

                Modelica® Standard Library documentation.

            </Typography>

        </CardContent>

        <CardActions>

            <Button

                size="small"

                color="primary"

                component={Link}

                to="http://doc.modelica.org/om/Modelica.html"

                target="_blank"

            >

                Learn More About Modelica

            </Button>

        </CardActions>

    </Card>

);



export default ContainmentCanvasInfoCard;

src/components/ContainmentCanvas/ContainmentCanvasItem.jsx

+3 −3
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ import DeleteIcon from '@material-ui/icons/Delete'; 
import Edit from '@material-ui/icons/Edit';



import DRAG_TYPES from '../../utils/dragTypes';

import ContainmentCanvasItemPort from './ContainmentCanvasItemPort';

import SVGRegistryBasedCanvasItemPort from '../SVGRegistryBasedCanvasItem/SVGRegistryBasedCanvasItemPort';

import Territory from '../Territory/Territory';

import BasicConnection from './BasicConnection';

import BasicConnection from '../BasicConnection/BasicConnection';

import {toggleRightDrawer, setActiveSelection} from '../../utils/actions';

import Z_LEVELS from '../../utils/zLevels';
@@ -421,7 +421,7 @@ class ContainmentCanvasItem extends Component { 
        const keys = Object.keys(ports);

        for (i = 0; i < keys.length; i += 1) {

            if (childrenName2Id[keys[i]]) {

                portComponents.push((<ContainmentCanvasItemPort

                portComponents.push((<SVGRegistryBasedCanvasItemPort

                    key={keys[i]}

                    gmeClient={gmeClient}

                    connectionManager={connectionManager}