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

Redux removed from canvas item.

parent cc18f9bb
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ class demoApp extends Component {
                component: <DemoModalSpinner/>,
                title: 'ModalSpinner',
            },
            // {
            //     component: <DemoContainmentCanvas/>,
            //     title: 'ContainmentCanvas',
            // },
            {
                component: <DemoContainmentCanvas/>,
                title: 'ContainmentCanvas',
            },
            {
                component: <DemoSingleConnectedNode/>,
                title: 'SingleConnectedNode',
+4 −3
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ import {DropTarget} from 'react-dnd';
import SingleConnectedNode from '../SingleConnectedNode/SingleConnectedNode';
import DRAG_TYPES from '../../utils/dragTypes';
import SVGRegistryBasedCanvasItem from '../SVGRegistryBasedCanvasItem/SVGRegistryBasedCanvasItem';
import ConnectionManager from './ConnectionManager';
import BasicConnectingComponent from './BasicConnectingComponent';
import ConnectionManager from '../ConnectionManager/ConnectionManager';
import BasicConnectingComponent from '../ConnectionManager/BasicConnectingComponent';
import BasicEventManager from '../BasicEventManager/BasicEventManager';
import getIndexedName from '../../utils/getIndexedName';

@@ -180,13 +180,14 @@ class ContainmentCanvas extends SingleConnectedNode {
        const {connectDropTarget, activeNode, gmeClient} = this.props;
        const {children, dragMode} = this.state;

        const childrenItems = children.map(child => (<ContainmentCanvasItem
        const childrenItems = children.map(child => (<SVGRegistryBasedCanvasItem
            key={child.id}
            gmeClient={gmeClient}
            activeNode={child.id}
            contextNode={activeNode}
            connectionManager={this.cm}
            eventManager={this.em}
            scale={1}
        />));

        const content = (
+0 −91
Original line number Diff line number Diff line
export const setActiveNode = activeNode => ({
    type: 'SET_ACTIVE_NODE',
    activeNode,
});

export const setActiveSelection = activeSelection => ({
    type: 'SET_ACTIVE_SELECTION',
    activeSelection,
});

export const toggleLeftDrawer = (show) => {
    if (show) {
        return {
            type: 'SHOW_LEFT_DRAWER',
        };
    }
    return {
        type: 'HIDE_LEFT_DRAWER',
    };
};

export const toggleRightDrawer = (show) => {
    if (show) {
        return {
            type: 'SHOW_RIGHT_DRAWER',
        };
    }
    return {
        type: 'HIDE_RIGHT_DRAWER',
    };
};

export const setScale = scale => ({
    type: 'SET_SCALE',
    scale,
});

export const addPlotVariable = variable => ({
    type: 'ADD_PLOT_VARIABLE',
    variable,
});

export const removePlotVariable = variable => ({
    type: 'REMOVE_PLOT_VARIABLE',
    variable,
});

export const clearPlotVariables = () => ({
    type: 'CLEAR_PLOT_VARIABLES',
});

export const setPlotNode = nodeId => ({
    type: 'SET_PLOT_NODE',
    nodeId,
});

export const setSimResData = simRes => ({
    type: 'SET_SIM_RES_DATA',
    simRes,
});

export const setResultNode = resultNode => ({
    type: 'SET_RESULT_NODE',
    resultNode,
});

export const toggleModelingView = (show) => {
    if (show) {
        return {
            type: 'MODELING_VIEW',
        };
    }
    return {
        type: 'SIMULATION_VIEW',
    };
};

export const setSystemWaiting = systemWaiting => ({
    type: 'SET_SYSTEM_WAITING',
    systemWaiting,
});

export const setCurrentUser = currentUser => ({
    type: 'SET_CURRENT_USER',
    currentUser,
});

export const setIdToDisplayName = userIdToDisplayName => ({
    type: 'SET_ID_TO_DISPLAY_NAME_MAP',
    userIdToDisplayName,
});
Loading