Implement room name edit

2 files changed, 22 insertions, 3 deletions

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(