You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2021/07/30 07:11:16 UTC
[incubator-streampipes] 01/08: [STREAMPIPES-402] Add new panel to
configure data explorer widgets
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 3695f41e986bc384fcfff323903f631e3c2f78d4
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Wed Jul 28 14:48:48 2021 +0200
[STREAMPIPES-402] Add new panel to configure data explorer widgets
---
.../backend/StreamPipesResourceConfig.java | 6 +-
.../model/datalake/DataExplorerWidgetModel.java | 57 +++++++---
.../model/datalake/DataLakeMeasure.java | 21 +++-
.../model/datalake/PersistedDataStream.java | 71 ++++++++++++
.../AbstractPipelineExtractionResource.java | 88 +++++++++++++++
.../rest/impl/dashboard/VisualizablePipeline.java | 124 ---------------------
.../dashboard/VisualizablePipelineResource.java | 82 ++++++++++++++
.../impl/datalake/PersistedDataStreamResource.java | 72 ++++++++++++
ui/src/app/core-model/gen/streampipes-model.ts | 75 ++++++++-----
...lorer-widget-appearance-settings.component.html | 49 ++++++++
...lorer-widget-appearance-settings.component.scss | 17 +++
...xplorer-widget-appearance-settings.component.ts | 14 ++-
.../data-explorer-designer-panel.component.html | 10 +-
.../data-explorer-designer-panel.component.scss | 4 +
.../data-explorer-designer-panel.component.ts | 3 +-
...ta-explorer-widget-data-settings.component.html | 30 +++++
...a-explorer-widget-data-settings.component.scss} | 9 +-
...data-explorer-widget-data-settings.component.ts | 54 +++++++++
.../data-explorer-dashboard-grid.component.html | 4 +-
.../grid/data-explorer-dashboard-grid.component.ts | 18 ++-
.../data-explorer-dashboard-panel.component.html | 5 +-
.../data-explorer-dashboard-panel.component.ts | 29 +++--
.../data-explorer-dashboard-widget.component.html | 14 ++-
.../data-explorer-dashboard-widget.component.scss | 2 +-
.../data-explorer-dashboard-widget.component.ts | 17 ++-
.../widgets/base/base-data-explorer-widget.ts | 3 +-
.../line-chart/line-chart-widget.component.ts | 14 +--
.../widgets/table/table-widget.component.ts | 6 +-
.../no-data/no-data-in-date-range.component.css | 1 -
ui/src/app/data-explorer/data-explorer.module.ts | 4 +
...xplorer-add-visualization-dialog.component.html | 3 +-
...-explorer-add-visualization-dialog.component.ts | 15 ++-
.../models/dataview-dashboard.model.ts | 6 +
.../services/data-view-data-explorer.service.ts | 48 +++++---
34 files changed, 732 insertions(+), 243 deletions(-)
diff --git a/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java b/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
index e21f900..e99ea98 100644
--- a/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
+++ b/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
@@ -26,10 +26,11 @@ import org.apache.streampipes.ps.PipelineElementTemplateResource;
import org.apache.streampipes.rest.impl.*;
import org.apache.streampipes.rest.impl.dashboard.Dashboard;
import org.apache.streampipes.rest.impl.dashboard.DashboardWidget;
-import org.apache.streampipes.rest.impl.dashboard.VisualizablePipeline;
+import org.apache.streampipes.rest.impl.dashboard.VisualizablePipelineResource;
import org.apache.streampipes.rest.impl.datalake.DataLakeDashboardResource;
import org.apache.streampipes.rest.impl.datalake.DataLakeNoUserResourceV3;
import org.apache.streampipes.rest.impl.datalake.DataLakeWidgetResource;
+import org.apache.streampipes.rest.impl.datalake.PersistedDataStreamResource;
import org.apache.streampipes.rest.impl.nouser.FileServingResource;
import org.apache.streampipes.rest.impl.nouser.PipelineElementImportNoUser;
import org.apache.streampipes.rest.impl.nouser.PipelineNoUserResource;
@@ -68,6 +69,7 @@ public class StreamPipesResourceConfig extends ResourceConfig {
register(Notification.class);
register(OntologyMeasurementUnit.class);
register(OntologyPipelineElement.class);
+ register(PersistedDataStreamResource.class);
register(PipelineCanvasMetadataCache.class);
register(PipelineCanvasMetadataResource.class);
register(PipelineCache.class);
@@ -101,7 +103,7 @@ public class StreamPipesResourceConfig extends ResourceConfig {
register(Dashboard.class);
register(VirtualSensor.class);
register(Visualization.class);
- register(VisualizablePipeline.class);
+ register(VisualizablePipelineResource.class);
// Serializers
register(GsonWithIdProvider.class);
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
index 8f16a3b..7b6be32 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
@@ -20,15 +20,20 @@ package org.apache.streampipes.model.datalake;
import org.apache.streampipes.model.dashboard.DashboardEntity;
+import java.util.Map;
+
public class DataExplorerWidgetModel extends DashboardEntity {
private String widgetId;
private String widgetType;
- private String selectedKeys;
+ private Map<String, Object> baseAppearanceConfig;
+ private Map<String, Object> visualizationConfig;
+ private Map<String, Object> dataConfig;
- private DataLakeMeasure dataLakeMeasure;
+ private String pipelineId;
+ private String measureName;
public DataExplorerWidgetModel() {
super();
@@ -42,14 +47,6 @@ public class DataExplorerWidgetModel extends DashboardEntity {
this.widgetId = widgetId;
}
- public DataLakeMeasure getDataLakeMeasure() {
- return dataLakeMeasure;
- }
-
- public void setDataLakeMeasure(DataLakeMeasure dataLakeMeasure) {
- this.dataLakeMeasure = dataLakeMeasure;
- }
-
public String getWidgetType() {
return widgetType;
}
@@ -58,11 +55,43 @@ public class DataExplorerWidgetModel extends DashboardEntity {
this.widgetType = widgetType;
}
- public String getSelectedKeys() {
- return selectedKeys;
+ public Map<String, Object> getBaseAppearanceConfig() {
+ return baseAppearanceConfig;
+ }
+
+ public void setBaseAppearanceConfig(Map<String, Object> baseAppearanceConfig) {
+ this.baseAppearanceConfig = baseAppearanceConfig;
+ }
+
+ public Map<String, Object> getVisualizationConfig() {
+ return visualizationConfig;
+ }
+
+ public void setVisualizationConfig(Map<String, Object> visualizationConfig) {
+ this.visualizationConfig = visualizationConfig;
+ }
+
+ public Map<String, Object> getDataConfig() {
+ return dataConfig;
+ }
+
+ public void setDataConfig(Map<String, Object> dataConfig) {
+ this.dataConfig = dataConfig;
+ }
+
+ public String getPipelineId() {
+ return pipelineId;
+ }
+
+ public void setPipelineId(String pipelineId) {
+ this.pipelineId = pipelineId;
+ }
+
+ public String getMeasureName() {
+ return measureName;
}
- public void setSelectedKeys(String selectedKeys) {
- this.selectedKeys = selectedKeys;
+ public void setMeasureName(String measureName) {
+ this.measureName = measureName;
}
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
index 72e3461..2ff4d2b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
@@ -20,12 +20,15 @@ package org.apache.streampipes.model.datalake;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.schema.EventSchema;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+@TsModel
public class DataLakeMeasure extends UnnamedStreamPipesEntity {
private String measureName;
-
private EventSchema eventSchema;
+ private String pipelineId;
+ private String pipelineName;
public DataLakeMeasure() {
super();
@@ -58,4 +61,20 @@ public class DataLakeMeasure extends UnnamedStreamPipesEntity {
public void setEventSchema(EventSchema eventSchema) {
this.eventSchema = eventSchema;
}
+
+ 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;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/PersistedDataStream.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/PersistedDataStream.java
new file mode 100644
index 0000000..277732c
--- /dev/null
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/PersistedDataStream.java
@@ -0,0 +1,71 @@
+/*
+ * 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.datalake;
+
+import org.apache.streampipes.model.schema.EventSchema;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
+@TsModel
+public class PersistedDataStream {
+
+ private String pipelineId;
+ private String pipelineName;
+ private EventSchema schema;
+ private String measureName;
+
+ public PersistedDataStream() {
+ }
+
+ public PersistedDataStream(String pipelineId, EventSchema schema, String measureName) {
+ this.pipelineId = pipelineId;
+ this.schema = schema;
+ this.measureName = measureName;
+ }
+
+ public String getPipelineId() {
+ return pipelineId;
+ }
+
+ public void setPipelineId(String pipelineId) {
+ this.pipelineId = pipelineId;
+ }
+
+ public EventSchema getSchema() {
+ return schema;
+ }
+
+ public void setSchema(EventSchema schema) {
+ this.schema = schema;
+ }
+
+ public String getMeasureName() {
+ return measureName;
+ }
+
+ public void setMeasureName(String measureName) {
+ this.measureName = measureName;
+ }
+
+ public String getPipelineName() {
+ return pipelineName;
+ }
+
+ public void setPipelineName(String pipelineName) {
+ this.pipelineName = pipelineName;
+ }
+}
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/AbstractPipelineExtractionResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/AbstractPipelineExtractionResource.java
new file mode 100644
index 0000000..b1f8db6
--- /dev/null
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/AbstractPipelineExtractionResource.java
@@ -0,0 +1,88 @@
+/*
+ * 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.rest.impl.dashboard;
+
+import org.apache.streampipes.model.graph.DataSinkInvocation;
+import org.apache.streampipes.model.pipeline.Pipeline;
+import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
+import org.apache.streampipes.rest.impl.AbstractRestResource;
+
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public abstract class AbstractPipelineExtractionResource<T> extends AbstractRestResource {
+
+ protected Response getPipelineByIdAndFieldValue(String appId,
+ String pipelineId,
+ String fieldValue) {
+ List<T> pipelines = extract(new ArrayList<>(), appId);
+
+ Optional<T> matchedPipeline =
+ pipelines
+ .stream()
+ .filter(pipeline -> matches(pipeline, pipelineId, fieldValue)).findFirst();
+
+ return matchedPipeline.isPresent() ? ok(matchedPipeline.get()) : fail();
+ }
+
+ protected List<T> extract(List<T> target, String appId) {
+ getPipelineStorage()
+ .getAllPipelines()
+ .forEach(pipeline -> {
+ List<DataSinkInvocation> sinks = extractSink(pipeline, appId);
+ sinks.forEach(sink -> target.add(convert(pipeline, sink)));
+ });
+ return target;
+ }
+
+ protected abstract T convert(Pipeline pipeline,
+ DataSinkInvocation sink);
+
+ protected abstract boolean matches(T resourceToExtract,
+ String pipelineId,
+ String fieldValue);
+
+ protected List<DataSinkInvocation> extractSink(Pipeline pipeline, String appId) {
+ return pipeline
+ .getActions()
+ .stream()
+ .filter(sink -> sink.getAppId().equals(appId))
+ .collect(Collectors.toList());
+ }
+
+ protected String extractFieldValue(DataSinkInvocation sink, String fieldName) {
+ return sink.getStaticProperties()
+ .stream()
+ .filter(sp -> sp.getInternalName().equals(fieldName))
+ .map(sp -> (FreeTextStaticProperty) sp)
+ .findFirst().get().getValue();
+ }
+
+ protected String extractInputTopic(DataSinkInvocation sink) {
+ return sink
+ .getInputStreams()
+ .get(0)
+ .getEventGrounding()
+ .getTransportProtocol()
+ .getTopicDefinition()
+ .getActualTopicName();
+ }
+}
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/VisualizablePipeline.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/VisualizablePipeline.java
deleted file mode 100644
index 7e52397..0000000
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/VisualizablePipeline.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.rest.impl.dashboard;
-
-import org.apache.streampipes.model.graph.DataSinkInvocation;
-import org.apache.streampipes.model.pipeline.Pipeline;
-import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
-import org.apache.streampipes.rest.impl.AbstractRestResource;
-import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Path("/v2/users/{username}/dashboard/pipelines")
-public class VisualizablePipeline extends AbstractRestResource {
-
- private static final String DashboardAppId = "org.apache.streampipes.sinks.internal.jvm.dashboard";
- private static final String VisualizationFieldInternalName = "visualization-name";
-
- @GET
- @JacksonSerialized
- @Produces(MediaType.APPLICATION_JSON)
- public Response getVisualizablePipelines() {
- return ok(extractVisualizablePipelines());
- }
-
- @GET
- @JacksonSerialized
- @Produces(MediaType.APPLICATION_JSON)
- @Path("{pipelineId}/{visualizationName}")
- public Response getVisualizablePipelineByPipelineIdAndVisualizationName(@PathParam("pipelineId") String pipelineId,
- @PathParam("visualizationName") String visualizationName) {
- List<org.apache.streampipes.model.dashboard.VisualizablePipeline> pipelines =
- extractVisualizablePipelines();
-
- Optional<org.apache.streampipes.model.dashboard.VisualizablePipeline> matchedPipeline =
- pipelines
- .stream()
- .filter(pipeline -> pipeline.getPipelineId().equals(pipelineId)
- && pipeline.getVisualizationName().equals(visualizationName)).findFirst();
-
- return matchedPipeline.isPresent() ? ok(matchedPipeline.get()) : fail();
- }
-
- private List<org.apache.streampipes.model.dashboard.VisualizablePipeline> extractVisualizablePipelines() {
- List<org.apache.streampipes.model.dashboard.VisualizablePipeline> visualizablePipelines = new ArrayList<>();
- getPipelineStorage()
- .getAllPipelines()
- .forEach(pipeline -> {
- List<DataSinkInvocation> dashboardSinks = extractDashboardSinks(pipeline);
- dashboardSinks.forEach(sink -> {
- org.apache.streampipes.model.dashboard.VisualizablePipeline visualizablePipeline = new org.apache.streampipes.model.dashboard.VisualizablePipeline();
- visualizablePipeline.setPipelineId(pipeline.getPipelineId());
- visualizablePipeline.setPipelineName(pipeline.getName());
- visualizablePipeline.setVisualizationName(extractVisualizationName(sink));
- visualizablePipeline.setSchema(sink.getInputStreams().get(0).getEventSchema());
- visualizablePipeline.setTopic(makeTopic(sink));
-
- visualizablePipelines.add(visualizablePipeline);
- });
- });
-
- return visualizablePipelines;
- }
-
- private String makeTopic(DataSinkInvocation sink) {
- return extractInputTopic(sink) + "-" + normalize(extractVisualizationName(sink));
- }
-
- private String extractInputTopic(DataSinkInvocation sink) {
- return sink
- .getInputStreams()
- .get(0)
- .getEventGrounding()
- .getTransportProtocol()
- .getTopicDefinition()
- .getActualTopicName();
- }
-
- private String normalize(String visualizationName) {
- return visualizationName.replaceAll(" ", "").toLowerCase();
- }
-
-
- private String extractVisualizationName(DataSinkInvocation sink) {
- return sink.getStaticProperties()
- .stream()
- .filter(sp -> sp.getInternalName().equals(VisualizationFieldInternalName))
- .map(sp -> (FreeTextStaticProperty) sp)
- .findFirst().get().getValue();
- }
-
- private List<DataSinkInvocation> extractDashboardSinks(Pipeline pipeline) {
- return pipeline
- .getActions()
- .stream()
- .filter(sink -> sink.getAppId().equals(DashboardAppId))
- .collect(Collectors.toList());
- }
-}
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/VisualizablePipelineResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/VisualizablePipelineResource.java
new file mode 100644
index 0000000..9d0492a
--- /dev/null
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dashboard/VisualizablePipelineResource.java
@@ -0,0 +1,82 @@
+/*
+ * 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.rest.impl.dashboard;
+
+import org.apache.streampipes.model.dashboard.VisualizablePipeline;
+import org.apache.streampipes.model.graph.DataSinkInvocation;
+import org.apache.streampipes.model.pipeline.Pipeline;
+import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+
+@Path("/v2/users/{username}/dashboard/pipelines")
+public class VisualizablePipelineResource extends AbstractPipelineExtractionResource<VisualizablePipeline> {
+
+ private static final String DashboardAppId = "org.apache.streampipes.sinks.internal.jvm.dashboard";
+ private static final String VisualizationFieldInternalName = "visualization-name";
+
+ @GET
+ @JacksonSerialized
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getVisualizablePipelines() {
+ return ok(extract(new ArrayList<>(), DashboardAppId));
+ }
+
+ @GET
+ @JacksonSerialized
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("{pipelineId}/{visualizationName}")
+ public Response getVisualizablePipelineByPipelineIdAndVisualizationName(@PathParam("pipelineId") String pipelineId,
+ @PathParam("visualizationName") String visualizationName) {
+ return getPipelineByIdAndFieldValue(DashboardAppId, pipelineId, visualizationName);
+ }
+
+ private String makeTopic(DataSinkInvocation sink) {
+ return extractInputTopic(sink) + "-" + normalize(extractFieldValue(sink, VisualizationFieldInternalName));
+ }
+
+ private String normalize(String visualizationName) {
+ return visualizationName.replaceAll(" ", "").toLowerCase();
+ }
+
+ @Override
+ protected org.apache.streampipes.model.dashboard.VisualizablePipeline convert(Pipeline pipeline, DataSinkInvocation sink) {
+ VisualizablePipeline visualizablePipeline = new org.apache.streampipes.model.dashboard.VisualizablePipeline();
+ visualizablePipeline.setPipelineId(pipeline.getPipelineId());
+ visualizablePipeline.setPipelineName(pipeline.getName());
+ visualizablePipeline.setVisualizationName(extractFieldValue(sink, VisualizationFieldInternalName));
+ visualizablePipeline.setSchema(sink.getInputStreams().get(0).getEventSchema());
+ visualizablePipeline.setTopic(makeTopic(sink));
+ return visualizablePipeline;
+ }
+
+ @Override
+ protected boolean matches(VisualizablePipeline pipeline,
+ String pipelineId,
+ String visualizationName) {
+ return pipeline.getPipelineId().equals(pipelineId)
+ && pipeline.getVisualizationName().equals(visualizationName);
+ }
+}
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/PersistedDataStreamResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/PersistedDataStreamResource.java
new file mode 100644
index 0000000..853f09b
--- /dev/null
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/PersistedDataStreamResource.java
@@ -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.
+ *
+ */
+package org.apache.streampipes.rest.impl.datalake;
+
+import org.apache.streampipes.model.datalake.PersistedDataStream;
+import org.apache.streampipes.model.graph.DataSinkInvocation;
+import org.apache.streampipes.model.pipeline.Pipeline;
+import org.apache.streampipes.rest.impl.dashboard.AbstractPipelineExtractionResource;
+import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+
+@Path("/v3/users/{username}/datalake/pipelines")
+public class PersistedDataStreamResource extends AbstractPipelineExtractionResource<PersistedDataStream> {
+
+ private static final String DataLakeAppId = "org.apache.streampipes.sinks.internal.jvm.datalake";
+ private static final String MeasureFieldInternalName = "db_measurement";
+
+ @GET
+ @JacksonSerialized
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getPersistedDataStreams() {
+ return ok(extract(new ArrayList<>(), DataLakeAppId));
+ }
+
+ @GET
+ @JacksonSerialized
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("{pipelineId}/{measureName}")
+ public Response getVisualizablePipelineByPipelineIdAndVisualizationName(@PathParam("pipelineId") String pipelineId,
+ @PathParam("measureName") String measureName) {
+ return getPipelineByIdAndFieldValue(DataLakeAppId, pipelineId, measureName);
+ }
+
+ @Override
+ protected PersistedDataStream convert(Pipeline pipeline, DataSinkInvocation sink) {
+ PersistedDataStream ps = new PersistedDataStream();
+ ps.setSchema(sink.getInputStreams().get(0).getEventSchema());
+ ps.setPipelineId(pipeline.getPipelineId());
+ ps.setPipelineName(pipeline.getName());
+ ps.setMeasureName(extractFieldValue(sink, MeasureFieldInternalName));
+
+ return ps;
+ }
+
+ @Override
+ protected boolean matches(PersistedDataStream persistedDataStream, String pipelineId, String fieldValue) {
+ return persistedDataStream.getPipelineId().equals(pipelineId) &&
+ persistedDataStream.getMeasureName().equals(fieldValue);
+ }
+}
diff --git a/ui/src/app/core-model/gen/streampipes-model.ts b/ui/src/app/core-model/gen/streampipes-model.ts
index 9ac229d..0db11de 100644
--- a/ui/src/app/core-model/gen/streampipes-model.ts
+++ b/ui/src/app/core-model/gen/streampipes-model.ts
@@ -19,10 +19,10 @@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 2.27.744 on 2021-06-21 21:05:13.
+// Generated using typescript-generator version 2.27.744 on 2021-07-27 22:29:33.
export class AbstractStreamPipesEntity {
- "@class": "org.apache.streampipes.model.base.AbstractStreamPipesEntity" | "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.AdapterStre [...]
+ "@class": "org.apache.streampipes.model.base.AbstractStreamPipesEntity" | "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.AdapterStre [...]
elementId: string;
static fromData(data: AbstractStreamPipesEntity, target?: AbstractStreamPipesEntity): AbstractStreamPipesEntity {
@@ -37,7 +37,7 @@ export class AbstractStreamPipesEntity {
}
export class UnnamedStreamPipesEntity extends AbstractStreamPipesEntity {
- "@class": "org.apache.streampipes.model.base.UnnamedStreamPipesEntity" | "org.apache.streampipes.model.connect.guess.GuessSchema" | "org.apache.streampipes.model.connect.rules.TransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription" | "org.apache.streamp [...]
+ "@class": "org.apache.streampipes.model.base.UnnamedStreamPipesEntity" | "org.apache.streampipes.model.connect.guess.GuessSchema" | "org.apache.streampipes.model.connect.rules.TransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription" | "org.apache.streamp [...]
static fromData(data: UnnamedStreamPipesEntity, target?: UnnamedStreamPipesEntity): UnnamedStreamPipesEntity {
if (!data) {
@@ -165,6 +165,7 @@ export class AdapterDescription extends NamedStreamPipesEntity {
adapterType: string;
category: string[];
config: StaticPropertyUnion[];
+ correspondingServiceGroup: string;
createdAt: number;
eventGrounding: EventGrounding;
icon: string;
@@ -192,9 +193,10 @@ export class AdapterDescription extends NamedStreamPipesEntity {
instance.category = __getCopyArrayFn(__identity<string>())(data.category);
instance.createdAt = data.createdAt;
instance.selectedEndpointUrl = data.selectedEndpointUrl;
+ instance.correspondingServiceGroup = data.correspondingServiceGroup;
instance.id = data.id;
- instance.streamRules = __getCopyArrayFn(__identity<any>())(data.streamRules);
instance.valueRules = __getCopyArrayFn(__identity<any>())(data.valueRules);
+ instance.streamRules = __getCopyArrayFn(__identity<any>())(data.streamRules);
instance.schemaRules = __getCopyArrayFn(__identity<any>())(data.schemaRules);
return instance;
}
@@ -807,8 +809,7 @@ export class CustomTransformOutputStrategy extends OutputStrategy {
}
}
-export class DashboardEntity extends UnnamedStreamPipesEntity {
- "@class": "org.apache.streampipes.model.dashboard.DashboardEntity" | "org.apache.streampipes.model.dashboard.DashboardWidgetModel" | "org.apache.streampipes.model.datalake.DataExplorerWidgetModel";
+export class DashboardEntity {
_id: string;
_rev: string;
@@ -817,23 +818,10 @@ export class DashboardEntity extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new DashboardEntity();
- super.fromData(data, instance);
instance._id = data._id;
instance._rev = data._rev;
return instance;
}
-
- static fromDataUnion(data: DashboardEntityUnion): DashboardEntityUnion {
- if (!data) {
- return data;
- }
- switch (data["@class"]) {
- case "org.apache.streampipes.model.dashboard.DashboardWidgetModel":
- return DashboardWidgetModel.fromData(data);
- case "org.apache.streampipes.model.datalake.DataExplorerWidgetModel":
- return DataExplorerWidgetModel.fromData(data);
- }
- }
}
export class DashboardItem {
@@ -866,6 +854,8 @@ export class DashboardItem {
export class DashboardModel {
_id: string;
_rev: string;
+ dashboardGeneralSettings: { [index: string]: any };
+ dashboardTimeSettings: { [index: string]: any };
description: string;
displayHeader: boolean;
id: string;
@@ -881,6 +871,8 @@ export class DashboardModel {
instance.name = data.name;
instance.description = data.description;
instance.displayHeader = data.displayHeader;
+ instance.dashboardTimeSettings = __getCopyObjectFn(__identity<any>())(data.dashboardTimeSettings);
+ instance.dashboardGeneralSettings = __getCopyObjectFn(__identity<any>())(data.dashboardGeneralSettings);
instance.widgets = __getCopyArrayFn(DashboardItem.fromData)(data.widgets);
instance._id = data._id;
instance._rev = data._rev;
@@ -889,7 +881,6 @@ export class DashboardModel {
}
export class DashboardWidgetModel extends DashboardEntity {
- "@class": "org.apache.streampipes.model.dashboard.DashboardWidgetModel";
dashboardWidgetSettings: DashboardWidgetSettings;
pipelineId: string;
visualizationName: string;
@@ -937,9 +928,11 @@ export class DashboardWidgetSettings extends UnnamedStreamPipesEntity {
}
export class DataExplorerWidgetModel extends DashboardEntity {
- "@class": "org.apache.streampipes.model.datalake.DataExplorerWidgetModel";
- dataLakeMeasure: DataLakeMeasure;
- selectedKeys: string;
+ baseAppearanceConfig: { [index: string]: any };
+ dataConfig: { [index: string]: any };
+ measureName: string;
+ pipelineId: string;
+ visualizationConfig: { [index: string]: any };
widgetId: string;
widgetType: string;
@@ -951,8 +944,11 @@ export class DataExplorerWidgetModel extends DashboardEntity {
super.fromData(data, instance);
instance.widgetId = data.widgetId;
instance.widgetType = data.widgetType;
- instance.selectedKeys = data.selectedKeys;
- instance.dataLakeMeasure = DataLakeMeasure.fromData(data.dataLakeMeasure);
+ instance.baseAppearanceConfig = __getCopyObjectFn(__identity<any>())(data.baseAppearanceConfig);
+ instance.visualizationConfig = __getCopyObjectFn(__identity<any>())(data.visualizationConfig);
+ instance.dataConfig = __getCopyObjectFn(__identity<any>())(data.dataConfig);
+ instance.pipelineId = data.pipelineId;
+ instance.measureName = data.measureName;
return instance;
}
}
@@ -1651,9 +1647,9 @@ 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.eventSchema = EventSchema.fromData(data.eventSchema);
return instance;
}
}
@@ -1670,9 +1666,9 @@ 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.eventSchema = EventSchema.fromData(data.eventSchema);
return instance;
}
}
@@ -2059,6 +2055,25 @@ export class Option extends UnnamedStreamPipesEntity {
}
}
+export class PersistedDataStream {
+ measureName: string;
+ pipelineId: string;
+ pipelineName: string;
+ schema: EventSchema;
+
+ static fromData(data: PersistedDataStream, target?: PersistedDataStream): PersistedDataStream {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new PersistedDataStream();
+ instance.pipelineId = data.pipelineId;
+ instance.pipelineName = data.pipelineName;
+ instance.schema = EventSchema.fromData(data.schema);
+ instance.measureName = data.measureName;
+ return instance;
+ }
+}
+
export class Pipeline extends ElementComposition {
_id: string;
_rev: string;
@@ -2735,6 +2750,7 @@ export class SpDataSet extends SpDataStream {
brokerHostname: string;
correspondingPipeline: string;
datasetInvocationId: string;
+ selectedEndpointUrl: string;
supportedGrounding: EventGrounding;
static fromData(data: SpDataSet, target?: SpDataSet): SpDataSet {
@@ -2746,8 +2762,9 @@ export class SpDataSet extends SpDataStream {
instance.supportedGrounding = EventGrounding.fromData(data.supportedGrounding);
instance.datasetInvocationId = data.datasetInvocationId;
instance.correspondingPipeline = data.correspondingPipeline;
- instance.actualTopicName = data.actualTopicName;
+ instance.selectedEndpointUrl = data.selectedEndpointUrl;
instance.brokerHostname = data.brokerHostname;
+ instance.actualTopicName = data.actualTopicName;
return instance;
}
}
@@ -3031,8 +3048,6 @@ export type AdapterSetDescriptionUnion = GenericAdapterSetDescription | Specific
export type AdapterStreamDescriptionUnion = SpecificAdapterStreamDescription;
-export type DashboardEntityUnion = DashboardWidgetModel | DataExplorerWidgetModel;
-
export type EventPropertyQualityDefinitionUnion = Accuracy | MeasurementRange | Precision | Resolution;
export type EventPropertyUnion = EventPropertyList | EventPropertyNested | EventPropertyPrimitive;
diff --git a/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.html b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.html
index e69de29..79c4631 100644
--- a/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.html
+++ b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.html
@@ -0,0 +1,49 @@
+<!--
+ ~ 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 fxFlex="100" fxLayout="column">
+ <h4>Widget Title</h4>
+ <div fxFlex="100" fxLayout="row">
+ <mat-form-field color="accent" fxFlex="100">
+ <mat-label>Widget Title</mat-label>
+ <input matInput
+ [(ngModel)]="baseAppearanceConfig.widgetTitle"/>
+ </mat-form-field>
+ </div>
+
+ <h4>Color Settings</h4>
+ <div fxFlex="100" fxLayout="row">
+ <mat-form-field color="accent" fxFlex="100">
+ <mat-label>Background Color</mat-label>
+ <input matInput
+ [(colorPicker)]="baseAppearanceConfig.backgroundColor"
+ [cpPosition]="'bottom'"
+ [style.background]="baseAppearanceConfig.backgroundColor" required [cpPresetColors] = "presetColors"/>
+ </mat-form-field>
+ </div>
+
+ <div fxFlex="100" fxLayout="row">
+ <mat-form-field color="accent" fxFlex="100">
+ <mat-label>Text Color</mat-label>
+ <input matInput
+ [(colorPicker)]="baseAppearanceConfig.textColor"
+ [cpPosition]="'bottom'"
+ [style.background]="baseAppearanceConfig.textColor" required [cpPresetColors] = "presetColors"/>
+ </mat-form-field>
+ </div>
+</div>
diff --git a/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.scss b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.scss
index e69de29..13cbc4a 100644
--- a/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.scss
+++ b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.scss
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ *
+ */
diff --git a/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
index ea872b8..47dcbca 100644
--- a/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
+++ b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
@@ -16,17 +16,23 @@
*
*/
-import {Component, OnInit} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
+import {DataExplorerWidgetModel} from "../../../../core-model/gen/streampipes-model";
+import {WidgetBaseAppearanceConfig} from "../../../models/dataview-dashboard.model";
@Component({
- selector: 'sp-data-explorer-designer-panel',
- templateUrl: './data-explorer-designer-panel.component.html',
- styleUrls: ['./data-explorer-designer-panel.component.scss'],
+ selector: 'sp-data-explorer-widget-appearance-settings',
+ templateUrl: './data-explorer-widget-appearance-settings.component.html',
+ styleUrls: ['./data-explorer-widget-appearance-settings.component.scss'],
})
export class DataExplorerWidgetAppearanceSettingsComponent implements OnInit {
+ @Input() baseAppearanceConfig: WidgetBaseAppearanceConfig;
+
+ presetColors: Array<any> = ["#39B54A", "#1B1464", "#f44336", "#4CAF50", "#FFEB3B", "#FFFFFF", "#000000"];
ngOnInit(): void {
+
}
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.html b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.html
index 2745046..8bb6a0a 100644
--- a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.html
+++ b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.html
@@ -23,12 +23,13 @@
<mat-tab label="Visualization"></mat-tab>
<mat-tab label="Appearance"></mat-tab>
</mat-tab-group>
- <input [(ngModel)]="currentlyConfiguredWidget.dataLakeMeasure.measureName" *ngIf="currentlyConfiguredWidget">
<div fxFlex="100" fxLayout="column">
<div class="designer-panel-config" *ngIf="currentlyConfiguredWidget">
<div *ngIf="selectedIndex == 0">
- <span>Data settings</span>
+ <sp-data-explorer-widget-data-settings [persistedDataStream]="persistedDataStream" [currentlyConfiguredWidget]="currentlyConfiguredWidget">
+
+ </sp-data-explorer-widget-data-settings>
</div>
<div *ngIf="selectedIndex == 1">
Visualization
@@ -39,7 +40,10 @@
</div>
</div>
<div *ngIf="selectedIndex == 2">
- Appearance
+ <sp-data-explorer-widget-appearance-settings
+ [baseAppearanceConfig]="currentlyConfiguredWidget.baseAppearanceConfig">
+
+ </sp-data-explorer-widget-appearance-settings>
</div>
</div>
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss
index 70f39ee..9a93f19 100644
--- a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss
+++ b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss
@@ -19,3 +19,7 @@
.designer-panel-content {
padding: 10px;
}
+
+.designer-panel-config {
+ padding: 10px;
+}
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.ts b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.ts
index 994cdeb..1386db0 100644
--- a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.ts
+++ b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.ts
@@ -41,7 +41,7 @@ import {RefreshDashboardService} from '../../services/refresh-dashboard.service'
import {ResizeService} from '../../services/resize.service';
import {
DashboardWidgetModel,
- DataExplorerWidgetModel
+ DataExplorerWidgetModel, PersistedDataStream
} from "../../../core-model/gen/streampipes-model";
import {forkJoin} from "rxjs/internal/observable/forkJoin";
import {Observable} from "rxjs";
@@ -55,6 +55,7 @@ import {DataExplorerDashboardGridComponent} from "../grid/data-explorer-dashboar
export class DataExplorerDesignerPanelComponent implements OnInit {
@Input() currentlyConfiguredWidget: DataExplorerWidgetModel;
+ @Input() persistedDataStream: PersistedDataStream;
selectedIndex: number = 0;
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.html b/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.html
new file mode 100644
index 0000000..fed830e
--- /dev/null
+++ b/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.html
@@ -0,0 +1,30 @@
+<!--
+ ~ 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 fxFlex="100">
+ <h4>Pipeline</h4>
+ <mat-form-field color="accent">
+ <mat-label>Data Explorer Sinks</mat-label>
+ <mat-select [(value)]="persistedDataStream">
+ <mat-option [value]="pipeline" *ngFor="let pipeline of availablePipelines">
+ <div class="pipeline-name">{{ pipeline.pipelineName }}</div>
+ <div class="measure-name">{{ pipeline.measureName }}</div>
+ </mat-option>
+ </mat-select>
+ </mat-form-field>
+</div>
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss b/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.scss
similarity index 90%
copy from ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss
copy to ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.scss
index 70f39ee..61d4e85 100644
--- a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss
+++ b/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.scss
@@ -16,6 +16,11 @@
*
*/
-.designer-panel-content {
- padding: 10px;
+.pipeline-name {
+ font-weight: bold;
+}
+
+.measure-name {
+ font-weight: normal;
+
}
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts b/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts
new file mode 100644
index 0000000..33fed90
--- /dev/null
+++ b/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.ts
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ *
+ */
+
+import {Component, Input, OnInit} from '@angular/core';
+import {
+ DataExplorerWidgetModel,
+ PersistedDataStream
+} from "../../../../core-model/gen/streampipes-model";
+import {DataViewDataExplorerService} from "../../../services/data-view-data-explorer.service";
+
+@Component({
+ selector: 'sp-data-explorer-widget-data-settings',
+ templateUrl: './data-explorer-widget-data-settings.component.html',
+ styleUrls: ['./data-explorer-widget-data-settings.component.scss'],
+})
+export class DataExplorerWidgetDataSettingsComponent implements OnInit {
+
+ @Input() currentlyConfiguredWidget: DataExplorerWidgetModel;
+ @Input() persistedDataStream: PersistedDataStream;
+
+ availablePipelines: Array<PersistedDataStream>;
+
+ constructor(private dataExplorerService: DataViewDataExplorerService) {
+
+ }
+
+ ngOnInit(): void {
+ console.log(this.persistedDataStream);
+ this.loadAvailablePipelines();
+ }
+
+ loadAvailablePipelines() {
+ this.dataExplorerService.getAllPersistedDataStreams().subscribe(response => {
+ this.availablePipelines = response;
+ })
+ }
+
+
+}
diff --git a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html
index 058851f..b73e9d6 100644
--- a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html
+++ b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html
@@ -31,8 +31,10 @@
[item]="item"
[widget]="item"
[configuredWidget]="configuredWidgets.get(item.id)"
+ [persistedDataStream]="persistedDataStreams.get(item.id)"
[editMode]="editMode"
- [gridsterItemComponent]="gridsterItemComponent" *ngIf="configuredWidgets.has(item.id)"></sp-data-explorer-dashboard-widget>
+ [gridsterItemComponent]="gridsterItemComponent"
+ *ngIf="configuredWidgets.has(item.id) && persistedDataStreams.has(item.id)"></sp-data-explorer-dashboard-widget>
</gridster-item>
</ng-container>
</gridster>
diff --git a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
index 2c0e862..affcb5f 100644
--- a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
+++ b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
@@ -41,10 +41,11 @@ import {RefreshDashboardService} from '../../services/refresh-dashboard.service'
import {ResizeService} from '../../services/resize.service';
import {
DashboardWidgetModel,
- DataExplorerWidgetModel
+ DataExplorerWidgetModel, PersistedDataStream
} from "../../../core-model/gen/streampipes-model";
import {forkJoin} from "rxjs/internal/observable/forkJoin";
import {Observable} from "rxjs";
+import {Tuple2} from "../../../core-model/base/Tuple2";
@Component({
selector: 'sp-data-explorer-dashboard-grid',
@@ -60,6 +61,7 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
dashboard: IDataViewDashboard;
configuredWidgets: Map<String, DataExplorerWidgetModel> = new Map<String, DataExplorerWidgetModel>();
+ persistedDataStreams: Map<String, PersistedDataStream> = new Map<String, PersistedDataStream>();
/**
* This is the date range (start, end) to view the data and is set in data-explorer.ts
@@ -69,7 +71,7 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
@Output() deleteCallback: EventEmitter<IDataViewDashboardItem> = new EventEmitter<IDataViewDashboardItem>();
@Output() updateCallback: EventEmitter<DataExplorerWidgetModel> = new EventEmitter<DataExplorerWidgetModel>();
- @Output() configureWidgetCallback: EventEmitter<DataExplorerWidgetModel> = new EventEmitter<DataExplorerWidgetModel>();
+ @Output() configureWidgetCallback: EventEmitter<Tuple2<DataExplorerWidgetModel, PersistedDataStream>> = new EventEmitter<Tuple2<DataExplorerWidgetModel, PersistedDataStream>>();
options: IDataViewDashboardConfig;
loaded = false;
@@ -117,7 +119,9 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
loadWidgetConfig(widgetId: string) {
this.dataViewDataExplorerService.getWidget(widgetId).subscribe(response => {
this.configuredWidgets.set(widgetId, response);
- console.log(this.configuredWidgets);
+ this.dataViewDataExplorerService.getPersistedDataStream(response.pipelineId, response.measureName).subscribe(ps => {
+ this.persistedDataStreams.set(widgetId, ps);
+ })
});
}
@@ -138,7 +142,7 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
this.updateCallback.emit(dashboardWidget);
}
- propagateWidgetSelection(configuredWidget: DataExplorerWidgetModel) {
+ propagateWidgetSelection(configuredWidget: Tuple2<DataExplorerWidgetModel, PersistedDataStream>) {
this.configureWidgetCallback.emit(configuredWidget);
this.options.api.optionsChanged();
}
@@ -148,8 +152,10 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
this.options.api.optionsChanged();
}
- triggerWidgetSelection(item: DataExplorerWidgetModel) {
- this.configureWidgetCallback.emit(item);
+ updateAllWidgets() {
+ this.configuredWidgets.forEach((value, key) => {
+ this.dataViewDataExplorerService.updateWidget(value).subscribe();
+ })
}
}
diff --git a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html
index bacdaae..e497c05 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html
+++ b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html
@@ -28,7 +28,10 @@
</button>
</div>
</div>
- <sp-data-explorer-designer-panel [currentlyConfiguredWidget]="currentlyConfiguredWidget" fxFlex="100">
+ <sp-data-explorer-designer-panel
+ [currentlyConfiguredWidget]="currentlyConfiguredWidget"
+ [persistedDataStream]="persistedDataStream"
+ fxFlex="100">
</sp-data-explorer-designer-panel>
</div>
diff --git a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
index af110e3..b7785f0 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
+++ b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
@@ -27,10 +27,11 @@ import { DataViewDataExplorerService } from '../../services/data-view-data-explo
import { RefreshDashboardService } from '../../services/refresh-dashboard.service';
import {
DashboardWidgetModel,
- DataExplorerWidgetModel
+ DataExplorerWidgetModel, PersistedDataStream
} from "../../../core-model/gen/streampipes-model";
import {DataExplorerDashboardGridComponent} from "../grid/data-explorer-dashboard-grid.component";
import {MatDrawer} from "@angular/material/sidenav";
+import {Tuple2} from "../../../core-model/base/Tuple2";
@Component({
selector: 'sp-data-explorer-dashboard-panel',
@@ -65,6 +66,7 @@ export class DataExplorerDashboardPanelComponent implements OnInit {
widgetsToUpdate: Map<string, DataExplorerWidgetModel> = new Map<string, DataExplorerWidgetModel>();
currentlyConfiguredWidget: DataExplorerWidgetModel;
+ persistedDataStream: PersistedDataStream;
constructor(private dataViewDataExplorerService: DataViewDataExplorerService,
public dialog: MatDialog,
@@ -99,18 +101,21 @@ export class DataExplorerDashboardPanelComponent implements OnInit {
dashboardItem.x = 0;
dashboardItem.y = 0;
this.dashboard.widgets.push(dashboardItem);
+ this.dashboardGrid.loadWidgetConfig(widget._id);
}
updateDashboard(closeEditMode?: boolean) {
this.dataViewDataExplorerService.updateDashboard(this.dashboard).subscribe(result => {
- if (this.widgetsToUpdate.size > 0) {
- forkJoin(this.prepareWidgetUpdates()).subscribe(result => {
- this.closeEditModeAndReloadDashboard(closeEditMode);
- });
- } else {
- this.deleteWidgets();
- this.closeEditModeAndReloadDashboard(false);
- }
+ // TODO delete widgets
+ this.dashboardGrid.updateAllWidgets();
+ // if (this.widgetsToUpdate.size > 0) {
+ // forkJoin(this.prepareWidgetUpdates()).subscribe(result => {
+ // this.closeEditModeAndReloadDashboard(closeEditMode);
+ // });
+ // } else {
+ // this.deleteWidgets();
+ // this.closeEditModeAndReloadDashboard(false);
+ // }
});
}
@@ -159,8 +164,10 @@ export class DataExplorerDashboardPanelComponent implements OnInit {
this.dashboardGrid.options.api.optionsChanged();
}
- updateCurrentlyConfiguredWidget(widget: DataExplorerWidgetModel) {
- this.currentlyConfiguredWidget = widget;
+ updateCurrentlyConfiguredWidget(currentWidget: Tuple2<DataExplorerWidgetModel, PersistedDataStream>) {
+ this.widgetsToUpdate.set(currentWidget.a._id, currentWidget.a);
+ this.currentlyConfiguredWidget = currentWidget.a;
+ this.persistedDataStream = currentWidget.b;
this.designerDrawer.open();
}
}
diff --git a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html
index 6ff9f5b..4145a83 100644
--- a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html
+++ b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html
@@ -17,11 +17,11 @@
-->
<div class="h-100">
- <div class="box">
+ <div class="box" [ngStyle]="{background: configuredWidget.baseAppearanceConfig.backgroundColor, color: configuredWidget.baseAppearanceConfig.textColor}">
<div class="widget-header">
<div class="m-0 row header h-40" *ngIf="editMode">
<div fxFlex="100" fxLayout="row" fxLayoutAlign="start center" class="widget-header-text">
- {{ configuredWidget.dataLakeMeasure.measureName }}
+ {{ configuredWidget.baseAppearanceConfig.widgetTitle }}
</div>
<div fxFlex="100" fxLayout="row" fxLayoutAlign="end center" *ngIf="editMode">
<button mat-icon-button (click)="triggerWidgetEditMode()">
@@ -53,7 +53,10 @@
[gridsterItemComponent]="gridsterItemComponent"
[editMode]="editMode"
[dataViewDashboardItem]="widget"
- [dataExplorerWidget]="configuredWidget" class="h-100"></sp-data-explorer-table-widget>
+ [dataExplorerWidget]="configuredWidget"
+ [persistedDataStream]="persistedDataStream"
+ class="h-100">
+ </sp-data-explorer-table-widget>
</div>
<div *ngIf="configuredWidget.widgetType === 'line-chart'" class="h-100 p-0">
<sp-data-explorer-line-chart-widget
@@ -63,7 +66,10 @@
[gridsterItemComponent]="gridsterItemComponent"
[editMode]="editMode"
[dataViewDashboardItem]="widget"
- [dataExplorerWidget]="configuredWidget" class="h-100"></sp-data-explorer-line-chart-widget>
+ [dataExplorerWidget]="configuredWidget"
+ [persistedDataStream]="persistedDataStream"
+ class="h-100">
+ </sp-data-explorer-line-chart-widget>
</div>
<div *ngIf="configuredWidget.widgetType === 'image'" class="h-100 p-0">
<sp-data-explorer-image-widget
diff --git a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.scss b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.scss
index 7173caa..3474819 100644
--- a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.scss
+++ b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.scss
@@ -19,7 +19,7 @@
@import '../../../../scss/variables';
.gridster-item-content {
- background: var(--color-bg-0);
+ //background: var(--color-bg-0);
}
.h-100 {
diff --git a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
index 6b28393..5ce1854 100644
--- a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
+++ b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
@@ -23,8 +23,12 @@ import { DateRange } from '../../../core-model/datalake/DateRange';
import { DataExplorerAddVisualizationDialogComponent } from '../../dialogs/add-widget/data-explorer-add-visualization-dialog.component';
import { IDataViewDashboardItem } from '../../models/dataview-dashboard.model';
import { DataViewDataExplorerService } from '../../services/data-view-data-explorer.service';
-import {DataExplorerWidgetModel} from "../../../core-model/gen/streampipes-model";
+import {
+ DataExplorerWidgetModel,
+ PersistedDataStream
+} from "../../../core-model/gen/streampipes-model";
import {DataDownloadDialog} from "../datadownloadDialog/dataDownload.dialog";
+import {Tuple2} from "../../../core-model/base/Tuple2";
@Component({
selector: 'sp-data-explorer-dashboard-widget',
@@ -40,6 +44,9 @@ export class DataExplorerDashboardWidgetComponent implements OnInit {
configuredWidget: DataExplorerWidgetModel;
@Input()
+ persistedDataStream: PersistedDataStream;
+
+ @Input()
editMode: boolean;
@Input()
@@ -56,7 +63,7 @@ export class DataExplorerDashboardWidgetComponent implements OnInit {
@Output() deleteCallback: EventEmitter<IDataViewDashboardItem> = new EventEmitter<IDataViewDashboardItem>();
@Output() updateCallback: EventEmitter<DataExplorerWidgetModel> = new EventEmitter<DataExplorerWidgetModel>();
- @Output() configureWidgetCallback: EventEmitter<DataExplorerWidgetModel> = new EventEmitter<DataExplorerWidgetModel>();
+ @Output() configureWidgetCallback: EventEmitter<Tuple2<DataExplorerWidgetModel, PersistedDataStream>> = new EventEmitter<Tuple2<DataExplorerWidgetModel, PersistedDataStream>>();
title = '';
@@ -69,7 +76,7 @@ export class DataExplorerDashboardWidgetComponent implements OnInit {
ngOnInit(): void {
console.log(this.configuredWidget);
this.widgetLoaded = true;
- this.title = this.configuredWidget.dataLakeMeasure.measureName;
+ this.title = this.persistedDataStream.measureName;
}
removeWidget() {
@@ -97,12 +104,12 @@ export class DataExplorerDashboardWidgetComponent implements OnInit {
downloadDataAsFile() {
const dialogRef = this.dialog.open(DataDownloadDialog, {
width: '600px',
- data: { index: this.configuredWidget.dataLakeMeasure.measureName, date: this.viewDateRange },
+ data: { index: this.persistedDataStream.measureName, date: this.viewDateRange },
panelClass: 'custom-dialog-container'
});
}
triggerWidgetEditMode() {
- this.configureWidgetCallback.emit(this.configuredWidget);
+ this.configureWidgetCallback.emit({a: this.configuredWidget, b: this.persistedDataStream});
}
}
diff --git a/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts b/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts
index b67e30d..1197728 100644
--- a/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts
+++ b/ui/src/app/data-explorer/components/widgets/base/base-data-explorer-widget.ts
@@ -26,7 +26,7 @@ import { DataDownloadDialog } from '../../datadownloadDialog/dataDownload.dialog
import {
DataExplorerWidgetModel,
EventProperty, EventPropertyPrimitive, EventPropertyUnion,
- EventSchema
+ EventSchema, PersistedDataStream
} from "../../../../core-model/gen/streampipes-model";
@Directive()
@@ -48,6 +48,7 @@ export abstract class BaseDataExplorerWidget implements OnChanges {
@Input() dataViewDashboardItem: IDataViewDashboardItem;
@Input() dataExplorerWidget: DataExplorerWidgetModel;
+ @Input() persistedDataStream: PersistedDataStream;
public selectedProperties: string[];
diff --git a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
index 3110c04..f5532ab 100644
--- a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
+++ b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
@@ -141,13 +141,13 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
ngOnInit(): void {
- this.availableProperties = this.getNumericProperty(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
- this.dimensionProperties = this.getDimensionProperties(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
- this.availableNoneNumericColumns = this.getNoneNumericProperties(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
+ this.availableProperties = this.getNumericProperty(this.persistedDataStream.schema);
+ this.dimensionProperties = this.getDimensionProperties(this.persistedDataStream.schema);
+ this.availableNoneNumericColumns = this.getNoneNumericProperties(this.persistedDataStream.schema);
// Reduce selected columns when more then 6
this.selectedLineChartProperties = this.availableProperties.length > 6 ? this.availableProperties.slice(0, 5) : this.availableProperties;
- this.xKey = this.getTimestampProperty(this.dataExplorerWidget.dataLakeMeasure.eventSchema).runtimeName;
+ this.xKey = this.getTimestampProperty(this.persistedDataStream.schema).runtimeName;
this.yKeys = this.getRuntimeNames(this.selectedLineChartProperties);
this.updateData();
this.resizeService.resizeSubject.subscribe(info => {
@@ -166,7 +166,7 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
if (!this.advancedSettingsActive) {
this.setShownComponents(false, false, true);
this.dataLakeRestService.getDataAutoAggregation(
- this.dataExplorerWidget.dataLakeMeasure.measureName, this.viewDateRange.startDate.getTime(), this.viewDateRange.endDate.getTime())
+ this.persistedDataStream.measureName, this.viewDateRange.startDate.getTime(), this.viewDateRange.endDate.getTime())
.subscribe((res: DataResult) => {
this.processNoneGroupedData(res);
});
@@ -174,7 +174,7 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
if (this.groupValue === 'None') {
this.setShownComponents(false, false, true);
this.dataLakeRestService.getData(
- this.dataExplorerWidget.dataLakeMeasure.measureName, this.viewDateRange.startDate.getTime(), this.viewDateRange.endDate.getTime()
+ this.persistedDataStream.measureName, this.viewDateRange.startDate.getTime(), this.viewDateRange.endDate.getTime()
, this.aggregationTimeUnit, this.aggregationValue)
.subscribe((res: DataResult) => {
this.processNoneGroupedData(res);
@@ -194,7 +194,7 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
if (res.total === 0) {
this.setShownComponents(true, false, false);
} else {
- res.measureName = this.dataExplorerWidget.dataLakeMeasure.measureName;
+ res.measureName = this.persistedDataStream.measureName;
const tmp = this.transformData(res, this.xKey);
this.data = this.displayData(tmp, this.yKeys);
diff --git a/ui/src/app/data-explorer/components/widgets/table/table-widget.component.ts b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.ts
index 101ff85..913a2f1 100644
--- a/ui/src/app/data-explorer/components/widgets/table/table-widget.component.ts
+++ b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.ts
@@ -47,8 +47,8 @@ export class TableWidgetComponent extends BaseDataExplorerWidget implements OnIn
ngOnInit(): void {
this.dataSource.sort = this.sort;
- this.availableColumns = [this.getTimestampProperty(this.dataExplorerWidget.dataLakeMeasure.eventSchema)];
- this.availableColumns = this.availableColumns.concat(this.getValuePropertyKeys(this.dataExplorerWidget.dataLakeMeasure.eventSchema));
+ this.availableColumns = [this.getTimestampProperty(this.persistedDataStream.schema)];
+ this.availableColumns = this.availableColumns.concat(this.getValuePropertyKeys(this.persistedDataStream.schema));
// Reduce selected columns when more then 6
this.selectedColumns = this.availableColumns.length > 6 ? this.availableColumns.slice(0, 5) : this.availableColumns;
@@ -62,7 +62,7 @@ export class TableWidgetComponent extends BaseDataExplorerWidget implements OnIn
this.setShownComponents(false, false, true);
this.dataLakeRestService.getDataAutoAggregation(
- this.dataExplorerWidget.dataLakeMeasure.measureName, this.viewDateRange.startDate.getTime(), this.viewDateRange.endDate.getTime())
+ this.persistedDataStream.measureName, this.viewDateRange.startDate.getTime(), this.viewDateRange.endDate.getTime())
.subscribe(
(res: DataResult) => {
this.dataSource.data = this.transformData(res);
diff --git a/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.css b/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.css
index b372e44..8f0e659 100644
--- a/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.css
+++ b/ui/src/app/data-explorer/components/widgets/utils/no-data/no-data-in-date-range.component.css
@@ -17,7 +17,6 @@
*/
.default-text {
- color: var(--color-default-text);
padding: 10px;
font-size: 16pt;
text-align: center;
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
index 16b081c..4b9ee1f 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -69,6 +69,8 @@ import {PointSelectionInfoComponent} from './components/widgets/line-chart/compo
import {ColorService} from './components/widgets/line-chart/services/color.service';
import {DataExplorerDesignerPanelComponent} from "./components/designer-panel/data-explorer-designer-panel.component";
import {TableWidgetConfigComponent} from "./components/widgets/table/config/table-widget-config.component";
+import {DataExplorerWidgetAppearanceSettingsComponent} from "./components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component";
+import {DataExplorerWidgetDataSettingsComponent} from "./components/designer-panel/data-settings/data-explorer-widget-data-settings.component";
const dashboardWidgets = [];
@@ -124,6 +126,8 @@ export const MY_NATIVE_FORMATS = {
DataExplorerDesignerPanelComponent,
DataExplorerAddVisualizationDialogComponent,
DataExplorerEditDataViewDialogComponent,
+ DataExplorerWidgetAppearanceSettingsComponent,
+ DataExplorerWidgetDataSettingsComponent,
TableWidgetComponent,
ImageWidgetComponent,
LineChartWidgetComponent,
diff --git a/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html b/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html
index 47d7c7d..d1d5b57 100644
--- a/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html
+++ b/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.html
@@ -37,7 +37,8 @@
<div mat-list-avatar
class="pipeline-avatar sp-accent-bg">{{iconText(dataSet.measureName)}}
</div>
- <h4 mat-line>{{dataSet.measureName}}</h4>
+ <h4 mat-line>{{dataSet.pipelineName}}</h4>
+ <p mat-line>{{dataSet.measureName}} </p>
</mat-list-item>
</mat-list>
</div>
diff --git a/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts b/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts
index f7584f4..24e66ef 100644
--- a/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts
+++ b/ui/src/app/data-explorer/dialogs/add-widget/data-explorer-add-visualization-dialog.component.ts
@@ -25,7 +25,7 @@ import { DataViewDataExplorerService } from '../../services/data-view-data-explo
import {
DataExplorerWidgetModel,
DataLakeMeasure,
- EventSchema
+ EventSchema, PersistedDataStream
} from "../../../core-model/gen/streampipes-model";
@Component({
@@ -53,10 +53,10 @@ export class DataExplorerAddVisualizationDialogComponent implements OnInit {
description: 'Select widget'
}];
- visualizableData: DataLakeMeasure[] = [];
+ visualizableData: PersistedDataStream[] = [];
availableWidgets: IWidget[];
- selectedDataSet: DataLakeMeasure;
+ selectedDataSet: PersistedDataStream;
selectedWidget: string;
dashboard: IDataViewDashboard;
@@ -76,7 +76,7 @@ export class DataExplorerAddVisualizationDialogComponent implements OnInit {
ngOnInit() {
if (!this.data) {
this.dialogTitle = 'Add widget';
- this.dataViewDataExplorerService.getVisualizableData().subscribe(visualizations => {
+ this.dataViewDataExplorerService.getAllPersistedDataStreams().subscribe(visualizations => {
this.visualizableData = visualizations;
});
this.availableWidgets = DataExplorerWidgetRegistry.getAvailableWidgetTemplates();
@@ -132,8 +132,11 @@ export class DataExplorerAddVisualizationDialogComponent implements OnInit {
// configuredWidget.eventSchema.eventProperties.push(ep.copy());
// }
- configuredWidget.dataLakeMeasure = this.selectedDataSet;
- configuredWidget.dataLakeMeasure["@class"] = "org.apache.streampipes.model.datalake.DataLakeMeasure";
+ configuredWidget.pipelineId = this.selectedDataSet.pipelineId;
+ configuredWidget.measureName = this.selectedDataSet.measureName;
+ configuredWidget.baseAppearanceConfig = {};
+ configuredWidget.visualizationConfig = {};
+ configuredWidget.dataConfig = {};
configuredWidget.widgetType = this.selectedWidget;
this.dataViewDataExplorerService.saveWidget(configuredWidget).subscribe(response => {
this.dialogRef.close(response);
diff --git a/ui/src/app/data-explorer/models/dataview-dashboard.model.ts b/ui/src/app/data-explorer/models/dataview-dashboard.model.ts
index d282903..72b8659 100644
--- a/ui/src/app/data-explorer/models/dataview-dashboard.model.ts
+++ b/ui/src/app/data-explorer/models/dataview-dashboard.model.ts
@@ -40,3 +40,9 @@ export interface IWidget {
id: string;
label: string;
}
+
+export interface WidgetBaseAppearanceConfig {
+ backgroundColor: string;
+ textColor: string;
+ widgetTitle: string;
+}
diff --git a/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts b/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
index 2d22abc..56cfe6e 100644
--- a/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
+++ b/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
@@ -24,7 +24,11 @@ import {DatalakeRestService} from '../../core-services/datalake/datalake-rest.se
import {SharedDatalakeRestService} from '../../core-services/shared/shared-dashboard.service';
import {AuthStatusService} from '../../services/auth-status.service';
import {IDataViewDashboard} from '../models/dataview-dashboard.model';
-import {DataExplorerWidgetModel, DataLakeMeasure} from "../../core-model/gen/streampipes-model";
+import {
+ DataExplorerWidgetModel,
+ DataLakeMeasure,
+ PersistedDataStream
+} from "../../core-model/gen/streampipes-model";
@Injectable()
@@ -46,50 +50,66 @@ export class DataViewDataExplorerService {
}
getDataViews(): Observable<IDataViewDashboard[]> {
- return this.sharedDatalakeRestService.getDashboards(this.getDashboardUrl());
+ return this.sharedDatalakeRestService.getDashboards(this.dashboardUrl);
}
updateDashboard(dashboard: IDataViewDashboard): Observable<IDataViewDashboard> {
- return this.sharedDatalakeRestService.updateDashboard(this.getDashboardUrl(), dashboard);
+ return this.sharedDatalakeRestService.updateDashboard(this.dashboardUrl, dashboard);
}
deleteDashboard(dashboard: IDataViewDashboard): Observable<any> {
- return this.sharedDatalakeRestService.deleteDashboard(this.getDashboardUrl(), dashboard);
+ return this.sharedDatalakeRestService.deleteDashboard(this.dashboardUrl, dashboard);
}
saveDataView(dataViewDashboard: IDataViewDashboard): Observable<any> {
- return this.sharedDatalakeRestService.saveDashboard(this.getDashboardUrl(), dataViewDashboard);
+ return this.sharedDatalakeRestService.saveDashboard(this.dashboardUrl, dataViewDashboard);
}
- private getbaseUrl() {
+ private get baseUrl() {
return '/streampipes-backend';
}
- private getDashboardUrl() {
- return this.getbaseUrl() + '/api/v3/users/' + this.authStatusService.email + '/datalake/dashboard';
+ private get persistedDataStreamsUrl() {
+ return `${this.baseUrl}/api/v3/users/${this.authStatusService.email}/datalake/pipelines`;
}
- private getDashboardWidgetUrl() {
- return this.getbaseUrl() + '/api/v3/users/' + this.authStatusService.email + '/datalake/dashboard/widgets';
+ private get dashboardUrl() {
+ return `${this.baseUrl}/api/v3/users/${this.authStatusService.email}/datalake/dashboard`;
+ }
+
+ private get dashboardWidgetUrl() {
+ return `${this.baseUrl}/api/v3/users/${this.authStatusService.email}/datalake/dashboard/widgets`;
}
getWidget(widgetId: string): Observable<DataExplorerWidgetModel> {
- return this.http.get(this.getDashboardWidgetUrl() + '/' + widgetId).pipe(map(response => {
+ return this.http.get(this.dashboardWidgetUrl + '/' + widgetId).pipe(map(response => {
return DataExplorerWidgetModel.fromData(response as DataExplorerWidgetModel);
}));
}
saveWidget(widget: DataExplorerWidgetModel): Observable<DataExplorerWidgetModel> {
- return this.http.post(this.getDashboardWidgetUrl(), widget).pipe(map(response => {
+ return this.http.post(this.dashboardWidgetUrl, widget).pipe(map(response => {
return DataExplorerWidgetModel.fromData(response as DataExplorerWidgetModel);
}));
}
deleteWidget(widgetId: string): Observable<any> {
- return this.http.delete(this.getDashboardWidgetUrl() + '/' + widgetId);
+ return this.http.delete(this.dashboardWidgetUrl + '/' + widgetId);
}
updateWidget(widget: DataExplorerWidgetModel): Observable<any> {
- return this.http.put(this.getDashboardWidgetUrl() + '/' + widget._id, widget);
+ return this.http.put(this.dashboardWidgetUrl + '/' + widget._id, widget);
+ }
+
+ getPersistedDataStream(pipelineId: string, measureName: string): Observable<PersistedDataStream> {
+ return this.http.get(`${this.persistedDataStreamsUrl}/${pipelineId}/${measureName}`)
+ .pipe(map(response => PersistedDataStream.fromData(response as any)));
+ }
+
+ getAllPersistedDataStreams(): Observable<PersistedDataStream[]> {
+ return this.http.get(this.persistedDataStreamsUrl)
+ .pipe(map(response => {
+ return (response as any[]).map(p => PersistedDataStream.fromData(p));
+ }));
}
}