merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 0 insertions, 40 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/modals/EditRackNameModal.js b/opendc-web/opendc-web-ui/src/containers/modals/EditRackNameModal.js
deleted file mode 100644
index 9128f449..00000000
--- a/opendc-web/opendc-web-ui/src/containers/modals/EditRackNameModal.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react'
-import { connect } from 'react-redux'
-import { closeEditRackNameModal } from '../../actions/modals/topology'
-import { editRackName } from '../../actions/topology/rack'
-import TextInputModal from '../../components/modals/TextInputModal'
-
-const EditRackNameModalComponent = ({ visible, previousName, callback }) => (
-    <TextInputModal
-        title="Edit rack name"
-        label="Rack name"
-        show={visible}
-        initialValue={previousName}
-        callback={callback}
-    />
-)
-
-const mapStateToProps = (state) => {
-    return {
-        visible: state.modals.editRackNameModalVisible,
-        previousName:
-            state.interactionLevel.mode === 'RACK'
-                ? state.objects.rack[state.objects.tile[state.interactionLevel.tileId].rackId].name
-                : '',
-    }
-}
-
-const mapDispatchToProps = (dispatch) => {
-    return {
-        callback: (name) => {
-            if (name) {
-                dispatch(editRackName(name))
-            }
-            dispatch(closeEditRackNameModal())
-        },
-    }
-}
-
-const EditRackNameModal = connect(mapStateToProps, mapDispatchToProps)(EditRackNameModalComponent)
-
-export default EditRackNameModal