You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/08/20 14:37:50 UTC
[incubator-streampipes] branch dev updated (185415b -> 9153ca1)
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 185415b [STREAMPIPES-199] Improve pipeline storage dialog
new de0a649 [STREAMPIPES-199][ui] remove advanced settings option from setup
new 0ad9a1c [STREAMPIPES-199][backend] remove external service config from initial settings
new 9153ca1 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
The 3 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:
.../model/client/setup/InitialSettings.java | 42 +------------
.../manager/setup/InstallationConfiguration.java | 23 --------
.../login/components/setup/setup.component.html | 68 ++--------------------
.../app/login/components/setup/setup.component.ts | 9 ---
4 files changed, 6 insertions(+), 136 deletions(-)
[incubator-streampipes] 03/03: Merge remote-tracking branch
'refs/remotes/origin/dev' into dev
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 9153ca197f475409bfce89a73358209571dd9138
Merge: 0ad9a1c 185415b
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Thu Aug 20 16:37:27 2020 +0200
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
.../master/rest/AdapterTemplateResource.java | 17 +---
.../model/runtime/RuntimeOptionsRequest.java | 10 +++
.../model/runtime/RuntimeOptionsResponse.java | 2 +
.../streampipes/manager/operations/Operations.java | 10 +--
.../remote/ContainerProvidedOptionsHandler.java | 45 +++-------
.../rest/impl/ContainerProvidedOptions.java | 8 +-
ui/src/app/connect/connect.component.ts | 5 +-
ui/src/app/connect/connect.module.ts | 2 +
.../adapter-description.component.ts | 29 ++++---
...nt.css => adapter-export-dialog.component.scss} | 16 +---
.../adapter-export-dialog.component.ts | 40 +++------
.../adapter-export/adapter-export-dialog.html | 30 ++-----
...nt.css => adapter-upload-dialog.component.scss} | 2 +
.../adapter-upload-dialog.component.ts | 42 +++-------
.../adapter-upload/adapter-upload-dialog.html | 51 +++++------
.../data-marketplace.component.css | 4 +
.../data-marketplace.component.html | 2 +-
.../data-marketplace/data-marketplace.component.ts | 41 +++------
.../connect/new-adapter/new-adapter.component.html | 10 +--
ui/src/app/connect/rest.service.ts | 12 ---
.../base/abstract-static-property.ts | 6 +-
.../base/abstract-validated-static-property.ts | 2 +-
.../filter/display-recommended.pipe.ts | 1 -
.../static-alternatives.component.ts | 5 +-
.../static-any-input.component.html | 11 +--
.../static-any-input/static-any-input.component.ts | 6 ++
.../static-code-input.component.ts | 8 +-
.../static-collection.component.ts | 9 +-
.../static-color-picker.component.ts | 5 +-
.../static-free-input.component.ts | 8 +-
.../static-mapping/static-mapping.ts | 11 ++-
.../static-property.component.html | 12 ++-
.../static-properties/static-property.component.ts | 7 +-
...tic-runtime-resolvable-any-input.component.html | 24 ++++--
...tatic-runtime-resolvable-any-input.component.ts | 27 +++---
.../base-runtime-resolvable-input.ts | 98 ++++++++++++++++++++++
.../runtime-resolvable.service.ts | 43 ++++++++++
...c-runtime-resolvable-oneof-input.component.html | 19 +++--
...tic-runtime-resolvable-oneof-input.component.ts | 81 +++---------------
.../static-secret-input.component.ts | 3 +-
ui/src/app/core-model/gen/streampipes-model.ts | 13 +--
.../dialog/base-dialog/base-dialog.service.ts | 8 +-
.../dialog/customize/customize.component.html | 8 +-
.../editor/dialog/customize/customize.component.ts | 6 ++
.../save-pipeline/save-pipeline.component.html | 24 ++++--
.../save-pipeline/save-pipeline.component.scss | 9 ++
.../save-pipeline/save-pipeline.component.ts | 33 ++++----
ui/src/scss/sp/main.scss | 5 ++
48 files changed, 441 insertions(+), 429 deletions(-)
[incubator-streampipes] 01/03: [STREAMPIPES-199][ui] remove
advanced settings option from setup
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit de0a6492ae1230d700055b633c4c78317a2a3ac2
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Thu Aug 20 16:35:57 2020 +0200
[STREAMPIPES-199][ui] remove advanced settings option from setup
---
.../login/components/setup/setup.component.html | 68 ++--------------------
.../app/login/components/setup/setup.component.ts | 9 ---
2 files changed, 5 insertions(+), 72 deletions(-)
diff --git a/ui/src/app/login/components/setup/setup.component.html b/ui/src/app/login/components/setup/setup.component.html
index 3fe6d70..d6ebcae 100644
--- a/ui/src/app/login/components/setup/setup.component.html
+++ b/ui/src/app/login/components/setup/setup.component.html
@@ -19,7 +19,7 @@
<div class="md-padding full-background" fxLayout="row" fxLayoutAlign="center center"
style="min-height:100vh !important;">
<div fxFlex="40" fxLayout="column" fxLayoutAlign="center center">
- <mat-card class="card-100-center box-shadow-login" style="padding:20px;overflow-y:auto;height:80vh;">
+ <mat-card class="card-100-center box-shadow-login" style="padding:20px;overflow-y:auto;">
<div fxFlex="100" fxLayout="column">
<div fxLayout="row" fxLayoutAlign="center center" style="margin-left:auto;margin-right:auto;margin-bottom:20px;">
<div fxFlex="60" fxLayoutAlign="center center" fxLayout="row"
@@ -27,7 +27,7 @@
style="margin-top:40px;width:400px;" alt="icon" src="../../../../assets/img/login/logo.png">
</div>
</div>
- <form #setupForm="ngForm" >
+ <form #setupForm="ngForm">
<mat-card-title>
<div fxFlex="100" fxLayout="column">
@@ -47,58 +47,10 @@
<mat-label>Password</mat-label>
<input [(ngModel)]="setup.adminPassword" matInput type="password" name="password" class="sp" required/>
</mat-form-field>
- <mat-checkbox color="primary" [(ngModel)]="setup.installPipelineElements" name="install"><span>Also install available data streams, processors and sinks.</span></mat-checkbox>
-<!-- <md-input-container flex>-->
-<!-- <label>Email</label>-->
-<!-- <input name="email" type="email" ng-model="ctrl.setup.adminEmail" required>-->
-<!-- <span ng-show="ctrl.setupForm.email.$touched && ctrl.setupForm.email.$error.required">The email field can't be blank.</span>-->
-<!-- <span ng-show="ctrl.setupForm.email.$error.email">This is not a valid email.</span>-->
-<!-- </md-input-container>-->
-<!-- <md-input-container flex>-->
-<!-- <label>Password</label>-->
-<!-- <input name="password" type="password" ng-model="ctrl.setup.adminPassword" required>-->
-<!-- <span ng-show="ctrl.setupForm.password.$touched && ctrl.setupForm.password.$error.required">The password field can't be blank.</span>-->
-<!-- </md-input-container>-->
+ <mat-checkbox style="margin-bottom: 10px;" color="primary" [(ngModel)]="setup.installPipelineElements" name="install"><span>Also install available data streams, processors and sinks.</span></mat-checkbox>
</div>
-<!-- <md-checkbox ng-model="ctrl.setup.installPipelineElements" aria-label="Install pipeline elements">-->
-<!-- Also install available data streams, processors and sinks.-->
-<!-- </md-checkbox>-->
-
</div>
<div>
- <div *ngIf="showAdvancedSettings && !installationRunning">
- <div fxFlex fxLayout="column">
- <h3>Advanced Settings</h3>
- <div fxLayout="row">
- <mat-form-field fxFlex="45" fxLayoutAlign="start center">
- <mat-label>CouchDB Host</mat-label>
- <input [(ngModel)]="setup.couchDbHost" matInput name="couchDbHost" class="sp"/>
- </mat-form-field>
- <mat-form-field fxFlex="45" fxLayoutAlign="end center">
- <mat-label>JMS Host</mat-label>
- <input [(ngModel)]="setup.jmsHost" matInput name="jmsHost" class="sp"/>
- </mat-form-field>
- </div>
- <div fxLayout="row">
- <mat-form-field fxFlex="45" fxLayoutAlign="start center">
- <mat-label>Kafka Host</mat-label>
- <input [(ngModel)]="setup.kafkaHost" matInput name="kafkaHost" class="sp"/>
- </mat-form-field>
- <mat-form-field fxFlex="45" fxLayoutAlign="end center">
- <mat-label>Zookeeper Host</mat-label>
- <input [(ngModel)]="setup.zookeeperHost" matInput name="zookeeperHost" class="sp"/>
- </mat-form-field>
-<!-- <md-input-container flex>-->
-<!-- <label>Kafka Host</label>-->
-<!-- <input name="kafkaHost" ng-model="ctrl.setup.kafkaHost">-->
-<!-- </md-input-container>-->
-<!-- <md-input-container flex>-->
-<!-- <label>Zookeeper Host</label>-->
-<!-- <input name="zookeeperHost" ng-model="ctrl.setup.zookeeperHost">-->
-<!-- </md-input-container>-->
- </div>
- </div>
- </div>
<div *ngIf="installationRunning">
<h3>Installation Results</h3>
<div *ngFor="let msg of installationResults">
@@ -128,22 +80,12 @@
<mat-divider></mat-divider>
<mat-card-actions fxLayout="row" fxLayoutAlign="end center" *ngIf="!installationRunning">
<div fxFlex fxLayout="column">
-
- <div fxLayout="row">
+ <div fxLayout="row" style="margin-top: 10px; margin-bottom: 10px;">
<button mat-button mat-raised-button color="primary"
- [disabled]="!(parentForm.valid) || loading || installationFinished"
+ [disabled]="!(setupForm.valid) || loading || installationFinished"
(click)="configure(0)">Install
</button>
- <button mat-button mat-raised-button class="mat-basic" *ngIf="!showAdvancedSettings"
- (click)="showAdvancedSettings = !showAdvancedSettings"
- [disabled]="installationFinished">Show Advanced Settings
- </button>
- <button mat-button mat-raised-button class="mat-basic" *ngIf="showAdvancedSettings"
- (click)="showAdvancedSettings = !showAdvancedSettings"
- [disabled]="installationFinished">Hide Advanced Settings
- </button>
</div>
-
</div>
</mat-card-actions>
</div>
diff --git a/ui/src/app/login/components/setup/setup.component.ts b/ui/src/app/login/components/setup/setup.component.ts
index 701606e..2f371b8 100644
--- a/ui/src/app/login/components/setup/setup.component.ts
+++ b/ui/src/app/login/components/setup/setup.component.ts
@@ -33,20 +33,13 @@ export class SetupComponent {
loading: any;
showAdvancedSettings: any;
setup: any = {
- couchDbHost: '',
- kafkaHost: '',
- zookeeperHost: '',
- jmsHost: '',
adminEmail: '',
adminPassword: '',
installPipelineElements: true
};
- setupForm: any;
installationRunning: any;
nextTaskTitle: any;
- parentForm: FormGroup = new FormGroup({});
-
constructor(private loginService: LoginService,
private RestApi: RestApi) {
@@ -55,8 +48,6 @@ export class SetupComponent {
this.installationResults = [];
this.loading = false;
this.showAdvancedSettings = false;
-
- this.setup
}
configure(currentInstallationStep) {
[incubator-streampipes] 02/03: [STREAMPIPES-199][backend] remove
external service config from initial settings
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 0ad9a1ce53702e6ab4f20f492b06180ef126491d
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Thu Aug 20 16:36:52 2020 +0200
[STREAMPIPES-199][backend] remove external service config from initial settings
---
.../model/client/setup/InitialSettings.java | 42 +---------------------
.../manager/setup/InstallationConfiguration.java | 23 ------------
2 files changed, 1 insertion(+), 64 deletions(-)
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/setup/InitialSettings.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/setup/InitialSettings.java
index febf233..cfb6aa1 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/setup/InitialSettings.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/setup/InitialSettings.java
@@ -23,19 +23,11 @@ public class InitialSettings {
private String adminEmail;
private String adminPassword;
- private String couchDbHost;
- private String kafkaHost;
- private String zookeeperHost;
- private String jmsHost;
private Boolean installPipelineElements;
- public InitialSettings(String adminEmail, String adminPassword, String couchDbHost, String kafkaHost, String zookeeperHost, String jmsHost, Boolean installPipelineElements) {
+ public InitialSettings(String adminEmail, String adminPassword, Boolean installPipelineElements) {
this.adminEmail = adminEmail;
this.adminPassword = adminPassword;
- this.couchDbHost = couchDbHost;
- this.kafkaHost = kafkaHost;
- this.zookeeperHost = zookeeperHost;
- this.jmsHost = jmsHost;
this.installPipelineElements = installPipelineElements;
}
@@ -58,38 +50,6 @@ public class InitialSettings {
this.adminEmail = adminEmail;
}
- public String getCouchDbHost() {
- return couchDbHost;
- }
-
- public void setCouchDbHost(String couchDbHost) {
- this.couchDbHost = couchDbHost;
- }
-
- public String getKafkaHost() {
- return kafkaHost;
- }
-
- public void setKafkaHost(String kafkaHost) {
- this.kafkaHost = kafkaHost;
- }
-
- public String getZookeeperHost() {
- return zookeeperHost;
- }
-
- public void setZookeeperHost(String zookeeperHost) {
- this.zookeeperHost = zookeeperHost;
- }
-
- public String getJmsHost() {
- return jmsHost;
- }
-
- public void setJmsHost(String jmsHost) {
- this.jmsHost = jmsHost;
- }
-
public Boolean getInstallPipelineElements() {
return installPipelineElements;
}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/InstallationConfiguration.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/InstallationConfiguration.java
index a6c8c1a..4e77c3f 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/InstallationConfiguration.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/InstallationConfiguration.java
@@ -18,11 +18,9 @@
package org.apache.streampipes.manager.setup;
-import org.apache.streampipes.config.backend.BackendConfig;
import org.apache.streampipes.manager.endpoint.EndpointFetcher;
import org.apache.streampipes.model.client.endpoint.RdfEndpoint;
import org.apache.streampipes.model.client.setup.InitialSettings;
-import org.apache.streampipes.storage.couchdb.utils.CouchDbConfig;
import java.util.ArrayList;
import java.util.List;
@@ -31,8 +29,6 @@ public class InstallationConfiguration {
public static List<InstallationStep> getInstallationSteps(InitialSettings settings)
{
-
- setInitialConfiguration(settings);
List<InstallationStep> steps = new ArrayList<>();
steps.add(new CouchDbInstallationStep());
@@ -49,23 +45,4 @@ public class InstallationConfiguration {
return steps;
}
-
- /**
- * Set the initial configuration when the user specifies it in the user interface during the installation
- * @param s settings the user provided in the installation dialogue
- */
- private static void setInitialConfiguration(InitialSettings s) {
- if (!"".equals(s.getCouchDbHost())) {
- CouchDbConfig.INSTANCE.setHost(s.getCouchDbHost());
- }
- if (!"".equals(s.getKafkaHost())) {
- BackendConfig.INSTANCE.setKafkaHost(s.getKafkaHost());
- }
- if (!"".equals(s.getZookeeperHost())) {
- BackendConfig.INSTANCE.setZookeeperHost(s.getZookeeperHost());
- }
- if (!"".equals(s.getJmsHost())) {
- BackendConfig.INSTANCE.setJmsHost(s.getJmsHost());
- }
- }
}