From cd0b45627f0d8da8c8dc4edde223f3c36e9bcfbf Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
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.
---
 .../src/components/modals/ConfirmationModal.js     |  37 ------
 frontend/src/components/modals/Modal.js            |  53 --------
 frontend/src/components/modals/TextInputModal.js   |  54 --------
 .../NewPortfolioModalComponent.js                  |  78 -----------
 .../custom-components/NewScenarioModalComponent.js | 144 ---------------------
 .../custom-components/NewTopologyModalComponent.js |  71 ----------
 6 files changed, 437 deletions(-)
 delete mode 100644 frontend/src/components/modals/ConfirmationModal.js
 delete mode 100644 frontend/src/components/modals/Modal.js
 delete mode 100644 frontend/src/components/modals/TextInputModal.js
 delete mode 100644 frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js
 delete mode 100644 frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
 delete mode 100644 frontend/src/components/modals/custom-components/NewTopologyModalComponent.js

(limited to 'frontend/src/components/modals')

diff --git a/frontend/src/components/modals/ConfirmationModal.js b/frontend/src/components/modals/ConfirmationModal.js
deleted file mode 100644
index 589047dc..00000000
--- a/frontend/src/components/modals/ConfirmationModal.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import Modal from './Modal'
-
-class ConfirmationModal extends React.Component {
-    static propTypes = {
-        title: PropTypes.string.isRequired,
-        message: PropTypes.string.isRequired,
-        show: PropTypes.bool.isRequired,
-        callback: PropTypes.func.isRequired,
-    }
-
-    onConfirm() {
-        this.props.callback(true)
-    }
-
-    onCancel() {
-        this.props.callback(false)
-    }
-
-    render() {
-        return (
-            <Modal
-                title={this.props.title}
-                show={this.props.show}
-                onSubmit={this.onConfirm.bind(this)}
-                onCancel={this.onCancel.bind(this)}
-                submitButtonType="danger"
-                submitButtonText="Confirm"
-            >
-                {this.props.message}
-            </Modal>
-        )
-    }
-}
-
-export default ConfirmationModal
diff --git a/frontend/src/components/modals/Modal.js b/frontend/src/components/modals/Modal.js
deleted file mode 100644
index 21b7f119..00000000
--- a/frontend/src/components/modals/Modal.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { useState, useEffect } from 'react'
-import PropTypes from 'prop-types'
-import { Modal as RModal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap'
-
-function Modal({ children, title, show, onSubmit, onCancel, submitButtonType, submitButtonText }) {
-    const [modal, setModal] = useState(show)
-
-    useEffect(() => setModal(show), [show])
-
-    const toggle = () => setModal(!modal)
-    const cancel = () => {
-        if (onCancel() !== false) {
-            toggle()
-        }
-    }
-    const submit = () => {
-        if (onSubmit() !== false) {
-            toggle()
-        }
-    }
-
-    return (
-        <RModal isOpen={modal} toggle={cancel}>
-            <ModalHeader toggle={cancel}>{title}</ModalHeader>
-            <ModalBody>{children}</ModalBody>
-            <ModalFooter>
-                <Button color="secondary" onClick={cancel}>
-                    Close
-                </Button>
-                <Button color={submitButtonType} onClick={submit}>
-                    {submitButtonText}
-                </Button>
-            </ModalFooter>
-        </RModal>
-    )
-}
-
-Modal.propTypes = {
-    title: PropTypes.string.isRequired,
-    show: PropTypes.bool.isRequired,
-    onSubmit: PropTypes.func.isRequired,
-    onCancel: PropTypes.func.isRequired,
-    submitButtonType: PropTypes.string,
-    submitButtonText: PropTypes.string,
-}
-
-Modal.defaultProps = {
-    submitButtonType: 'primary',
-    submitButtonText: 'Save',
-    show: false,
-}
-
-export default Modal
diff --git a/frontend/src/components/modals/TextInputModal.js b/frontend/src/components/modals/TextInputModal.js
deleted file mode 100644
index d0918c7e..00000000
--- a/frontend/src/components/modals/TextInputModal.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import Modal from './Modal'
-
-class TextInputModal extends React.Component {
-    static propTypes = {
-        title: PropTypes.string.isRequired,
-        label: PropTypes.string.isRequired,
-        show: PropTypes.bool.isRequired,
-        callback: PropTypes.func.isRequired,
-        initialValue: PropTypes.string,
-    }
-
-    componentDidUpdate() {
-        if (this.props.initialValue && this.textInput) {
-            this.textInput.value = this.props.initialValue
-        }
-    }
-
-    onSubmit() {
-        this.props.callback(this.textInput.value)
-        this.textInput.value = ''
-    }
-
-    onCancel() {
-        this.props.callback(undefined)
-        this.textInput.value = ''
-    }
-
-    render() {
-        return (
-            <Modal
-                title={this.props.title}
-                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">{this.props.label}</label>
-                        <input type="text" className="form-control" ref={(textInput) => (this.textInput = textInput)} />
-                    </div>
-                </form>
-            </Modal>
-        )
-    }
-}
-
-export default TextInputModal
diff --git a/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js b/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js
deleted file mode 100644
index 3c6b8724..00000000
--- a/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import PropTypes from 'prop-types'
-import React, { useRef } from 'react'
-import { Form, FormGroup, Input, Label } from 'reactstrap'
-import Modal from '../Modal'
-import { AVAILABLE_METRICS, METRIC_NAMES } from '../../../util/available-metrics'
-
-const NewPortfolioModalComponent = ({ show, callback }) => {
-    const form = useRef(null)
-    const textInput = useRef(null)
-    const repeatsInput = useRef(null)
-    const metricCheckboxes = useRef({})
-
-    const onSubmit = () => {
-        if (form.current.reportValidity()) {
-            callback(textInput.current.value, {
-                enabledMetrics: AVAILABLE_METRICS.filter((metric) => metricCheckboxes.current[metric].checked),
-                repeatsPerScenario: parseInt(repeatsInput.current.value),
-            })
-
-            return true
-        } else {
-            return false
-        }
-    }
-    const onCancel = () => callback(undefined)
-
-    return (
-        <Modal title="New Portfolio" show={show} onSubmit={onSubmit} onCancel={onCancel}>
-            <Form
-                onSubmit={(e) => {
-                    e.preventDefault()
-                    this.onSubmit()
-                }}
-                innerRef={form}
-            >
-                <FormGroup>
-                    <Label for="name">Name</Label>
-                    <Input name="name" type="text" required innerRef={textInput} placeholder="My Portfolio" />
-                </FormGroup>
-                <h4>Targets</h4>
-                <h5>Metrics</h5>
-                <FormGroup>
-                    {AVAILABLE_METRICS.map((metric) => (
-                        <FormGroup check key={metric}>
-                            <Label for={metric} check>
-                                <Input
-                                    name={metric}
-                                    type="checkbox"
-                                    innerRef={(ref) => (metricCheckboxes.current[metric] = ref)}
-                                />
-                                {METRIC_NAMES[metric]}
-                            </Label>
-                        </FormGroup>
-                    ))}
-                </FormGroup>
-                <FormGroup>
-                    <Label for="repeats">Repeats per scenario</Label>
-                    <Input
-                        name="repeats"
-                        type="number"
-                        required
-                        innerRef={repeatsInput}
-                        defaultValue="1"
-                        min="1"
-                        step="1"
-                    />
-                </FormGroup>
-            </Form>
-        </Modal>
-    )
-}
-
-NewPortfolioModalComponent.propTypes = {
-    show: PropTypes.bool.isRequired,
-    callback: PropTypes.func.isRequired,
-}
-
-export default NewPortfolioModalComponent
diff --git a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
deleted file mode 100644
index 01a5719c..00000000
--- a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
+++ /dev/null
@@ -1,144 +0,0 @@
-import PropTypes from 'prop-types'
-import React, { useRef } from 'react'
-import { Form, FormGroup, Input, Label } from 'reactstrap'
-import Shapes from '../../../shapes'
-import Modal from '../Modal'
-
-const NewScenarioModalComponent = ({
-    show,
-    callback,
-    currentPortfolioId,
-    currentPortfolioScenarioIds,
-    traces,
-    topologies,
-    schedulers,
-}) => {
-    const form = useRef(null)
-    const textInput = useRef(null)
-    const traceSelect = useRef(null)
-    const traceLoadInput = useRef(null)
-    const topologySelect = useRef(null)
-    const failuresCheckbox = useRef(null)
-    const performanceInterferenceCheckbox = useRef(null)
-    const schedulerSelect = useRef(null)
-
-    const onSubmit = () => {
-        if (!form.current.reportValidity()) {
-            return false
-        }
-        callback(
-            textInput.current.value,
-            currentPortfolioId,
-            {
-                traceId: traceSelect.current.value,
-                loadSamplingFraction: parseFloat(traceLoadInput.current.value),
-            },
-            {
-                topologyId: topologySelect.current.value,
-            },
-            {
-                failuresEnabled: failuresCheckbox.current.checked,
-                performanceInterferenceEnabled: performanceInterferenceCheckbox.current.checked,
-                schedulerName: schedulerSelect.current.value,
-            }
-        )
-        return true
-    }
-    const onCancel = () => {
-        callback(undefined)
-    }
-
-    return (
-        <Modal title="New Scenario" show={show} onSubmit={onSubmit} onCancel={onCancel}>
-            <Form
-                onSubmit={(e) => {
-                    e.preventDefault()
-                    onSubmit()
-                }}
-                innerRef={form}
-            >
-                <FormGroup>
-                    <Label for="name">Name</Label>
-                    <Input
-                        name="name"
-                        type="text"
-                        required
-                        disabled={currentPortfolioScenarioIds.length === 0}
-                        defaultValue={currentPortfolioScenarioIds.length === 0 ? 'Base scenario' : ''}
-                        innerRef={textInput}
-                    />
-                </FormGroup>
-                <h4>Trace</h4>
-                <FormGroup>
-                    <Label for="trace">Trace</Label>
-                    <Input name="trace" type="select" innerRef={traceSelect}>
-                        {traces.map((trace) => (
-                            <option value={trace._id} key={trace._id}>
-                                {trace.name}
-                            </option>
-                        ))}
-                    </Input>
-                </FormGroup>
-                <FormGroup>
-                    <Label for="trace-load">Load sampling fraction</Label>
-                    <Input
-                        name="trace-load"
-                        type="number"
-                        innerRef={traceLoadInput}
-                        required
-                        defaultValue="1"
-                        min="0"
-                        max="1"
-                        step="0.1"
-                    />
-                </FormGroup>
-                <h4>Topology</h4>
-                <div className="form-group">
-                    <Label for="topology">Topology</Label>
-                    <Input name="topology" type="select" innerRef={topologySelect}>
-                        {topologies.map((topology) => (
-                            <option value={topology._id} key={topology._id}>
-                                {topology.name}
-                            </option>
-                        ))}
-                    </Input>
-                </div>
-                <h4>Operational Phenomena</h4>
-                <FormGroup check>
-                    <Label check for="failures">
-                        <Input type="checkbox" name="failures" innerRef={failuresCheckbox} />{' '}
-                        <span className="ml-2">Enable failures</span>
-                    </Label>
-                </FormGroup>
-                <FormGroup check>
-                    <Label check for="perf-interference">
-                        <Input type="checkbox" name="perf-interference" innerRef={performanceInterferenceCheckbox} />{' '}
-                        <span className="ml-2">Enable performance interference</span>
-                    </Label>
-                </FormGroup>
-                <FormGroup>
-                    <Label for="scheduler">Scheduler</Label>
-                    <Input name="scheduler" type="select" innerRef={schedulerSelect}>
-                        {schedulers.map((scheduler) => (
-                            <option value={scheduler.name} key={scheduler.name}>
-                                {scheduler.name}
-                            </option>
-                        ))}
-                    </Input>
-                </FormGroup>
-            </Form>
-        </Modal>
-    )
-}
-
-NewScenarioModalComponent.propTypes = {
-    show: PropTypes.bool.isRequired,
-    currentPortfolioId: PropTypes.string.isRequired,
-    currentPortfolioScenarioIds: PropTypes.arrayOf(PropTypes.string),
-    traces: PropTypes.arrayOf(Shapes.Trace),
-    topologies: PropTypes.arrayOf(Shapes.Topology),
-    schedulers: PropTypes.arrayOf(Shapes.Scheduler),
-    callback: PropTypes.func.isRequired,
-}
-
-export default NewScenarioModalComponent
diff --git a/frontend/src/components/modals/custom-components/NewTopologyModalComponent.js b/frontend/src/components/modals/custom-components/NewTopologyModalComponent.js
deleted file mode 100644
index 9fee8831..00000000
--- a/frontend/src/components/modals/custom-components/NewTopologyModalComponent.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import PropTypes from 'prop-types'
-import { Form, FormGroup, Input, Label } from 'reactstrap'
-import React, { useRef } from 'react'
-import Shapes from '../../../shapes'
-import Modal from '../Modal'
-
-const NewTopologyModalComponent = ({ show, onCreateTopology, onDuplicateTopology, onCancel, topologies }) => {
-    const form = useRef(null)
-    const textInput = useRef(null)
-    const originTopology = useRef(null)
-
-    const onCreate = () => {
-        onCreateTopology(textInput.current.value)
-    }
-
-    const onDuplicate = () => {
-        onDuplicateTopology(textInput.current.value, originTopology.current.value)
-    }
-
-    const onSubmit = () => {
-        if (!form.current.reportValidity()) {
-            return false
-        } else if (originTopology.current.selectedIndex === 0) {
-            onCreate()
-        } else {
-            onDuplicate()
-        }
-
-        return true
-    }
-
-    return (
-        <Modal title="New Topology" show={show} onSubmit={onSubmit} onCancel={onCancel}>
-            <Form
-                onSubmit={(e) => {
-                    e.preventDefault()
-                    onSubmit()
-                }}
-                innerRef={form}
-            >
-                <FormGroup>
-                    <Label for="name">Name</Label>
-                    <Input name="name" type="text" required innerRef={textInput} />
-                </FormGroup>
-                <FormGroup>
-                    <Label for="origin">Topology to duplicate</Label>
-                    <Input name="origin" type="select" innerRef={originTopology}>
-                        <option value={-1} key={-1}>
-                            None - start from scratch
-                        </option>
-                        {topologies.map((topology) => (
-                            <option value={topology._id} key={topology._id}>
-                                {topology.name}
-                            </option>
-                        ))}
-                    </Input>
-                </FormGroup>
-            </Form>
-        </Modal>
-    )
-}
-
-NewTopologyModalComponent.propTypes = {
-    show: PropTypes.bool.isRequired,
-    topologies: PropTypes.arrayOf(Shapes.Topology),
-    onCreateTopology: PropTypes.func.isRequired,
-    onDuplicateTopology: PropTypes.func.isRequired,
-    onCancel: PropTypes.func.isRequired,
-}
-
-export default NewTopologyModalComponent
-- 
cgit v1.2.3