summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/actions/modals/profile.js14
-rw-r--r--src/actions/modals/simulations.js14
-rw-r--r--src/actions/modals/topology.js14
-rw-r--r--src/actions/profile.js13
-rw-r--r--src/actions/simulations.js14
-rw-r--r--src/actions/topology.js27
-rw-r--r--src/components/modals/TextInputModal.js15
-rw-r--r--src/components/navigation/Navbar.js2
-rw-r--r--src/containers/modals/DeleteProfileModal.js (renamed from src/containers/profile/DeleteProfileModal.js)2
-rw-r--r--src/containers/modals/EditRoomNameModal.js38
-rw-r--r--src/containers/modals/NewSimulationModal.js (renamed from src/containers/simulations/NewSimulationModal.js)3
-rw-r--r--src/containers/sidebars/topology/room/RoomNameContainer.js3
-rw-r--r--src/pages/App.js2
-rw-r--r--src/pages/Profile.js4
-rw-r--r--src/pages/Simulations.js5
-rw-r--r--src/reducers/modals.js17
-rw-r--r--src/reducers/objects.js8
-rw-r--r--src/sagas/index.js3
-rw-r--r--src/sagas/topology.js15
19 files changed, 160 insertions, 53 deletions
diff --git a/src/actions/modals/profile.js b/src/actions/modals/profile.js
new file mode 100644
index 00000000..421e7602
--- /dev/null
+++ b/src/actions/modals/profile.js
@@ -0,0 +1,14 @@
+export const OPEN_DELETE_PROFILE_MODAL = "OPEN_DELETE_PROFILE_MODAL";
+export const CLOSE_DELETE_PROFILE_MODAL = "CLOSE_DELETE_PROFILE_MODAL";
+
+export function openDeleteProfileModal() {
+ return {
+ type: OPEN_DELETE_PROFILE_MODAL
+ };
+}
+
+export function closeDeleteProfileModal() {
+ return {
+ type: CLOSE_DELETE_PROFILE_MODAL
+ };
+}
diff --git a/src/actions/modals/simulations.js b/src/actions/modals/simulations.js
new file mode 100644
index 00000000..53d2c565
--- /dev/null
+++ b/src/actions/modals/simulations.js
@@ -0,0 +1,14 @@
+export const OPEN_NEW_SIMULATION_MODAL = "OPEN_NEW_SIMULATION_MODAL";
+export const CLOSE_NEW_SIMULATION_MODAL = "CLOSE_SIMULATION_POPUP";
+
+export function openNewSimulationModal() {
+ return {
+ type: OPEN_NEW_SIMULATION_MODAL
+ };
+}
+
+export function closeNewSimulationModal() {
+ return {
+ type: CLOSE_NEW_SIMULATION_MODAL
+ };
+}
diff --git a/src/actions/modals/topology.js b/src/actions/modals/topology.js
new file mode 100644
index 00000000..5e3fc803
--- /dev/null
+++ b/src/actions/modals/topology.js
@@ -0,0 +1,14 @@
+export const OPEN_EDIT_ROOM_NAME_MODAL = "OPEN_EDIT_ROOM_NAME_MODAL";
+export const CLOSE_EDIT_ROOM_NAME_MODAL = "CLOSE_EDIT_ROOM_NAME_MODAL";
+
+export function openEditRoomNameModal() {
+ return {
+ type: OPEN_EDIT_ROOM_NAME_MODAL
+ };
+}
+
+export function closeEditRoomNameModal() {
+ return {
+ type: CLOSE_EDIT_ROOM_NAME_MODAL
+ };
+}
diff --git a/src/actions/profile.js b/src/actions/profile.js
index 421e7602..b28b04f6 100644
--- a/src/actions/profile.js
+++ b/src/actions/profile.js
@@ -1,14 +1,3 @@
-export const OPEN_DELETE_PROFILE_MODAL = "OPEN_DELETE_PROFILE_MODAL";
-export const CLOSE_DELETE_PROFILE_MODAL = "CLOSE_DELETE_PROFILE_MODAL";
-export function openDeleteProfileModal() {
- return {
- type: OPEN_DELETE_PROFILE_MODAL
- };
-}
-export function closeDeleteProfileModal() {
- return {
- type: CLOSE_DELETE_PROFILE_MODAL
- };
-}
+
diff --git a/src/actions/simulations.js b/src/actions/simulations.js
index 2e722d16..145ceab2 100644
--- a/src/actions/simulations.js
+++ b/src/actions/simulations.js
@@ -1,6 +1,4 @@
export const SET_AUTH_VISIBILITY_FILTER = "SET_AUTH_VISIBILITY_FILTER";
-export const OPEN_NEW_SIMULATION_MODAL = "OPEN_NEW_SIMULATION_MODAL";
-export const CLOSE_NEW_SIMULATION_MODAL = "CLOSE_SIMULATION_POPUP";
export const ADD_SIMULATION = "ADD_SIMULATION";
export const ADD_SIMULATION_SUCCEEDED = "ADD_SIMULATION_SUCCEEDED";
export const DELETE_SIMULATION = "DELETE_SIMULATION";
@@ -14,18 +12,6 @@ export function setAuthVisibilityFilter(filter) {
};
}
-export function openNewSimulationModal() {
- return {
- type: OPEN_NEW_SIMULATION_MODAL
- };
-}
-
-export function closeNewSimulationModal() {
- return {
- type: CLOSE_NEW_SIMULATION_MODAL
- };
-}
-
export function addSimulation(name) {
return (dispatch, getState) => {
const {auth} = getState();
diff --git a/src/actions/topology.js b/src/actions/topology.js
index 76b1ef27..79f1bfb5 100644
--- a/src/actions/topology.js
+++ b/src/actions/topology.js
@@ -1,4 +1,4 @@
-import {addIdToStoreObjectListProp, removeIdFromStoreObjectListProp} from "./objects";
+import {addIdToStoreObjectListProp, addPropToStoreObject, removeIdFromStoreObjectListProp} from "./objects";
export const FETCH_TOPOLOGY_OF_DATACENTER = "FETCH_TOPOLOGY_OF_DATACENTER";
export const FETCH_TOPOLOGY_OF_DATACENTER_SUCCEEDED = "FETCH_TOPOLOGY_OF_DATACENTER_SUCCEEDED";
@@ -10,9 +10,8 @@ export const FINISH_NEW_ROOM_CONSTRUCTION = "FINISH_NEW_ROOM_CONSTRUCTION";
export const CANCEL_NEW_ROOM_CONSTRUCTION = "CANCEL_NEW_ROOM_CONSTRUCTION";
export const CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED = "CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED";
export const ADD_TILE = "ADD_TILE";
-export const ADD_TILE_SUCCEEDED = "ADD_TILE_SUCCEEDED";
export const DELETE_TILE = "DELETE_TILE";
-export const DELETE_TILE_SUCCEEDED = "DELETE_TILE_SUCCEEDED";
+export const EDIT_ROOM_NAME = "EDIT_ROOM_NAME";
export function fetchLatestDatacenter() {
return (dispatch, getState) => {
@@ -107,10 +106,6 @@ export function addTileSucceeded(tileId) {
return (dispatch, getState) => {
const {currentRoomInConstruction} = getState();
dispatch(addIdToStoreObjectListProp("room", currentRoomInConstruction, "tileIds", tileId));
- dispatch({
- type: ADD_TILE_SUCCEEDED,
- tileId
- });
};
}
@@ -125,9 +120,19 @@ export function deleteTileSucceeded(tileId) {
return (dispatch, getState) => {
const {currentRoomInConstruction} = getState();
dispatch(removeIdFromStoreObjectListProp("room", currentRoomInConstruction, "tileIds", tileId));
- dispatch({
- type: DELETE_TILE_SUCCEEDED,
- tileId
- });
+ };
+}
+
+export function editRoomName(name) {
+ return {
+ type: EDIT_ROOM_NAME,
+ name
+ };
+}
+
+export function editRoomNameSucceeded(name) {
+ return (dispatch, getState) => {
+ const {interactionLevel} = getState();
+ dispatch(addPropToStoreObject("room", interactionLevel.roomId, {name}));
};
}
diff --git a/src/components/modals/TextInputModal.js b/src/components/modals/TextInputModal.js
index 97986fe2..e4a55372 100644
--- a/src/components/modals/TextInputModal.js
+++ b/src/components/modals/TextInputModal.js
@@ -11,14 +11,20 @@ class TextInputModal extends React.Component {
initialValue: PropTypes.string,
};
+ componentDidUpdate() {
+ if (this.props.initialValue) {
+ this.textInput.value = this.props.initialValue;
+ }
+ }
+
onSubmit() {
- this.props.callback(this.refs.textInput.value);
- this.refs.textInput.value = "";
+ this.props.callback(this.textInput.value);
+ this.textInput.value = "";
}
onCancel() {
this.props.callback(undefined);
- this.refs.textInput.value = "";
+ this.textInput.value = "";
}
render() {
@@ -33,7 +39,8 @@ class TextInputModal extends React.Component {
}}>
<div className="form-group">
<label className="form-control-label">{this.props.label}:</label>
- <input type="text" className="form-control" ref="textInput" value={this.props.initialValue}/>
+ <input type="text" className="form-control"
+ ref={textInput => this.textInput = textInput}/>
</div>
</form>
</Modal>
diff --git a/src/components/navigation/Navbar.js b/src/components/navigation/Navbar.js
index 68fa2ab1..2358e146 100644
--- a/src/components/navigation/Navbar.js
+++ b/src/components/navigation/Navbar.js
@@ -7,7 +7,7 @@ import Logout from "../../containers/auth/Logout";
import ProfileName from "../../containers/auth/ProfileName";
import "./Navbar.css";
-export const NAVBAR_HEIGHT = 62;
+export const NAVBAR_HEIGHT = 60;
export const NavItem = withRouter(props => <NavItemWithoutRoute {...props}/>);
export const LoggedInSection = withRouter(props => <LoggedInSectionWithoutRoute {...props}/>);
diff --git a/src/containers/profile/DeleteProfileModal.js b/src/containers/modals/DeleteProfileModal.js
index b59db055..0108a1eb 100644
--- a/src/containers/profile/DeleteProfileModal.js
+++ b/src/containers/modals/DeleteProfileModal.js
@@ -1,6 +1,6 @@
import React from "react";
import {connect} from "react-redux";
-import {closeDeleteProfileModal} from "../../actions/profile";
+import {closeDeleteProfileModal} from "../../actions/modals/profile";
import {deleteCurrentUser} from "../../actions/users";
import ConfirmationModal from "../../components/modals/ConfirmationModal";
diff --git a/src/containers/modals/EditRoomNameModal.js b/src/containers/modals/EditRoomNameModal.js
new file mode 100644
index 00000000..649ffeda
--- /dev/null
+++ b/src/containers/modals/EditRoomNameModal.js
@@ -0,0 +1,38 @@
+import React from "react";
+import {connect} from "react-redux";
+import {closeEditRoomNameModal} from "../../actions/modals/topology";
+import {editRoomName} from "../../actions/topology";
+import TextInputModal from "../../components/modals/TextInputModal";
+
+const EditRoomNameModalComponent = ({visible, previousName, callback}) => (
+ <TextInputModal title="Edit room name"
+ label="Room name"
+ show={visible}
+ initialValue={previousName}
+ callback={callback}/>
+);
+
+const mapStateToProps = state => {
+ return {
+ visible: state.modals.editRoomNameModalVisible,
+ previousName: state.interactionLevel.mode === "ROOM" ? state.objects.room[state.interactionLevel.roomId].name : "",
+ };
+};
+
+const mapDispatchToProps = dispatch => {
+ return {
+ callback: (name) => {
+ if (name) {
+ dispatch(editRoomName(name));
+ }
+ dispatch(closeEditRoomNameModal());
+ }
+ };
+};
+
+const EditRoomNameModal = connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(EditRoomNameModalComponent);
+
+export default EditRoomNameModal;
diff --git a/src/containers/simulations/NewSimulationModal.js b/src/containers/modals/NewSimulationModal.js
index cb858fed..d85b59ef 100644
--- a/src/containers/simulations/NewSimulationModal.js
+++ b/src/containers/modals/NewSimulationModal.js
@@ -1,6 +1,7 @@
import React from "react";
import {connect} from "react-redux";
-import {addSimulation, closeNewSimulationModal} from "../../actions/simulations";
+import {closeNewSimulationModal} from "../../actions/modals/simulations";
+import {addSimulation} from "../../actions/simulations";
import TextInputModal from "../../components/modals/TextInputModal";
const NewSimulationModalComponent = ({visible, callback}) => (
diff --git a/src/containers/sidebars/topology/room/RoomNameContainer.js b/src/containers/sidebars/topology/room/RoomNameContainer.js
index 5408cb6c..7b9dc249 100644
--- a/src/containers/sidebars/topology/room/RoomNameContainer.js
+++ b/src/containers/sidebars/topology/room/RoomNameContainer.js
@@ -1,4 +1,5 @@
import {connect} from "react-redux";
+import {openEditRoomNameModal} from "../../../../actions/modals/topology";
import RoomNameComponent from "../../../../components/sidebars/topology/room/RoomNameComponent";
const mapStateToProps = state => {
@@ -9,7 +10,7 @@ const mapStateToProps = state => {
const mapDispatchToProps = dispatch => {
return {
- onEdit: () => dispatch(null), // FIXME
+ onEdit: () => dispatch(openEditRoomNameModal()),
};
};
diff --git a/src/pages/App.js b/src/pages/App.js
index a6f4dad4..7f690002 100644
--- a/src/pages/App.js
+++ b/src/pages/App.js
@@ -5,6 +5,7 @@ import {openSimulationSucceeded} from "../actions/simulations";
import {fetchLatestDatacenter} from "../actions/topology";
import MapStage from "../components/map/MapStage";
import AppNavbar from "../components/navigation/AppNavbar";
+import EditRoomNameModal from "../containers/modals/EditRoomNameModal";
import TopologySidebar from "../containers/sidebars/topology/TopologySidebar";
class AppContainer extends React.Component {
@@ -25,6 +26,7 @@ class AppContainer extends React.Component {
<MapStage/>
<TopologySidebar/>
</div>
+ <EditRoomNameModal/>
</div>
);
}
diff --git a/src/pages/Profile.js b/src/pages/Profile.js
index 4f69b408..ca09d0f4 100644
--- a/src/pages/Profile.js
+++ b/src/pages/Profile.js
@@ -1,8 +1,8 @@
import React from 'react';
import {connect} from "react-redux";
-import {openDeleteProfileModal} from "../actions/profile";
+import {openDeleteProfileModal} from "../actions/modals/profile";
import AppNavbar from "../components/navigation/AppNavbar";
-import DeleteProfileModal from "../containers/profile/DeleteProfileModal";
+import DeleteProfileModal from "../containers/modals/DeleteProfileModal";
const ProfileContainer = ({onDelete}) => (
<div className="full-height">
diff --git a/src/pages/Simulations.js b/src/pages/Simulations.js
index 52551139..c04c74ae 100644
--- a/src/pages/Simulations.js
+++ b/src/pages/Simulations.js
@@ -1,11 +1,12 @@
import React from 'react';
import {connect} from "react-redux";
-import {addSimulation, openNewSimulationModal} from "../actions/simulations";
+import {openNewSimulationModal} from "../actions/modals/simulations";
+import {addSimulation} from "../actions/simulations";
import {fetchAuthorizationsOfCurrentUser} from "../actions/users";
import AppNavbar from "../components/navigation/AppNavbar";
import SimulationFilterPanel from "../components/simulations/FilterPanel";
import NewSimulationButton from "../components/simulations/NewSimulationButton";
-import NewSimulationModal from "../containers/simulations/NewSimulationModal";
+import NewSimulationModal from "../containers/modals/NewSimulationModal";
import VisibleSimulationList from "../containers/simulations/VisibleSimulationAuthList";
class SimulationsContainer extends React.Component {
diff --git a/src/reducers/modals.js b/src/reducers/modals.js
index e74b66b9..1786bb87 100644
--- a/src/reducers/modals.js
+++ b/src/reducers/modals.js
@@ -1,6 +1,7 @@
import {combineReducers} from "redux";
-import {CLOSE_DELETE_PROFILE_MODAL, OPEN_DELETE_PROFILE_MODAL} from "../actions/profile";
-import {CLOSE_NEW_SIMULATION_MODAL, OPEN_NEW_SIMULATION_MODAL} from "../actions/simulations";
+import {CLOSE_DELETE_PROFILE_MODAL, OPEN_DELETE_PROFILE_MODAL} from "../actions/modals/profile";
+import {CLOSE_NEW_SIMULATION_MODAL, OPEN_NEW_SIMULATION_MODAL} from "../actions/modals/simulations";
+import {CLOSE_EDIT_ROOM_NAME_MODAL, OPEN_EDIT_ROOM_NAME_MODAL} from "../actions/modals/topology";
function newSimulationModalVisible(state = false, action) {
switch (action.type) {
@@ -24,7 +25,19 @@ function deleteProfileModalVisible(state = false, action) {
}
}
+function editRoomNameModalVisible(state = false, action) {
+ switch (action.type) {
+ case OPEN_EDIT_ROOM_NAME_MODAL:
+ return true;
+ case CLOSE_EDIT_ROOM_NAME_MODAL:
+ return false;
+ default:
+ return state;
+ }
+}
+
export const modals = combineReducers({
newSimulationModalVisible,
deleteProfileModalVisible,
+ editRoomNameModalVisible,
});
diff --git a/src/reducers/objects.js b/src/reducers/objects.js
index 801a5456..b75e9ae6 100644
--- a/src/reducers/objects.js
+++ b/src/reducers/objects.js
@@ -46,7 +46,13 @@ function objectWithId(type, getId) {
return Object.assign(
{},
state,
- {[action.objectId]: Object.assign(state[action.objectId], action.propObject)}
+ {
+ [action.objectId]: Object.assign(
+ {},
+ state[action.objectId],
+ action.propObject
+ )
+ }
);
} else if (action.type === ADD_ID_TO_STORE_OBJECT_LIST_PROP) {
return Object.assign(
diff --git a/src/sagas/index.js b/src/sagas/index.js
index 7c1d921f..a076736c 100644
--- a/src/sagas/index.js
+++ b/src/sagas/index.js
@@ -5,6 +5,7 @@ import {
ADD_TILE,
CANCEL_NEW_ROOM_CONSTRUCTION,
DELETE_TILE,
+ EDIT_ROOM_NAME,
FETCH_LATEST_DATACENTER,
START_NEW_ROOM_CONSTRUCTION
} from "../actions/topology";
@@ -15,6 +16,7 @@ import {
onAddTile,
onCancelNewRoomConstruction,
onDeleteTile,
+ onEditRoomName,
onFetchLatestDatacenter,
onStartNewRoomConstruction
} from "./topology";
@@ -31,4 +33,5 @@ export default function* rootSaga() {
yield takeEvery(CANCEL_NEW_ROOM_CONSTRUCTION, onCancelNewRoomConstruction);
yield takeEvery(ADD_TILE, onAddTile);
yield takeEvery(DELETE_TILE, onDeleteTile);
+ yield takeEvery(EDIT_ROOM_NAME, onEditRoomName);
}
diff --git a/src/sagas/topology.js b/src/sagas/topology.js
index 815cd842..c029c861 100644
--- a/src/sagas/topology.js
+++ b/src/sagas/topology.js
@@ -4,11 +4,12 @@ import {
addTileSucceeded,
cancelNewRoomConstructionSucceeded,
deleteTileSucceeded,
+ editRoomNameSucceeded,
fetchLatestDatacenterSucceeded,
startNewRoomConstructionSucceeded
} from "../actions/topology";
import {addRoomToDatacenter} from "../api/routes/datacenters";
-import {addTileToRoom, deleteRoom} from "../api/routes/rooms";
+import {addTileToRoom, deleteRoom, updateRoom} from "../api/routes/rooms";
import {deleteTile} from "../api/routes/tiles";
import {
fetchAndStoreCoolingItem,
@@ -129,3 +130,15 @@ export function* onDeleteTile(action) {
console.log(error);
}
}
+
+export function* onEditRoomName(action) {
+ try {
+ const roomId = yield select(state => state.interactionLevel.roomId);
+ const room = Object.assign({}, yield select(state => state.objects.room[roomId]));
+ room.name = action.name;
+ yield call(updateRoom, room);
+ yield put(editRoomNameSucceeded(action.name));
+ } catch (error) {
+ console.log(error);
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-04 14:54:15 +0000