- {isNotNullOrUndefined(props.temperature) && (
+ {props.valued && (
- {props.unit === 'celsius' ? 'C' : 'F'}
+
)}
- {!isNotNullOrUndefined(props.temperature) && (
+ {!props.valued && (
@@ -36,8 +38,13 @@ class RoomTemperatureBoxComponent extends Component {
this.props.getTemperatureInRoom(this.props.box, this.props.x, this.props.y);
};
+ updateRoomTemperature = payload => {
+ this.props.deviceFeatureWebsocketEvent(this.props.box, this.props.x, this.props.y, payload);
+ };
+
componentDidMount() {
this.refreshData();
+ this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STATE, this.updateRoomTemperature);
}
componentDidUpdate(previousProps) {
@@ -47,19 +54,32 @@ class RoomTemperatureBoxComponent extends Component {
}
}
+ componentWillUnmount() {
+ this.props.session.dispatcher.removeListener(WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STATE, this.updateRoomTemperature);
+ }
+
render(props, {}) {
const boxData = get(props, `${DASHBOARD_BOX_DATA_KEY}TemperatureInRoom.${props.x}_${props.y}`);
const boxStatus = get(props, `${DASHBOARD_BOX_STATUS_KEY}TemperatureInRoom.${props.x}_${props.y}`);
const temperature = get(boxData, 'room.temperature.temperature');
const unit = get(boxData, 'room.temperature.unit');
const roomName = get(boxData, 'room.name');
+ const valued = isNotNullOrUndefined(temperature);
+
return (
-
+
);
}
}
export default connect(
- 'DashboardBoxDataTemperatureInRoom,DashboardBoxStatusTemperatureInRoom',
+ 'session,DashboardBoxDataTemperatureInRoom,DashboardBoxStatusTemperatureInRoom',
actions
)(RoomTemperatureBoxComponent);
diff --git a/server/services/example/index.js b/server/services/example/index.js
index c8b18e6caa..5a23268d9b 100644
--- a/server/services/example/index.js
+++ b/server/services/example/index.js
@@ -9,6 +9,8 @@ module.exports = function ExampleService(gladys) {
const client = axios.create({
timeout: 1000,
});
+ const device = new ExampleLightHandler(gladys, client);
+
/**
* @public
* @description This function starts the ExampleService service
@@ -32,6 +34,7 @@ module.exports = function ExampleService(gladys) {
return Object.freeze({
start,
stop,
- light: new ExampleLightHandler(gladys, client),
+ light: device,
+ device,
});
};
diff --git a/server/services/example/lib/light/index.js b/server/services/example/lib/light/index.js
index 65f830748b..b03f891e33 100644
--- a/server/services/example/lib/light/index.js
+++ b/server/services/example/lib/light/index.js
@@ -1,6 +1,7 @@
const turnOn = require('./light.turnOn');
const turnOff = require('./light.turnOff');
const getState = require('./light.getState');
+const setValue = require('./light.setValue');
/**
* @description Add ability to control a light
@@ -17,5 +18,6 @@ const ExampleLightHandler = function ExampleLightHandler(gladys, client) {
ExampleLightHandler.prototype.turnOn = turnOn;
ExampleLightHandler.prototype.turnOff = turnOff;
ExampleLightHandler.prototype.getState = getState;
+ExampleLightHandler.prototype.setValue = setValue;
module.exports = ExampleLightHandler;
diff --git a/server/services/example/lib/light/light.setValue.js b/server/services/example/lib/light/light.setValue.js
new file mode 100644
index 0000000000..4c39d1b827
--- /dev/null
+++ b/server/services/example/lib/light/light.setValue.js
@@ -0,0 +1,19 @@
+/**
+ * @private
+ * @description Set the current state of a device.
+ * @param {Object} device - The device to control.
+ * @param {Object} deviceFeature - The deviceFeature to control.
+ * @param {string|number} value - The new state to set.
+ * @returns {Promise} Resolving with deviceFeature state.
+ * @example
+ * setValue(device, deviceFeature, value);
+ */
+async function setValue(device, deviceFeature, value) {
+ // Implement the way you send a new value to the real device
+ // - call HTTP API
+ // - send a message to a MQTT broker
+ // - ...
+ return value;
+}
+
+module.exports = setValue;
diff --git a/server/test/services/example/lib/setValue.test.js b/server/test/services/example/lib/setValue.test.js
new file mode 100644
index 0000000000..d93633bf47
--- /dev/null
+++ b/server/test/services/example/lib/setValue.test.js
@@ -0,0 +1,19 @@
+const { expect } = require('chai');
+
+const ExampleService = require('../../../../services/example/lib/light');
+
+const gladys = {};
+const serviceId = '264d191c-dae2-4893-bf35-3c7fee3cc262';
+
+describe('example setValue', () => {
+ let service;
+
+ beforeEach(() => {
+ service = new ExampleService(gladys, serviceId);
+ });
+
+ it('should return arg value', async () => {
+ const result = await service.setValue(null, null, 'value');
+ expect(result).to.equal('value');
+ });
+});