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 2021/06/15 15:03:35 UTC
[incubator-streampipes] branch STREAMPIPES-380 updated (8365737 ->
de605f2)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch STREAMPIPES-380
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 8365737 Create start adapter configuration component
new 0432889 Move buttons into components
new de605f2 Remove stepper variable from sub components
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../format-configuration.component.css | 3 ++
.../format-configuration.component.html | 13 +++++-
.../format-configuration.component.ts | 33 ++++++++++---
.../generic-adapter-configuration.component.css | 3 ++
.../generic-adapter-configuration.component.html | 10 +++-
.../generic-adapter-configuration.component.ts | 22 +++++++--
.../new-adapter/new-adapter.component.html | 54 ++++++----------------
.../new-adapter/new-adapter.component.ts | 47 +++++--------------
.../event-schema/event-schema.component.html | 10 ++++
.../event-schema/event-schema.component.ts | 26 +++++++++++
.../specific-adapter-configuration.component.html | 4 --
.../specific-adapter-configuration.component.ts | 7 +--
.../start-adapter-configuration.component.html | 1 -
.../start-adapter-configuration.component.ts | 8 +---
14 files changed, 137 insertions(+), 104 deletions(-)
[incubator-streampipes] 01/02: Move buttons into components
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-380
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 043288912ac664a1daa3b0f3b9a4c08d0851f3f0
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Jun 15 16:57:16 2021 +0200
Move buttons into components
---
.../format-configuration.component.css | 3 ++
.../format-configuration.component.html | 13 +++++-
.../format-configuration.component.ts | 39 ++++++++++++++---
.../generic-adapter-configuration.component.css | 3 ++
.../generic-adapter-configuration.component.html | 10 ++++-
.../generic-adapter-configuration.component.ts | 27 ++++++++++--
.../new-adapter/new-adapter.component.html | 50 +++++++---------------
.../new-adapter/new-adapter.component.ts | 1 +
.../event-schema/event-schema.component.html | 10 +++++
.../event-schema/event-schema.component.ts | 31 ++++++++++++++
.../specific-adapter-configuration.component.html | 4 --
.../start-adapter-configuration.component.html | 1 -
12 files changed, 140 insertions(+), 52 deletions(-)
diff --git a/ui/src/app/connect/components/format-configuration/format-configuration.component.css b/ui/src/app/connect/components/format-configuration/format-configuration.component.css
index e69de29..16fe680 100644
--- a/ui/src/app/connect/components/format-configuration/format-configuration.component.css
+++ b/ui/src/app/connect/components/format-configuration/format-configuration.component.css
@@ -0,0 +1,3 @@
+.stepper-button {
+ margin-left:10px;
+}
\ No newline at end of file
diff --git a/ui/src/app/connect/components/format-configuration/format-configuration.component.html b/ui/src/app/connect/components/format-configuration/format-configuration.component.html
index f6502cf..bb858eb 100644
--- a/ui/src/app/connect/components/format-configuration/format-configuration.component.html
+++ b/ui/src/app/connect/components/format-configuration/format-configuration.component.html
@@ -1,5 +1,4 @@
<div style="margin-bottom: 2%;">
- <ng-template matStepLabel>Select Format</ng-template>
<div class="assemblyOptions sp-blue-bg">
<h4>Select format</h4>
@@ -32,3 +31,15 @@
</div>
</div>
</div>
+
+<div fxLayoutAlign="end">
+ <button class="mat-basic" mat-raised-button (click)="removeSelection()">Cancel</button>
+ <button class="mat-basic stepper-button" mat-raised-button (click)="goBack()">Back</button>
+ <button class="stepper-button" id="format-selection-next-button"
+ [disabled]="!formatConfigurationValid"
+ (click)="clickNext()"
+ color="primary" mat-raised-button>
+ Next
+ </button>
+</div>
+
diff --git a/ui/src/app/connect/components/format-configuration/format-configuration.component.ts b/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
index 6b7e014..b8f2c1f 100644
--- a/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
+++ b/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
@@ -7,6 +7,7 @@ import {
} from '../../../core-model/gen/streampipes-model';
import { FormBuilder, FormGroup } from '@angular/forms';
import { RestService } from '../../services/rest.service';
+import { MatStepper } from '@angular/material/stepper';
@Component({
selector: 'sp-format-configuration',
@@ -21,9 +22,24 @@ export class FormatConfigurationComponent implements OnInit {
@Input() adapterDescription: AdapterDescriptionUnion;
/**
- * Returns whether the user input for the format configuration is valid or not
+ * Mat stepper to trigger next confifuration step when this is completed
*/
- @Output() validateEmitter: EventEmitter<boolean> = new EventEmitter();
+ @Input() stepper: MatStepper;
+
+
+ @Output() goBackEmitter: EventEmitter<MatStepper> = new EventEmitter();
+
+ /**
+ * Cancels the adapter configuration process
+ */
+ @Output() removeSelectionEmitter: EventEmitter<boolean> = new EventEmitter();
+
+ /**
+ * Go to next configuration step when this is complete
+ */
+ @Output() clickNextEmitter: EventEmitter<MatStepper> = new EventEmitter();
+
+ formatConfigurationValid: boolean;
/**
* Local reference of the format description from the adapter description
@@ -54,7 +70,7 @@ export class FormatConfigurationComponent implements OnInit {
// initialize form for validation
this.formatForm = this._formBuilder.group({});
this.formatForm.statusChanges.subscribe((status) => {
- this.validateEmitter.emit(this.formatForm.valid);
+ this.formatConfigurationValid = this.formatForm.valid;
});
// ensure that adapter description is a generic adapter
@@ -64,12 +80,12 @@ export class FormatConfigurationComponent implements OnInit {
}
if (this.adapterDescription instanceof GenericAdapterSetDescription) {
if ((this.adapterDescription as GenericAdapterSetDescription).formatDescription !== undefined) {
- this.validateEmitter.emit(true);
+ this.formatConfigurationValid = this.formatForm.valid;
}
}
if (this.adapterDescription instanceof GenericAdapterStreamDescription) {
if ((this.adapterDescription as GenericAdapterStreamDescription).formatDescription !== undefined) {
- this.validateEmitter.emit(true);
+ this.formatConfigurationValid = this.formatForm.valid;
}
}
}
@@ -82,9 +98,20 @@ export class FormatConfigurationComponent implements OnInit {
this.adapterDescription.formatDescription = selectedFormat;
this.selectedFormat = selectedFormat;
if (selectedFormat.config.length === 0) {
- this.validateEmitter.emit(true);
+ this.formatConfigurationValid = this.formatForm.valid;
}
}
}
+ public removeSelection() {
+ this.removeSelectionEmitter.emit();
+ }
+
+ public clickNext() {
+ this.clickNextEmitter.emit(this.stepper);
+ }
+
+ public goBack() {
+ this.goBackEmitter.emit(this.stepper);
+ }
}
diff --git a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.css b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.css
index e69de29..16fe680 100644
--- a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.css
+++ b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.css
@@ -0,0 +1,3 @@
+.stepper-button {
+ margin-left:10px;
+}
\ No newline at end of file
diff --git a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.html b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.html
index 44f99f6..a0d22f1 100644
--- a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.html
+++ b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.html
@@ -1,5 +1,4 @@
<div style="margin-bottom: 2%;">
- <ng-template matStepLabel>Settings</ng-template>
<div >
<div class="assemblyOptions sp-blue-bg">
@@ -11,7 +10,14 @@
[adapterId]="adapterDescription.appId"
[configuration]="protocolDescription.config">
</sp-configuration-group>
-
</div>
+</div>
+<div fxLayoutAlign="end">
+ <button class="mat-basic" mat-raised-button (click)="removeSelection()">Cancel</button>
+ <div id="generic-settings-next-button">
+ <button class="stepper-button" [disabled]="!genericAdapterSettingsFormValid"
+ (click)="clickNext()" color="primary" mat-raised-button>Next
+ </button>
+ </div>
</div>
diff --git a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
index 3474e91..af3efbd 100644
--- a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
@@ -6,6 +6,7 @@ import {
ProtocolDescription
} from '../../../core-model/gen/streampipes-model';
import { FormBuilder, FormGroup } from '@angular/forms';
+import { MatStepper } from '@angular/material/stepper';
@Component({
selector: 'sp-generic-adapter-configuration',
@@ -20,9 +21,22 @@ export class GenericAdapterConfigurationComponent implements OnInit {
@Input() adapterDescription: AdapterDescriptionUnion;
/**
- * Returns whether the user input for the format configuration is valid or not
+ * Mat stepper to trigger next confifuration step when this is completed
*/
- @Output() validateEmitter: EventEmitter<boolean> = new EventEmitter();
+ @Input() stepper: MatStepper;
+
+ /**
+ * Cancels the adapter configuration process
+ */
+ @Output() removeSelectionEmitter: EventEmitter<boolean> = new EventEmitter();
+
+ /**
+ * Go to next configuration step when this is complete
+ */
+ @Output() clickNextEmitter: EventEmitter<MatStepper> = new EventEmitter();
+
+
+ genericAdapterSettingsFormValid: boolean;
genericAdapterForm: FormGroup;
@@ -42,8 +56,15 @@ export class GenericAdapterConfigurationComponent implements OnInit {
// initialize form for validation
this.genericAdapterForm = this._formBuilder.group({});
this.genericAdapterForm.statusChanges.subscribe((status) => {
- this.validateEmitter.emit(this.genericAdapterForm.valid);
+ this.genericAdapterSettingsFormValid = this.genericAdapterForm.valid;
});
}
+ public removeSelection() {
+ this.removeSelectionEmitter.emit();
+ }
+
+ public clickNext() {
+ this.clickNextEmitter.emit(this.stepper);
+ }
}
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.html b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
index 4fc9934..099fb74 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.html
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
@@ -43,8 +43,8 @@
</div>
<mat-horizontal-stepper [linear]="true" #stepper>
-
<mat-step *ngIf="!isGenericAdapter">
+ <ng-template matStepLabel>Settings</ng-template>
<sp-specific-adapter-configuration
[adapterDescription]="adapter"
[stepper]="stepper"
@@ -54,61 +54,41 @@
</mat-step>
<mat-step *ngIf="isGenericAdapter">
+ <ng-template matStepLabel>Settings</ng-template>
<sp-generic-adapter-configuration
[adapterDescription]="adapter"
- (validateEmitter)="validateGenericAdapterForm($event)">
+ [stepper]="stepper"
+ (clickNextEmitter)="clickProtocolSettingsNextButton($event)"
+ (removeSelectionEmitter)="removeSelection()">
</sp-generic-adapter-configuration>
-
-
- <div fxLayoutAlign="end">
- <button class="mat-basic" mat-raised-button (click)="removeSelection()">Cancel</button>
- <div id="generic-settings-next-button">
- <button class="stepper-button" [disabled]="!genericAdapterSettingsFormValid"
- (click)="clickProtocolSettingsNextButton(stepper)" color="primary" mat-raised-button>Next
- </button>
- </div>
- </div>
</mat-step>
<mat-step *ngIf="isGenericAdapter">
+ <ng-template matStepLabel>Select Format</ng-template>
<sp-format-configuration
[adapterDescription]="adapter"
- (validateEmitter)="validateFormat($event)">
+ [stepper]="stepper"
+ (clickNextEmitter)="clickFormatSelectionNextButton($event)"
+ (goBackEmitter)="goBack($event)"
+ (removeSelectionEmitter)="removeSelection()">
</sp-format-configuration>
-
- <div fxLayoutAlign="end">
- <button class="mat-basic" mat-raised-button (click)="removeSelection()">Cancel</button>
- <button class="mat-basic stepper-button" mat-raised-button (click)="goBack(stepper)">Back</button>
- <button class="stepper-button" id="format-selection-next-button"
- [disabled]="!formatConfigurationValid"
- (click)="clickFormatSelectionNextButton(stepper)"
- color="primary" mat-raised-button>
- Next
- </button>
- </div>
-
</mat-step>
<mat-step>
<ng-template matStepLabel>Define Event Schema</ng-template>
-
<sp-event-schema #eschema fxLayout="column" fxFlex="100"
[(isEditable)]="isEditable"
[adapterDescription]="adapter"
[(eventSchema)]="eventSchema"
- [(oldEventSchema)]="oldEventSchema">
+ [(oldEventSchema)]="oldEventSchema"
+ (clickNextEmitter)="clickEventSchemaNextButtonButton($event)"
+ (goBackEmitter)="goBack($event)"
+ (removeSelectionEmitter)="removeSelection()">
</sp-event-schema>
-
- <div fxLayoutAlign="end">
- <button class="mat-basic" mat-raised-button (click)="removeSelection()">Cancel</button>
- <button class="mat-basic stepper-button" mat-raised-button (click)="goBack(stepper)">Back</button>
- <button class="stepper-button" id="event-schema-next-button"
- (click)="clickEventSchemaNextButtonButton(stepper)" color="primary" mat-raised-button>Next
- </button>
- </div>
</mat-step>
<mat-step>
+ <ng-template matStepLabel>Start Adapter</ng-template>
<sp-start-adapter-configuration
[adapterDescription]="adapter"
[stepper]="stepper"
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
index a579b39..3b4a59c 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
@@ -292,6 +292,7 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
goBack(stepper: MatStepper) {
this.myStepper.selectedIndex = this.myStepper.selectedIndex - 1;
}
+
goForward(stepper: MatStepper) {
this.myStepper.selectedIndex = this.myStepper.selectedIndex + 1;
}
diff --git a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.html b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.html
index 274d72c..33ee0d5 100644
--- a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.html
+++ b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.html
@@ -16,6 +16,7 @@
~
-->
+
<div fxLayout="row" fxLayoutAlign="center">
<div fxFlex="0 1 80%">
@@ -58,3 +59,12 @@
<sp-event-schema-preview [eventSchema]="eventSchema"></sp-event-schema-preview>
</div>
</div>
+
+
+<div fxLayoutAlign="end">
+ <button class="mat-basic" mat-raised-button (click)="removeSelection()">Cancel</button>
+ <button class="mat-basic stepper-button" mat-raised-button (click)="goBack()">Back</button>
+ <button class="stepper-button" id="event-schema-next-button"
+ (click)="clickNext()" color="primary" mat-raised-button>Next
+ </button>
+</div>
diff --git a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
index beecff6..1b4eba3 100644
--- a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
+++ b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
@@ -38,6 +38,7 @@ import {
GuessSchema,
Notification
} from '../../../../core-model/gen/streampipes-model';
+import { MatStepper } from '@angular/material/stepper';
@Component({
selector: 'sp-event-schema',
@@ -48,6 +49,11 @@ export class EventSchemaComponent implements OnChanges {
constructor(private restService: RestService, private dataTypesService: DataTypesService) { }
+ /**
+ * Mat stepper to trigger next confifuration step when this is completed
+ */
+ @Input() stepper: MatStepper;
+
@Input() adapterDescription: AdapterDescription;
@Input() isEditable = true;
@Input() oldEventSchema: EventSchema;
@@ -58,6 +64,19 @@ export class EventSchemaComponent implements OnChanges {
@Output() eventSchemaChange = new EventEmitter<EventSchema>();
@Output() oldEventSchemaChange = new EventEmitter<EventSchema>();
+ @Output() goBackEmitter: EventEmitter<MatStepper> = new EventEmitter();
+
+ /**
+ * Cancels the adapter configuration process
+ */
+ @Output() removeSelectionEmitter: EventEmitter<boolean> = new EventEmitter();
+
+ /**
+ * Go to next configuration step when this is complete
+ */
+ @Output() clickNextEmitter: EventEmitter<MatStepper> = new EventEmitter();
+
+
@ViewChild(TreeComponent, { static: true }) tree: TreeComponent;
schemaGuess: GuessSchema = new GuessSchema();
@@ -187,4 +206,16 @@ export class EventSchemaComponent implements OnChanges {
setTimeout(() => { this.refreshTree() }, 200);
}
+
+ public removeSelection() {
+ this.removeSelectionEmitter.emit();
+ }
+
+ public clickNext() {
+ this.clickNextEmitter.emit(this.stepper);
+ }
+
+ public goBack() {
+ this.goBackEmitter.emit(this.stepper);
+ }
}
diff --git a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.html b/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.html
index 696c3b6..3636756 100644
--- a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.html
+++ b/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.html
@@ -1,5 +1,4 @@
<div style="margin-bottom: 2%;">
- <ng-template matStepLabel>Settings</ng-template>
<div>
<div class="assemblyOptions sp-blue-bg">
<h4>Basic settings</h4>
@@ -20,8 +19,5 @@
<button class="stepper-button" [disabled]="!specificAdapterSettingsFormValid"
(click)="clickNext()" color="primary" mat-raised-button>Next
</button>
-<!-- <button class="stepper-button" [disabled]="!specificAdapterSettingsFormValid"-->
-<!-- (click)="clickSpecificSettingsNextButton(stepper)" color="primary" mat-raised-button>Next-->
-<!-- </button>-->
</div>
</div>
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
index 47df4ae..f52d27a 100644
--- a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
+++ b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
@@ -1,5 +1,4 @@
<div [formGroup]="startAdapterForm">
- <ng-template matStepLabel>Start Adapter</ng-template>
<div class="assemblyOptions sp-blue-bg">
<h4>Adapter settings</h4>
</div>
[incubator-streampipes] 02/02: Remove stepper variable from sub
components
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-380
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit de605f25d8772ee7d95b1bdcd5d68d83f3a355fc
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Jun 15 17:03:08 2021 +0200
Remove stepper variable from sub components
---
.../format-configuration.component.ts | 10 +----
.../generic-adapter-configuration.component.ts | 7 +---
.../new-adapter/new-adapter.component.html | 18 ++++-----
.../new-adapter/new-adapter.component.ts | 46 ++++++----------------
.../event-schema/event-schema.component.ts | 9 +----
.../specific-adapter-configuration.component.ts | 7 +---
.../start-adapter-configuration.component.ts | 8 +---
7 files changed, 25 insertions(+), 80 deletions(-)
diff --git a/ui/src/app/connect/components/format-configuration/format-configuration.component.ts b/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
index b8f2c1f..8b7d1c0 100644
--- a/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
+++ b/ui/src/app/connect/components/format-configuration/format-configuration.component.ts
@@ -21,12 +21,6 @@ export class FormatConfigurationComponent implements OnInit {
*/
@Input() adapterDescription: AdapterDescriptionUnion;
- /**
- * Mat stepper to trigger next confifuration step when this is completed
- */
- @Input() stepper: MatStepper;
-
-
@Output() goBackEmitter: EventEmitter<MatStepper> = new EventEmitter();
/**
@@ -108,10 +102,10 @@ export class FormatConfigurationComponent implements OnInit {
}
public clickNext() {
- this.clickNextEmitter.emit(this.stepper);
+ this.clickNextEmitter.emit();
}
public goBack() {
- this.goBackEmitter.emit(this.stepper);
+ this.goBackEmitter.emit();
}
}
diff --git a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
index af3efbd..4669661 100644
--- a/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/generic-adapter-configuration/generic-adapter-configuration.component.ts
@@ -21,11 +21,6 @@ export class GenericAdapterConfigurationComponent implements OnInit {
@Input() adapterDescription: AdapterDescriptionUnion;
/**
- * Mat stepper to trigger next confifuration step when this is completed
- */
- @Input() stepper: MatStepper;
-
- /**
* Cancels the adapter configuration process
*/
@Output() removeSelectionEmitter: EventEmitter<boolean> = new EventEmitter();
@@ -65,6 +60,6 @@ export class GenericAdapterConfigurationComponent implements OnInit {
}
public clickNext() {
- this.clickNextEmitter.emit(this.stepper);
+ this.clickNextEmitter.emit();
}
}
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.html b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
index 099fb74..d263ed2 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.html
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
@@ -47,8 +47,7 @@
<ng-template matStepLabel>Settings</ng-template>
<sp-specific-adapter-configuration
[adapterDescription]="adapter"
- [stepper]="stepper"
- (clickNextEmitter)="clickSpecificSettingsNextButton($event)"
+ (clickNextEmitter)="clickSpecificSettingsNextButton()"
(removeSelectionEmitter)="removeSelection()">
</sp-specific-adapter-configuration>
</mat-step>
@@ -57,8 +56,7 @@
<ng-template matStepLabel>Settings</ng-template>
<sp-generic-adapter-configuration
[adapterDescription]="adapter"
- [stepper]="stepper"
- (clickNextEmitter)="clickProtocolSettingsNextButton($event)"
+ (clickNextEmitter)="clickProtocolSettingsNextButton()"
(removeSelectionEmitter)="removeSelection()">
</sp-generic-adapter-configuration>
</mat-step>
@@ -67,9 +65,8 @@
<ng-template matStepLabel>Select Format</ng-template>
<sp-format-configuration
[adapterDescription]="adapter"
- [stepper]="stepper"
- (clickNextEmitter)="clickFormatSelectionNextButton($event)"
- (goBackEmitter)="goBack($event)"
+ (clickNextEmitter)="clickFormatSelectionNextButton()"
+ (goBackEmitter)="goBack()"
(removeSelectionEmitter)="removeSelection()">
</sp-format-configuration>
</mat-step>
@@ -81,8 +78,8 @@
[adapterDescription]="adapter"
[(eventSchema)]="eventSchema"
[(oldEventSchema)]="oldEventSchema"
- (clickNextEmitter)="clickEventSchemaNextButtonButton($event)"
- (goBackEmitter)="goBack($event)"
+ (clickNextEmitter)="clickEventSchemaNextButtonButton()"
+ (goBackEmitter)="goBack()"
(removeSelectionEmitter)="removeSelection()">
</sp-event-schema>
</mat-step>
@@ -91,9 +88,8 @@
<ng-template matStepLabel>Start Adapter</ng-template>
<sp-start-adapter-configuration
[adapterDescription]="adapter"
- [stepper]="stepper"
(removeSelectionEmitter)="removeSelection()"
- (goBackEmitter)="goBack($event)"
+ (goBackEmitter)="goBack()"
(adapterStartedEmitter)="adapterWasStarted()">
</sp-start-adapter-configuration>
</mat-step>
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
index 3b4a59c..897ad81 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.ts
@@ -26,17 +26,15 @@ import {
Output,
ViewChild
} from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup } from '@angular/forms';
import { MatStepper } from '@angular/material/stepper';
import {
AdapterDescription,
AdapterDescriptionUnion,
EventProperty,
- EventRateTransformationRuleDescription,
EventSchema,
GenericAdapterSetDescription,
GenericAdapterStreamDescription,
- RemoveDuplicatesTransformationRuleDescription,
SpecificAdapterSetDescription,
SpecificAdapterStreamDescription,
TransformationRuleDescriptionUnion
@@ -49,10 +47,7 @@ import { ConfigurationInfo } from '../../model/ConfigurationInfo';
import { RestService } from '../../services/rest.service';
import { EventSchemaComponent } from '../schema-editor/event-schema/event-schema.component';
import { TransformationRuleService } from '../../services/transformation-rule.service';
-import { AdapterStartedDialog } from '../../dialog/adapter-started/adapter-started-dialog.component';
import { IconService } from '../../services/icon.service';
-import { DialogService } from '../../../core-ui/dialog/base-dialog/base-dialog.service';
-import { PanelType } from '../../../core-ui/dialog/base-dialog/base-dialog.model';
@Component({
selector: 'sp-new-adapter',
@@ -67,7 +62,6 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
isDataSetDescription = false;
isDataStreamDescription = false;
-
dataLakeTimestampField: string;
@Input()
@@ -86,9 +80,6 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
protocolConfigurationValid: boolean;
formatConfigurationValid: boolean;
-
- // startAdapterFormGroup: FormGroup;
-
eventSchema: EventSchema;
oldEventSchema: EventSchema;
@@ -182,36 +173,23 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
this.changeDetectorRef.detectChanges();
}
- public showPreview(isPreviewEnabled) {
- this.isPreviewEnabled = isPreviewEnabled;
- }
-
-
-
- validateFormat(valid) {
- this.formatConfigurationValid = valid;
- }
-
- validateGenericAdapterForm(valid) {
- this.genericAdapterSettingsFormValid = valid;
- }
removeSelection() {
this.removeSelectionEmitter.emit();
}
- clickProtocolSettingsNextButton(stepper: MatStepper) {
+ clickProtocolSettingsNextButton() {
this.shepherdService.trigger('specific-settings-next-button');
- this.goForward(stepper);
+ this.goForward();
}
- clickSpecificSettingsNextButton(stepper: MatStepper) {
+ clickSpecificSettingsNextButton() {
this.shepherdService.trigger('specific-settings-next-button');
this.guessEventSchema();
- this.goForward(stepper);
+ this.goForward();
}
- clickEventSchemaNextButtonButton(stepper: MatStepper) {
+ clickEventSchemaNextButtonButton() {
if (this.isEditable) {
this.setSchema();
}
@@ -223,15 +201,13 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
}
this.shepherdService.trigger('event-schema-next-button');
- this.goForward(stepper);
-
-
+ this.goForward();
}
- clickFormatSelectionNextButton(stepper: MatStepper) {
+ clickFormatSelectionNextButton() {
this.shepherdService.trigger('format-selection-next-button');
this.guessEventSchema();
- this.goForward(stepper);
+ this.goForward();
}
guessEventSchema() {
@@ -289,11 +265,11 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
this.adapter.rules = transformationRules;
}
- goBack(stepper: MatStepper) {
+ goBack() {
this.myStepper.selectedIndex = this.myStepper.selectedIndex - 1;
}
- goForward(stepper: MatStepper) {
+ goForward() {
this.myStepper.selectedIndex = this.myStepper.selectedIndex + 1;
}
diff --git a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
index 1b4eba3..df4fe7e 100644
--- a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
+++ b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.ts
@@ -49,11 +49,6 @@ export class EventSchemaComponent implements OnChanges {
constructor(private restService: RestService, private dataTypesService: DataTypesService) { }
- /**
- * Mat stepper to trigger next confifuration step when this is completed
- */
- @Input() stepper: MatStepper;
-
@Input() adapterDescription: AdapterDescription;
@Input() isEditable = true;
@Input() oldEventSchema: EventSchema;
@@ -212,10 +207,10 @@ export class EventSchemaComponent implements OnChanges {
}
public clickNext() {
- this.clickNextEmitter.emit(this.stepper);
+ this.clickNextEmitter.emit();
}
public goBack() {
- this.goBackEmitter.emit(this.stepper);
+ this.goBackEmitter.emit();
}
}
diff --git a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts b/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts
index c7a3a18..1ba136b 100644
--- a/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/specific-adapter-configuration/specific-adapter-configuration.component.ts
@@ -16,11 +16,6 @@ export class SpecificAdapterConfigurationComponent implements OnInit {
@Input() adapterDescription: AdapterDescriptionUnion;
/**
- * Mat stepper to trigger next confifuration step when this is completed
- */
- @Input() stepper: MatStepper;
-
- /**
* Cancels the adapter configuration process
*/
@Output() removeSelectionEmitter: EventEmitter<boolean> = new EventEmitter();
@@ -51,6 +46,6 @@ export class SpecificAdapterConfigurationComponent implements OnInit {
}
public clickNext() {
- this.clickNextEmitter.emit(this.stepper);
+ this.clickNextEmitter.emit();
}
}
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
index 85e2f9e..a5b361c 100644
--- a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
@@ -24,11 +24,6 @@ export class StartAdapterConfigurationComponent implements OnInit {
@Input() adapterDescription: AdapterDescriptionUnion;
/**
- * Mat stepper to trigger next confifuration step when this is completed
- */
- @Input() stepper: MatStepper;
-
- /**
* Cancels the adapter configuration process
*/
@Output() removeSelectionEmitter: EventEmitter<boolean> = new EventEmitter();
@@ -38,7 +33,6 @@ export class StartAdapterConfigurationComponent implements OnInit {
*/
@Output() adapterStartedEmitter: EventEmitter<void> = new EventEmitter<void>();
-
/**
* Go to next configuration step when this is complete
*/
@@ -133,6 +127,6 @@ export class StartAdapterConfigurationComponent implements OnInit {
}
public goBack() {
- this.goBackEmitter.emit(this.stepper);
+ this.goBackEmitter.emit();
}
}