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
apache · Oct 20, 2023 · f1d8639 · f1d8639
1 parent 3299dd8
commit f1d8639
Show file tree

Hide file tree

Showing 22 changed files with 14 additions and 55 deletions.
diff --git a/...rc/main/java/org/apache/streampipes/model/extensions/svcdiscovery/SpServiceTagPrefix.java b/...rc/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/...-api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServicePathPrefix.java b/...-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/...api/src/main/java/org/apache/streampipes/svcdiscovery/api/model/SpServiceUrlProvider.java b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,7 @@ <h4>Exported items {{ config.assetName }}</h4>
                 ></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
@@ -96,7 +96,7 @@ <h4>Select resources to import</h4>
             ></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/...components/adapter-configuration/schema-editor/error-message/error-message.component.html b/...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">
             &nbsp;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/...t/components/adapter-configuration/schema-editor/event-schema/event-schema.component.scss b/...t/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/...onnect/components/data-marketplace/adapter-description/adapter-description.component.scss b/...onnect/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
@@ -30,11 +30,6 @@
 .adapter-icon {
     max-height: 50px;
 }
-
-.historic {
-    cursor: pointer;
-    color: #ffa23b;
-}
 .real-time {
     cursor: pointer;
     color: #ffeb3b;

diff --git a/...pp/editor/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.ts b/...pp/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -70,8 +70,3 @@
     background: $sp-color-stream;
     color: #343434;
 }
-
-.pe-info-set {
-    background: $sp-color-set;
-    color: white;
-}