Add related assets to adapter during adapter generation process

streampipes-data-explorer-api/src/main/java/org/apache/streampipes/dataexplorer/api/IDataExplorerSchemaManagement.java

@@ -21,13 +21,16 @@
 import org.apache.streampipes.model.datalake.DataLakeMeasure;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface IDataExplorerSchemaManagement {
 
   List<DataLakeMeasure> getAllMeasurements();
 
   DataLakeMeasure getById(String elementId);
 
+  Optional<DataLakeMeasure> getExistingMeasureByName(String measureName);
+
   DataLakeMeasure createOrUpdateMeasurement(DataLakeMeasure measure);
 
   void deleteMeasurement(String elementId);

streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java

@@ -51,7 +51,8 @@ public DataLakeMeasure getById(String elementId) {
   }
 
   /**
-   * For new measurements an entry is generated in the database. For existing measurements the schema is updated
+   * For new measurements an entry is generated in the database. For existing
+   * measurements the schema is updated
    * according to the update strategy defined by the measurement.
    */
   @Override
@@ -75,28 +76,28 @@ public DataLakeMeasure createOrUpdateMeasurement(DataLakeMeasure measure) {
    */
   private void handleExistingMeasurement(
       DataLakeMeasure measure,
-      DataLakeMeasure existingMeasure
-  ) {
+      DataLakeMeasure existingMeasure) {
     measure.setElementId(existingMeasure.getElementId());
     if (DataLakeMeasureSchemaUpdateStrategy.UPDATE_SCHEMA.equals(measure.getSchemaUpdateStrategy())) {
       // For the update schema strategy the old schema is overwritten with the new one
       updateMeasurement(measure);
     } else {
-      // For the extent existing schema strategy the old schema is merged with the new one
+      // For the extent existing schema strategy the old schema is merged with the new
+      // one
       unifyEventSchemaAndUpdateMeasure(measure, existingMeasure);
     }
   }
 
-
   /**
    * Returns the existing measure that has the provided measure name
    */
-  private Optional<DataLakeMeasure> getExistingMeasureByName(String measureName) {
+  @Override
+  public Optional<DataLakeMeasure> getExistingMeasureByName(String measureName) {
     return dataLakeStorage.findAll()
-                          .stream()
-                          .filter(m -> m.getMeasureName()
-                                        .equals(measureName))
-                          .findFirst();
+        .stream()
+        .filter(m -> m.getMeasureName()
+            .equals(measureName))
+        .findFirst();
   }
 
   private static void setDefaultUpdateStrategyIfNoneProvided(DataLakeMeasure measure) {
@@ -117,16 +118,15 @@ public void deleteMeasurement(String elementId) {
   @Override
   public boolean deleteMeasurementByName(String measureName) {
     var measureToDeleteOpt = dataLakeStorage.findAll()
-                                            .stream()
-                                            .filter(measurement -> measurement.getMeasureName()
-                                                                               .equals(measureName))
-                                            .findFirst();
+        .stream()
+        .filter(measurement -> measurement.getMeasureName()
+            .equals(measureName))
+        .findFirst();
 
     return measureToDeleteOpt.map(measure -> {
       dataLakeStorage.deleteElementById(measure.getElementId());
       return true;
-    }
-    ).orElse(false);
+    }).orElse(false);
   }
 
   @Override
@@ -146,16 +146,15 @@ private void setSchemaVersionAndStoreMeasurement(DataLakeMeasure measure) {
   }
 
   /**
-   * First the event schemas of the measurements are merged and then the measure is updated in the database
+   * First the event schemas of the measurements are merged and then the measure
+   * is updated in the database
    */
   private void unifyEventSchemaAndUpdateMeasure(
       DataLakeMeasure measure,
-      DataLakeMeasure existingMeasure
-  ) {
+      DataLakeMeasure existingMeasure) {
     var properties = getUnifiedEventProperties(
         existingMeasure,
-        measure
-    );
+        measure);
 
     measure
         .getEventSchema()
@@ -170,26 +169,23 @@ private void unifyEventSchemaAndUpdateMeasure(
    */
   private List<EventProperty> getUnifiedEventProperties(
       DataLakeMeasure measure1,
-      DataLakeMeasure measure2
-  ) {
-// Combine the event properties from both measures into a single Stream
+      DataLakeMeasure measure2) {
+    // Combine the event properties from both measures into a single Stream
     var allMeasurementProperties = Stream.concat(
         measure1.getEventSchema()
-                .getEventProperties()
-                .stream(),
+            .getEventProperties()
+            .stream(),
         measure2.getEventSchema()
-                .getEventProperties()
-                .stream()
-    );
+            .getEventProperties()
+            .stream());
 
     // Filter event properties by removing duplicate runtime names
     // If there are duplicate keys, choose the first occurrence
     var unifiedEventProperties = allMeasurementProperties
         .collect(Collectors.toMap(
             EventProperty::getRuntimeName,
             Function.identity(),
-            (eventProperty, eventProperty2) -> eventProperty
-        ))
+            (eventProperty, eventProperty2) -> eventProperty))
         .values();
     return new ArrayList<>(unifiedEventProperties);
   }

streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeMeasureResource.java

@@ -49,42 +49,33 @@ public class DataLakeMeasureResource extends AbstractAuthGuardedRestResource {
 
   public DataLakeMeasureResource() {
     this.dataLakeMeasureManagement = new DataExplorerDispatcher().getDataExplorerManager()
-                                                                 .getSchemaManagement();
+        .getSchemaManagement();
   }
 
-  @PostMapping(
-      produces = MediaType.APPLICATION_JSON_VALUE,
-      consumes = MediaType.APPLICATION_JSON_VALUE
-  )
+  @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<DataLakeMeasure> addDataLake(@RequestBody DataLakeMeasure dataLakeMeasure) {
     DataLakeMeasure result = this.dataLakeMeasureManagement.createOrUpdateMeasurement(dataLakeMeasure);
     return ok(result);
   }
 
   /**
-   * Handles HTTP GET requests to retrieve the entry counts of specified measurements.
+   * Handles HTTP GET requests to retrieve the entry counts of specified
+   * measurements.
    *
    * @param measurementNames A list of measurement names to return the count.
-   * @return A ResponseEntity containing a map of measurement names and their corresponding entry counts.
+   * @return A ResponseEntity containing a map of measurement names and their
+   *         corresponding entry counts.
    */
-  @Operation(
-      summary = "Retrieve measurement counts",
-      description = "Retrieves the entry counts for the specified measurements from the data lake.")
-  @GetMapping(
-      path = "/count",
-      produces = MediaType.APPLICATION_JSON_VALUE)
+  @Operation(summary = "Retrieve measurement counts", description = "Retrieves the entry counts for the specified measurements from the data lake.")
+  @GetMapping(path = "/count", produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<Map<String, Integer>> getEntryCountsOfMeasurments(
-      @Parameter(description = "A list of measurement names to return the count.")
-      @RequestParam(value = "measurementNames")
-      List<String> measurementNames
-  ) {
+      @Parameter(description = "A list of measurement names to return the count.") @RequestParam(value = "measurementNames") List<String> measurementNames) {
     var allMeasurements = this.dataLakeMeasureManagement.getAllMeasurements();
     var result = new DataExplorerDispatcher()
         .getDataExplorerManager()
         .getMeasurementCounter(
             allMeasurements,
-            measurementNames
-        )
+            measurementNames)
         .countMeasurementSizes();
     return ok(result);
   }
@@ -99,11 +90,20 @@ public ResponseEntity<?> getDataLakeMeasure(@PathVariable("id") String elementId
     }
   }
 
+  @GetMapping(path = "byName/{measureName}", produces = MediaType.APPLICATION_JSON_VALUE)
+  public ResponseEntity<?> getDataLakeMeasureName(@PathVariable("measureName") String measureName) {
+    var measure = this.dataLakeMeasureManagement.getExistingMeasureByName(measureName);
+    if (Objects.nonNull(measure)) {
+      return ok(measure);
+    } else {
+      return notFound();
+    }
+  }
+
   @PutMapping(path = "{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<?> updateDataLakeMeasure(
       @PathVariable("id") String elementId,
-      @RequestBody DataLakeMeasure measure
-  ) {
+      @RequestBody DataLakeMeasure measure) {
     if (elementId.equals(measure.getElementId())) {
       try {
         this.dataLakeMeasureManagement.updateMeasurement(measure);
@@ -115,7 +115,6 @@ public ResponseEntity<?> updateDataLakeMeasure(
     return badRequest();
   }
 
-
   @DeleteMapping(path = "{id}", produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<?> deleteDataLakeMeasure(@PathVariable("id") String elementId) {
     try {

ui/deployment/i18n/en.json

@@ -414,5 +414,10 @@
   "Error Details": null,
   "Resources": null,
   "All {{allResourcesAlias}}": "All {{allResourcesAlias}}",
-  "{{ widgetTitle }} Clone": "{{ widgetTitle }} Clone"
+  "{{ widgetTitle }} Clone": "{{ widgetTitle }} Clone",
+  "Your {{assetTypes}} were successfully added to {{assetIds}}.": "Your {{assetTypes}} were successfully added to {{assetIds}}.",
+  "Your {{assetTypes}} were successfully deleted from {{assetIds}}.": "Your {{assetTypes}} were successfully deleted from {{assetIds}}.",
+  "Starting adapter {{adapterName}}": "Starting adapter {{adapterName}}",
+  "Creating adapter {{adapterName}}": "Creating adapter {{adapterName}}",
+  "Updating adapter {{adapterName}}": "Updating adapter {{adapterName}}"
 }

ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts

@@ -75,6 +75,12 @@ export class DatalakeRestService {
             .pipe(map(res => res as DataLakeMeasure));
     }
 
+    getMeasurementByName(name: String): Observable<DataLakeMeasure> {
+        return this.http
+            .get(`${this.dataLakeMeasureUrl}/byName/${name}`)
+            .pipe(map(res => res as DataLakeMeasure));
+    }
+
     performMultiQuery(
         queryParams: DatalakeQueryParameters[],
     ): Observable<SpQueryResult[]> {

ui/projects/streampipes/platform-services/src/lib/model/assets/asset.model.ts

@@ -43,6 +43,14 @@ export interface AssetLink {
     navigationActive: boolean;
 }
 
+export interface LinkageData {
+    //Data Model to extract AssetLinks from the UI
+    name: string;
+    id: string;
+    type: string;
+    selected?: boolean | null;
+}
+
 export interface Isa95TypeDesc {
     label: string;
     type: Isa95Type;
@@ -94,6 +102,14 @@ export interface SpAssetModel extends SpAsset {
     removable: boolean;
 }
 
+export interface SpAssetTreeNode {
+    assetId: string;
+    assetName: string;
+    assets?: SpAssetTreeNode[];
+    spAssetModelId: string;
+    flattenPath: any[];
+}
+
 export type Isa95Type =
     | 'PROCESS_CELL'
     | 'PRODUCTION_UNIT'

ui/src/app/connect/components/adapter-configuration/adapter-asset-configuration/adapter-asset-configuration.component.html

@@ -0,0 +1,72 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+<div *ngIf="assetsData?.length">
+    <mat-tree
+        [dataSource]="dataSource"
+        [treeControl]="treeControl"
+        class="asset-tree"
+    >
+        <!-- Parent Node Definition -->
+        <mat-nested-tree-node *matTreeNodeDef="let node; when: hasChild">
+            <div
+                class="mat-tree-node"
+                (click)="onAssetSelect(node)"
+                [class.selected-node]="isSelected(node)"
+            >
+                <button
+                    mat-icon-button
+                    matTreeNodeToggle
+                    [attr.aria-label]="'Toggle ' + node.assetName"
+                >
+                    <mat-icon>{{
+                        treeControl.isExpanded(node)
+                            ? 'expand_more'
+                            : 'chevron_right'
+                    }}</mat-icon>
+                </button>
+                <span>{{ node.assetName }}</span>
+            </div>
+            <div *ngIf="treeControl.isExpanded(node)" role="group">
+                <ng-container matTreeNodeOutlet></ng-container>
+            </div>
+        </mat-nested-tree-node>
+
+        <!-- Leaf Node Definition (no children) -->
+        <mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle>
+            <div
+                class="mat-tree-node"
+                (click)="onAssetSelect(node)"
+                [class.selected-node]="isSelected(node)"
+            >
+                <button
+                    mat-icon-button
+                    matTreeNodeToggle
+                    [attr.aria-label]="'Toggle ' + node.assetName"
+                >
+                    <mat-icon></mat-icon>
+                </button>
+                <span>{{ node.assetName }}</span>
+            </div>
+        </mat-tree-node>
+    </mat-tree>
+</div>
+
+<!-- If no assets available -->
+<div *ngIf="!assetsData?.length">
+    <p>No assets available</p>
+</div>