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 2022/02/02 09:23:00 UTC
[incubator-streampipes] branch experimental-module-federation updated (80afad4 -> 499f4a9)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 80afad4 [hotfix] Remove old assets
new e9cb859 [hotfix] Remove linting errors in add module
new 499f4a9 [hotfix] Remove linting errors in app asset monitoring module
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:
.idea/runConfigurations/all_pipeline_elements_jvm.xml | 1 -
.idea/runConfigurations/backend.xml | 1 -
.idea/runConfigurations/connect_adapters_iiot.xml | 1 -
ui/src/app/add/add.component.html | 14 +++++++-------
ui/src/app/add/add.component.ts | 2 +-
.../endpoint-item/endpoint-item.component.ts | 12 ++++++------
.../add/dialogs/add-endpoint/add-endpoint.component.ts | 18 +++++++++---------
.../endpoint-installation.component.ts | 6 +++---
ui/src/app/apidocs/apidocs.component.ts | 4 ++--
.../app-asset-monitoring.component.html | 6 +++---
.../app-asset-monitoring.component.ts | 12 ++++++------
.../components/create-asset/create-asset.component.ts | 2 +-
.../dashboard-overview/dashboard-overview.component.ts | 2 +-
.../components/view-asset/view-asset.component.ts | 2 +-
.../add-pipeline/add-pipeline-dialog.component.ts | 2 +-
.../save-dashboard/save-dashboard-dialog.component.ts | 2 +-
ui/src/app/app-overview/app-overview.component.html | 4 ++--
17 files changed, 44 insertions(+), 47 deletions(-)
[incubator-streampipes] 02/02: [hotfix] Remove linting errors in app asset monitoring module
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 499f4a9b219ac5b10cb221f226dcb0a9c354173b
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Feb 2 10:22:47 2022 +0100
[hotfix] Remove linting errors in app asset monitoring module
---
.idea/runConfigurations/all_pipeline_elements_jvm.xml | 1 -
.idea/runConfigurations/backend.xml | 1 -
.idea/runConfigurations/connect_adapters_iiot.xml | 1 -
ui/src/app/apidocs/apidocs.component.ts | 4 ++--
.../app-asset-monitoring/app-asset-monitoring.component.html | 6 +++---
.../app-asset-monitoring/app-asset-monitoring.component.ts | 12 ++++++------
.../components/create-asset/create-asset.component.ts | 2 +-
.../dashboard-overview/dashboard-overview.component.ts | 2 +-
.../components/view-asset/view-asset.component.ts | 2 +-
.../dialog/add-pipeline/add-pipeline-dialog.component.ts | 2 +-
.../dialog/save-dashboard/save-dashboard-dialog.component.ts | 2 +-
ui/src/app/app-overview/app-overview.component.html | 4 ++--
12 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/.idea/runConfigurations/all_pipeline_elements_jvm.xml b/.idea/runConfigurations/all_pipeline_elements_jvm.xml
index 0dbe4a8..08521f8 100644
--- a/.idea/runConfigurations/all_pipeline_elements_jvm.xml
+++ b/.idea/runConfigurations/all_pipeline_elements_jvm.xml
@@ -13,7 +13,6 @@
<env name="SP_BACKEND_HOST" value="localhost" />
<env name="SP_BACKEND_PORT" value="8030" />
<env name="SP_IMAGE_STORAGE_LOCATION" value=".streampipes/spImages/" />
- <env name="SP_HOST" value="141.21.12.107" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.jvm.AllPipelineElementsInit" />
<module name="streampipes-pipeline-elements-all-jvm" />
diff --git a/.idea/runConfigurations/backend.xml b/.idea/runConfigurations/backend.xml
index b4a2f8a..ff3c772 100644
--- a/.idea/runConfigurations/backend.xml
+++ b/.idea/runConfigurations/backend.xml
@@ -14,7 +14,6 @@
<env name="SP_JMS_HOST" value="localhost" />
<env name="SP_DEBUG" value="true " />
<env name="SP_PRIORITIZED_PROTOCOL" value="kafka" />
- <env name="SP_HOST" value="141.21.12.107" />
</envs>
<method v="2">
<option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/connect_adapters_iiot.xml b/.idea/runConfigurations/connect_adapters_iiot.xml
index 977637b..ace1686 100644
--- a/.idea/runConfigurations/connect_adapters_iiot.xml
+++ b/.idea/runConfigurations/connect_adapters_iiot.xml
@@ -5,7 +5,6 @@
<env name="SP_DATA_LOCATION" value="./test_data/" />
<env name="SP_DEBUG" value="true" />
<env name="SP_DEBUG_CONNECT" value="false" />
- <env name="SP_HOST" value="141.21.12.107" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.apache.streampipes.connect.iiot.ConnectAdapterIiotInit" />
<module name="streampipes-connect-adapters-iiot" />
diff --git a/ui/src/app/apidocs/apidocs.component.ts b/ui/src/app/apidocs/apidocs.component.ts
index 87fca4c..e3f94e5 100644
--- a/ui/src/app/apidocs/apidocs.component.ts
+++ b/ui/src/app/apidocs/apidocs.component.ts
@@ -21,7 +21,7 @@ import SwaggerUI from 'swagger-ui';
@Component({
- selector: 'apidocs',
+ selector: 'sp-apidocs',
templateUrl: './apidocs.component.html',
styleUrls: ['./apidocs.component.scss']
})
@@ -32,7 +32,7 @@ export class ApidocsComponent implements OnInit {
}
ngOnInit(): void {
- const ui = SwaggerUI({
+ SwaggerUI({
url: '/streampipes-backend/api/openapi.json',
domNode: this.el.nativeElement.querySelector('.swagger-ui'),
deepLinking: false,
diff --git a/ui/src/app/app-asset-monitoring/app-asset-monitoring.component.html b/ui/src/app/app-asset-monitoring/app-asset-monitoring.component.html
index a51fd85..13dae74 100644
--- a/ui/src/app/app-asset-monitoring/app-asset-monitoring.component.html
+++ b/ui/src/app/app-asset-monitoring/app-asset-monitoring.component.html
@@ -29,8 +29,8 @@
</div>
<div fxLayout="column" fxFlex="100">
- <asset-dashboard-overview *ngIf="selectedIndex == 0 && !dashboardSelected" fxFlex="100" (selectedDashboard)="openDashboard($event)"></asset-dashboard-overview>
- <view-asset fxFlex="100" *ngIf="selectedIndex == 0 && dashboardSelected" [dashboardConfig]="selectedDashboard" (dashboardClosed)="closeDashboard($event)" (editDashboardEmitter)="editDashboard($event)"></view-asset>
- <create-asset *ngIf="selectedIndex == 1" fxFlex="100" (dashboardClosed)="closeDashboard($event)" [dashboardConfig]="selectedDashboard"></create-asset>
+ <sp-asset-dashboard-overview *ngIf="selectedIndex == 0 && !dashboardSelected" fxFlex="100" (selectedDashboard)="openDashboard($event)"></sp-asset-dashboard-overview>
+ <sp-view-asset fxFlex="100" *ngIf="selectedIndex == 0 && dashboardSelected" [dashboardConfig]="selectedDashboard" (dashboardClosed)="closeDashboard($event)" (editDashboardEmitter)="editDashboard($event)"></sp-view-asset>
+ <sp-create-asset *ngIf="selectedIndex == 1" fxFlex="100" (dashboardClosed)="closeDashboard($event)" [dashboardConfig]="selectedDashboard"></sp-create-asset>
</div>
</div>
diff --git a/ui/src/app/app-asset-monitoring/app-asset-monitoring.component.ts b/ui/src/app/app-asset-monitoring/app-asset-monitoring.component.ts
index e692078..b0e7a31 100644
--- a/ui/src/app/app-asset-monitoring/app-asset-monitoring.component.ts
+++ b/ui/src/app/app-asset-monitoring/app-asset-monitoring.component.ts
@@ -16,19 +16,19 @@
*
*/
-import { Component, EventEmitter, Output } from '@angular/core';
-import { DashboardConfiguration } from "./model/dashboard-configuration.model";
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { DashboardConfiguration } from './model/dashboard-configuration.model';
@Component({
- selector: 'app-asset-monitoring',
+ selector: 'sp-app-asset-monitoring',
templateUrl: './app-asset-monitoring.component.html',
styleUrls: ['./app-asset-monitoring.component.css']
})
-export class AppAssetMonitoringComponent {
+export class AppAssetMonitoringComponent implements OnInit {
- selectedIndex: number = 0;
- dashboardSelected: boolean = false;
+ selectedIndex = 0;
+ dashboardSelected = false;
selectedDashboard: DashboardConfiguration;
@Output() appOpened = new EventEmitter<boolean>();
diff --git a/ui/src/app/app-asset-monitoring/components/create-asset/create-asset.component.ts b/ui/src/app/app-asset-monitoring/components/create-asset/create-asset.component.ts
index a3e00f4..4111fbd 100644
--- a/ui/src/app/app-asset-monitoring/components/create-asset/create-asset.component.ts
+++ b/ui/src/app/app-asset-monitoring/components/create-asset/create-asset.component.ts
@@ -36,7 +36,7 @@ interface Window {
declare const window: Window;
@Component({
- selector: 'create-asset',
+ selector: 'sp-create-asset',
templateUrl: './create-asset.component.html',
styleUrls: ['./create-asset.component.css']
})
diff --git a/ui/src/app/app-asset-monitoring/components/dashboard-overview/dashboard-overview.component.ts b/ui/src/app/app-asset-monitoring/components/dashboard-overview/dashboard-overview.component.ts
index 71235a2..57b0a6f 100644
--- a/ui/src/app/app-asset-monitoring/components/dashboard-overview/dashboard-overview.component.ts
+++ b/ui/src/app/app-asset-monitoring/components/dashboard-overview/dashboard-overview.component.ts
@@ -21,7 +21,7 @@ import { RestService } from '../../services/rest.service';
import { DashboardConfiguration } from '../../model/dashboard-configuration.model';
@Component({
- selector: 'asset-dashboard-overview',
+ selector: 'sp-asset-dashboard-overview',
templateUrl: './dashboard-overview.component.html',
styleUrls: ['./dashboard-overview.component.css']
})
diff --git a/ui/src/app/app-asset-monitoring/components/view-asset/view-asset.component.ts b/ui/src/app/app-asset-monitoring/components/view-asset/view-asset.component.ts
index 61c4165..1fe5319 100644
--- a/ui/src/app/app-asset-monitoring/components/view-asset/view-asset.component.ts
+++ b/ui/src/app/app-asset-monitoring/components/view-asset/view-asset.component.ts
@@ -32,7 +32,7 @@ interface Window {
declare const window: Window;
@Component({
- selector: 'view-asset',
+ selector: 'sp-view-asset',
templateUrl: './view-asset.component.html',
styleUrls: ['./view-asset.component.css']
})
diff --git a/ui/src/app/app-asset-monitoring/dialog/add-pipeline/add-pipeline-dialog.component.ts b/ui/src/app/app-asset-monitoring/dialog/add-pipeline/add-pipeline-dialog.component.ts
index 2d7c7ec..294f79d 100644
--- a/ui/src/app/app-asset-monitoring/dialog/add-pipeline/add-pipeline-dialog.component.ts
+++ b/ui/src/app/app-asset-monitoring/dialog/add-pipeline/add-pipeline-dialog.component.ts
@@ -26,7 +26,7 @@ import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
import { VisualizablePipeline } from '@streampipes/platform-services';
@Component({
- selector: 'add-pipeline-dialog-component',
+ selector: 'sp-add-pipeline-dialog-component',
templateUrl: './add-pipeline-dialog.component.html',
styleUrls: ['./add-pipeline-dialog.component.scss']
})
diff --git a/ui/src/app/app-asset-monitoring/dialog/save-dashboard/save-dashboard-dialog.component.ts b/ui/src/app/app-asset-monitoring/dialog/save-dashboard/save-dashboard-dialog.component.ts
index 8f2a078..dde7587 100644
--- a/ui/src/app/app-asset-monitoring/dialog/save-dashboard/save-dashboard-dialog.component.ts
+++ b/ui/src/app/app-asset-monitoring/dialog/save-dashboard/save-dashboard-dialog.component.ts
@@ -25,7 +25,7 @@ import Konva from 'konva';
import Stage = Konva.Stage;
@Component({
- selector: 'save-dashboard-dialog-component',
+ selector: 'sp-save-dashboard-dialog-component',
templateUrl: 'save-dashboard-dialog.component.html',
styleUrls: ['./save-dashboard-dialog.component.scss'],
})
diff --git a/ui/src/app/app-overview/app-overview.component.html b/ui/src/app/app-overview/app-overview.component.html
index 1058a6b..298cc54 100644
--- a/ui/src/app/app-overview/app-overview.component.html
+++ b/ui/src/app/app-overview/app-overview.component.html
@@ -48,8 +48,8 @@
</div>
</div>
<div class="fixed-height" fxLayout="column" fxFlex="100">
- <app-asset-monitoring (appOpened)="appOpened($event)"
- *ngIf="currentlySelectedApp === apps[0].appId"></app-asset-monitoring>
+ <sp-app-asset-monitoring (appOpened)="appOpened($event)"
+ *ngIf="currentlySelectedApp === apps[0].appId"></sp-app-asset-monitoring>
<app-image-labeling (appOpened)="appOpened($event)"
*ngIf="currentlySelectedApp === apps[1].appId"></app-image-labeling>
</div>
[incubator-streampipes] 01/02: [hotfix] Remove linting errors in add module
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit e9cb859e3465a0d2755e060a31d2b70f52752c81
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Feb 2 10:15:24 2022 +0100
[hotfix] Remove linting errors in add module
---
ui/src/app/add/add.component.html | 14 +++++++-------
ui/src/app/add/add.component.ts | 2 +-
.../endpoint-item/endpoint-item.component.ts | 12 ++++++------
.../add/dialogs/add-endpoint/add-endpoint.component.ts | 18 +++++++++---------
.../endpoint-installation.component.ts | 6 +++---
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/ui/src/app/add/add.component.html b/ui/src/app/add/add.component.html
index 0591fd4..63c025a 100644
--- a/ui/src/app/add/add.component.html
+++ b/ui/src/app/add/add.component.html
@@ -99,13 +99,13 @@
</div>
<div fxLayout="row wrap" class="w-100">
- <endpoint-item fxFlex="33"
- [itemSelected]="endpointItem.selected"
- [item]="endpointItem"
- (triggerInstallation)="triggerInstallation($event)"
- *ngFor="let endpointItem of endpointItems | pipelineElementTypeFilter: selectedTab | pipelineElementNameFilter: filterTerm | pipelineElementInstallationStatusFilter: selectedInstallationStatus | orderBy: 'asc':'name'"
- class="p-15"
- (click)="toggleSelected(endpointItem)"></endpoint-item>
+ <sp-endpoint-item fxFlex="33"
+ [itemSelected]="endpointItem.selected"
+ [item]="endpointItem"
+ (triggerInstallation)="triggerInstallation($event)"
+ *ngFor="let endpointItem of endpointItems | pipelineElementTypeFilter: selectedTab | pipelineElementNameFilter: filterTerm | pipelineElementInstallationStatusFilter: selectedInstallationStatus | orderBy: 'asc':'name'"
+ class="p-15"
+ (click)="toggleSelected(endpointItem)"></sp-endpoint-item>
</div>
</div>
<div fxFlex="100" fxLayout="row" fxLayoutAlign="center center" *ngIf="!endpointItemsLoadingComplete">
diff --git a/ui/src/app/add/add.component.ts b/ui/src/app/add/add.component.ts
index 43d9584..29301ff 100644
--- a/ui/src/app/add/add.component.ts
+++ b/ui/src/app/add/add.component.ts
@@ -27,7 +27,7 @@ import { EndpointInstallationComponent } from './dialogs/endpoint-installation/e
import { ExtensionsServiceEndpointItem } from '@streampipes/platform-services';
@Component({
- selector: 'add',
+ selector: 'sp-add',
templateUrl: './add.component.html',
styleUrls: ['./add.component.scss']
})
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 fb7b20c..bcc9932 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
@@ -16,7 +16,7 @@
*
*/
-import { Component, EventEmitter, Input, OnInit, Output, Sanitizer } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { MatSnackBar } from '@angular/material/snack-bar';
import { AddService } from '../../services/add.service';
import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
@@ -27,7 +27,7 @@ import { PanelType } from '../../../core-ui/dialog/base-dialog/base-dialog.model
import { DialogService } from '../../../core-ui/dialog/base-dialog/base-dialog.service';
@Component({
- selector: 'endpoint-item',
+ selector: 'sp-endpoint-item',
templateUrl: './endpoint-item.component.html',
styleUrls: ['./endpoint-item.component.scss']
})
@@ -66,7 +66,7 @@ export class EndpointItemComponent implements OnInit {
const objectURL = URL.createObjectURL(blob);
this.image = this.sanitizer.bypassSecurityTrustUrl(objectURL);
this.iconReady = true;
- }, error => this.iconError = true);
+ }, () => this.iconError = true);
}
}
@@ -76,7 +76,7 @@ export class EndpointItemComponent implements OnInit {
result = s;
} else {
const words = s.split(' ');
- words.forEach(function (word, i) {
+ words.forEach((word, i) => {
if (i < 4) {
result += word.charAt(0);
}
@@ -107,11 +107,11 @@ export class EndpointItemComponent implements OnInit {
findItemStyle() {
const baseType = 'pe-label ';
- if (this.item.type == 'stream') {
+ 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') {
+ } else if (this.item.type === 'sepa') {
this.itemTypeStyle = baseType + 'processor-label';
} else {
this.itemTypeStyle = baseType + 'sink-label';
diff --git a/ui/src/app/add/dialogs/add-endpoint/add-endpoint.component.ts b/ui/src/app/add/dialogs/add-endpoint/add-endpoint.component.ts
index 89f239e..561a1cd 100644
--- a/ui/src/app/add/dialogs/add-endpoint/add-endpoint.component.ts
+++ b/ui/src/app/add/dialogs/add-endpoint/add-endpoint.component.ts
@@ -21,7 +21,7 @@ import { AddService } from '../../services/add.service';
import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
@Component({
- selector: 'add-endpoint-dialog',
+ selector: 'sp-add-endpoint-dialog',
templateUrl: './add-endpoint.component.html',
styleUrls: ['./add-endpoint.component.scss']
})
@@ -33,8 +33,8 @@ export class AddEndpointComponent implements OnInit {
endpointsChanged = false;
- constructor(private AddService: AddService,
- private DialogRef: DialogRef<AddEndpointComponent>) {
+ constructor(private addService: AddService,
+ private dialogRef: DialogRef<AddEndpointComponent>) {
this.rdfEndpoints = [];
this.addSelected = false;
this.newEndpoint = {};
@@ -49,7 +49,7 @@ export class AddEndpointComponent implements OnInit {
}
loadRdfEndpoints() {
- this.AddService.getRdfEndpoints()
+ this.addService.getRdfEndpoints()
.subscribe(rdfEndpoints => {
this.rdfEndpoints = rdfEndpoints;
});
@@ -57,22 +57,22 @@ export class AddEndpointComponent implements OnInit {
addRdfEndpoint(rdfEndpoint) {
console.log(rdfEndpoint);
- this.AddService.addRdfEndpoint(rdfEndpoint)
- .subscribe(message => {
+ this.addService.addRdfEndpoint(rdfEndpoint)
+ .subscribe(() => {
this.loadRdfEndpoints();
this.endpointsChanged = true;
});
}
removeRdfEndpoint(rdfEndpointId) {
- this.AddService.removeRdfEndpoint(rdfEndpointId)
- .subscribe(message => {
+ this.addService.removeRdfEndpoint(rdfEndpointId)
+ .subscribe(() => {
this.loadRdfEndpoints();
this.endpointsChanged = true;
});
}
close() {
- this.DialogRef.close(this.endpointsChanged);
+ this.dialogRef.close(this.endpointsChanged);
}
}
diff --git a/ui/src/app/add/dialogs/endpoint-installation/endpoint-installation.component.ts b/ui/src/app/add/dialogs/endpoint-installation/endpoint-installation.component.ts
index b455cd4..7b58353 100644
--- a/ui/src/app/add/dialogs/endpoint-installation/endpoint-installation.component.ts
+++ b/ui/src/app/add/dialogs/endpoint-installation/endpoint-installation.component.ts
@@ -21,7 +21,7 @@ import { DialogRef } from '../../../core-ui/dialog/base-dialog/dialog-ref';
import { PipelineElementEndpointService } from '@streampipes/platform-services';
@Component({
- selector: 'endpoint-installation-dialog',
+ selector: 'sp-endpoint-installation-dialog',
templateUrl: './endpoint-installation.component.html',
styleUrls: ['./endpoint-installation.component.scss']
})
@@ -88,7 +88,7 @@ export class EndpointInstallationComponent {
this.installationStatus[index].status = 'error';
this.installationStatus[index].details = data.notifications[0].additionalInformation;
}
- }, data => {
+ }, () => {
this.installationStatus[index].status = 'error';
})
.add(() => {
@@ -107,7 +107,7 @@ export class EndpointInstallationComponent {
this.pipelineElementEndpointService.del(endpointUri.elementId)
.subscribe(data => {
this.installationStatus[index].status = data.success ? 'success' : 'error';
- }, data => {
+ }, () => {
this.installationStatus[index].status = 'error';
})
.add(() => {