Fixed git merge sentience
This commit is contained in:
parent
e5bf0dbd83
commit
dbc6223954
1 changed files with 0 additions and 75 deletions
|
@ -81,81 +81,6 @@ function reducer(previousState, action) {
|
|||
}
|
||||
};
|
||||
|
||||
const createOrUpdateRoom = (room) => {
|
||||
if (!newState.rooms[room.id]) {
|
||||
newState = update(newState, {
|
||||
rooms: { [room.id]: { $set: { ...room, devices: new Set() } } },
|
||||
});
|
||||
} else {
|
||||
newState = update(newState, {
|
||||
rooms: {
|
||||
[room.id]: {
|
||||
name: { $set: room.name },
|
||||
image: { $set: room.image },
|
||||
icon: { $set: room.icon },
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
if (newState.pendingJoins.rooms[room.id]) {
|
||||
newState = update(newState, {
|
||||
pendingJoins: { rooms: { $unset: [room.id] } },
|
||||
rooms: {
|
||||
[room.id]: {
|
||||
devices: {
|
||||
$add: [...newState.pendingJoins.rooms[room.id]],
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const createOrUpdateScene = (scene) => {
|
||||
if (!newState.scenes[scene.id]) {
|
||||
newState = update(newState, {
|
||||
scenes: {
|
||||
[scene.id]: { $set: { ...scene, sceneStates: new Set() } },
|
||||
},
|
||||
});
|
||||
} else {
|
||||
newState = update(newState, {
|
||||
scenes: {
|
||||
[scene.id]: {
|
||||
name: { $set: scene.name },
|
||||
icon: { $set: scene.icon },
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
if (newState.pendingJoins.scenes[scene.id]) {
|
||||
newState = update(newState, {
|
||||
pendingJoins: { scenes: { $unset: [scene.id] } },
|
||||
scenes: {
|
||||
[scene.id]: {
|
||||
sceneStates: {
|
||||
$add: [...newState.pendingJoins.scenes[scene.id]],
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const updateDeviceProps = (device) => {
|
||||
// In some updates the information regarding a device is incomplete
|
||||
// due to a fault in the type system and JPA repository management
|
||||
// in the backend. Therefore to solve this avoid to delete existing
|
||||
// attributes of this device in the previous state, but just update
|
||||
// the new ones.
|
||||
change.devices[device.id] = {};
|
||||
for (const key in device) {
|
||||
change.devices[device.id][key] = { $set: device[key] };
|
||||
}
|
||||
};
|
||||
|
||||
const updateSceneStateProps = (state) => {
|
||||
change.sceneStates[state.id] = {};
|
||||
for (const key in state) {
|
||||
|
|
Loading…
Reference in a new issue