From cd0b45627f0d8da8c8dc4edde223f3c36e9bcfbf Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 25 Apr 2021 16:01:14 +0200 Subject: build: Migrate to flat project structure This change updates the project structure to become flattened. Previously, the simulator, frontend and API each lived into their own directory. With this change, all modules of the project live in the top-level directory of the repository. This should improve discoverability of modules of the project. --- .../app/sidebars/project/PortfolioListContainer.js | 45 --------------------- .../sidebars/project/ProjectSidebarContainer.js | 10 ----- .../app/sidebars/project/ScenarioListContainer.js | 41 ------------------- .../app/sidebars/project/TopologyListContainer.js | 46 ---------------------- 4 files changed, 142 deletions(-) delete mode 100644 frontend/src/containers/app/sidebars/project/PortfolioListContainer.js delete mode 100644 frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js delete mode 100644 frontend/src/containers/app/sidebars/project/ScenarioListContainer.js delete mode 100644 frontend/src/containers/app/sidebars/project/TopologyListContainer.js (limited to 'frontend/src/containers/app/sidebars/project') diff --git a/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js b/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js deleted file mode 100644 index b32c8b1d..00000000 --- a/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js +++ /dev/null @@ -1,45 +0,0 @@ -import { connect } from 'react-redux' -import { withRouter } from 'react-router-dom' -import PortfolioListComponent from '../../../../components/app/sidebars/project/PortfolioListComponent' -import { deletePortfolio, setCurrentPortfolio } from '../../../../actions/portfolios' -import { openNewPortfolioModal } from '../../../../actions/modals/portfolios' -import { getState } from '../../../../util/state-utils' -import { setCurrentTopology } from '../../../../actions/topology/building' - -const mapStateToProps = (state) => { - let portfolios = state.objects.project[state.currentProjectId] - ? state.objects.project[state.currentProjectId].portfolioIds.map((t) => state.objects.portfolio[t]) - : [] - if (portfolios.filter((t) => !t).length > 0) { - portfolios = [] - } - - return { - currentProjectId: state.currentProjectId, - currentPortfolioId: state.currentPortfolioId, - portfolios, - } -} - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onNewPortfolio: () => { - dispatch(openNewPortfolioModal()) - }, - onChoosePortfolio: (portfolioId) => { - dispatch(setCurrentPortfolio(portfolioId)) - }, - onDeletePortfolio: async (id) => { - if (id) { - const state = await getState(dispatch) - dispatch(deletePortfolio(id)) - dispatch(setCurrentTopology(state.objects.project[state.currentProjectId].topologyIds[0])) - ownProps.history.push(`/projects/${state.currentProjectId}`) - } - }, - } -} - -const PortfolioListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(PortfolioListComponent)) - -export default PortfolioListContainer diff --git a/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js b/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js deleted file mode 100644 index 49001099..00000000 --- a/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js +++ /dev/null @@ -1,10 +0,0 @@ -import React from 'react' -import { withRouter } from 'react-router-dom' -import ProjectSidebarComponent from '../../../../components/app/sidebars/project/ProjectSidebarComponent' -import { isCollapsible } from '../../../../util/sidebar-space' - -const ProjectSidebarContainer = withRouter(({ location, ...props }) => ( - -)) - -export default ProjectSidebarContainer diff --git a/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js b/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js deleted file mode 100644 index 415e2792..00000000 --- a/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js +++ /dev/null @@ -1,41 +0,0 @@ -import { connect } from 'react-redux' -import ScenarioListComponent from '../../../../components/app/sidebars/project/ScenarioListComponent' -import { openNewScenarioModal } from '../../../../actions/modals/scenarios' -import { deleteScenario, setCurrentScenario } from '../../../../actions/scenarios' -import { setCurrentPortfolio } from '../../../../actions/portfolios' - -const mapStateToProps = (state, ownProps) => { - let scenarios = state.objects.portfolio[ownProps.portfolioId] - ? state.objects.portfolio[ownProps.portfolioId].scenarioIds.map((t) => state.objects.scenario[t]) - : [] - if (scenarios.filter((t) => !t).length > 0) { - scenarios = [] - } - - return { - currentProjectId: state.currentProjectId, - currentScenarioId: state.currentScenarioId, - scenarios, - } -} - -const mapDispatchToProps = (dispatch) => { - return { - onNewScenario: (currentPortfolioId) => { - dispatch(setCurrentPortfolio(currentPortfolioId)) - dispatch(openNewScenarioModal()) - }, - onChooseScenario: (portfolioId, scenarioId) => { - dispatch(setCurrentScenario(portfolioId, scenarioId)) - }, - onDeleteScenario: (id) => { - if (id) { - dispatch(deleteScenario(id)) - } - }, - } -} - -const ScenarioListContainer = connect(mapStateToProps, mapDispatchToProps)(ScenarioListComponent) - -export default ScenarioListContainer diff --git a/frontend/src/containers/app/sidebars/project/TopologyListContainer.js b/frontend/src/containers/app/sidebars/project/TopologyListContainer.js deleted file mode 100644 index e1de18f9..00000000 --- a/frontend/src/containers/app/sidebars/project/TopologyListContainer.js +++ /dev/null @@ -1,46 +0,0 @@ -import { connect } from 'react-redux' -import TopologyListComponent from '../../../../components/app/sidebars/project/TopologyListComponent' -import { setCurrentTopology } from '../../../../actions/topology/building' -import { openNewTopologyModal } from '../../../../actions/modals/topology' -import { withRouter } from 'react-router-dom' -import { getState } from '../../../../util/state-utils' -import { deleteTopology } from '../../../../actions/topologies' - -const mapStateToProps = (state) => { - let topologies = state.objects.project[state.currentProjectId] - ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t]) - : [] - if (topologies.filter((t) => !t).length > 0) { - topologies = [] - } - - return { - currentTopologyId: state.currentTopologyId, - topologies, - } -} - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onChooseTopology: async (id) => { - dispatch(setCurrentTopology(id)) - const state = await getState(dispatch) - ownProps.history.push(`/projects/${state.currentProjectId}`) - }, - onNewTopology: () => { - dispatch(openNewTopologyModal()) - }, - onDeleteTopology: async (id) => { - if (id) { - const state = await getState(dispatch) - dispatch(deleteTopology(id)) - dispatch(setCurrentTopology(state.objects.project[state.currentProjectId].topologyIds[0])) - ownProps.history.push(`/projects/${state.currentProjectId}`) - } - }, - } -} - -const TopologyListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(TopologyListComponent)) - -export default TopologyListContainer -- cgit v1.2.3