From 890cd3f7028bfccd77b0d04670f7bc07293ed383 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Tue, 7 Jul 2020 11:20:43 +0200
Subject: Add new left sidebar, move topology controls

---
 .../sidebars/project/ProjectSidebarComponent.js    |  12 ++
 .../app/sidebars/project/TopologyListComponent.js  |  63 ++++++++++
 .../ChangeTopologyModalComponent.js                | 131 ---------------------
 .../custom-components/NewTopologyModalComponent.js |  92 +++++++++++++++
 frontend/src/components/navigation/AppNavbar.js    |  54 ---------
 .../components/navigation/AppNavbarComponent.js    |  27 +++++
 6 files changed, 194 insertions(+), 185 deletions(-)
 create mode 100644 frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js
 create mode 100644 frontend/src/components/app/sidebars/project/TopologyListComponent.js
 delete mode 100644 frontend/src/components/modals/custom-components/ChangeTopologyModalComponent.js
 create mode 100644 frontend/src/components/modals/custom-components/NewTopologyModalComponent.js
 delete mode 100644 frontend/src/components/navigation/AppNavbar.js
 create mode 100644 frontend/src/components/navigation/AppNavbarComponent.js

(limited to 'frontend/src/components')

diff --git a/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js b/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js
new file mode 100644
index 00000000..d6e39ff6
--- /dev/null
+++ b/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js
@@ -0,0 +1,12 @@
+import React from 'react'
+import Sidebar from '../Sidebar'
+import TopologyListContainer from '../../../../containers/app/sidebars/project/TopologyListContainer'
+
+const ProjectSidebarComponent = () => (
+        <Sidebar isRight={false}>
+            <TopologyListContainer/>
+            <h2>Portfolios</h2>
+        </Sidebar>
+    )
+
+export default ProjectSidebarComponent
diff --git a/frontend/src/components/app/sidebars/project/TopologyListComponent.js b/frontend/src/components/app/sidebars/project/TopologyListComponent.js
new file mode 100644
index 00000000..98615711
--- /dev/null
+++ b/frontend/src/components/app/sidebars/project/TopologyListComponent.js
@@ -0,0 +1,63 @@
+import PropTypes from 'prop-types'
+import React from 'react'
+import Shapes from '../../../../shapes'
+import FontAwesome from 'react-fontawesome'
+
+class TopologyListComponent extends React.Component {
+    static propTypes = {
+        show: PropTypes.bool.isRequired,
+        topologies: PropTypes.arrayOf(Shapes.Topology),
+        currentTopologyId: PropTypes.string,
+        onChooseTopology: PropTypes.func.isRequired,
+        onNewTopology: PropTypes.func.isRequired,
+        onDeleteTopology: PropTypes.func.isRequired,
+    }
+
+    onChoose(id) {
+        this.props.onChooseTopology(id)
+    }
+
+    onDuplicate() {
+        this.props.onNewTopology(
+            this.textInput.value,
+            this.originTopology.value,
+        )
+    }
+
+    onDelete(id) {
+        this.props.onDeleteTopology(id)
+    }
+
+    render() {
+        return (
+            <div className="pb-3">
+                <h2>
+                    Topologies
+                    <button className="btn btn-outline-primary float-right" onClick={this.props.onNewTopology}>
+                        <FontAwesome name="plus"/>
+                    </button>
+                </h2>
+
+                {this.props.topologies.map((topology, idx) => (
+                    <div key={topology._id} className="row mb-1">
+                        <div className={'col-8 align-self-center ' + (topology._id === this.props.currentTopologyId ? 'font-weight-bold' : '')}>
+                            {topology.name}
+                        </div>
+                        <div className="col-4 text-right">
+                            <span
+                                className="btn btn-outline-primary mr-1 fa fa-play"
+                                onClick={() => this.onChoose(topology._id)}
+                            />
+                            <span
+                                className={'btn btn-outline-danger fa fa-trash ' + (idx === 0 ? 'disabled' : '')}
+                                onClick={() => idx !== 0 ? this.onDelete(topology._id) : undefined}
+                            />
+                        </div>
+                    </div>
+                ))}
+            </div>
+        )
+    }
+}
+
+export default TopologyListComponent
diff --git a/frontend/src/components/modals/custom-components/ChangeTopologyModalComponent.js b/frontend/src/components/modals/custom-components/ChangeTopologyModalComponent.js
deleted file mode 100644
index 22ef4585..00000000
--- a/frontend/src/components/modals/custom-components/ChangeTopologyModalComponent.js
+++ /dev/null
@@ -1,131 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import Shapes from '../../../shapes'
-import Modal from '../Modal'
-
-class ChangeTopologyModalComponent extends React.Component {
-    static propTypes = {
-        show: PropTypes.bool.isRequired,
-        topologies: PropTypes.arrayOf(Shapes.Topology),
-        currentTopologyId: PropTypes.string,
-        onChooseTopology: PropTypes.func.isRequired,
-        onCreateTopology: PropTypes.func.isRequired,
-        onDuplicateTopology: PropTypes.func.isRequired,
-        onDeleteTopology: PropTypes.func.isRequired,
-        onCancel: PropTypes.func.isRequired,
-    }
-
-    reset() {
-        this.textInput.value = ''
-        this.originTopology.selectedIndex = 0
-    }
-
-    onSubmit() {
-        if (this.originTopology.selectedIndex === 0) {
-            this.onCreate()
-        } else {
-            this.onDuplicate()
-        }
-    }
-
-    onChoose(id) {
-        this.props.onChooseTopology(id)
-        this.reset()
-    }
-
-    onCreate() {
-        this.props.onCreateTopology(this.textInput.value)
-        this.reset()
-    }
-
-    onDuplicate() {
-        this.props.onCreateTopology(
-            this.textInput.value,
-            this.originTopology.value,
-        )
-        this.reset()
-    }
-
-    onDelete(id) {
-        this.props.onDeleteTopology(id)
-        this.reset()
-    }
-
-    onCancel() {
-        this.props.onCancel()
-        this.reset()
-    }
-
-    render() {
-        return (
-            <Modal
-                title="Change Topology"
-                show={this.props.show}
-                onSubmit={this.onSubmit.bind(this)}
-                onCancel={this.onCancel.bind(this)}
-            >
-                <div>
-                    {this.props.topologies.map((topology, idx) => (
-                        <div key={topology._id} className="row mb-1">
-                            <div className="col-6">
-                                <em>{topology._id === this.props.currentTopologyId ? 'Active: ' : ''}</em>
-                                {topology.name}
-                            </div>
-                            <div className="col-6 text-right">
-                                <span
-                                    className="btn btn-primary mr-1"
-                                    onClick={() => this.onChoose(topology._id)}
-                                >
-                                    Choose
-                                </span>
-                                <span
-                                    className={'btn btn-danger ' + (idx === 0 ? 'disabled' : '')}
-                                    onClick={() => idx !== 0 ? this.onDelete(topology._id) : undefined}
-                                >
-                                    Delete
-                                </span>
-                            </div>
-                        </div>
-                    ))}
-                </div>
-
-                <h5 className="pt-3 pt-1">New Topology</h5>
-                <form
-                    onSubmit={e => {
-                        e.preventDefault()
-                        this.onSubmit()
-                    }}
-                >
-                    <div className="form-group">
-                        <label className="form-control-label">Name</label>
-                        <input
-                            type="text"
-                            className="form-control"
-                            required
-                            ref={textInput => (this.textInput = textInput)}
-                        />
-                    </div>
-                    <div className="form-group">
-                        <label className="form-control-label">Topology to duplicate (not supported yet)</label>
-                        <select
-                            className="form-control"
-                            disabled
-                            ref={originTopology => (this.originTopology = originTopology)}
-                        >
-                            <option value={-1} key={-1}>
-                                None - start from scratch
-                            </option>
-                            {this.props.topologies.map(topology => (
-                                <option value={topology._id} key={topology._id}>
-                                    {topology.name}
-                                </option>
-                            ))}
-                        </select>
-                    </div>
-                </form>
-            </Modal>
-        )
-    }
-}
-
-export default ChangeTopologyModalComponent
diff --git a/frontend/src/components/modals/custom-components/NewTopologyModalComponent.js b/frontend/src/components/modals/custom-components/NewTopologyModalComponent.js
new file mode 100644
index 00000000..a0d736a1
--- /dev/null
+++ b/frontend/src/components/modals/custom-components/NewTopologyModalComponent.js
@@ -0,0 +1,92 @@
+import PropTypes from 'prop-types'
+import React from 'react'
+import Shapes from '../../../shapes'
+import Modal from '../Modal'
+
+class NewTopologyModalComponent extends React.Component {
+    static propTypes = {
+        show: PropTypes.bool.isRequired,
+        topologies: PropTypes.arrayOf(Shapes.Topology),
+        onCreateTopology: PropTypes.func.isRequired,
+        onDuplicateTopology: PropTypes.func.isRequired,
+        onCancel: PropTypes.func.isRequired,
+    }
+
+    reset() {
+        this.textInput.value = ''
+        this.originTopology.selectedIndex = 0
+    }
+
+    onSubmit() {
+        if (this.originTopology.selectedIndex === 0) {
+            this.onCreate()
+        } else {
+            this.onDuplicate()
+        }
+    }
+
+    onCreate() {
+        this.props.onCreateTopology(this.textInput.value)
+        this.reset()
+    }
+
+    onDuplicate() {
+        this.props.onCreateTopology(
+            this.textInput.value,
+            this.originTopology.value,
+        )
+        this.reset()
+    }
+
+    onCancel() {
+        this.props.onCancel()
+        this.reset()
+    }
+
+    render() {
+        return (
+            <Modal
+                title="New Topology"
+                show={this.props.show}
+                onSubmit={this.onSubmit.bind(this)}
+                onCancel={this.onCancel.bind(this)}
+            >
+                <form
+                    onSubmit={e => {
+                        e.preventDefault()
+                        this.onSubmit()
+                    }}
+                >
+                    <div className="form-group">
+                        <label className="form-control-label">Name</label>
+                        <input
+                            type="text"
+                            className="form-control"
+                            required
+                            ref={textInput => (this.textInput = textInput)}
+                        />
+                    </div>
+                    <div className="form-group">
+                        <label className="form-control-label">Topology to duplicate (not supported yet)</label>
+                        <select
+                            className="form-control"
+                            disabled
+                            ref={originTopology => (this.originTopology = originTopology)}
+                        >
+                            <option value={-1} key={-1}>
+                                None - start from scratch
+                            </option>
+                            {this.props.topologies.map(topology => (
+                                <option value={topology._id} key={topology._id}>
+                                    {topology.name}
+                                </option>
+                            ))}
+                        </select>
+                    </div>
+                </form>
+            </Modal>
+        )
+    }
+}
+
+export default NewTopologyModalComponent
diff --git a/frontend/src/components/navigation/AppNavbar.js b/frontend/src/components/navigation/AppNavbar.js
deleted file mode 100644
index 876d4abd..00000000
--- a/frontend/src/components/navigation/AppNavbar.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from 'react'
-import FontAwesome from 'react-fontawesome'
-import { Link } from 'react-router-dom'
-import Navbar, { NavItem } from './Navbar'
-import './Navbar.css'
-
-const AppNavbar = ({ projectId, inProject, fullWidth, onViewTopologies }) => (
-    <Navbar fullWidth={fullWidth}>
-        <NavItem route="/projects">
-            <Link className="nav-link" title="My Projects" to="/projects">
-                <FontAwesome name="list" className="mr-2"/>
-                My Projects
-            </Link>
-        </NavItem>
-        {inProject ? (
-            <>
-                <NavItem route={'/projects/' + projectId}>
-                    <Link
-                        className="nav-link"
-                        title="Construction"
-                        to={'/projects/' + projectId}
-                    >
-                        <FontAwesome name="industry" className="mr-2"/>
-                        Construction
-                    </Link>
-                </NavItem>
-                <NavItem route="topologies">
-                    <span
-                        className="nav-link"
-                        title="Topologies"
-                        onClick={onViewTopologies}
-                    >
-                        <FontAwesome name="server" className="mr-2"/>
-                        Topologies
-                    </span>
-                </NavItem>
-                <NavItem route={'/projects/' + projectId + '/experiments'}>
-                    <Link
-                        className="nav-link"
-                        title="Experiments"
-                        to={'/projects/' + projectId + '/experiments'}
-                    >
-                        <FontAwesome name="play" className="mr-2"/>
-                        Experiments
-                    </Link>
-                </NavItem>
-            </>
-        ) : (
-            undefined
-        )}
-    </Navbar>
-)
-
-export default AppNavbar
diff --git a/frontend/src/components/navigation/AppNavbarComponent.js b/frontend/src/components/navigation/AppNavbarComponent.js
new file mode 100644
index 00000000..10a2b92c
--- /dev/null
+++ b/frontend/src/components/navigation/AppNavbarComponent.js
@@ -0,0 +1,27 @@
+import React from 'react'
+import FontAwesome from 'react-fontawesome'
+import { Link } from 'react-router-dom'
+import Navbar, { NavItem } from './Navbar'
+import './Navbar.css'
+
+const AppNavbarComponent = ({ project, fullWidth }) => (
+    <Navbar fullWidth={fullWidth}>
+        <NavItem route="/projects">
+            <Link className="nav-link" title="My Projects" to="/projects">
+                <FontAwesome name="list" className="mr-2"/>
+                My Projects
+            </Link>
+        </NavItem>
+        {project ? (
+            <NavItem>
+                <Link className="nav-link" title="Current Project" to={`/projects/${project._id}`}>
+                    <span>{project.name}</span>
+                </Link>
+            </NavItem>
+        ) : (
+            undefined
+        )}
+    </Navbar>
+)
+
+export default AppNavbarComponent
-- 
cgit v1.2.3