From cfef3fb7e0faef7942f2b7832333e46d3b542893 Mon Sep 17 00:00:00 2001 From: Sonja Happ Date: Tue, 28 Jan 2020 14:03:20 +0100 Subject: [PATCH] fix issue with FluxContainerConverter workaround --- src/file/select-file.js | 5 ++--- src/scenario/scenarios.js | 5 ++--- src/simulationmodel/simulation-model.js | 5 ++--- src/simulator/select-simulator.js | 5 ++--- src/simulator/simulators.js | 5 ++--- src/user/login.js | 5 ++--- src/widget/widget.js | 5 ++--- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/file/select-file.js b/src/file/select-file.js index a37912b..dc94b98 100644 --- a/src/file/select-file.js +++ b/src/file/select-file.js @@ -28,8 +28,6 @@ import LoginStore from '../user/login-store'; import AppDispatcher from '../common/app-dispatcher'; -import FluxContainerConverter from "../common/FluxContainerConverter"; - class SelectFile extends React.Component { static getStores() { return [ FileStore, LoginStore ]; @@ -150,4 +148,5 @@ class SelectFile extends React.Component { } } -export default Container.create(FluxContainerConverter.convert(SelectFile)); +let fluxContainerConverter = require('../common/FluxContainerConverter'); +export default Container.create(fluxContainerConverter.convert(SelectFile)); diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js index 5873d6e..1cd1e04 100644 --- a/src/scenario/scenarios.js +++ b/src/scenario/scenarios.js @@ -37,8 +37,6 @@ import ImportScenarioDialog from './import-scenario'; import DeleteDialog from '../common/dialogs/delete-dialog'; -import FluxContainerConverter from "../common/FluxContainerConverter"; - class Scenarios extends Component { static getStores() { return [ ScenarioStore, LoginStore ]; @@ -209,4 +207,5 @@ class Scenarios extends Component { } } -export default Container.create(FluxContainerConverter.convert(Scenarios)); +let fluxContainerConverter = require('../common/FluxContainerConverter'); +export default Container.create(fluxContainerConverter.convert(Scenarios)); diff --git a/src/simulationmodel/simulation-model.js b/src/simulationmodel/simulation-model.js index 6430ddb..1864531 100644 --- a/src/simulationmodel/simulation-model.js +++ b/src/simulationmodel/simulation-model.js @@ -33,8 +33,6 @@ import SignalMapping from './signal-mapping'; import EditableHeader from '../common/editable-header'; import ParametersEditor from '../common/parameters-editor'; -import FluxContainerConverter from "../common/FluxContainerConverter"; - class SimulationModel extends React.Component { static getStores() { return [ SimulationModelStore, LoginStore ]; @@ -170,4 +168,5 @@ class SimulationModel extends React.Component { } } -export default Container.create(FluxContainerConverter.convert(SimulationModel), { withProps: true }); +let fluxContainerConverter = require('../common/FluxContainerConverter'); +export default Container.create(fluxContainerConverter.convert(SimulationModel), { withProps: true }); diff --git a/src/simulator/select-simulator.js b/src/simulator/select-simulator.js index 823750d..c84ee58 100644 --- a/src/simulator/select-simulator.js +++ b/src/simulator/select-simulator.js @@ -26,8 +26,6 @@ import _ from 'lodash'; import SimulatorStore from './simulator-store'; -import FluxContainerConverter from "../common/FluxContainerConverter"; - class SelectSimulator extends React.Component { static getStores() { return [ SimulatorStore ]; @@ -89,4 +87,5 @@ class SelectSimulator extends React.Component { } } -export default Container.create(FluxContainerConverter.convert(SelectSimulator)); +let fluxContainerConverter = require('../common/FluxContainerConverter'); +export default Container.create(fluxContainerConverter.convert(SelectSimulator)); diff --git a/src/simulator/simulators.js b/src/simulator/simulators.js index aa8fa25..3ae1b6f 100644 --- a/src/simulator/simulators.js +++ b/src/simulator/simulators.js @@ -39,8 +39,6 @@ import ImportSimulatorDialog from './import-simulator'; import SimulatorAction from './simulator-action'; import DeleteDialog from '../common/dialogs/delete-dialog'; -import FluxContainerConverter from "../common/FluxContainerConverter"; - class Simulators extends Component { static getStores() { return [ LoginStore, SimulatorStore ]; @@ -324,4 +322,5 @@ class Simulators extends Component { } } -export default Container.create(FluxContainerConverter.convert(Simulators)); +let fluxContainerConverter = require('../common/FluxContainerConverter'); +export default Container.create(fluxContainerConverter.convert(Simulators)); diff --git a/src/user/login.js b/src/user/login.js index 840b834..d02114f 100644 --- a/src/user/login.js +++ b/src/user/login.js @@ -33,8 +33,6 @@ import NotificationsDataManager from '../common/data-managers/notifications-data import AppDispatcher from '../common/app-dispatcher'; import LoginStore from './login-store'; -import FluxContainerConverter from "../common/FluxContainerConverter"; - class Login extends Component { static getStores() { return [ LoginStore ]; @@ -100,4 +98,5 @@ class Login extends Component { } } -export default Container.create(FluxContainerConverter.convert(Login)); +let fluxContainerConverter = require('../common/FluxContainerConverter'); +export default Container.create(fluxContainerConverter.convert(Login)); diff --git a/src/widget/widget.js b/src/widget/widget.js index 0d7a049..3d9ff33 100644 --- a/src/widget/widget.js +++ b/src/widget/widget.js @@ -48,8 +48,6 @@ import WidgetBox from './widgets/box'; import WidgetHTML from './widgets/html'; import WidgetTopology from './widgets/topology'; -import FluxContainerConverter from "../common/FluxContainerConverter"; - import '../styles/widgets.css'; class Widget extends React.Component { @@ -182,4 +180,5 @@ class Widget extends React.Component { } } -export default Container.create(FluxContainerConverter.convert(Widget), { withProps: true }); +let fluxContainerConverter = require('../common/FluxContainerConverter'); +export default Container.create(fluxContainerConverter.convert(Widget), { withProps: true });