You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by bo...@apache.org on 2023/10/20 07:46:44 UTC
[streampipes] branch dev updated: refactor: remove references and artifacts for data sets (#2041)
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new f1d863920 refactor: remove references and artifacts for data sets (#2041)
f1d863920 is described below
commit f1d8639206cffafc4703a4fef2764875ccc7a8f9
Author: Tim <50...@users.noreply.github.com>
AuthorDate: Fri Oct 20 09:46:39 2023 +0200
refactor: remove references and artifacts for data sets (#2041)
* refactor: remove references and artifacts for data sets
* revert: change baseUrl in cypress config
* refactor: remove data set from sp service classes
* refactor: use data source for data explorer
---
.../model/extensions/svcdiscovery/SpServiceTagPrefix.java | 3 +--
.../svcdiscovery/api/model/SpServicePathPrefix.java | 1 -
.../svcdiscovery/api/model/SpServiceUrlProvider.java | 1 -
ui/cypress/tests/adapter/editAdapter.smoke.spec.ts | 2 +-
ui/deployment/_variables.scss | 3 +--
.../add/components/endpoint-item/endpoint-item.component.ts | 2 --
.../edit-asset-link/edit-asset-link-dialog.component.html | 2 +-
.../manage-asset-links-dialog.component.html | 2 +-
.../export/export-dialog/data-export-dialog.component.html | 2 +-
.../export/import-dialog/data-import-dialog.component.html | 2 +-
.../schema-editor/error-message/error-message.component.html | 2 +-
.../schema-editor/event-schema/event-schema.component.scss | 4 ----
.../adapter-description/adapter-description.component.scss | 4 ----
.../existing-adapters/existing-adapters.component.scss | 5 -----
.../pipeline-element-icon-stand.component.ts | 7 ++-----
ui/src/app/editor/model/editor.model.ts | 1 -
ui/src/app/editor/utils/editor.utils.ts | 2 --
ui/src/app/services/tour/adapter-tour-2.constants.ts | 2 +-
ui/src/app/services/tour/adapter-tour-3.constants.ts | 2 +-
ui/src/app/services/tour/adapter-tour.constants.ts | 4 ++--
ui/src/scss/sp/main.scss | 11 -----------
ui/src/scss/sp/pipeline-element-options.scss | 5 -----
22 files changed, 14 insertions(+), 55 deletions(-)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/extensions/svcdiscovery/SpServiceTagPrefix.java b/streampipes-model/src/main/java/org/apache/streampipes/model/extensions/svcdiscovery/SpServiceTagPrefix.java
index 006a00af2..346e0b222 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/extensions/svcdiscovery/SpServiceTagPrefix.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/extensions/svcdiscovery/SpServiceTagPrefix.java
@@ -23,8 +23,7 @@ public enum SpServiceTagPrefix {
ADAPTER("adapter"),
DATA_STREAM("dstream"),
DATA_PROCESSOR("dprocessor"),
- DATA_SINK("dsink"),
- DATA_SET("dset");
+ DATA_SINK("dsink");
private String prefix;
diff --git a/streampipes-service-discovery-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServicePathPrefix.java b/streampipes-service-discovery-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServicePathPrefix.java
index 970ca735e..573563a32 100644
--- a/streampipes-service-discovery-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServicePathPrefix.java
+++ b/streampipes-service-discovery-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServicePathPrefix.java
@@ -22,7 +22,6 @@ public class SpServicePathPrefix {
public static final String DATA_PROCESSOR = "sepa";
public static final String DATA_SINK = "sec";
public static final String DATA_STREAM = "stream";
- public static final String DATA_SET = "set";
public static final String ADAPTER = "api/v1/worker/adapters";
public static final String PROTOCOL = "api/v1/worker/protocols";
diff --git a/streampipes-service-discovery-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServiceUrlProvider.java b/streampipes-service-discovery-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServiceUrlProvider.java
index 0e0da154e..892086d07 100644
--- a/streampipes-service-discovery-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServiceUrlProvider.java
+++ b/streampipes-service-discovery-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServiceUrlProvider.java
@@ -25,7 +25,6 @@ public enum SpServiceUrlProvider {
DATA_PROCESSOR(SpServicePathPrefix.DATA_PROCESSOR, SpServiceTagPrefix.DATA_PROCESSOR),
DATA_SINK(SpServicePathPrefix.DATA_SINK, SpServiceTagPrefix.DATA_SINK),
DATA_STREAM(SpServicePathPrefix.DATA_STREAM, SpServiceTagPrefix.DATA_STREAM),
- DATA_SET(SpServicePathPrefix.DATA_SET, SpServiceTagPrefix.DATA_SET),
ADAPTER(SpServicePathPrefix.ADAPTER, SpServiceTagPrefix.ADAPTER);
private final String http = "http://";
diff --git a/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts b/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts
index cb297e1d7..5bad56c0a 100644
--- a/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts
+++ b/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts
@@ -73,7 +73,7 @@ describe('Test Edit Adapter', () => {
ConnectUtils.startAndValidateAdapter(3);
- // Validate that name of adapter and data source
+ // Validate that name of adapter and data stream
cy.dataCy('adapter-name').contains(newAdapterName);
cy.get('.sp-dialog-content').contains(newAdapterName);
});
diff --git a/ui/deployment/_variables.scss b/ui/deployment/_variables.scss
index c8de0a5a4..c91264f81 100644
--- a/ui/deployment/_variables.scss
+++ b/ui/deployment/_variables.scss
@@ -28,7 +28,6 @@ $sp-color-accent-light-transparent: rgba(156, 156, 156, 0.4);
$sp-color-accent-dark: #83a3de;
$sp-color-stream: #ffeb3b;
-$sp-color-set: #ffa23b;
$sp-color-processor: #009688;
$sp-color-sink: #3f51b5;
@@ -38,7 +37,7 @@ body {
--color-data-view: rgb(122, 206, 227);
--color-dashboard: rgb(76, 115, 164);
--color-adapter: rgb(182, 140, 97);
- --color-data-source: #ffa23b;
+ --color-data-source: #ffeb3b;
--color-pipeline: rgb(102, 185, 114);
--color-measurement: rgb(39, 164, 155);
--color-file: rgb(163, 98, 190);
diff --git a/ui/src/app/add/components/endpoint-item/endpoint-item.component.ts b/ui/src/app/add/components/endpoint-item/endpoint-item.component.ts
index f77b1cedf..cbf9f2595 100644
--- a/ui/src/app/add/components/endpoint-item/endpoint-item.component.ts
+++ b/ui/src/app/add/components/endpoint-item/endpoint-item.component.ts
@@ -112,8 +112,6 @@ export class EndpointItemComponent implements OnInit {
const baseType = 'pe-label ';
if (this.item.type === 'stream') {
this.itemTypeStyle = baseType + 'stream-label';
- } else if (this.item.type === 'set') {
- this.itemTypeStyle = baseType + 'set-label';
} else if (this.item.type === 'sepa') {
this.itemTypeStyle = baseType + 'processor-label';
} else {
diff --git a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.html b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.html
index b65fc359f..5e7a3246f 100644
--- a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.html
+++ b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.html
@@ -72,7 +72,7 @@
class="link-configuration"
>
<mat-form-field color="accent" fxFlex="100">
- <mat-label>Data Source</mat-label>
+ <mat-label>Data Stream</mat-label>
<mat-select
(selectionChange)="
changeLabel(
diff --git a/ui/src/app/assets/dialog/manage-asset-links/manage-asset-links-dialog.component.html b/ui/src/app/assets/dialog/manage-asset-links/manage-asset-links-dialog.component.html
index 2acb401b4..d27e5d4f4 100644
--- a/ui/src/app/assets/dialog/manage-asset-links/manage-asset-links-dialog.component.html
+++ b/ui/src/app/assets/dialog/manage-asset-links/manage-asset-links-dialog.component.html
@@ -190,7 +190,7 @@
<div fxLayout="row" fxLayoutAlign="start center" class="mb-10">
<div fxLayout="row" fxLayoutAlign="start center">
<span class="general-options-header mb-0"
- >Data Sources</span
+ >Data Streams</span
>
</div>
<div fxLayout="row" fxLayoutAlign="end center" fxFlex>
diff --git a/ui/src/app/configuration/export/export-dialog/data-export-dialog.component.html b/ui/src/app/configuration/export/export-dialog/data-export-dialog.component.html
index b4682524a..9be2f957f 100644
--- a/ui/src/app/configuration/export/export-dialog/data-export-dialog.component.html
+++ b/ui/src/app/configuration/export/export-dialog/data-export-dialog.component.html
@@ -40,7 +40,7 @@
></sp-data-export-item>
<sp-data-export-item
[exportItems]="config.dataSources"
- sectionTitle="Data Sources"
+ sectionTitle="Data Streams"
></sp-data-export-item>
<sp-data-export-item
[exportItems]="config.dataLakeMeasures"
diff --git a/ui/src/app/configuration/export/import-dialog/data-import-dialog.component.html b/ui/src/app/configuration/export/import-dialog/data-import-dialog.component.html
index 6e0bff524..9e6014846 100644
--- a/ui/src/app/configuration/export/import-dialog/data-import-dialog.component.html
+++ b/ui/src/app/configuration/export/import-dialog/data-import-dialog.component.html
@@ -96,7 +96,7 @@
></sp-data-export-item>
<sp-data-export-item
[exportItems]="importConfiguration.dataSources"
- sectionTitle="Data Sources"
+ sectionTitle="Data Streams"
></sp-data-export-item>
<sp-data-export-item
[exportItems]="importConfiguration.dataLakeMeasures"
diff --git a/ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.html b/ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.html
index 254695234..bdd48b886 100644
--- a/ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.html
+++ b/ui/src/app/connect/components/adapter-configuration/schema-editor/error-message/error-message.component.html
@@ -20,7 +20,7 @@
<div fxLayout="row" fxLayoutAlign="center center" fxFlex="100">
<div fxLayoutAlign="start center" class="error-text">
There was an error while guessing the schema of your
- configured data source:
+ configured data stream:
</div>
</div>
<div fxLayout="row" fxLayoutAlign="center center" class="mt-10">
diff --git a/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.scss b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.scss
index 3fd9bb2b2..170574abd 100644
--- a/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.scss
+++ b/ui/src/app/connect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.scss
@@ -135,10 +135,6 @@ ul {
opacity: 1 !important;
}
-.historic {
- cursor: pointer;
- color: #ffa23b;
-}
.real-time {
cursor: pointer;
color: #ffeb3b;
diff --git a/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.scss b/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.scss
index 939098875..927230b63 100644
--- a/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.scss
+++ b/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.scss
@@ -58,10 +58,6 @@
max-height: 50px;
max-width: 80%;
}
-.historic {
- cursor: pointer;
- color: #ffa23b;
-}
.real-time {
cursor: pointer;
color: #ffeb3b;
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.scss b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.scss
index b083b3e02..fedeedba7 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.scss
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.scss
@@ -30,11 +30,6 @@
.adapter-icon {
max-height: 50px;
}
-
-.historic {
- cursor: pointer;
- color: #ffa23b;
-}
.real-time {
cursor: pointer;
color: #ffeb3b;
diff --git a/ui/src/app/editor/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.ts b/ui/src/app/editor/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.ts
index 7754f1ad3..e93281cde 100644
--- a/ui/src/app/editor/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.ts
+++ b/ui/src/app/editor/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.ts
@@ -44,11 +44,8 @@ export class PipelineElementIconStandComponent
{
availableTypes = [
{
- title: 'Data Sources',
- filters: [
- PipelineElementType.DataStream,
- PipelineElementType.DataSet,
- ],
+ title: 'Data Streams',
+ filters: [PipelineElementType.DataStream],
open: true,
color: 'var(--color-stream)',
sort: 'name',
diff --git a/ui/src/app/editor/model/editor.model.ts b/ui/src/app/editor/model/editor.model.ts
index 5d6114fc8..57f939eba 100644
--- a/ui/src/app/editor/model/editor.model.ts
+++ b/ui/src/app/editor/model/editor.model.ts
@@ -64,7 +64,6 @@ export interface PipelineElementRecommendationLayout {
}
export enum PipelineElementType {
- DataSet,
DataStream,
DataProcessor,
DataSink,
diff --git a/ui/src/app/editor/utils/editor.utils.ts b/ui/src/app/editor/utils/editor.utils.ts
index c3138798f..9bc74654b 100644
--- a/ui/src/app/editor/utils/editor.utils.ts
+++ b/ui/src/app/editor/utils/editor.utils.ts
@@ -51,8 +51,6 @@ export class PipelineElementTypeUtils {
static toCssShortHand(elementType: PipelineElementType) {
if (PipelineElementType.DataStream === elementType) {
return 'stream';
- } else if (PipelineElementType.DataSet === elementType) {
- return 'set';
} else if (PipelineElementType.DataProcessor === elementType) {
return 'sepa';
} else {
diff --git a/ui/src/app/services/tour/adapter-tour-2.constants.ts b/ui/src/app/services/tour/adapter-tour-2.constants.ts
index 8a9e52004..bdbfc5103 100644
--- a/ui/src/app/services/tour/adapter-tour-2.constants.ts
+++ b/ui/src/app/services/tour/adapter-tour-2.constants.ts
@@ -115,7 +115,7 @@ export default {
{
stepId: 'step-9',
title: 'Congratulation',
- text: 'Congratulation you have created your first adapter and finished the tutorial. Go to the pipeline editor to see the new data source',
+ text: 'Congratulation you have created your first adapter and finished the tutorial. Go to the pipeline editor to see the new data stream',
classes: 'shepherd shepherd-welcome',
buttons: ['cancel'],
},
diff --git a/ui/src/app/services/tour/adapter-tour-3.constants.ts b/ui/src/app/services/tour/adapter-tour-3.constants.ts
index dc26631ed..857ee121d 100644
--- a/ui/src/app/services/tour/adapter-tour-3.constants.ts
+++ b/ui/src/app/services/tour/adapter-tour-3.constants.ts
@@ -90,7 +90,7 @@ export default {
{
stepId: 'step-9',
title: 'Congratulation',
- text: 'Congratulation you have created your second adapter and finished the tutorial. Go to the pipeline editor to see the new data source',
+ text: 'Congratulation you have created your second adapter and finished the tutorial. Go to the pipeline editor to see the new data stream',
classes: 'shepherd shepherd-welcome',
buttons: ['cancel'],
},
diff --git a/ui/src/app/services/tour/adapter-tour.constants.ts b/ui/src/app/services/tour/adapter-tour.constants.ts
index eea1b7d19..185d2853b 100644
--- a/ui/src/app/services/tour/adapter-tour.constants.ts
+++ b/ui/src/app/services/tour/adapter-tour.constants.ts
@@ -90,7 +90,7 @@ export default {
title: 'Adapter was started successfully',
text:
'<p>The adpater is now deployed in the background and the data is fetched and processed from the OpenSenseMap endpoint. Here you will see some example data, which is coming directly ' +
- 'the data source. This might take a minute. On the left you can see the runtime names of the properties you defined before. On the right side the values are shown. After having a look at ' +
+ 'displayed from the data stream. This might take a minute. On the left you can see the runtime names of the properties you defined before. On the right side the values are shown. After having a look at ' +
'the data <b>click on Close</b> to continue.</p>',
attachToElement: '#confirm_adapter_started_button',
attachPosition: 'bottom',
@@ -99,7 +99,7 @@ export default {
{
stepId: 'step-9',
title: 'Congratulation',
- text: '<b></b>Congratulation!</b> You have created your first adapter and finished the tutorial. Go to the pipeline editor to see the new data source',
+ text: '<b></b>Congratulation!</b> You have created your first adapter and finished the tutorial. Go to the pipeline editor to see the new data stream',
classes: 'shepherd shepherd-welcome',
buttons: ['cancel'],
},
diff --git a/ui/src/scss/sp/main.scss b/ui/src/scss/sp/main.scss
index 80ebae4a3..a48665248 100644
--- a/ui/src/scss/sp/main.scss
+++ b/ui/src/scss/sp/main.scss
@@ -38,7 +38,6 @@ body {
height: auto !important;
width: 100%;
- --color-set: #{$sp-color-set};
--color-stream: #{$sp-color-stream};
--color-processor: #{$sp-color-processor};
--color-sink: #{$sp-color-sink};
@@ -531,11 +530,6 @@ md-content {
color: black;
}
-.set-label {
- background: $sp-color-set;
- color: black;
-}
-
.processor-label {
background: $sp-color-processor;
}
@@ -549,11 +543,6 @@ md-content {
border: 2px solid $sp-color-stream;
}
-.set {
- border-radius: 50%;
- border: 2px solid $sp-color-set;
-}
-
.action {
border: 2px solid $sp-color-sink;
}
diff --git a/ui/src/scss/sp/pipeline-element-options.scss b/ui/src/scss/sp/pipeline-element-options.scss
index 762d355c0..5b6340e02 100644
--- a/ui/src/scss/sp/pipeline-element-options.scss
+++ b/ui/src/scss/sp/pipeline-element-options.scss
@@ -70,8 +70,3 @@
background: $sp-color-stream;
color: #343434;
}
-
-.pe-info-set {
- background: $sp-color-set;
- color: white;
-}