This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch
1960-better-support-modification-of-existing-adapters
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/1960-better-support-modification-of-existing-adapters by this push:
new 943e406be feat(#1960): Allow modification of adapters with pipelines
943e406be is described below
commit 943e406be0e9122eb0f93f19edb616bfb7577948
Author: Dominik Riemer <[email protected]>
AuthorDate: Fri Sep 29 12:52:59 2023 +0200
feat(#1960): Allow modification of adapters with pipelines
---
.../management/AdapterMasterManagement.java | 19 --
.../management/AdapterUpdateManagement.java | 208 +++++++++++++++++++++
.../dataexplorer/commons/TimeSeriesStore.java | 2 +-
.../dataexplorer/DataExplorerSchemaManagement.java | 4 +
.../model/connect/adapter/PipelineUpdateInfo.java | 80 ++++++++
.../streampipes/model/pipeline/Pipeline.java | 11 ++
.../matching/PipelineModificationGenerator.java | 21 ++-
.../matching/PipelineVerificationHandlerV2.java | 59 ++++--
.../mapping/MappingPropertyCalculator.java | 12 +-
.../matching/v2/pipeline/ApplyGroundingStep.java | 15 +-
.../v2/pipeline/CheckCompletedVisitor.java | 24 ++-
.../manager/matching/v2/pipeline/PrepareStep.java | 2 +-
.../manager/pipeline/PipelineManager.java | 8 +-
.../manager/recommender/ElementRecommender.java | 3 +-
.../streampipes/rest/impl/PipelineResource.java | 1 +
.../rest/impl/connect/AdapterResource.java | 22 ++-
.../src/lib/apis/adapter.service.ts | 23 ++-
.../src/lib/model/gen/streampipes-model.ts | 51 +++--
.../adapter-configuration.component.ts | 2 +-
.../adapter-options-panel.component.html | 15 +-
.../adapter-options-panel.component.scss | 3 +-
.../start-adapter-configuration.component.html | 4 +-
.../start-adapter-configuration.component.ts | 2 +-
.../existing-adapters.component.html | 1 -
.../existing-adapters.component.ts | 34 ++--
.../adapter-started-dialog.component.html | 66 ++++++-
.../adapter-started-dialog.component.scss | 8 +
.../adapter-started-dialog.component.ts | 39 +++-
.../static-mapping-unary.component.ts | 1 -
.../pipeline-assembly.component.ts | 4 +
.../components/pipeline/pipeline.component.ts | 23 ++-
.../editor/services/pipeline-validation.service.ts | 29 ++-
.../pipeline-overview.component.html | 58 ++++--
.../pipeline-overview.component.scss | 12 +-
ui/src/app/pipelines/pipelines.component.ts | 1 -
35 files changed, 696 insertions(+), 171 deletions(-)
diff --git
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterMasterManagement.java
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterMasterManagement.java
index 3debbb8d5..c8d16e4d3 100644
---
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterMasterManagement.java
+++
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterMasterManagement.java
@@ -91,15 +91,7 @@ public class AdapterMasterManagement {
return ad.getElementId();
}
- public void updateAdapter(AdapterDescription ad,
- String principalSid)
- throws AdapterException {
- // update adapter in database
- this.adapterResourceManager.encryptAndUpdate(ad);
- // update data source in database
- this.updateDataSource(ad);
- }
public AdapterDescription getAdapter(String elementId) throws
AdapterException {
List<AdapterDescription> allAdapters =
adapterInstanceStorage.getAllAdapters();
@@ -180,16 +172,6 @@ public class AdapterMasterManagement {
}
}
- private void updateDataSource(AdapterDescription ad) {
- // get data source
- SpDataStream dataStream =
this.dataStreamResourceManager.find(ad.getCorrespondingDataStreamElementId());
-
- SourcesManagement.updateDataStream(ad, dataStream);
-
- // Update data source in database
- this.dataStreamResourceManager.update(dataStream);
- }
-
private void installDataSource(SpDataStream stream,
String principalSid,
boolean publicElement) throws
AdapterException {
@@ -204,5 +186,4 @@ public class AdapterMasterManagement {
private IAdapterStorage getAdapterInstanceStorage() {
return new AdapterInstanceStorageImpl();
}
-
}
diff --git
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterUpdateManagement.java
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterUpdateManagement.java
new file mode 100644
index 000000000..0b2b38a6e
--- /dev/null
+++
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterUpdateManagement.java
@@ -0,0 +1,208 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.streampipes.connect.management.management;
+
+import org.apache.streampipes.commons.exceptions.connect.AdapterException;
+import org.apache.streampipes.manager.matching.PipelineVerificationHandlerV2;
+import org.apache.streampipes.manager.operations.Operations;
+import org.apache.streampipes.manager.pipeline.PipelineManager;
+import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.base.NamedStreamPipesEntity;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.model.connect.adapter.PipelineUpdateInfo;
+import org.apache.streampipes.model.message.PipelineModificationMessage;
+import org.apache.streampipes.model.pipeline.Pipeline;
+import org.apache.streampipes.model.pipeline.PipelineElementValidationInfo;
+import org.apache.streampipes.model.pipeline.PipelineHealthStatus;
+import org.apache.streampipes.resource.management.AdapterResourceManager;
+import org.apache.streampipes.resource.management.DataStreamResourceManager;
+import org.apache.streampipes.resource.management.SpResourceManager;
+import org.apache.streampipes.storage.management.StorageDispatcher;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+public class AdapterUpdateManagement {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(AdapterUpdateManagement.class);
+
+ private final AdapterMasterManagement adapterMasterManagement;
+ private final AdapterResourceManager adapterResourceManager;
+ private final DataStreamResourceManager dataStreamResourceManager;
+
+ public AdapterUpdateManagement(AdapterMasterManagement
adapterMasterManagement) {
+ this.adapterMasterManagement = adapterMasterManagement;
+ this.adapterResourceManager = new SpResourceManager().manageAdapters();
+ this.dataStreamResourceManager = new
SpResourceManager().manageDataStreams();
+ }
+
+ public void updateAdapter(AdapterDescription ad)
+ throws AdapterException {
+ // update adapter in database
+ this.adapterResourceManager.encryptAndUpdate(ad);
+ boolean shouldRestart = ad.isRunning();
+
+ if (ad.isRunning()) {
+ this.adapterMasterManagement.stopStreamAdapter(ad.getElementId());
+ }
+
+ // update data source in database
+ this.updateDataSource(ad);
+
+ // update pipelines
+ var affectedPipelines =
PipelineManager.getPipelinesContainingElements(ad.getCorrespondingDataStreamElementId());
+
+ affectedPipelines.forEach(p -> {
+ var shouldRestartPipeline = p.isRunning();
+ if (shouldRestartPipeline) {
+ Operations.stopPipeline(p, true);
+ }
+ var storedPipeline = PipelineManager.getPipeline(p.getPipelineId());
+ var pipeline = applyUpdatedDataStream(storedPipeline, ad);
+ try {
+ var modificationMessage = Operations.validatePipeline(pipeline);
+ var updateInfo = makeUpdateInfo(modificationMessage, pipeline);
+ var modifiedPipeline = new
PipelineVerificationHandlerV2(pipeline).makeModifiedPipeline();
+ var canAutoMigrate = canAutoMigrate(modificationMessage);
+ if (!canAutoMigrate) {
+
modifiedPipeline.setHealthStatus(PipelineHealthStatus.REQUIRES_ATTENTION);
+
modifiedPipeline.setPipelineNotifications(toNotification(updateInfo));
+ modifiedPipeline.setValid(false);
+ }
+
StorageDispatcher.INSTANCE.getNoSqlStore().getPipelineStorageAPI().updatePipeline(modifiedPipeline);
+ if (shouldRestartPipeline && canAutoMigrate) {
+
Operations.startPipeline(PipelineManager.getPipeline(p.getPipelineId()));
+ }
+ } catch (Exception e) {
+ LOG.error("Could not update pipeline {}", pipeline.getName(), e);
+ }
+ });
+
+ if (shouldRestart) {
+ this.adapterMasterManagement.startStreamAdapter(ad.getElementId());
+ }
+ }
+
+ public List<PipelineUpdateInfo> checkPipelineMigrations(AdapterDescription
adapterDescription) {
+ var affectedPipelines = PipelineManager
+
.getPipelinesContainingElements(adapterDescription.getCorrespondingDataStreamElementId());
+ var updateInfos = new ArrayList<PipelineUpdateInfo>();
+
+ affectedPipelines.forEach(pipeline -> {
+ var updatedPipeline = applyUpdatedDataStream(pipeline,
adapterDescription);
+ try {
+ var modificationMessage = Operations.validatePipeline(updatedPipeline);
+ var updateInfo = makeUpdateInfo(modificationMessage, updatedPipeline);
+ updateInfos.add(updateInfo);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+
+ return updateInfos;
+ }
+
+ private PipelineUpdateInfo makeUpdateInfo(PipelineModificationMessage
modificationMessage,
+ Pipeline pipeline) {
+ var updateInfo = new PipelineUpdateInfo();
+ updateInfo.setPipelineId(pipeline.getPipelineId());
+ updateInfo.setPipelineName(pipeline.getName());
+ updateInfo.setCanAutoMigrate(canAutoMigrate(modificationMessage));
+ updateInfo.setValidationInfos(extractModificationWarnings(pipeline,
modificationMessage));
+ return updateInfo;
+ }
+
+ private boolean canAutoMigrate(PipelineModificationMessage
modificationMessage) {
+ return modificationMessage
+ .getPipelineModifications()
+ .stream()
+ .allMatch(m -> m.isPipelineElementValid() &&
m.getValidationInfos().isEmpty());
+ }
+
+ private List<String> toNotification(PipelineUpdateInfo updateInfo) {
+ var notifications = new ArrayList<String>();
+ updateInfo.getValidationInfos().keySet().forEach((k) -> {
+ var msg = updateInfo
+ .getValidationInfos()
+ .get(k)
+ .stream()
+ .map(PipelineElementValidationInfo::getMessage)
+ .toList()
+ .toString();
+ notifications.add(String.format("Adapter modification: %s: %s", k, msg));
+ });
+ return notifications;
+ }
+
+ private Map<String, List<PipelineElementValidationInfo>>
extractModificationWarnings(
+ Pipeline pipeline,
+ PipelineModificationMessage modificationMessage) {
+ var infos = new HashMap<String, List<PipelineElementValidationInfo>>();
+ modificationMessage
+ .getPipelineModifications()
+ .stream()
+ .filter(v -> !v.getValidationInfos().isEmpty())
+ .forEach(m -> infos.put(getPipelineElementName(pipeline,
m.getElementId()), m.getValidationInfos()));
+
+ return infos;
+ }
+
+ private String getPipelineElementName(Pipeline pipeline,
+ String elementId) {
+ return Stream
+ .concat(pipeline.getSepas().stream(), pipeline.getActions().stream())
+ .filter(p -> p.getElementId().equals(elementId))
+ .findFirst()
+ .map(NamedStreamPipesEntity::getName)
+ .orElse(elementId);
+ }
+
+ private Pipeline applyUpdatedDataStream(Pipeline originalPipeline,
+ AdapterDescription updatedAdapter) {
+ var updatedStreams = originalPipeline
+ .getStreams()
+ .stream()
+ .peek(s -> {
+ if
(s.getElementId().equals(updatedAdapter.getCorrespondingDataStreamElementId()))
{
+ s.setEventSchema(updatedAdapter.getEventSchema());
+ }
+ })
+ .toList();
+
+ originalPipeline.setStreams(updatedStreams);
+
+ return originalPipeline;
+ }
+
+ private void updateDataSource(AdapterDescription ad) {
+ // get data source
+ SpDataStream dataStream =
this.dataStreamResourceManager.find(ad.getCorrespondingDataStreamElementId());
+
+ SourcesManagement.updateDataStream(ad, dataStream);
+
+ // Update data source in database
+ this.dataStreamResourceManager.update(dataStream);
+ }
+}
diff --git
a/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/TimeSeriesStore.java
b/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/TimeSeriesStore.java
index 99ab51281..5b063fff7 100644
---
a/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/TimeSeriesStore.java
+++
b/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/TimeSeriesStore.java
@@ -43,7 +43,7 @@ public class TimeSeriesStore {
DataLakeMeasure measure,
boolean enableImageStore) {
- measure = DataExplorerUtils.sanitizeAndRegisterAtDataLake(client, measure);
+ DataExplorerUtils.sanitizeAndRegisterAtDataLake(client, measure);
if (enableImageStore) {
// TODO check if event properties are replaces correctly
diff --git
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java
index f28cf6cbd..8c4dc4a34 100644
---
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java
+++
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java
@@ -60,6 +60,10 @@ public class DataExplorerSchemaManagement implements
IDataExplorerSchemaManageme
DataLakeMeasure oldEntry = optional.get();
if
(!compareEventProperties(oldEntry.getEventSchema().getEventProperties(),
measure.getEventSchema().getEventProperties())) {
+ oldEntry.setEventSchema(measure.getEventSchema());
+ oldEntry.setTimestampField(measure.getTimestampField());
+ oldEntry.setPipelineName(measure.getPipelineName());
+ getDataLakeStorage().updateDataLakeMeasure(oldEntry);
return oldEntry;
}
} else {
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/PipelineUpdateInfo.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/PipelineUpdateInfo.java
new file mode 100644
index 000000000..0d9f79f47
--- /dev/null
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/PipelineUpdateInfo.java
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.streampipes.model.connect.adapter;
+
+import org.apache.streampipes.model.pipeline.PipelineElementValidationInfo;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@TsModel
+public class PipelineUpdateInfo {
+
+ private String pipelineId;
+ private String pipelineName;
+ private boolean canAutoMigrate;
+ private String migrationInfo;
+ private Map<String, List<PipelineElementValidationInfo>> validationInfos;
+
+ public PipelineUpdateInfo() {
+ this.validationInfos = new HashMap<>();
+ }
+
+ public String getPipelineId() {
+ return pipelineId;
+ }
+
+ public void setPipelineId(String pipelineId) {
+ this.pipelineId = pipelineId;
+ }
+
+ public String getPipelineName() {
+ return pipelineName;
+ }
+
+ public void setPipelineName(String pipelineName) {
+ this.pipelineName = pipelineName;
+ }
+
+ public boolean isCanAutoMigrate() {
+ return canAutoMigrate;
+ }
+
+ public void setCanAutoMigrate(boolean canAutoMigrate) {
+ this.canAutoMigrate = canAutoMigrate;
+ }
+
+ public String getMigrationInfo() {
+ return migrationInfo;
+ }
+
+ public void setMigrationInfo(String migrationInfo) {
+ this.migrationInfo = migrationInfo;
+ }
+
+ public Map<String, List<PipelineElementValidationInfo>> getValidationInfos()
{
+ return validationInfos;
+ }
+
+ public void setValidationInfos(Map<String,
List<PipelineElementValidationInfo>> validationInfos) {
+ this.validationInfos = validationInfos;
+ }
+}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/Pipeline.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/Pipeline.java
index a8f4be5f5..7055ca29a 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/Pipeline.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/Pipeline.java
@@ -34,6 +34,7 @@ public class Pipeline extends ElementComposition {
private boolean running;
private boolean restartOnSystemReboot;
+ private boolean valid = true;
private long startedAt;
private long createdAt;
@@ -159,6 +160,14 @@ public class Pipeline extends ElementComposition {
this.healthStatus = healthStatus;
}
+ public boolean isValid() {
+ return valid;
+ }
+
+ public void setValid(boolean valid) {
+ this.valid = valid;
+ }
+
public Pipeline clone() {
Pipeline pipeline = new Pipeline();
pipeline.setName(name);
@@ -173,6 +182,8 @@ public class Pipeline extends ElementComposition {
pipeline.setHealthStatus(healthStatus);
pipeline.setPipelineNotifications(pipelineNotifications);
pipeline.setRev(rev);
+ pipeline.setValid(valid);
+
return pipeline;
}
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/PipelineModificationGenerator.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/PipelineModificationGenerator.java
index 3969c159b..cbfa7ecfa 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/PipelineModificationGenerator.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/PipelineModificationGenerator.java
@@ -27,6 +27,7 @@ import
org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.client.matching.MatchingResultMessage;
import org.apache.streampipes.model.graph.DataProcessorInvocation;
+import org.apache.streampipes.model.message.EdgeValidationStatusType;
import org.apache.streampipes.model.message.Notification;
import org.apache.streampipes.model.message.PipelineEdgeValidation;
import org.apache.streampipes.model.message.PipelineModificationMessage;
@@ -34,6 +35,7 @@ import
org.apache.streampipes.model.pipeline.PipelineElementValidationInfo;
import org.apache.streampipes.model.pipeline.PipelineModification;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -70,6 +72,11 @@ public class PipelineModificationGenerator {
List<PipelineEdgeValidation> edgesWithoutConnectedStream =
collectEdgesWithoutStream(modifications);
edgeValidations.addAll(edgesWithoutConnectedStream);
message.setEdgeValidations(edgeValidations);
+ message.setPipelineValid(
+ edgeValidations
+ .stream()
+ .allMatch(e -> e.getStatus().getValidationStatusType() ==
EdgeValidationStatusType.COMPLETE)
+ &&
message.getPipelineModifications().stream().allMatch(PipelineModification::isPipelineElementValid));
return message;
}
@@ -90,13 +97,13 @@ public class PipelineModificationGenerator {
modification.setElementId(t.getElementId());
try {
pipelineValidator.apply(source, t, targets, validationInfos);
- buildModification(modification, t);
+ buildModification(modification, t, t.getInputStreams(), true);
edgeValidations.put(makeKey(source, t),
PipelineEdgeValidation.complete(source.getDom(), t.getDom()));
} catch (SpValidationException e) {
- //e.getErrorLog().forEach(log ->
validationInfos.add(PipelineElementValidationInfo.error(log.toString())));
+ e.getErrorLog().forEach(log ->
validationInfos.add(PipelineElementValidationInfo.error(log.toString())));
edgeValidations.put(makeKey(source, t),
PipelineEdgeValidation.invalid(source.getDom(), t.getDom(),
toNotifications(e.getErrorLog())));
- modification.setPipelineElementValid(false);
+ buildModification(modification, t, Collections.emptyList(), false);
}
modification.setValidationInfos(validationInfos);
this.pipelineModifications.put(t.getDom(), modification);
@@ -115,14 +122,16 @@ public class PipelineModificationGenerator {
}
private void buildModification(PipelineModification modification,
- InvocableStreamPipesEntity t) {
+ InvocableStreamPipesEntity t,
+ List<SpDataStream> inputStreams,
+ boolean valid) {
if (t instanceof DataProcessorInvocation) {
modification.setOutputStrategies(((DataProcessorInvocation)
t).getOutputStrategies());
modification.setOutputStream(((DataProcessorInvocation)
t).getOutputStream());
}
- modification.setInputStreams(t.getInputStreams());
+ modification.setInputStreams(inputStreams);
modification.setStaticProperties(t.getStaticProperties());
- modification.setPipelineElementValid(true);
+ modification.setPipelineElementValid(valid);
}
private Set<InvocableStreamPipesEntity>
getConnections(NamedStreamPipesEntity source) {
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/PipelineVerificationHandlerV2.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/PipelineVerificationHandlerV2.java
index 0775550c7..ac3bed955 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/PipelineVerificationHandlerV2.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/PipelineVerificationHandlerV2.java
@@ -23,6 +23,7 @@ import
org.apache.streampipes.manager.recommender.AllElementsProvider;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.graph.DataProcessorInvocation;
+import org.apache.streampipes.model.graph.DataSinkInvocation;
import org.apache.streampipes.model.grounding.EventGrounding;
import org.apache.streampipes.model.message.PipelineModificationMessage;
import org.apache.streampipes.model.pipeline.Pipeline;
@@ -46,27 +47,34 @@ public class PipelineVerificationHandlerV2 {
return new
PipelineModificationGenerator(graph).buildPipelineModificationMessage();
}
+ public Pipeline makeModifiedPipeline() {
+ var allElements = verifyAndBuildGraphs(false);
+ pipeline.setSepas(filterAndConvert(allElements,
DataProcessorInvocation.class));
+ pipeline.setActions(filterAndConvert(allElements,
DataSinkInvocation.class));
+ return pipeline;
+ }
+
+ private <T extends InvocableStreamPipesEntity> List<T>
filterAndConvert(List<NamedStreamPipesEntity> elements,
+
Class<T> clazz) {
+ return elements
+ .stream()
+ .filter(clazz::isInstance)
+ .map(clazz::cast)
+ .toList();
+ }
+
public List<NamedStreamPipesEntity> verifyAndBuildGraphs(boolean
ignoreUnconfigured) {
- List<PipelineModification> pipelineModifications =
verifyPipeline().getPipelineModifications();
- List<NamedStreamPipesEntity> allElements = new
AllElementsProvider(pipeline).getAllElements();
- List<NamedStreamPipesEntity> result = new ArrayList<>();
+ var pipelineModifications = verifyPipeline().getPipelineModifications();
+ var allElements = new AllElementsProvider(pipeline).getAllElements();
+ var result = new ArrayList<NamedStreamPipesEntity>();
allElements.forEach(pipelineElement -> {
- Optional<PipelineModification> modificationOpt =
getModification(pipelineElement.getDom(), pipelineModifications);
+ var modificationOpt = getModification(pipelineElement.getDom(),
pipelineModifications);
if (modificationOpt.isPresent()) {
PipelineModification modification = modificationOpt.get();
if (pipelineElement instanceof InvocableStreamPipesEntity) {
- ((InvocableStreamPipesEntity)
pipelineElement).setInputStreams(modification.getInputStreams());
- ((InvocableStreamPipesEntity)
pipelineElement).setStaticProperties(modification.getStaticProperties());
+ applyModificationsForInvocable((InvocableStreamPipesEntity)
pipelineElement, modification);
if (pipelineElement instanceof DataProcessorInvocation) {
- ((DataProcessorInvocation)
pipelineElement).setOutputStream(modification.getOutputStream());
- if (((DataProcessorInvocation)
pipelineElement).getOutputStream().getEventGrounding() == null) {
- EventGrounding grounding =
- new GroundingBuilder(pipelineElement,
Collections.emptySet()).getEventGrounding();
- ((DataProcessorInvocation)
pipelineElement).getOutputStream().setEventGrounding(grounding);
- }
- if (modification.getOutputStrategies() != null) {
- ((DataProcessorInvocation)
pipelineElement).setOutputStrategies(modification.getOutputStrategies());
- }
+ applyModificationsForDataProcessor((DataProcessorInvocation)
pipelineElement, modification);
}
}
if (!ignoreUnconfigured || modification.isPipelineElementValid()) {
@@ -80,6 +88,27 @@ public class PipelineVerificationHandlerV2 {
return result;
}
+ private void applyModificationsForDataProcessor(DataProcessorInvocation
pipelineElement,
+ PipelineModification
modification) {
+ if (modification.getOutputStream() != null) {
+ pipelineElement.setOutputStream(modification.getOutputStream());
+ if (pipelineElement.getOutputStream().getEventGrounding() == null) {
+ EventGrounding grounding =
+ new GroundingBuilder(pipelineElement,
Collections.emptySet()).getEventGrounding();
+ pipelineElement.getOutputStream().setEventGrounding(grounding);
+ }
+ }
+ if (modification.getOutputStrategies() != null) {
+ pipelineElement.setOutputStrategies(modification.getOutputStrategies());
+ }
+ }
+
+ private void applyModificationsForInvocable(InvocableStreamPipesEntity
pipelineElement,
+ PipelineModification
modification) {
+ pipelineElement.setInputStreams(modification.getInputStreams());
+ pipelineElement.setStaticProperties(modification.getStaticProperties());
+ }
+
private Optional<PipelineModification> getModification(String id,
List<PipelineModification> modifications) {
return modifications.stream().filter(m ->
m.getDomId().equals(id)).findFirst();
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/mapping/MappingPropertyCalculator.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/mapping/MappingPropertyCalculator.java
index 079ccf50c..ea552f02f 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/mapping/MappingPropertyCalculator.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/mapping/MappingPropertyCalculator.java
@@ -28,14 +28,12 @@ import java.util.List;
public class MappingPropertyCalculator {
- private EventSchema schema;
- private List<String> availablePropertySelectors;
- private EventProperty requirement;
+ private final EventSchema schema;
+ private final List<String> availablePropertySelectors;
+ private final EventProperty requirement;
- public MappingPropertyCalculator() {
- }
-
- public MappingPropertyCalculator(EventSchema schema, List<String>
availablePropertySelectors,
+ public MappingPropertyCalculator(EventSchema schema,
+ List<String> availablePropertySelectors,
EventProperty requirement) {
this.schema = schema;
this.availablePropertySelectors = availablePropertySelectors;
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/ApplyGroundingStep.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/ApplyGroundingStep.java
index 8cf5c9e45..e691f285c 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/ApplyGroundingStep.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/ApplyGroundingStep.java
@@ -67,13 +67,16 @@ public class ApplyGroundingStep extends
AbstractPipelineValidationStep {
.setEventGrounding(selectedGrounding);
}
- target
- .getInputStreams()
- .get(getIndex(target))
- .setEventGrounding(selectedGrounding);
+ if (!target.getInputStreams().isEmpty()) {
- if (target.getInputStreams().size() > 1) {
- this.visitorHistory.put(target.getDom(), 1);
+ target
+ .getInputStreams()
+ .get(getIndex(target))
+ .setEventGrounding(selectedGrounding);
+
+ if (target.getInputStreams().size() > 1) {
+ this.visitorHistory.put(target.getDom(), 1);
+ }
}
}
}
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/CheckCompletedVisitor.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/CheckCompletedVisitor.java
index caa87744d..5274fff60 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/CheckCompletedVisitor.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/CheckCompletedVisitor.java
@@ -87,7 +87,13 @@ public class CheckCompletedVisitor extends
DefaultStaticPropertyVisitor {
.stream()
.filter(p -> mappingPropertyNary.getMapsFromOptions().contains(p))
.collect(Collectors.toList()));
- validationInfos.add(PipelineElementValidationInfo.info("Auto-updated
invalid field selection"));
+ var info = PipelineElementValidationInfo.info(
+ String.format(
+ "Auto-updated invalid field selection: Fields updated to %s",
+ mappingPropertyNary.getSelectedProperties().toString()
+ )
+ );
+ validationInfos.add(info);
}
}
@@ -95,10 +101,18 @@ public class CheckCompletedVisitor extends
DefaultStaticPropertyVisitor {
public void visit(MappingPropertyUnary mappingPropertyUnary) {
if (existsSelection(mappingPropertyUnary)) {
if
(!(mappingPropertyUnary.getMapsFromOptions().contains(mappingPropertyUnary.getSelectedProperty())))
{
- if (mappingPropertyUnary.getMapsFromOptions().size() > 0) {
+ if (!mappingPropertyUnary.getMapsFromOptions().isEmpty()) {
+ String existingSelector = mappingPropertyUnary.getSelectedProperty();
String firstSelector =
mappingPropertyUnary.getMapsFromOptions().get(0);
mappingPropertyUnary.setSelectedProperty(firstSelector);
- validationInfos.add(PipelineElementValidationInfo.info("Auto-updated
invalid field selection"));
+ var info = PipelineElementValidationInfo.info(
+ String.format(
+ "Auto-updated invalid field selection: Selected field %s was
changed to %s",
+ existingSelector,
+ firstSelector
+ )
+ );
+ validationInfos.add(info);
}
}
} else {
@@ -142,10 +156,10 @@ public class CheckCompletedVisitor extends
DefaultStaticPropertyVisitor {
}
private boolean existsSelection(MappingPropertyUnary mappingProperty) {
- return !(mappingProperty.getSelectedProperty() == null ||
mappingProperty.getSelectedProperty().equals(""));
+ return !(mappingProperty.getSelectedProperty() == null ||
mappingProperty.getSelectedProperty().isEmpty());
}
private boolean existsSelection(MappingPropertyNary mappingProperty) {
- return !(mappingProperty.getSelectedProperties() == null ||
mappingProperty.getSelectedProperties().size() == 0);
+ return !(mappingProperty.getSelectedProperties() == null ||
mappingProperty.getSelectedProperties().isEmpty());
}
}
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/PrepareStep.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/PrepareStep.java
index 6b7a0bfef..2cb0d2557 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/PrepareStep.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/PrepareStep.java
@@ -36,7 +36,7 @@ public class PrepareStep extends
AbstractPipelineValidationStep {
Set<InvocableStreamPipesEntity> allTargets,
List<PipelineElementValidationInfo> validationInfos)
throws SpValidationException {
if (target instanceof DataProcessorInvocation) {
- if (target.getInputStreams() == null) {
+ if (target.getInputStreams() == null ||
target.getInputStreams().isEmpty()) {
target.setInputStreams(new ArrayList<>());
for (int i = 0; i < target.getStreamRequirements().size(); i++) {
target.getInputStreams().add(new SpDataStream());
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/PipelineManager.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/PipelineManager.java
index c8cc072b1..e849aaa7e 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/PipelineManager.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/PipelineManager.java
@@ -136,8 +136,12 @@ public class PipelineManager {
private static Stream<? extends NamedStreamPipesEntity>
mergePipelineElement(Pipeline pipeline) {
return Stream.concat(
- Stream.concat(pipeline.getStreams().stream(),
pipeline.getSepas().stream()),
- pipeline.getActions().stream());
+ Stream.concat(
+ pipeline.getStreams().stream(),
+ pipeline.getSepas().stream()
+ ),
+ pipeline.getActions().stream()
+ );
}
private static void preparePipelineBasics(String username,
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/recommender/ElementRecommender.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/recommender/ElementRecommender.java
index d6268d661..fbfafe4bc 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/recommender/ElementRecommender.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/recommender/ElementRecommender.java
@@ -65,11 +65,10 @@ public class ElementRecommender {
Optional<SpDataStream> outputStream = getOutputStream(elementsProvider);
outputStream.ifPresent(spDataStream -> validate(spDataStream, getAll()));
} catch (Exception e) {
- e.printStackTrace();
return recommendationMessage;
}
- if (recommendationMessage.getPossibleElements().size() == 0) {
+ if (recommendationMessage.getPossibleElements().isEmpty()) {
throw new NoSuitableSepasAvailableException();
} else {
recommendationMessage
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
index b42f9e02d..25a17b573 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
@@ -237,6 +237,7 @@ public class PipelineResource extends
AbstractAuthGuardedRestResource {
storedPipeline.setPipelineCategories(pipeline.getPipelineCategories());
storedPipeline.setHealthStatus(pipeline.getHealthStatus());
storedPipeline.setPipelineNotifications(pipeline.getPipelineNotifications());
+ storedPipeline.setValid(pipeline.isValid());
Operations.updatePipeline(storedPipeline);
SuccessMessage message = Notifications.success("Pipeline modified");
message.addNotification(new Notification("id", pipelineId));
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterResource.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterResource.java
index 7de6ed08c..2f71f1444 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterResource.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterResource.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.rest.impl.connect;
import org.apache.streampipes.commons.exceptions.connect.AdapterException;
import
org.apache.streampipes.connect.management.management.AdapterMasterManagement;
+import
org.apache.streampipes.connect.management.management.AdapterUpdateManagement;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.message.Notifications;
import org.apache.streampipes.model.monitoring.SpLogMessage;
@@ -79,12 +80,9 @@ public class AdapterResource extends
AbstractAdapterResource<AdapterMasterManage
@Produces(MediaType.APPLICATION_JSON)
@PreAuthorize(AuthConstants.HAS_WRITE_ADAPTER_PRIVILEGE)
public Response updateAdapter(AdapterDescription adapterDescription) {
- var principalSid = getAuthenticatedUserSid();
- var username = getAuthenticatedUsername();
- LOG.info("User: " + username + " updates adapter " +
adapterDescription.getElementId());
-
+ var updateManager = new AdapterUpdateManagement(managementService);
try {
- managementService.updateAdapter(adapterDescription, principalSid);
+ updateManager.updateAdapter(adapterDescription);
} catch (AdapterException e) {
LOG.error("Error while updating adapter with id " +
adapterDescription.getElementId(), e);
return ok(Notifications.error(e.getMessage()));
@@ -93,6 +91,18 @@ public class AdapterResource extends
AbstractAdapterResource<AdapterMasterManage
return ok(Notifications.success(adapterDescription.getElementId()));
}
+ @PUT
+ @JacksonSerialized
+ @Produces(MediaType.APPLICATION_JSON)
+ @PreAuthorize(AuthConstants.HAS_WRITE_ADAPTER_PRIVILEGE)
+ @Path("pipeline-migration-preflight")
+ public Response performPipelineMigrationPreflight(AdapterDescription
adapterDescription) {
+ var updateManager = new AdapterUpdateManagement(managementService);
+ var migrations = updateManager.checkPipelineMigrations(adapterDescription);
+
+ return ok(migrations);
+ }
+
@GET
@JacksonSerialized
@Path("/{id}")
@@ -148,7 +158,7 @@ public class AdapterResource extends
AbstractAdapterResource<AdapterMasterManage
public Response deleteAdapter(@PathParam("id") String elementId) {
List<String> pipelinesUsingAdapter = getPipelinesUsingAdapter(elementId);
- if (pipelinesUsingAdapter.size() == 0) {
+ if (pipelinesUsingAdapter.isEmpty()) {
try {
managementService.deleteAdapter(elementId);
return ok(Notifications.success("Adapter with id: " + elementId + " is
deleted."));
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
index af3c34c37..a8a97c377 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
@@ -22,7 +22,11 @@ import { map } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { PlatformServicesCommons } from './commons.service';
-import { AdapterDescription, Message } from '../model/gen/streampipes-model';
+import {
+ AdapterDescription,
+ Message,
+ PipelineUpdateInfo,
+} from '../model/gen/streampipes-model';
@Injectable({ providedIn: 'root' })
export class AdapterService {
@@ -95,6 +99,23 @@ export class AdapterService {
.pipe(map(response => Message.fromData(response as any)));
}
+ performPipelineMigrationPreflight(
+ adapter: AdapterDescription,
+ ): Observable<PipelineUpdateInfo[]> {
+ return this.http
+ .put(
+
`${this.connectPath}/master/adapters/pipeline-migration-preflight`,
+ adapter,
+ )
+ .pipe(
+ map(response => {
+ return (response as any[]).map(p =>
+ PipelineUpdateInfo.fromData(p),
+ );
+ }),
+ );
+ }
+
get adapterMasterUrl() {
return `${this.connectPath}/master/adapters/`;
}
diff --git
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
index 36a810b51..2fa595cac 100644
---
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
@@ -1,26 +1,7 @@
-/*
- * 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.
- */
-
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 3.1.1185 on 2023-08-06
11:37:37.
+// Generated using typescript-generator version 3.2.1263 on 2023-09-28
22:59:29.
export class NamedStreamPipesEntity {
'@class':
@@ -2446,6 +2427,7 @@ export class Pipeline extends ElementComposition {
restartOnSystemReboot: boolean;
running: boolean;
startedAt: number;
+ valid: boolean;
static fromData(data: Pipeline, target?: Pipeline): Pipeline {
if (!data) {
@@ -2471,6 +2453,7 @@ export class Pipeline extends ElementComposition {
instance.restartOnSystemReboot = data.restartOnSystemReboot;
instance.running = data.running;
instance.startedAt = data.startedAt;
+ instance.valid = data.valid;
return instance;
}
}
@@ -2959,6 +2942,32 @@ export class PipelineTemplateInvocation {
}
}
+export class PipelineUpdateInfo {
+ canAutoMigrate: boolean;
+ migrationInfo: string;
+ pipelineId: string;
+ pipelineName: string;
+ validationInfos: { [index: string]: PipelineElementValidationInfo[] };
+
+ static fromData(
+ data: PipelineUpdateInfo,
+ target?: PipelineUpdateInfo,
+ ): PipelineUpdateInfo {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new PipelineUpdateInfo();
+ instance.canAutoMigrate = data.canAutoMigrate;
+ instance.migrationInfo = data.migrationInfo;
+ instance.pipelineId = data.pipelineId;
+ instance.pipelineName = data.pipelineName;
+ instance.validationInfos = __getCopyObjectFn(
+ __getCopyArrayFn(PipelineElementValidationInfo.fromData),
+ )(data.validationInfos);
+ return instance;
+ }
+}
+
export class ProducedMessagesInfo extends MessagesInfo {
totalProducedMessages: number;
totalProducedMessagesSincePipelineStart: number;
@@ -3521,6 +3530,7 @@ export class SpServiceRegistration {
scheme: string;
svcGroup: string;
svcId: string;
+ svcType: string;
tags: SpServiceTag[];
static fromData(
@@ -3540,6 +3550,7 @@ export class SpServiceRegistration {
instance.scheme = data.scheme;
instance.svcGroup = data.svcGroup;
instance.svcId = data.svcId;
+ instance.svcType = data.svcType;
instance.tags = __getCopyArrayFn(SpServiceTag.fromData)(data.tags);
return instance;
}
diff --git
a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
index e2e0c7e33..e0d0ee64b 100644
---
a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
+++
b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
@@ -65,7 +65,7 @@ export class AdapterConfigurationComponent implements OnInit {
}
removeSelection() {
- this.router.navigate(['connect', 'create']).then();
+ this.router.navigate(['connect']).then();
}
clickSpecificSettingsNextButton() {
diff --git
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
index c219c181f..2bcfd840d 100644
---
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
+++
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
@@ -17,13 +17,18 @@
-->
<div fxFlex="100" fxLayout="column" class="options-panel">
- <div fxLayout="row" fxFlex="100" fxLayoutAlign="start start">
- <div class="mr-15" fxLayoutAlign="start start">
+ <div fxLayout="row" fxFlex="100" fxLayoutAlign="start center">
+ <div class="mr-15" fxLayoutAlign="start center">
<mat-icon class="icon">{{ optionIcon }}</mat-icon>
</div>
- <div fxFlex fxLayout="column">
- <div fxFlex="100" class="title" fxLayout="row">
- <div fxLayoutAlign="start start" class="mr-15">
+ <div fxFlex fxLayout="column" fxLayoutAlign="center start">
+ <div
+ fxFlex="100"
+ class="title"
+ fxLayout="row"
+ fxLayoutAlign="start center"
+ >
+ <div fxLayoutAlign="start center" class="mr-15">
<mat-checkbox
(change)="optionSelectedEmitter.emit($event.checked)"
[checked]="isChecked"
diff --git
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss
index 275840dfb..ebbd1b2d4 100644
---
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss
+++
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss
@@ -31,7 +31,6 @@
color: var(--color-default-text);
font-weight: 600;
font-size: 13pt;
- margin-bottom: 10px;
}
.description {
@@ -41,5 +40,5 @@
.icon {
margin-right: 10px;
color: var(--color-accent);
- font-size: 22pt;
+ font-size: 20pt;
}
diff --git
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
index 579285f21..0ba0c1a0e 100644
---
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
+++
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.html
@@ -52,6 +52,7 @@
optionDescription="Start adapter now"
optionIcon="play_arrow"
dataCy="start-adapter-now-checkbox"
+ *ngIf="!isEditMode"
[isChecked]="startAdapterNow"
(optionSelectedEmitter)="startAdapterNow = $event"
>
@@ -119,6 +120,7 @@
optionDescription="Store all events of this source in the internal
data store"
optionIcon="save"
dataCy="sp-store-in-datalake"
+ *ngIf="!isEditMode"
(optionSelectedEmitter)="handlePersistOption($event)"
>
<mat-form-field *ngIf="saveInDataLake" color="accent">
@@ -178,7 +180,7 @@
mat-button
style="margin-left: 10px"
>
- Edit Adapter
+ Update Adapter
</button>
</div>
</div>
diff --git
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
index 6edb79139..f7c6d453c 100644
---
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
+++
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
@@ -141,7 +141,7 @@ export class StartAdapterConfigurationComponent implements
OnInit {
});
dialogRef.afterClosed().subscribe(() => {
- this.adapterStartedEmitter.emit();
+ //this.adapterStartedEmitter.emit();
});
}
diff --git
a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
index e36efb248..224ded787 100644
---
a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
+++
b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
@@ -297,7 +297,6 @@
matTooltip="Edit adapter"
data-cy="edit-adapter"
matTooltipPosition="above"
- [disabled]="adapter.running"
(click)="editAdapter(adapter)"
>
<i class="material-icons"
diff --git
a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
index 4cfb1c7b8..780475ddc 100644
---
a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
+++
b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
@@ -18,13 +18,13 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import {
- AdapterService,
AdapterDescription,
AdapterMonitoringService,
+ AdapterService,
PipelineElementService,
- SpMetricsEntry,
PipelineService,
SpLogMessage,
+ SpMetricsEntry,
} from '@streampipes/platform-services';
import { MatTableDataSource } from '@angular/material/table';
import { ConnectService } from '../../services/connect.service';
@@ -42,13 +42,11 @@ import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { ObjectPermissionDialogComponent } from
'../../../core-ui/object-permission-dialog/object-permission-dialog.component';
import { UserRole } from '../../../_enums/user-role.enum';
-import { AuthService } from '../../../services/auth.service';
import { HelpComponent } from '../../../editor/dialog/help/help.component';
import { Router } from '@angular/router';
import { AdapterFilterSettingsModel } from
'../../model/adapter-filter-settings.model';
import { AdapterFilterPipe } from '../../filter/adapter-filter.pipe';
import { SpConnectRoutes } from '../../connect.routes';
-import { CanNotEditAdapterDialog } from
'../../dialog/can-not-edit-adapter-dialog/can-not-edit-adapter-dialog.component';
import { zip } from 'rxjs';
@Component({
@@ -233,22 +231,18 @@ export class ExistingAdaptersComponent implements OnInit {
adapter.correspondingDataStreamElementId,
)
.subscribe(effectedPipelines => {
- if (effectedPipelines.length > 0) {
- this.dialogService.open(CanNotEditAdapterDialog, {
- panelType: PanelType.STANDARD_PANEL,
- title: 'No edit possible',
- width: '50vw',
- data: {
- pipelines: effectedPipelines,
- },
- });
- } else {
- this.router.navigate([
- 'connect',
- 'edit',
- adapter.elementId,
- ]);
- }
+ // if (effectedPipelines.length > 0) {
+ // this.dialogService.open(CanNotEditAdapterDialog, {
+ // panelType: PanelType.STANDARD_PANEL,
+ // title: 'No edit possible',
+ // width: '50vw',
+ // data: {
+ // pipelines: effectedPipelines,
+ // },
+ // });
+ // } else {
+ this.router.navigate(['connect', 'edit', adapter.elementId]);
+ //}
});
}
diff --git
a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
index a76b9dddb..850668127 100644
---
a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
+++
b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
@@ -19,7 +19,7 @@
<div class="sp-dialog-container">
<div class="sp-dialog-content p-15">
<div fxLayout="column" fxLayoutAlign="center center" fxFlex="100">
- <div fxLayout="column" *ngIf="!adapterInstalled">
+ <div fxLayout="column" *ngIf="loading">
<div fxLayoutAlign="center">
<mat-spinner
[diameter]="50"
@@ -31,16 +31,72 @@
</div>
<div fxLayoutAlign="center">
<h3>
- Please wait while your new adapter is being
generated...
+ Please wait while your new adapter is being
+ {{ editMode ? 'updated' : 'generated' }}...
</h3>
</div>
</div>
+ <div
+ fxLayout="column"
+ *ngIf="
+ adapterUpdatePreflight &&
+ editMode &&
+ !adapterInstalled &&
+ !loading
+ "
+ fxLayoutAlign="start center"
+ >
+ <h4>
+ This adapter is used by
+ {{ adapterPipelineUpdateInfos.length }} pipelines.
+ </h4>
+ <div class="migration-infos">
+ <div *ngFor="let updateInfo of adapterPipelineUpdateInfos">
+ <div
+ *ngIf="updateInfo.canAutoMigrate"
+ fxLayoutAlign="start center"
+ >
+ <i class="material-icons">check</i
+ > Pipeline <b>{{
+ updateInfo.pipelineName
+ }}</b
+ > will be automatically migrated.
+ </div>
+ <div
+ *ngIf="!updateInfo.canAutoMigrate"
+ fxLayoutAlign="start center"
+ >
+ <i class="material-icons">warning</i>
+ Pipeline <b>{{
+ updateInfo.pipelineName
+ }}</b
+ > will be stopped and needs manual review.
+ </div>
+ </div>
+ </div>
+ <div class="migration-infos" fxLayoutAlign="start center">
+ <i class="material-icons">warning</i>
+ Please check and possibly modify existing dashboards and
+ data views afterwards.
+ </div>
+ <div>
+ <button
+ mat-button
+ mat-raised-button
+ color="accent"
+ (click)="updateAdapter()"
+ >
+ Update adapter and migrate pipelines
+ </button>
+ </div>
+ </div>
<div fxLayout="column" *ngIf="adapterInstalled && editMode">
<div
data-cy="info-adapter-successfully-updated"
- fxLayoutAlign="center"
+ fxLayoutAlign="start center"
>
- <h3>Adapter successfully updated</h3>
+ <i class="material-icons">check</i>
+ <h4>Adapter successfully updated</h4>
</div>
</div>
<div
@@ -102,7 +158,7 @@
>
</div>
</div>
- <div *ngIf="startAdapterNow" fxFlex="100">
+ <div *ngIf="showPreview" fxFlex="100">
<sp-pipeline-element-runtime-info
[streamDescription]="streamDescription"
[pollingActive]="pollingActive"
diff --git
a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.scss
b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.scss
index 2d6f70134..c34732f98 100644
---
a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.scss
+++
b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.scss
@@ -23,6 +23,14 @@
font-size: 14pt;
margin-top: 20px;
margin-bottom: 20px;
+ border: 1px solid var(--color-bg-2);
+ background: var(--color-bg-1);
+}
+
+.migration-infos {
+ padding: 10px;
+ margin-top: 10px;
+ margin-bottom: 10px;
}
.warning-message {
diff --git
a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
index 73056e646..f6e6ebe04 100644
---
a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
+++
b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
@@ -21,15 +21,16 @@ import { ShepherdService } from
'../../../services/tour/shepherd.service';
import { RestService } from '../../services/rest.service';
import {
AdapterDescription,
+ AdapterService,
ErrorMessage,
Message,
PipelineOperationStatus,
PipelineTemplateService,
+ PipelineUpdateInfo,
SpDataStream,
} from '@streampipes/platform-services';
import { DialogRef } from '@streampipes/shared-ui';
import { PipelineInvocationBuilder } from
'../../../core-services/template/PipelineInvocationBuilder';
-import { AdapterService } from
'../../../../../projects/streampipes/platform-services/src/lib/apis/adapter.service';
@Component({
selector: 'sp-dialog-adapter-started-dialog',
@@ -71,6 +72,10 @@ export class AdapterStartedDialog implements OnInit {
@Input() startAdapterNow = true;
templateErrorMessage: ErrorMessage;
+ adapterUpdatePreflight = false;
+ adapterPipelineUpdateInfos: PipelineUpdateInfo[];
+ loading = false;
+ showPreview = false;
constructor(
public dialogRef: DialogRef<AdapterStartedDialog>,
@@ -82,21 +87,43 @@ export class AdapterStartedDialog implements OnInit {
ngOnInit() {
if (this.editMode) {
- this.editAdapter();
+ this.initAdapterUpdatePreflight();
} else {
this.addAdapter();
}
}
- editAdapter() {
- this.adapterService.updateAdapter(this.adapter).subscribe(status => {
- this.adapterStatus = status;
+ initAdapterUpdatePreflight(): void {
+ this.loading = true;
+ this.adapterService
+ .performPipelineMigrationPreflight(this.adapter)
+ .subscribe(res => {
+ if (res.length === 0) {
+ this.updateAdapter();
+ } else {
+ this.adapterUpdatePreflight = true;
+ this.adapterPipelineUpdateInfos = res;
+ this.loading = false;
+ }
+ });
+ }
+
+ updateAdapter(): void {
+ this.loading = true;
+ this.adapterService.updateAdapter(this.adapter).subscribe(res => {
+ this.loading = false;
+ this.adapterStatus = res;
this.adapterInstalled = true;
+ if (this.adapter.running) {
+ this.showAdapterPreview(res, this.adapter.elementId);
+ }
});
}
addAdapter() {
+ this.loading = true;
this.adapterService.addAdapter(this.adapter).subscribe(status => {
+ this.loading = false;
this.adapterStatus = status;
if (status.success) {
@@ -124,7 +151,6 @@ export class AdapterStartedDialog implements OnInit {
}
showAdapterPreview(status: Message, adapterElementId: string) {
- // Start preview on streams and message for sets
if (status.success) {
this.getLiveViewPreview(adapterElementId);
this.adapterInstalled = true;
@@ -142,6 +168,7 @@ export class AdapterStartedDialog implements OnInit {
this.restService
.getSourceDetails(adapter.correspondingDataStreamElementId)
.subscribe(st => {
+ this.showPreview = true;
this.streamDescription = st;
this.pollingActive = true;
});
diff --git
a/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.ts
b/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.ts
index 89a963212..8e85680ed 100644
---
a/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.ts
+++
b/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.ts
@@ -53,7 +53,6 @@ export class StaticMappingUnaryComponent
onStatusChange(status: any) {}
onValueChange(value: any) {
- console.log(value);
this.staticProperty.selectedProperty = value;
this.emitUpdate(true);
}
diff --git
a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
index 7507ffd11..0cb54b1b7 100644
---
a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
+++
b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
@@ -251,6 +251,10 @@ export class PipelineAssemblyComponent implements OnInit,
AfterViewInit {
this.pipelineCanvasMetadata,
pipelineModel,
);
+ pipeline.valid = this.pipelineValidationService.isValidPipeline(
+ pipelineModel,
+ this.preview,
+ );
pipeline.name = this.currentPipelineName;
pipeline.description = this.currentPipelineDescription;
if (this.currentModifiedPipelineId) {
diff --git a/ui/src/app/editor/components/pipeline/pipeline.component.ts
b/ui/src/app/editor/components/pipeline/pipeline.component.ts
index ccbfa8258..b096493b6 100644
--- a/ui/src/app/editor/components/pipeline/pipeline.component.ts
+++ b/ui/src/app/editor/components/pipeline/pipeline.component.ts
@@ -149,7 +149,7 @@ export class PipelineComponent implements OnInit, OnDestroy
{
this.initPlumb();
}
- validatePipeline() {
+ validatePipeline(pm?: PipelineModificationMessage) {
setTimeout(() => {
this.ngZone.run(() => {
this.pipelineValid =
@@ -158,6 +158,7 @@ export class PipelineComponent implements OnInit, OnDestroy
{
pe => !pe.settings.disabled,
),
this.preview,
+ pm,
);
});
});
@@ -301,7 +302,6 @@ export class PipelineComponent implements OnInit, OnDestroy
{
}
checkTopicModel(pipelineElementConfig: PipelineElementConfig) {
- console.log(pipelineElementConfig);
setTimeout(() => {
this.jsplumbService.dataStreamDropped(
pipelineElementConfig.payload.dom,
@@ -405,7 +405,9 @@ export class PipelineComponent implements OnInit, OnDestroy
{
edgeValidations,
);
if (currentConnectionValid) {
- this.validatePipeline();
+ this.validatePipeline(
+ pipelineModificationMessage,
+ );
this.modifyPipeline(
pipelineModificationMessage,
);
@@ -620,15 +622,12 @@ export class PipelineComponent implements OnInit,
OnDestroy {
.updatePipeline(this.currentPipelineModel)
.subscribe(pm => {
this.modifyPipeline(pm);
- // if (!(pipelineElementConfig.payload instanceof
DataSinkInvocation)) {
- // this.JsplumbBridge.activateEndpoint('out-' +
pipelineElementConfig.payload.dom, pipelineElementConfig.settings.completed);
- // }
this.triggerPipelineCacheUpdate();
this.announceConfiguredElement(pipelineElementConfig);
if (this.previewModeActive) {
this.deletePipelineElementPreview(true);
}
- this.validatePipeline();
+ this.validatePipeline(pm);
});
} else {
this.validatePipeline();
@@ -675,6 +674,14 @@ export class PipelineComponent implements OnInit,
OnDestroy {
);
this.objectProvider
.updatePipeline(this.currentPipelineModel)
- .subscribe(pm => this.modifyPipeline(pm));
+ .subscribe(pm => {
+ this.modifyPipeline(pm);
+ this.pipelineValid =
+ this.pipelineValidationService.isValidPipeline(
+ this.rawPipelineModel,
+ this.preview,
+ pm,
+ );
+ });
}
}
diff --git a/ui/src/app/editor/services/pipeline-validation.service.ts
b/ui/src/app/editor/services/pipeline-validation.service.ts
index df6e1ce45..791b632ba 100644
--- a/ui/src/app/editor/services/pipeline-validation.service.ts
+++ b/ui/src/app/editor/services/pipeline-validation.service.ts
@@ -30,6 +30,7 @@ import {
import { JsplumbFactoryService } from './jsplumb-factory.service';
import { UserErrorMessage } from '../../core-model/base/UserErrorMessage';
import { Connection } from '@jsplumb/browser-ui';
+import { PipelineModificationMessage } from
'../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
@Injectable({ providedIn: 'root' })
export class PipelineValidationService {
@@ -57,11 +58,19 @@ export class PipelineValidationService {
'Did you configure all elements?',
"There's a pipeline element which is missing some configuration.",
),
+ new UserErrorMessage(
+ 'Invalid pipeline configuration',
+ 'Check the current pipeline structure for invalid connections and
configurations',
+ ),
];
constructor(private jsplumbFactoryService: JsplumbFactoryService) {}
- isValidPipeline(rawPipelineModel, previewConfig: boolean) {
+ isValidPipeline(
+ rawPipelineModel: PipelineElementConfig[],
+ previewConfig: boolean,
+ pm?: PipelineModificationMessage,
+ ) {
const jsplumbBridge =
this.jsplumbFactoryService.getJsplumbBridge(previewConfig);
const streamInAssembly = this.isStreamInAssembly(rawPipelineModel);
@@ -99,12 +108,18 @@ export class PipelineValidationService {
this.errorMessages = [];
}
+ if (pm && !pm.pipelineValid) {
+ this.errorMessages.push(this.availableErrorMessages[5]);
+ }
+
this.pipelineValid =
streamInAssembly &&
actionInAssembly &&
allElementsConnected &&
onlyOnePipelineCreated &&
- allElementsConfigured;
+ allElementsConfigured &&
+ (pm ? pm.pipelineValid : true);
+
return this.pipelineValid;
}
@@ -117,11 +132,11 @@ export class PipelineValidationService {
}
buildErrorMessages(
- streamInAssembly,
- actionInAssembly,
- allElementsConnected,
- onlyOnePipelineCreated,
- allElementsConfigured,
+ streamInAssembly: boolean,
+ actionInAssembly: boolean,
+ allElementsConnected: boolean,
+ onlyOnePipelineCreated: boolean,
+ allElementsConfigured: boolean,
) {
this.errorMessages = [];
if (!streamInAssembly) {
diff --git
a/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.html
b/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.html
index b9bf1c8f4..a428276dd 100644
---
a/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.html
+++
b/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.html
@@ -36,7 +36,7 @@
<div
fxLayout="row"
fxLayoutAlign="start center"
- fxFlex="100px"
+ fxFlex="150px"
>
<div
*ngIf="
@@ -64,22 +64,38 @@
class="light light-neutral"
[matTooltip]="'Stopped'"
></div>
- <button
- class="ml-10"
- mat-icon-button
- [disabled]="!hasPipelineWritePrivileges"
- (click)="openPipelineNotificationsDialog(pipeline)"
- *ngIf="pipeline.pipelineNotifications.length > 0"
- matTooltip="{{
- pipeline.pipelineNotifications.length
- }} notification{{
- pipeline.pipelineNotifications.length > 1
- ? 's'
- : ''
- }}"
- >
- <mat-icon color="warn">warning</mat-icon>
- </button>
+ <div class="notification-icon">
+ <button
+ class="ml-10"
+ mat-icon-button
+ [disabled]="!hasPipelineWritePrivileges"
+ (click)="
+ openPipelineNotificationsDialog(pipeline)
+ "
+ *ngIf="
+ pipeline.pipelineNotifications.length > 0
+ "
+ matTooltip="{{
+ pipeline.pipelineNotifications.length
+ }} notification{{
+ pipeline.pipelineNotifications.length > 1
+ ? 's'
+ : ''
+ }}"
+ >
+ <i class="material-icons pipeline-notification"
+ >warning</i
+ >
+ </button>
+ </div>
+ <div class="ml-10 notification-icon">
+ <mat-icon
+ color="warn"
+ matTooltip="Invalid pipeline: Modify to fix
problems"
+ *ngIf="!pipeline.valid"
+ >sync_problem</mat-icon
+ >
+ </div>
</div>
</div>
</td>
@@ -99,7 +115,11 @@
toggleRunningOperation
)
"
- [disabled]="!hasPipelineWritePrivileges || starting"
+ [disabled]="
+ !hasPipelineWritePrivileges ||
+ starting ||
+ !pipeline.valid
+ "
*ngIf="!pipeline.running"
>
<i class="material-icons">play_arrow</i>
@@ -127,7 +147,7 @@
<ng-container matColumnDef="name">
<th mat-header-cell mat-sort-header *matHeaderCellDef>Name</th>
<td mat-cell *matCellDef="let pipeline">
- <h4 style="margin-bottom: 0px">{{ pipeline.name }}</h4>
+ <h4 style="margin-bottom: 0">{{ pipeline.name }}</h4>
<h5>
{{
pipeline.description !== '' ? pipeline.description :
'-'
diff --git
a/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.scss
b/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.scss
index 355026659..dd97d20ab 100644
---
a/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.scss
+++
b/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.scss
@@ -28,8 +28,8 @@
}
.mat-column-status {
- width: 100px;
- max-width: 100px;
+ width: 120px;
+ max-width: 120px;
}
.light {
@@ -62,3 +62,11 @@
.ml-10 {
margin-left: 10px;
}
+
+.pipeline-notification {
+ color: #dede00;
+}
+
+.notification-icon {
+ width: 50px;
+}
diff --git a/ui/src/app/pipelines/pipelines.component.ts
b/ui/src/app/pipelines/pipelines.component.ts
index 69b21303d..61e02c9d4 100644
--- a/ui/src/app/pipelines/pipelines.component.ts
+++ b/ui/src/app/pipelines/pipelines.component.ts
@@ -119,7 +119,6 @@ export class PipelinesComponent implements OnInit {
getFunctions() {
this.functionsService.getActiveFunctions().subscribe(functions => {
this.functions = functions.map(f => f.functionId);
- console.log(this.functions);
this.functionsReady = true;
});
}