Merge branch '84-fix-measured-quantity-in-dynamic-locations' into 'master'

Configurations: device measured quantities not selectable for dynamic locations

Closes #84

See merge request sensor-system-management/frontend!114

serializers/jsonapi/DeviceSerializer.ts

@@ -41,6 +41,7 @@ import {
   IJsonApiEntityListEnvelope,
   IJsonApiEntity,
   IJsonApiEntityWithOptionalId,
+  IJsonApiEntityWithoutDetails,
   IJsonApiEntityWithOptionalAttributes
 } from '@/serializers/jsonapi/JsonApiTypes'
 
@@ -163,6 +164,15 @@ export class DeviceSerializer {
         if (includedEntry.type === 'device') {
           const device = this.convertJsonApiDataToModel(includedEntry, []).device
           result.push(device)
+
+          // take all device_properties in the included array for this device
+          // and add them to the device
+          included.filter((includedEntry) => {
+            return includedEntry.type === 'device_property' && (includedEntry.relationships?.device?.data as IJsonApiEntityWithoutDetails)?.id === device.id
+          }).forEach((includedEntry) => {
+            const deviceProperty = this.devicePropertySerializer.convertJsonApiDataToModel(includedEntry)
+            device.properties.push(deviceProperty)
+          })
         }
       }
     }

services/sms/ConfigurationApi.ts

@@ -70,6 +70,7 @@ export class ConfigurationApi {
           'contacts',
           'configuration_platforms.platform',
           'configuration_devices.device',
+          'configuration_devices.device.device_properties',
           'src_longitude',
           'src_latitude',
           'src_elevation'