This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch STREAMPIPES-145 in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 087b609a8c8e40f47b6272a18e423234f173040d Author: Dominik Riemer <[email protected]> AuthorDate: Fri Jul 31 21:36:07 2020 +0200 [STREAMPIPES-145] Fix data sets in editor --- .../master/management/WorkerRestClient.java | 18 ++++++------------ .../model/message/DataSetModificationMessage.java | 2 ++ .../adapter-description.component.ts | 1 + .../data-marketplace/data-marketplace.component.ts | 3 --- .../data-marketplace/data-marketplace.service.ts | 1 - ui/src/app/connect/data-marketplace/filter.pipe.ts | 22 +++++++++------------- ui/src/app/core-model/gen/streampipes-model.ts | 10 +++++----- ui/src/app/editor-v2/editor.component.ts | 1 + ui/src/app/editor-v2/services/editor.service.ts | 7 ++++++- ui/src/app/editor-v2/services/jsplumb.service.ts | 8 ++++---- 10 files changed, 34 insertions(+), 39 deletions(-) diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java index 7d0c843..e60aba0 100644 --- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java +++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java @@ -23,18 +23,17 @@ import org.apache.http.client.fluent.Request; import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntity; import org.apache.http.entity.mime.content.InputStreamBody; -import org.apache.streampipes.model.connect.grounding.ProtocolDescription; -import org.apache.streampipes.model.runtime.RuntimeOptionsRequest; -import org.apache.streampipes.serializers.json.JacksonSerializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.streampipes.connect.adapter.exception.AdapterException; import org.apache.streampipes.model.connect.adapter.AdapterDescription; import org.apache.streampipes.model.connect.adapter.AdapterSetDescription; import org.apache.streampipes.model.connect.adapter.AdapterStreamDescription; +import org.apache.streampipes.model.connect.grounding.ProtocolDescription; +import org.apache.streampipes.model.runtime.RuntimeOptionsRequest; import org.apache.streampipes.model.runtime.RuntimeOptionsResponse; -import org.apache.streampipes.rest.shared.util.JsonLdUtils; +import org.apache.streampipes.serializers.json.JacksonSerializer; import org.apache.streampipes.storage.couchdb.impl.AdapterStorageImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; @@ -108,12 +107,7 @@ public class WorkerRestClient { try { logger.info("Trying to stopAdapter adpater on endpoint: " + url); - // TODO quick fix because otherwise it is not serialized to json-ld - if (ad.getUri() == null) { - logger.error("Adapter uri is null this should not happen " + ad); - } - - String adapterDescription = JsonLdUtils.toJsonLD(ad); + String adapterDescription = JacksonSerializer.getObjectMapper().writeValueAsString(ad); // TODO change this to a delete request String responseString = Request.Post(url) diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/message/DataSetModificationMessage.java b/streampipes-model/src/main/java/org/apache/streampipes/model/message/DataSetModificationMessage.java index a15180f..bf1aaeb 100644 --- a/streampipes-model/src/main/java/org/apache/streampipes/model/message/DataSetModificationMessage.java +++ b/streampipes-model/src/main/java/org/apache/streampipes/model/message/DataSetModificationMessage.java @@ -18,7 +18,9 @@ package org.apache.streampipes.model.message; import org.apache.streampipes.model.grounding.EventGrounding; +import org.apache.streampipes.model.shared.annotation.TsModel; +@TsModel public class DataSetModificationMessage extends Message { private EventGrounding eventGrounding; diff --git a/ui/src/app/connect/data-marketplace/adapter-description/adapter-description.component.ts b/ui/src/app/connect/data-marketplace/adapter-description/adapter-description.component.ts index 9faed90..ce8377c 100644 --- a/ui/src/app/connect/data-marketplace/adapter-description/adapter-description.component.ts +++ b/ui/src/app/connect/data-marketplace/adapter-description/adapter-description.component.ts @@ -50,6 +50,7 @@ export class AdapterDescriptionComponent { constructor(private connectService: ConnectService, private dataMarketplaceService: DataMarketplaceService, public dialog: MatDialog) {} ngOnInit() { + if (this.adapter.name == null) this.adapter.name = ""; this.isDataSetDescription = this.connectService.isDataSetDescription(this.adapter); this.isDataStreamDescription = this.connectService.isDataStreamDescription(this.adapter); this.isRunningAdapter = (this.adapter.couchDBId != undefined && !(this.adapter as any).isTemplate); diff --git a/ui/src/app/connect/data-marketplace/data-marketplace.component.ts b/ui/src/app/connect/data-marketplace/data-marketplace.component.ts index 2862d37..497557e 100644 --- a/ui/src/app/connect/data-marketplace/data-marketplace.component.ts +++ b/ui/src/app/connect/data-marketplace/data-marketplace.component.ts @@ -147,9 +147,6 @@ export class DataMarketplaceComponent implements OnInit { this.newAdapterFromDescription.dataSet.eventSchema = new EventSchema(); this.newAdapterFromDescription.dataSet.eventSchema["@class"] = "org.apache.streampipes.model.schema.EventSchema"; } - console.log("new adapter"); - console.log(this.newAdapterFromDescription); - this.ShepherdService.trigger("select-adapter"); } diff --git a/ui/src/app/connect/data-marketplace/data-marketplace.service.ts b/ui/src/app/connect/data-marketplace/data-marketplace.service.ts index 38cb0f5..fa62ad3 100644 --- a/ui/src/app/connect/data-marketplace/data-marketplace.service.ts +++ b/ui/src/app/connect/data-marketplace/data-marketplace.service.ts @@ -50,7 +50,6 @@ export class DataMarketplaceService { getAdapterDescriptions(): Observable<AdapterDescriptionUnion[]> { return this.requestAdapterDescriptions('/master/description/adapters').pipe(map(response => { - console.log(response); return (response as any[]).map(resp => AdapterDescription.fromDataUnion(resp)).filter(ad => this.connectService.isSpecificDescription(ad)); })); } diff --git a/ui/src/app/connect/data-marketplace/filter.pipe.ts b/ui/src/app/connect/data-marketplace/filter.pipe.ts index 8f67b70..965fc18 100644 --- a/ui/src/app/connect/data-marketplace/filter.pipe.ts +++ b/ui/src/app/connect/data-marketplace/filter.pipe.ts @@ -17,6 +17,7 @@ */ import {Pipe, PipeTransform} from '@angular/core'; +import {AdapterDescriptionUnion} from "../../core-model/gen/streampipes-model"; @Pipe({ name: 'filter' @@ -24,21 +25,16 @@ import {Pipe, PipeTransform} from '@angular/core'; export class FilterPipe implements PipeTransform { - - - transform(adapterDescription: any, filterTerm?: any): any{ + transform(adapterDescriptions: AdapterDescriptionUnion[], filterTerm?: any): any{ //check if search filterTerm is undefined - if(filterTerm == undefined || !adapterDescription) return adapterDescription; - return adapterDescription.filter(function(adapterDescription){ - adapterDescription.name.replace(' ', '_'); - if (adapterDescription.name.toLowerCase().includes(filterTerm.toLowerCase()) || adapterDescription.description.toLowerCase().includes(filterTerm.toLowerCase())) { - return true - } - else { - return false + if(filterTerm == undefined || !adapterDescriptions) return adapterDescriptions; + return adapterDescriptions.filter(adapterDescription => { + if (adapterDescription.name == null) { + return true; + } else { + adapterDescription.name.replace(' ', '_'); + return adapterDescription.name.toLowerCase().includes(filterTerm.toLowerCase()) || adapterDescription.description.toLowerCase().includes(filterTerm.toLowerCase()); } }); - } - } \ No newline at end of file diff --git a/ui/src/app/core-model/gen/streampipes-model.ts b/ui/src/app/core-model/gen/streampipes-model.ts index 414b0d7..a6e2d2d 100644 --- a/ui/src/app/core-model/gen/streampipes-model.ts +++ b/ui/src/app/core-model/gen/streampipes-model.ts @@ -19,7 +19,7 @@ /* tslint:disable */ /* eslint-disable */ // @ts-nocheck -// Generated using typescript-generator version 2.24.612 on 2020-07-27 12:58:03. +// Generated using typescript-generator version 2.24.612 on 2020-07-31 21:29:23. export class AbstractStreamPipesEntity { "@class": "org.apache.streampipes.model.base.NamedStreamPipesEntity" | "org.apache.streampipes.model.connect.adapter.AdapterDescription" | "org.apache.streampipes.model.connect.adapter.AdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.AdapterStreamDescription" | "org.apache.streampipes.model.connect.adapter.G [...] @@ -187,9 +187,9 @@ export class AdapterDescription extends NamedStreamPipesEntity { instance.config = __getCopyArrayFn(StaticProperty.fromDataUnion)(data.config); instance.rules = __getCopyArrayFn(TransformationRuleDescription.fromDataUnion)(data.rules); instance.category = __getCopyArrayFn(__identity<string>())(data.category); - instance.schemaRules = __getCopyArrayFn(__identity<any>())(data.schemaRules); instance.valueRules = __getCopyArrayFn(__identity<any>())(data.valueRules); instance.streamRules = __getCopyArrayFn(__identity<any>())(data.streamRules); + instance.schemaRules = __getCopyArrayFn(__identity<any>())(data.schemaRules); instance.couchDBId = data.couchDBId; instance._rev = data._rev; return instance; @@ -1564,8 +1564,8 @@ export class GenericAdapterSetDescription extends AdapterSetDescription implemen const instance = target || new GenericAdapterSetDescription(); super.fromData(data, instance); instance.eventSchema = EventSchema.fromData(data.eventSchema); - instance.formatDescription = FormatDescription.fromData(data.formatDescription); instance.protocolDescription = ProtocolDescription.fromData(data.protocolDescription); + instance.formatDescription = FormatDescription.fromData(data.formatDescription); return instance; } } @@ -1583,8 +1583,8 @@ export class GenericAdapterStreamDescription extends AdapterStreamDescription im const instance = target || new GenericAdapterStreamDescription(); super.fromData(data, instance); instance.eventSchema = EventSchema.fromData(data.eventSchema); - instance.formatDescription = FormatDescription.fromData(data.formatDescription); instance.protocolDescription = ProtocolDescription.fromData(data.protocolDescription); + instance.formatDescription = FormatDescription.fromData(data.formatDescription); return instance; } } @@ -2459,8 +2459,8 @@ export class SpDataSet extends SpDataStream { instance.supportedGrounding = EventGrounding.fromData(data.supportedGrounding); instance.datasetInvocationId = data.datasetInvocationId; instance.correspondingPipeline = data.correspondingPipeline; - instance.brokerHostname = data.brokerHostname; instance.actualTopicName = data.actualTopicName; + instance.brokerHostname = data.brokerHostname; return instance; } } diff --git a/ui/src/app/editor-v2/editor.component.ts b/ui/src/app/editor-v2/editor.component.ts index 6bf1604..f7a3229 100644 --- a/ui/src/app/editor-v2/editor.component.ts +++ b/ui/src/app/editor-v2/editor.component.ts @@ -115,6 +115,7 @@ export class EditorComponent implements OnInit { .filter(s => s instanceof SpDataSet) .map(s => s as SpDataSet); this.allElements = this.allElements.concat(this.availableDataStreams); + this.allElements = this.allElements.concat(this.availableDataSets); this.selectPipelineElements(1); this.afterPipelineElementLoaded(1); diff --git a/ui/src/app/editor-v2/services/editor.service.ts b/ui/src/app/editor-v2/services/editor.service.ts index 7e3cbab..c9c19b4 100644 --- a/ui/src/app/editor-v2/services/editor.service.ts +++ b/ui/src/app/editor-v2/services/editor.service.ts @@ -19,7 +19,7 @@ import {Injectable} from "@angular/core"; import {HttpClient} from "@angular/common/http"; import { - DataProcessorInvocation, DataSinkInvocation, + DataProcessorInvocation, DataSetModificationMessage, DataSinkInvocation, PipelineElementRecommendationMessage, PipelineModificationMessage, SpDataSet, SpDataStream } from "../../core-model/gen/streampipes-model"; @@ -57,6 +57,11 @@ export class EditorService { }); } + updateDataSet(dataSet): Observable<DataSetModificationMessage> { + return this.http.post(this.platformServicesCommons.authUserBasePath() +"/pipelines/update/dataset", dataSet) + .pipe(map(data => DataSetModificationMessage.fromData(data as DataSetModificationMessage))); + } + getCachedPipeline(): Observable<PipelineElementConfig[]> { return this.http.get(this.platformServicesCommons.authUserBasePath() + '/pipeline-cache') .pipe(map(result => { diff --git a/ui/src/app/editor-v2/services/jsplumb.service.ts b/ui/src/app/editor-v2/services/jsplumb.service.ts index 6dca6b6..96190da 100644 --- a/ui/src/app/editor-v2/services/jsplumb.service.ts +++ b/ui/src/app/editor-v2/services/jsplumb.service.ts @@ -27,15 +27,16 @@ import { SpDataSet, SpDataStream } from "../../core-model/gen/streampipes-model"; +import {EditorService} from "./editor.service"; @Injectable() export class JsplumbService { idCounter: any; - RestApi: any; constructor(private JsplumbConfigService: JsplumbConfigService, - private JsplumbBridge: JsplumbBridge) { + private JsplumbBridge: JsplumbBridge, + private EditorService: EditorService) { this.idCounter = 0; } @@ -204,8 +205,7 @@ export class JsplumbService { }; setDropped($newElement, json, endpoints, preview) { - this.RestApi.updateDataSet(json).then(msg => { - let data = msg.data; + this.EditorService.updateDataSet(json).subscribe(data => { json.eventGrounding = data.eventGrounding; json.datasetInvocationId = data.invocationId; this.streamDropped($newElement, json, endpoints, preview);
