feat: Add measurement unit resource identifier to data explorer field config (#3685)

Author: dominikriemer

streampipes-measurement-units/src/main/java/org/apache/streampipes/units/UnitProvider.java

@@ -30,6 +30,8 @@ public enum UnitProvider {
 
   INSTANCE;
 
+  private static final String RESOURCE_URI_PREFIX = "http://qudt.org/vocab/unit#";
+
   private final List<Unit> availableUnitTypes = new ArrayList<>();
   private final List<Unit> availableUnits = new ArrayList<>();
 
@@ -54,6 +56,10 @@ public Unit getUnit(String resourceUri) {
     return factory.getUnit(resourceUri);
   }
 
+  public Unit getUnitByIdentifier(String unitIdentifier) {
+    return getUnit(RESOURCE_URI_PREFIX + unitIdentifier);
+  }
+
   public List<Unit> getUnitsByType(URI type) {
     return availableUnits
         .stream()

streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/MeasurementUnitResource.java

@@ -40,9 +40,15 @@ public ResponseEntity<List<Unit>> getAllMeasurementUnits() {
     return ok(UnitProvider.INSTANCE.getAvailableUnits());
   }
 
-  @GetMapping(path = "/{measurementResourceUri}", produces = MediaType.APPLICATION_JSON_VALUE)
+  /**
+   * Returns the measurement unit information for a given unit identifier.
+   * @param unitIdentifier The identifier of the measurement unit to retrieve,
+   *                       consisting of the unit's ID without the QUDT URI prefix.
+   * @return ResponseEntity containing the Unit object if found, or an error response if not found.
+   */
+  @GetMapping(path = "/{unitIdentifier}", produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<Unit> getMeasurementUnitInfo(
-      @PathVariable("measurementResourceUri") String measurementResourceUri) {
-    return ok(UnitProvider.INSTANCE.getUnit(measurementResourceUri));
+      @PathVariable("unitIdentifier") String unitIdentifier) {
+    return ok(UnitProvider.INSTANCE.getUnitByIdentifier(unitIdentifier));
   }
 }

ui/projects/streampipes/platform-services/src/lib/apis/measurement-units.service.ts

@@ -20,7 +20,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { PlatformServicesCommons } from './commons.service';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { MeasurementUnit } from '../model/measurement-unit/MeasurementUnit';
 
 @Injectable({
     providedIn: 'root',
@@ -31,15 +31,25 @@ export class MeasurementUnitsService {
         private platformServicesCommons: PlatformServicesCommons,
     ) {}
 
-    getAllMeasurementUnits(): Observable<any> {
-        return this.http
-            .get(
-                this.platformServicesCommons.apiBasePath + '/measurement-units',
-            )
-            .pipe(
-                map(response => {
-                    return response;
-                }),
+    getAllMeasurementUnits(): Observable<MeasurementUnit[]> {
+        return this.http.get<MeasurementUnit[]>(
+            `${this.platformServicesCommons.apiBasePath}/measurement-units`,
+        );
+    }
+
+    getMeasurementUnitInfo(
+        measurementResourceUri: string,
+    ): Observable<MeasurementUnit> {
+        const unitIdentifier = measurementResourceUri.split('#').pop();
+
+        if (!unitIdentifier) {
+            throw new Error(
+                'Invalid measurementResourceUri: missing unit identifier',
             );
+        }
+
+        return this.http.get<MeasurementUnit>(
+            `${this.platformServicesCommons.apiBasePath}/measurement-units/${unitIdentifier}`,
+        );
     }
 }

ui/projects/streampipes/platform-services/src/lib/model/datalake/data-lake-query-config.model.ts

@@ -28,6 +28,7 @@ export interface DataExplorerFieldCharacteristics {
 export interface DataExplorerField {
     runtimeName: string;
     aggregation?: string;
+    measurementUnitResourceId?: string;
     measure: string;
     fullDbName: string;
     sourceIndex: number;

ui/src/app/data-explorer-shared/services/data-explorer-field-provider-service.ts

@@ -116,6 +116,9 @@ export class DataExplorerFieldProviderService {
                 semanticTypes: [property.semanticType],
             },
         };
+        if (property instanceof EventPropertyPrimitive) {
+            field.measurementUnitResourceId = property.measurementUnit;
+        }
         provider.allFields.push(field);
 
         if (field.fieldCharacteristics.numeric) {