Refactored measurements not to be platform-specific.

src/AbstractPlatform.js

@@ -1,7 +1,12 @@
 import request from 'axios';
+import keyMirror from 'keymirror';
 
 export default class AbstractPlatform {
 
+	static Measurement = keyMirror({
+		LIGHT: null,
+	});
+
 	getDevices() {}
 	getDevice(id) {}
 	getRealtimeUpdates(channel, callback) {}

src/CumulocityPlatform.js

@@ -106,19 +106,47 @@ export default class CumulocityPlatform extends AbstractPlatform {
 				const {
 					id,
 					time,
-					type,
-					self, // eslint-disable-line
-					source, // eslint-disable-line
-					...rest,
 				} = update.data.data;
 
+				const measurement = this._getMeasurement(update);
+
+				if (measurement === null) {
+					return null;
+				}
+
 				return {
 					id,
 					time,
-					type,
-					...rest,
+					...measurement,
 				};
-			});
+			})
+			.filter((update) => update !== null);
+	}
+
+	_getMeasurement(update) {
+		const parsers = {
+			c8y_LightMeasurement: this._getLightMeasurement.bind(this),
+		};
+
+		return Object.keys(parsers).reduce((measurement, name) => {
+			if (typeof update.data.data[name] !== 'undefined') {
+				measurement = parsers[name](update); // eslint-disable-line
+			}
+
+			return measurement;
+		}, null);
+	}
+
+	_getLightMeasurement(update) {
+		const info = update.data.data.c8y_LightMeasurement.e;
+
+		return {
+			type: AbstractPlatform.Measurement.LIGHT,
+			info: {
+				value: info.value,
+				unit: info.unit,
+			},
+		};
 	}
 
 	_performRealtimeSubscription(subscription) {

views/DeviceView.js

@@ -130,10 +130,10 @@ class DeviceView extends Component {
 
 	renderCapabilityWidget(info, capability) {
 		const channel = this.getDeviceMeasurementsChannelName(this.props.params.deviceId);
-		const realtimeInfo = this.props.realtime[channel] || [];
+		const realtimeUpdates = this.props.realtime[channel] || [];
 		const capabilityProps = {
-			device: info,
-			realtimeInfo,
+			info,
+			realtimeUpdates,
 		};
 
 		switch (capability.type) {
@@ -177,6 +177,7 @@ class DeviceView extends Component {
 		const typeToBackgroundMap = {
 			c8y_Linux: '/gfx/images/Devices/computer.jpg',
 			Light: '/gfx/images/devices/light.jpg',
+			Motion: '/gfx/images/devices/motion.jpg',
 		};
 		let backgroundImage = null;
 

views/components/capabilities/LightSensorCapabilityComponent.js

@@ -3,13 +3,14 @@ import { connect } from 'react-redux';
 
 import CircularProgress from 'material-ui/CircularProgress';
 
+import AbstractPlatform from '../../../src/AbstractPlatform';
 import GaugeComponent from '../GaugeComponent';
 
 class LightSensorCapabilityComponent extends Component {
 
 	static propTypes = {
-		device: PropTypes.object.isRequired,
-		realtimeInfo: PropTypes.array.isRequired,
+		info: PropTypes.object.isRequired,
+		realtimeUpdates: PropTypes.array.isRequired,
 	};
 
 	constructor(props) {
@@ -24,10 +25,10 @@ class LightSensorCapabilityComponent extends Component {
 
 	componentWillReceiveProps(newProps) {
 		const {
-			realtimeInfo,
+			realtimeUpdates,
 		} = this.props;
 
-		const measurement = this.getRealtimeMeasurement(realtimeInfo);
+		const measurement = this.getRealtimeMeasurement(realtimeUpdates);
 
 		if (measurement !== null) {
 			this.setState({
@@ -67,19 +68,18 @@ class LightSensorCapabilityComponent extends Component {
 		);
 	}
 
-	getRealtimeMeasurement(realtimeInfo) {
-		// TODO cumulocity specific
-		const measurement = realtimeInfo.find(
-			(item) => item.type === 'c8y_LightSensor'
+	getRealtimeMeasurement(updates) {
+		const measurement = updates.find(
+			(item) => item.type === AbstractPlatform.Measurement.LIGHT
 		) || null;
 
 		if (!measurement) {
 			return null;
 		}
 
 		return {
-			value: measurement.c8y_LightMeasurement.e.value,
-			unit: measurement.c8y_LightMeasurement.e.unit,
+			value: measurement.info.value,
+			unit: measurement.info.unit,
 		};
 	}