You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2023/02/15 09:20:56 UTC
[streampipes] branch remove-set-adapters updated: [#1289] Remove data set model from ui
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch remove-set-adapters
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/remove-set-adapters by this push:
new 5adea5ec9 [#1289] Remove data set model from ui
5adea5ec9 is described below
commit 5adea5ec9c17b8e9d697e0cf0932ccbc26cfda95
Author: Philipp Zehnder <te...@users.noreply.github.com>
AuthorDate: Wed Feb 15 10:20:35 2023 +0100
[#1289] Remove data set model from ui
---
.../src/lib/model/gen/streampipes-model-client.ts | 75 +++++++------
.../src/lib/model/gen/streampipes-model.ts | 124 ++++-----------------
.../endpoint-item/endpoint-item.component.ts | 2 -
.../adapter-configuration-header.component.html | 10 +-
.../adapter-configuration-header.component.scss | 4 -
.../adapter-configuration-header.component.ts | 5 -
.../adapter-configuration.component.html | 1 -
.../adapter-configuration.component.ts | 14 +--
.../format-configuration.component.ts | 11 --
.../generic-adapter-configuration.component.ts | 3 -
.../adapter-description.component.html | 15 ---
.../adapter-description.component.ts | 26 +----
.../existing-adapters.component.html | 69 +-----------
.../existing-adapters.component.ts | 1 -
.../filter-toolbar/filter-toolbar.component.html | 12 --
.../filter-toolbar/filter-toolbar.component.ts | 1 -
.../adapter-started-dialog.component.html | 20 +---
.../adapter-started-dialog.component.ts | 13 +--
ui/src/app/connect/filter/adapter-filter.pipe.ts | 19 ----
ui/src/app/connect/services/connect.service.ts | 60 ++--------
20 files changed, 80 insertions(+), 405 deletions(-)
diff --git a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
index 6901ebb20..5d83b9be3 100644
--- a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
@@ -15,11 +15,10 @@
* limitations under the License.
*
*/
-
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 2.27.744 on 2022-10-19 14:23:28.
+// Generated using typescript-generator version 3.1.1185 on 2023-02-15 09:08:06.
export class ExtensionsServiceEndpointItem {
appId: string;
@@ -43,20 +42,20 @@ export class ExtensionsServiceEndpointItem {
return data;
}
const instance = target || new ExtensionsServiceEndpointItem();
- instance.name = data.name;
+ instance.appId = data.appId;
+ instance.available = data.available;
instance.description = data.description;
+ instance.editable = data.editable;
instance.elementId = data.elementId;
- instance.uri = data.uri;
- instance.type = data.type;
- instance.appId = data.appId;
- instance.includesIcon = data.includesIcon;
instance.includesDocs = data.includesDocs;
+ instance.includesIcon = data.includesIcon;
instance.installed = data.installed;
- instance.editable = data.editable;
- instance.available = data.available;
+ instance.name = data.name;
instance.streams = __getCopyArrayFn(
ExtensionsServiceEndpointItem.fromData,
)(data.streams);
+ instance.type = data.type;
+ instance.uri = data.uri;
return instance;
}
}
@@ -73,8 +72,8 @@ export class Group {
}
const instance = target || new Group();
instance.groupId = data.groupId;
- instance.rev = data.rev;
instance.groupName = data.groupName;
+ instance.rev = data.rev;
instance.roles = __getCopyArrayFn(__identity<Role>())(data.roles);
return instance;
}
@@ -96,12 +95,12 @@ export class MatchingResultMessage {
return data;
}
const instance = target || new MatchingResultMessage();
- instance.matchingSuccessful = data.matchingSuccessful;
- instance.title = data.title;
instance.description = data.description;
+ instance.matchingSuccessful = data.matchingSuccessful;
instance.offerSubject = data.offerSubject;
- instance.requirementSubject = data.requirementSubject;
instance.reasonText = data.reasonText;
+ instance.requirementSubject = data.requirementSubject;
+ instance.title = data.title;
return instance;
}
}
@@ -120,15 +119,15 @@ export class Permission {
return data;
}
const instance = target || new Permission();
- instance.permissionId = data.permissionId;
- instance.rev = data.rev;
- instance.objectInstanceId = data.objectInstanceId;
- instance.objectClassName = data.objectClassName;
- instance.publicElement = data.publicElement;
- instance.ownerSid = data.ownerSid;
instance.grantedAuthorities = __getCopyArrayFn(
PermissionEntry.fromData,
)(data.grantedAuthorities);
+ instance.objectClassName = data.objectClassName;
+ instance.objectInstanceId = data.objectInstanceId;
+ instance.ownerSid = data.ownerSid;
+ instance.permissionId = data.permissionId;
+ instance.publicElement = data.publicElement;
+ instance.rev = data.rev;
return instance;
}
}
@@ -145,8 +144,8 @@ export class PermissionEntry {
return data;
}
const instance = target || new PermissionEntry();
- instance.sid = data.sid;
instance.principalType = data.principalType;
+ instance.sid = data.sid;
return instance;
}
}
@@ -168,18 +167,18 @@ export class Principal {
return data;
}
const instance = target || new Principal();
- instance.principalId = data.principalId;
- instance.rev = data.rev;
instance.accountEnabled = data.accountEnabled;
- instance.accountLocked = data.accountLocked;
instance.accountExpired = data.accountExpired;
- instance.username = data.username;
+ instance.accountLocked = data.accountLocked;
+ instance.groups = __getCopyArrayFn(__identity<string>())(data.groups);
instance.objectPermissions = __getCopyArrayFn(__identity<string>())(
data.objectPermissions,
);
- instance.roles = __getCopyArrayFn(__identity<Role>())(data.roles);
- instance.groups = __getCopyArrayFn(__identity<string>())(data.groups);
+ instance.principalId = data.principalId;
instance.principalType = data.principalType;
+ instance.rev = data.rev;
+ instance.roles = __getCopyArrayFn(__identity<Role>())(data.roles);
+ instance.username = data.username;
return instance;
}
}
@@ -198,10 +197,10 @@ export class RawUserApiToken {
return data;
}
const instance = target || new RawUserApiToken();
- instance.rawToken = data.rawToken;
instance.hashedToken = data.hashedToken;
- instance.tokenName = data.tokenName;
+ instance.rawToken = data.rawToken;
instance.tokenId = data.tokenId;
+ instance.tokenName = data.tokenName;
return instance;
}
}
@@ -241,22 +240,22 @@ export class UserAccount extends Principal {
}
const instance = target || new UserAccount();
super.fromData(data, instance);
+ instance.darkMode = data.darkMode;
instance.fullName = data.fullName;
+ instance.hideTutorial = data.hideTutorial;
instance.password = data.password;
- instance.preferredDataStreams = __getCopyArrayFn(__identity<string>())(
- data.preferredDataStreams,
- );
instance.preferredDataProcessors = __getCopyArrayFn(
__identity<string>(),
)(data.preferredDataProcessors);
instance.preferredDataSinks = __getCopyArrayFn(__identity<string>())(
data.preferredDataSinks,
);
+ instance.preferredDataStreams = __getCopyArrayFn(__identity<string>())(
+ data.preferredDataStreams,
+ );
instance.userApiTokens = __getCopyArrayFn(UserApiToken.fromData)(
data.userApiTokens,
);
- instance.hideTutorial = data.hideTutorial;
- instance.darkMode = data.darkMode;
return instance;
}
}
@@ -305,7 +304,11 @@ export type Privilege =
| 'PRIVILEGE_READ_NOTIFICATIONS'
| 'PRIVILEGE_READ_FILES'
| 'PRIVILEGE_WRITE_FILES'
- | 'PRIVILEGE_DELETE_FILES';
+ | 'PRIVILEGE_DELETE_FILES'
+ | 'PRIVILEGE_READ_ASSETS'
+ | 'PRIVILEGE_WRITE_ASSETS'
+ | 'PRIVILEGE_READ_GENERIC_STORAGE'
+ | 'PRIVILEGE_WRITE_GENERIC_STORAGE';
export type Role =
| 'ROLE_ADMIN'
@@ -317,7 +320,9 @@ export type Role =
| 'ROLE_DASHBOARD_USER'
| 'ROLE_DATA_EXPLORER_USER'
| 'ROLE_PIPELINE_USER'
- | 'ROLE_APP_USER';
+ | 'ROLE_APP_USER'
+ | 'ROLE_ASSET_USER'
+ | 'ROLE_ASSET_ADMIN';
function __getCopyArrayFn<T>(itemCopyFn: (item: T) => T): (array: T[]) => T[] {
return (array: T[]) => __copyArray(array, itemCopyFn);
diff --git a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
index a52d4b2f1..bcc71eb4c 100644
--- a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
@@ -15,18 +15,14 @@
* limitations under the License.
*
*/
-
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 3.1.1185 on 2023-01-08 16:02:05.
+// Generated using typescript-generator version 3.1.1185 on 2023-02-15 09:08:05.
export class NamedStreamPipesEntity {
'@class':
| 'org.apache.streampipes.model.connect.adapter.AdapterDescription'
- | 'org.apache.streampipes.model.connect.adapter.AdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription'
| 'org.apache.streampipes.model.connect.adapter.AdapterStreamDescription'
| 'org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription'
| 'org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription'
@@ -92,9 +88,6 @@ export class NamedStreamPipesEntity {
export class AdapterDescription extends NamedStreamPipesEntity {
'@class':
| 'org.apache.streampipes.model.connect.adapter.AdapterDescription'
- | 'org.apache.streampipes.model.connect.adapter.AdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription'
| 'org.apache.streampipes.model.connect.adapter.AdapterStreamDescription'
| 'org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription'
| 'org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription';
@@ -108,6 +101,7 @@ export class AdapterDescription extends NamedStreamPipesEntity {
'correspondingServiceGroup': string;
'createdAt': number;
'eventGrounding': EventGrounding;
+ 'eventSchema': EventSchema;
'icon': string;
'rules': TransformationRuleDescriptionUnion[];
'schemaRules': TransformationRuleDescriptionUnion[];
@@ -136,6 +130,7 @@ export class AdapterDescription extends NamedStreamPipesEntity {
instance.correspondingServiceGroup = data.correspondingServiceGroup;
instance.createdAt = data.createdAt;
instance.eventGrounding = EventGrounding.fromData(data.eventGrounding);
+ instance.eventSchema = EventSchema.fromData(data.eventSchema);
instance.icon = data.icon;
instance.rules = __getCopyArrayFn(
TransformationRuleDescription.fromDataUnion,
@@ -160,14 +155,10 @@ export class AdapterDescription extends NamedStreamPipesEntity {
return data;
}
switch (data['@class']) {
- case 'org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription':
- return GenericAdapterSetDescription.fromData(data);
case 'org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription':
return GenericAdapterStreamDescription.fromData(data);
case 'org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription':
return SpecificAdapterStreamDescription.fromData(data);
- case 'org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription':
- return SpecificAdapterSetDescription.fromData(data);
}
}
}
@@ -194,41 +185,6 @@ export class AdapterEventPreview {
}
}
-export class AdapterSetDescription extends AdapterDescription {
- '@class':
- | 'org.apache.streampipes.model.connect.adapter.AdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription';
- 'dataSet': SpDataSet;
-
- static 'fromData'(
- data: AdapterSetDescription,
- target?: AdapterSetDescription,
- ): AdapterSetDescription {
- if (!data) {
- return data;
- }
- const instance = target || new AdapterSetDescription();
- super.fromData(data, instance);
- instance.dataSet = SpDataSet.fromData(data.dataSet);
- return instance;
- }
-
- static 'fromDataUnion'(
- data: AdapterSetDescriptionUnion,
- ): AdapterSetDescriptionUnion {
- if (!data) {
- return data;
- }
- switch (data['@class']) {
- case 'org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription':
- return GenericAdapterSetDescription.fromData(data);
- case 'org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription':
- return SpecificAdapterSetDescription.fromData(data);
- }
- }
-}
-
export class AdapterStreamDescription extends AdapterDescription {
'@class':
| 'org.apache.streampipes.model.connect.adapter.AdapterStreamDescription'
@@ -1226,7 +1182,10 @@ export class DataLakeMeasure {
}
}
-export class InvocableStreamPipesEntity extends NamedStreamPipesEntity {
+export class InvocableStreamPipesEntity
+ extends NamedStreamPipesEntity
+ implements EndpointSelectable
+{
'@class':
| 'org.apache.streampipes.model.base.InvocableStreamPipesEntity'
| 'org.apache.streampipes.model.graph.DataProcessorInvocation'
@@ -1235,6 +1194,7 @@ export class InvocableStreamPipesEntity extends NamedStreamPipesEntity {
'configured': boolean;
'correspondingPipeline': string;
'correspondingUser': string;
+ 'detachPath': string;
'inputStreams': SpDataStreamUnion[];
'selectedEndpointUrl': string;
'staticProperties': StaticPropertyUnion[];
@@ -1256,6 +1216,7 @@ export class InvocableStreamPipesEntity extends NamedStreamPipesEntity {
instance.configured = data.configured;
instance.correspondingPipeline = data.correspondingPipeline;
instance.correspondingUser = data.correspondingUser;
+ instance.detachPath = data.detachPath;
instance.inputStreams = __getCopyArrayFn(SpDataStream.fromDataUnion)(
data.inputStreams,
);
@@ -1547,6 +1508,13 @@ export class ElementStatusInfoSettings {
}
}
+export interface EndpointSelectable {
+ correspondingPipeline: string;
+ detachPath: string;
+ name: string;
+ selectedEndpointUrl: string;
+}
+
export class ValueSpecification {
'@class':
| 'org.apache.streampipes.model.schema.QuantitativeValue'
@@ -2040,47 +2008,16 @@ export class FunctionId {
}
export interface GenericAdapterDescription {
- eventSchema: EventSchema;
formatDescription: FormatDescription;
protocolDescription: ProtocolDescription;
rules: TransformationRuleDescriptionUnion[];
}
-export class GenericAdapterSetDescription
- extends AdapterSetDescription
- implements GenericAdapterDescription
-{
- '@class': 'org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription';
- 'eventSchema': EventSchema;
- 'formatDescription': FormatDescription;
- 'protocolDescription': ProtocolDescription;
-
- static 'fromData'(
- data: GenericAdapterSetDescription,
- target?: GenericAdapterSetDescription,
- ): GenericAdapterSetDescription {
- if (!data) {
- return data;
- }
- 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,
- );
- return instance;
- }
-}
-
export class GenericAdapterStreamDescription
extends AdapterStreamDescription
implements GenericAdapterDescription
{
'@class': 'org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription';
- 'eventSchema': EventSchema;
'formatDescription': FormatDescription;
'protocolDescription': ProtocolDescription;
@@ -2093,7 +2030,6 @@ export class GenericAdapterStreamDescription
}
const instance = target || new GenericAdapterStreamDescription();
super.fromData(data, instance);
- instance.eventSchema = EventSchema.fromData(data.eventSchema);
instance.formatDescription = FormatDescription.fromData(
data.formatDescription,
);
@@ -3494,12 +3430,13 @@ export class SpDataStream extends NamedStreamPipesEntity {
}
}
-export class SpDataSet extends SpDataStream {
+export class SpDataSet extends SpDataStream implements EndpointSelectable {
'@class': 'org.apache.streampipes.model.SpDataSet';
'actualTopicName': string;
'brokerHostname': string;
'correspondingPipeline': string;
'datasetInvocationId': string;
+ 'detachPath': string;
'selectedEndpointUrl': string;
'supportedGrounding': EventGrounding;
@@ -3513,6 +3450,7 @@ export class SpDataSet extends SpDataStream {
instance.brokerHostname = data.brokerHostname;
instance.correspondingPipeline = data.correspondingPipeline;
instance.datasetInvocationId = data.datasetInvocationId;
+ instance.detachPath = data.detachPath;
instance.selectedEndpointUrl = data.selectedEndpointUrl;
instance.supportedGrounding = EventGrounding.fromData(
data.supportedGrounding,
@@ -3606,22 +3544,6 @@ export class SpQueryResult {
}
}
-export class SpecificAdapterSetDescription extends AdapterSetDescription {
- '@class': 'org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription';
-
- static 'fromData'(
- data: SpecificAdapterSetDescription,
- target?: SpecificAdapterSetDescription,
- ): SpecificAdapterSetDescription {
- if (!data) {
- return data;
- }
- const instance = target || new SpecificAdapterSetDescription();
- super.fromData(data, instance);
- return instance;
- }
-}
-
export class SpecificAdapterStreamDescription extends AdapterStreamDescription {
'@class': 'org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription';
@@ -4067,14 +3989,8 @@ export class WildcardTopicMapping {
}
export type AdapterDescriptionUnion =
- | GenericAdapterSetDescription
| GenericAdapterStreamDescription
- | SpecificAdapterStreamDescription
- | SpecificAdapterSetDescription;
-
-export type AdapterSetDescriptionUnion =
- | GenericAdapterSetDescription
- | SpecificAdapterSetDescription;
+ | SpecificAdapterStreamDescription;
export type AdapterStreamDescriptionUnion = SpecificAdapterStreamDescription;
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 639c20791..f77b1cedf 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
@@ -101,8 +101,6 @@ export class EndpointItemComponent implements OnInit {
findItemTypeTitle() {
if (this.item.type === 'stream') {
this.itemTypeTitle = 'Data Stream';
- } else if (this.item.type === 'set') {
- this.itemTypeTitle = 'Data Set';
} else if (this.item.type === 'sepa') {
this.itemTypeTitle = 'Data Processor';
} else {
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.html b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.html
index c02354698..0412b5677 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.html
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.html
@@ -18,15 +18,9 @@
<div fxLayout="column" fxFlex="100">
<div fxLayout="row" fxLayoutAlign="start center">
- <mat-icon *ngIf="!isDataStreamDescription" class="historic"
- >lens</mat-icon
- >
- <mat-icon *ngIf="isDataStreamDescription" class="real-time"
- >lens
- </mat-icon>
+ <mat-icon class="real-time">lens </mat-icon>
<div fxLayoutAlign="start center">
- <p *ngIf="!isDataStreamDescription">Data Set</p>
- <p *ngIf="isDataStreamDescription">Data Stream</p>
+ <p>Data Stream</p>
</div>
<span fxFlex></span>
</div>
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.scss b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.scss
index 178de8251..7579cb899 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.scss
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.scss
@@ -16,10 +16,6 @@
*
*/
-.historic {
- cursor: pointer;
- color: #ffa23b;
-}
.real-time {
cursor: pointer;
color: #ffeb3b;
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts
index 990c4bbde..209e0e5e7 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component.ts
@@ -29,11 +29,6 @@ export class AdapterConfigurationHeaderComponent {
*/
@Input() displayName = '';
- /**
- * Indicates whether the adapter is a data set or data stream adapter
- */
- @Input() isDataStreamDescription = true;
-
/**
* Use different title when in edit mode
*/
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
index 7def4d66e..30f16ee2d 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.html
@@ -25,7 +25,6 @@
<div fxLayout="column" fxLayoutAlign="center stretch" *ngIf="adapter">
<sp-adapter-configuration-header
[displayName]="displayName"
- [isDataStreamDescription]="isDataStreamDescription"
[isEditMode]="isEditMode"
></sp-adapter-configuration-header>
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
index e3a8a5ab1..cf4dac1ba 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
@@ -22,9 +22,7 @@ import { MatStepper } from '@angular/material/stepper';
import {
AdapterDescriptionUnion,
EventSchema,
- GenericAdapterSetDescription,
GenericAdapterStreamDescription,
- SpecificAdapterSetDescription,
SpecificAdapterStreamDescription,
} from '@streampipes/platform-services';
import { ShepherdService } from '../../../services/tour/shepherd.service';
@@ -49,7 +47,6 @@ export class AdapterConfigurationComponent implements OnInit {
/**
* Required to render the corresponding components
*/
- isDataStreamDescription = true;
isGenericAdapter = false;
myStepper: MatStepper;
@@ -71,8 +68,6 @@ export class AdapterConfigurationComponent implements OnInit {
ngOnInit() {
this.parentForm = this._formBuilder.group({});
- this.isDataStreamDescription =
- this.connectService.isDataStreamDescription(this.adapter);
this.isGenericAdapter = this.connectService.isGenericDescription(
this.adapter,
);
@@ -120,14 +115,7 @@ export class AdapterConfigurationComponent implements OnInit {
}
public setSchema() {
- if (this.adapter instanceof GenericAdapterSetDescription) {
- (this.adapter as GenericAdapterSetDescription).dataSet.eventSchema =
- this.eventSchema;
- } else if (this.adapter instanceof SpecificAdapterSetDescription) {
- (
- this.adapter as SpecificAdapterSetDescription
- ).dataSet.eventSchema = this.eventSchema;
- } else if (this.adapter instanceof GenericAdapterStreamDescription) {
+ if (this.adapter instanceof GenericAdapterStreamDescription) {
(
this.adapter as GenericAdapterStreamDescription
).dataStream.eventSchema = this.eventSchema;
diff --git a/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts
index 5de192214..abf053f80 100644
--- a/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts
@@ -20,7 +20,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import {
AdapterDescriptionUnion,
FormatDescription,
- GenericAdapterSetDescription,
GenericAdapterStreamDescription,
} from '@streampipes/platform-services';
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
@@ -77,19 +76,10 @@ export class FormatConfigurationComponent implements OnInit {
// ensure that adapter description is a generic adapter
if (
- this.adapterDescription instanceof GenericAdapterSetDescription ||
this.adapterDescription instanceof GenericAdapterStreamDescription
) {
this.selectedFormat = this.adapterDescription.formatDescription;
}
- if (this.adapterDescription instanceof GenericAdapterSetDescription) {
- if (
- (this.adapterDescription as GenericAdapterSetDescription)
- .formatDescription !== undefined
- ) {
- this.formatConfigurationValid = this.formatForm.valid;
- }
- }
if (
this.adapterDescription instanceof GenericAdapterStreamDescription
) {
@@ -106,7 +96,6 @@ export class FormatConfigurationComponent implements OnInit {
formatSelected(selectedFormat) {
if (
- this.adapterDescription instanceof GenericAdapterSetDescription ||
this.adapterDescription instanceof GenericAdapterStreamDescription
) {
this.adapterDescription.formatDescription = selectedFormat;
diff --git a/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
index cd26b04ae..517ce4670 100644
--- a/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
@@ -18,7 +18,6 @@
import { Component, OnInit } from '@angular/core';
import {
- GenericAdapterSetDescription,
GenericAdapterStreamDescription,
ProtocolDescription,
PipelineElementTemplateService,
@@ -60,7 +59,6 @@ export class GenericAdapterConfigurationComponent
ngOnInit(): void {
super.onInit();
if (
- this.adapterDescription instanceof GenericAdapterSetDescription ||
this.adapterDescription instanceof GenericAdapterStreamDescription
) {
this.protocolDescription =
@@ -91,7 +89,6 @@ export class GenericAdapterConfigurationComponent
adapterDescription.protocolDescription,
);
if (
- this.adapterDescription instanceof GenericAdapterSetDescription ||
this.adapterDescription instanceof GenericAdapterStreamDescription
) {
this.adapterDescription.protocolDescription =
diff --git a/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.html b/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.html
index 6f78c27ef..10784aacc 100644
--- a/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.html
+++ b/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.html
@@ -24,21 +24,6 @@
fxLayoutAlign="start start"
fxFlex="100"
>
- <div
- class="type-data"
- fxLayout="row"
- fxLayoutAlign="start center"
- fxFlex
- >
- <mat-icon *ngIf="isDataSetDescription" class="historic"
- >lens</mat-icon
- >
- <mat-icon *ngIf="isDataStreamDescription" class="real-time"
- >lens</mat-icon
- >
- <p *ngIf="isDataSetDescription">Data Set</p>
- <p *ngIf="isDataStreamDescription">Data Stream</p>
- </div>
<div
fxLayout="row"
fxLayoutAlign="end end"
diff --git a/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.ts b/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.ts
index 93026e555..5dfab94ae 100644
--- a/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.ts
+++ b/ui/src/app/connect/components/data-marketplace/adapter-description/adapter-description.component.ts
@@ -42,10 +42,7 @@ export class AdapterDescriptionComponent implements OnInit {
createTemplateEmitter: EventEmitter<AdapterDescription> =
new EventEmitter<AdapterDescription>();
- deleting = false;
className = '';
- isDataSetDescription = false;
- isDataStreamDescription = false;
isRunningAdapter = false;
adapterLabel: string;
@@ -61,11 +58,6 @@ export class AdapterDescriptionComponent implements OnInit {
if (this.adapter.name == null) {
this.adapter.name = '';
}
- this.isDataSetDescription = this.connectService.isDataSetDescription(
- this.adapter,
- );
- this.isDataStreamDescription =
- this.connectService.isDataStreamDescription(this.adapter);
this.isRunningAdapter =
this.adapter.elementId !== undefined &&
!(this.adapter as any).isTemplate;
@@ -73,20 +65,12 @@ export class AdapterDescriptionComponent implements OnInit {
this.className = this.getClassName();
}
- isGenericDescription(): boolean {
- return this.connectService.isGenericDescription(this.adapter);
- }
-
getClassName() {
let className = this.isRunningAdapter
? 'adapter-box'
: 'adapter-description-box';
- if (this.isDataSetDescription) {
- className += ' adapter-box-set';
- } else {
- className += ' adapter-box-stream';
- }
+ className += ' adapter-box-stream';
return className;
}
@@ -106,15 +90,15 @@ export class AdapterDescriptionComponent implements OnInit {
removeAdapter(): void {
this.dataMarketplaceService
.deleteAdapterDescription(this.adapter.elementId)
- .subscribe(
- _ => {
+ .subscribe({
+ next: () => {
this.updateAdapterEmitter.emit();
},
- _ => {
+ error: () => {
this._snackBar.open(
'Cannot delete an adapter which has an active instance running.',
);
},
- );
+ });
}
}
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
index 4f1fbe342..ed124684a 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
@@ -86,11 +86,7 @@
matTooltipPosition="above"
data-cy="start-adapter"
(click)="startAdapter(adapter)"
- *ngIf="
- connectService.isDataStreamDescription(
- adapter
- ) && !adapter.running
- "
+ *ngIf="!adapter.running"
>
<i class="material-icons">play_arrow</i>
</button>
@@ -102,11 +98,7 @@
matTooltipPosition="above"
data-cy="stop-adapter"
(click)="stopAdapter(adapter)"
- *ngIf="
- connectService.isDataStreamDescription(
- adapter
- ) && adapter.running
- "
+ *ngIf="adapter.running"
>
<i class="material-icons">stop</i>
</button>
@@ -157,63 +149,6 @@
/>
</td>
</ng-container>
- <ng-container matColumnDef="adapterType">
- <th mat-header-cell *matHeaderCellDef>Type</th>
- <td mat-cell *matCellDef="let adapter">
- <div
- class="type-data"
- fxLayout="row"
- fxLayoutAlign="start start"
- >
- <div
- fxLayout="row"
- fxLayoutAlign="center center"
- >
- <mat-icon
- *ngIf="
- connectService.isDataSetDescription(
- adapter
- )
- "
- class="historic"
- >
- lens
- </mat-icon>
- <mat-icon
- *ngIf="
- connectService.isDataStreamDescription(
- adapter
- )
- "
- class="real-time"
- >
- lens
- </mat-icon>
- <div
- fxFlex="100"
- fxLayoutAlign="center center"
- >
- <span
- *ngIf="
- connectService.isDataSetDescription(
- adapter
- )
- "
- > Data Set</span
- >
- <span
- *ngIf="
- connectService.isDataStreamDescription(
- adapter
- )
- "
- > Data Stream</span
- >
- </div>
- </div>
- </div>
- </td>
- </ng-container>
<ng-container matColumnDef="lastModified">
<th mat-header-cell *matHeaderCellDef>
Created
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
index da5d4a016..cf155ac91 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
@@ -70,7 +70,6 @@ export class ExistingAdaptersComponent implements OnInit {
'start',
'name',
'adapterBase',
- 'adapterType',
'lastModified',
'action',
];
diff --git a/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.html b/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.html
index ecb2b1812..74d70027c 100644
--- a/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.html
+++ b/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.html
@@ -33,18 +33,6 @@
/>
</mat-form-field>
</div>
- <div class="data-marketplace-options-item">
- <mat-form-field color="accent">
- <mat-select
- [(value)]="currentFilter.selectedType"
- (selectionChange)="filterAdapter($event)"
- >
- <mat-option *ngFor="let type of adapterTypes" [value]="type">
- {{ type }}
- </mat-option>
- </mat-select>
- </mat-form-field>
- </div>
<div class="data-marketplace-options-item">
<mat-form-field color="accent">
<mat-select
diff --git a/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.ts b/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.ts
index c4d9068ec..09391be87 100644
--- a/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.ts
+++ b/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.ts
@@ -31,7 +31,6 @@ export class SpConnectFilterToolbarComponent implements OnInit {
filterChangedEmitter: EventEmitter<AdapterFilterSettingsModel> =
new EventEmitter<AdapterFilterSettingsModel>();
- adapterTypes: string[] = ['All types', 'Data Set', 'Data Stream'];
adapterCategories: any;
currentFilter: AdapterFilterSettingsModel = {
diff --git a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
index 4dd40f8a4..b3addfc7c 100644
--- a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
+++ b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
@@ -68,7 +68,7 @@
fxLayout="column"
class="w-100"
>
- <div *ngIf="!isSetAdapter">
+ <div>
<div
class="success-message"
fxFlex="100"
@@ -82,23 +82,7 @@
>
</div>
</div>
- <div *ngIf="isSetAdapter">
- <div
- class="success-message"
- fxFlex="100"
- fxLayoutAlign="center center"
- fxLayout="row"
- data-cy="sp-connect-adapter-set-success"
- >
- <i class="material-icons">done</i>
- <span
- > Your new data set is now available in the
- pipeline editor.</span
- >
- </div>
- </div>
-
- <div *ngIf="!isSetAdapter && startAdapterNow" fxFlex="100">
+ <div *ngIf="startAdapterNow" fxFlex="100">
<sp-pipeline-element-runtime-info
[streamDescription]="streamDescription"
[pollingActive]="pollingActive"
diff --git a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
index 9c38f9594..a8cb63a56 100644
--- a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
+++ b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
@@ -21,14 +21,12 @@ import { ShepherdService } from '../../../services/tour/shepherd.service';
import { RestService } from '../../services/rest.service';
import {
AdapterDescriptionUnion,
- GenericAdapterSetDescription,
Message,
PipelineOperationStatus,
PipelineTemplateService,
SpDataStream,
GenericAdapterStreamDescription,
SpecificAdapterStreamDescription,
- SpecificAdapterSetDescription,
} from '@streampipes/platform-services';
import { DialogRef } from '@streampipes/shared-ui';
import { PipelineInvocationBuilder } from '../../../core-services/template/PipelineInvocationBuilder';
@@ -44,7 +42,6 @@ export class AdapterStartedDialog implements OnInit {
public adapterStatus: Message;
public streamDescription: SpDataStream;
pollingActive = false;
- public isSetAdapter = false;
public pipelineOperationStatus: PipelineOperationStatus;
adapterSuccessfullyEdited = false;
@@ -131,15 +128,7 @@ export class AdapterStartedDialog implements OnInit {
showAdapterPreview(status: Message, adapterElementId: string) {
// Start preview on streams and message for sets
if (status.success) {
- if (
- this.adapter instanceof GenericAdapterSetDescription ||
- this.adapter instanceof SpecificAdapterSetDescription
- ) {
- this.isSetAdapter = true;
- } else {
- this.getLiveViewPreview(adapterElementId);
- }
-
+ this.getLiveViewPreview(adapterElementId);
this.adapterInstalled = true;
}
}
diff --git a/ui/src/app/connect/filter/adapter-filter.pipe.ts b/ui/src/app/connect/filter/adapter-filter.pipe.ts
index a817d7973..1e92da815 100644
--- a/ui/src/app/connect/filter/adapter-filter.pipe.ts
+++ b/ui/src/app/connect/filter/adapter-filter.pipe.ts
@@ -44,10 +44,6 @@ export class AdapterFilterPipe implements PipeTransform {
activeFilters: AdapterFilterSettingsModel,
): boolean {
return (
- this.meetsFilterTypeCondition(
- adapterDescription,
- activeFilters.selectedType,
- ) &&
this.meetsFilterCategoryCondition(
adapterDescription,
activeFilters.selectedCategory,
@@ -59,21 +55,6 @@ export class AdapterFilterPipe implements PipeTransform {
);
}
- private meetsFilterTypeCondition(
- adapterDescription: AdapterDescriptionUnion,
- selectedType: string,
- ): boolean {
- if (selectedType === 'All types') {
- return true;
- } else if (selectedType === 'Data Set') {
- return this.connectService.isDataSetDescription(adapterDescription);
- } else if (selectedType === 'Data Stream') {
- return !this.connectService.isDataSetDescription(
- adapterDescription,
- );
- }
- }
-
private meetsFilterCategoryCondition(
adapterDescription: AdapterDescriptionUnion,
selectedCategory: string,
diff --git a/ui/src/app/connect/services/connect.service.ts b/ui/src/app/connect/services/connect.service.ts
index 8074db18f..7a5343d1a 100644
--- a/ui/src/app/connect/services/connect.service.ts
+++ b/ui/src/app/connect/services/connect.service.ts
@@ -20,55 +20,21 @@ import { Injectable } from '@angular/core';
import {
AdapterDescription,
EventSchema,
- GenericAdapterSetDescription,
GenericAdapterStreamDescription,
- SpecificAdapterSetDescription,
SpecificAdapterStreamDescription,
AdapterDescriptionUnion,
} from '@streampipes/platform-services';
@Injectable()
export class ConnectService {
- isDataStreamDescription(adapter: AdapterDescription): boolean {
- return (
- adapter instanceof SpecificAdapterStreamDescription ||
- adapter instanceof GenericAdapterStreamDescription
- );
- }
-
- isDataSetDescription(adapter: AdapterDescription): boolean {
- return (
- adapter instanceof SpecificAdapterSetDescription ||
- adapter instanceof GenericAdapterSetDescription
- );
- }
-
isGenericDescription(adapter: AdapterDescription): boolean {
- return (
- adapter instanceof GenericAdapterSetDescription ||
- adapter instanceof GenericAdapterStreamDescription
- );
- }
-
- isSpecificDescription(adapter: AdapterDescription): boolean {
- return (
- adapter instanceof SpecificAdapterSetDescription ||
- adapter instanceof SpecificAdapterStreamDescription
- );
+ return adapter instanceof GenericAdapterStreamDescription;
}
getEventSchema(adapter: AdapterDescription): EventSchema {
let eventSchema: EventSchema;
- if (adapter instanceof GenericAdapterSetDescription) {
- eventSchema =
- (adapter as GenericAdapterSetDescription).dataSet.eventSchema ||
- new EventSchema();
- } else if (adapter instanceof SpecificAdapterSetDescription) {
- eventSchema =
- (adapter as SpecificAdapterSetDescription).dataSet
- .eventSchema || new EventSchema();
- } else if (adapter instanceof GenericAdapterStreamDescription) {
+ if (adapter instanceof GenericAdapterStreamDescription) {
eventSchema =
(adapter as GenericAdapterStreamDescription).dataStream
.eventSchema || new EventSchema();
@@ -97,29 +63,17 @@ export class ConnectService {
): AdapterDescriptionUnion {
let result: AdapterDescriptionUnion;
- if (this.isGenericDescription(toClone)) {
- if (toClone instanceof GenericAdapterStreamDescription) {
- result = GenericAdapterStreamDescription.fromData(
- toClone,
- new GenericAdapterStreamDescription(),
- );
- } else if (toClone instanceof GenericAdapterSetDescription) {
- result = GenericAdapterSetDescription.fromData(
- toClone,
- new GenericAdapterSetDescription(),
- );
- }
+ if (toClone instanceof GenericAdapterStreamDescription) {
+ result = GenericAdapterStreamDescription.fromData(
+ toClone,
+ new GenericAdapterStreamDescription(),
+ );
} else {
if (toClone instanceof SpecificAdapterStreamDescription) {
result = SpecificAdapterStreamDescription.fromData(
toClone,
new SpecificAdapterStreamDescription(),
);
- } else if (toClone instanceof SpecificAdapterSetDescription) {
- result = SpecificAdapterSetDescription.fromData(
- toClone,
- new SpecificAdapterSetDescription(),
- );
}
}