You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/07/26 06:45:30 UTC
[incubator-streampipes] 02/03: [STREAMPIPES-545] Improve asset link dialog
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-545
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 43c67ffbb4345175b4daf5924415560034d262f4
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Tue Jul 26 08:44:46 2022 +0200
[STREAMPIPES-545] Improve asset link dialog
---
.../v070/CreateDefaultAssetMigration.java | 11 ++++++++--
.../model/datalake/DataLakeMeasure.java | 1 +
.../setup/tasks/CreateAssetLinkTypeTask.java | 2 +-
.../asset-details-panel.component.html | 2 +-
.../asset-details-panel.component.ts | 4 ++--
.../asset-link-item/asset-link-item.component.html | 2 +-
.../asset-link-item/asset-link-item.component.scss | 1 +
.../asset-details/asset-details.component.html | 2 +-
.../edit-asset-link-dialog.component.html | 24 ++++++++++++++--------
.../edit-asset-link-dialog.component.scss | 11 ++++++++++
.../edit-asset-link-dialog.component.ts | 17 ++++++++-------
ui/src/scss/_variables.scss | 1 +
12 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/streampipes-backend/src/main/java/org/apache/streampipes/backend/migrations/v070/CreateDefaultAssetMigration.java b/streampipes-backend/src/main/java/org/apache/streampipes/backend/migrations/v070/CreateDefaultAssetMigration.java
index 5cedcf4cf..7cf10d5c3 100644
--- a/streampipes-backend/src/main/java/org/apache/streampipes/backend/migrations/v070/CreateDefaultAssetMigration.java
+++ b/streampipes-backend/src/main/java/org/apache/streampipes/backend/migrations/v070/CreateDefaultAssetMigration.java
@@ -20,14 +20,21 @@
package org.apache.streampipes.backend.migrations.v070;
import org.apache.streampipes.backend.migrations.Migration;
+import org.apache.streampipes.commons.constants.GenericDocTypes;
import org.apache.streampipes.manager.setup.tasks.CreateDefaultAssetTask;
+import org.apache.streampipes.storage.management.StorageDispatcher;
+
+import java.io.IOException;
public class CreateDefaultAssetMigration implements Migration {
@Override
public boolean shouldExecute() {
- return true;
- //return StorageDispatcher.INSTANCE.getNoSqlStore().getGenericStorage().findOne(GenericDocTypes.DEFAULT_ASSET_DOC_ID) == null;
+ try {
+ return StorageDispatcher.INSTANCE.getNoSqlStore().getGenericStorage().findOne(GenericDocTypes.DEFAULT_ASSET_DOC_ID) == null;
+ } catch (IOException e) {
+ return true;
+ }
}
@Override
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
index 532e5379e..7f1df47a9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
@@ -86,4 +86,5 @@ public class DataLakeMeasure extends UnnamedStreamPipesEntity {
public void setPipelineIsRunning(boolean pipelineIsRunning) {
this.pipelineIsRunning = pipelineIsRunning;
}
+
}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/tasks/CreateAssetLinkTypeTask.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/tasks/CreateAssetLinkTypeTask.java
index 1be6c0efe..46bdc13bf 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/tasks/CreateAssetLinkTypeTask.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/tasks/CreateAssetLinkTypeTask.java
@@ -36,7 +36,7 @@ public class CreateAssetLinkTypeTask implements InstallationTask {
new AssetLinkType("adapter", "Adapter", "var(--color-adapter)", "power", "adapter", List.of("connect"), true),
new AssetLinkType("data-source", "Data Source", "var(--color-data-source)", "", "data-source", List.of(), false),
new AssetLinkType("pipeline", "Pipeline", "var(--color-pipeline)", "play_arrow", "pipeline", List.of("pipeline", "details"), true),
- new AssetLinkType("measurement", "Data Lake Storage", "var(--color-measurement", "", "measurement", List.of(), false)
+ new AssetLinkType("measurement", "Data Lake Storage", "var(--color-measurement)", "", "measurement", List.of(), false)
);
@Override
diff --git a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-panel.component.html b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-panel.component.html
index 65beaa635..064bfa416 100644
--- a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-panel.component.html
+++ b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-panel.component.html
@@ -37,7 +37,7 @@
</sp-basic-inner-panel>
- <sp-basic-inner-panel panelTitle="Asset Links" outerMargin="0px 0px">
+ <sp-basic-inner-panel panelTitle="Linked Resources" outerMargin="0px 0px">
<div header fxLayoutAlign="end center" fxLayout="row" fxFlex="100">
<button mat-button color="accent" *ngIf="editMode" (click)="openCreateAssetLinkDialog()"><i class="material-icons">add</i><span> Add link</span></button>
</div>
diff --git a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-panel.component.ts b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-panel.component.ts
index ff847bffc..f349c3e8d 100644
--- a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-panel.component.ts
+++ b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-panel.component.ts
@@ -78,12 +78,12 @@ export class SpAssetDetailsPanelComponent implements OnInit {
}
openCreateAssetLinkDialog(): void {
- const assetLink: AssetLink = {linkLabel: '', linkType: 'data-view', editingDisabled: false, resourceId: ''};
+ const assetLink: AssetLink = {linkLabel: '', linkType: 'data-view', editingDisabled: false, resourceId: '', navigationActive: true};
this.openEditAssetLinkDialog(assetLink, -1, true);
}
deleteAssetLink(index: number): void {
- this.asset.assetLinks = this.asset.assetLinks.splice(index, 1);
+ this.asset.assetLinks.splice(index, 1);
this.updateAssetEmitter.emit(this.asset);
}
diff --git a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-link-item/asset-link-item.component.html b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-link-item/asset-link-item.component.html
index 9bddca368..c9c645ab1 100644
--- a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-link-item/asset-link-item.component.html
+++ b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-link-item/asset-link-item.component.html
@@ -26,7 +26,7 @@
<div fxLayoutAlign="start center"><span class="link-label">{{assetLink.linkLabel}}</span></div>
<div fxFlex></div>
<div fxLayoutAlign="end center">
- <button mat-button mat-icon-button color="accent" (click)="openLink()"><i class="material-icons">link</i>
+ <button mat-button mat-icon-button color="accent" (click)="openLink()" *ngIf="assetLink.navigationActive"><i class="material-icons">link</i>
</button>
<button mat-button mat-icon-button color="accent" (click)="editLink()" *ngIf="editMode"><i
class="material-icons">edit</i></button>
diff --git a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-link-item/asset-link-item.component.scss b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-link-item/asset-link-item.component.scss
index 646aa931a..11c71ec39 100644
--- a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-link-item/asset-link-item.component.scss
+++ b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-link-item/asset-link-item.component.scss
@@ -33,4 +33,5 @@
height: 40px;
padding: 5px;
color: var(--color-bg-1);
+ background: var(--color-bg-3);
}
diff --git a/ui/src/app/assets/components/asset-details/asset-details.component.html b/ui/src/app/assets/components/asset-details/asset-details.component.html
index 76d1a6b0a..ee6b0d553 100644
--- a/ui/src/app/assets/components/asset-details/asset-details.component.html
+++ b/ui/src/app/assets/components/asset-details/asset-details.component.html
@@ -22,7 +22,7 @@
<div nav fxFlex="100" fxLayoutAlign="start center" fxLayout="row" class="pl-10">
<div fxLayout="row" fxLayoutAlign="start center" *ngIf="editMode">
<button mat-button mat-raised-button color="accent" (click)="updateAsset()">
- <i class="material-icons">add</i><span> Save</span>
+ <i class="material-icons">save</i><span> Save</span>
</button>
</div>
<div fxFlex fxLayout="row" fxLayoutAlign="end center">
diff --git a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.html b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.html
index 9e6c0ba64..715a130c4 100644
--- a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.html
+++ b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.html
@@ -20,17 +20,17 @@
<div class="sp-dialog-container">
<div class="sp-dialog-content p-15">
<div fxFlex="100" fxLayout="column" *ngIf="clonedAssetLink">
- <div fxFlex style="margin:5px;width:100%" fxLayout="column">
+ <div fxLayout="column" class="link-configuration link-type-selection">
<mat-form-field color="accent">
<mat-label>Link Type</mat-label>
- <mat-select fxFlex [(value)]="clonedAssetLink.linkType"
+ <mat-select fxFlex [(value)]="selectedLinkType"
required (selectionChange)="onLinkTypeChanged($event)">
<mat-option *ngFor="let assetLinkType of assetLinkTypes"
- [value]="assetLinkType.linkQueryHint">{{assetLinkType.linkLabel}}</mat-option>
+ [value]="assetLinkType">{{assetLinkType.linkLabel}}</mat-option>
</mat-select>
</mat-form-field>
</div>
- <div *ngIf="selectedLinkType === 'pipeline'" fxLayout="column">
+ <div *ngIf="selectedLinkType.linkType === 'pipeline'" fxLayout="column" class="link-configuration">
<mat-form-field color="accent" fxFlex="100">
<mat-label>Pipelines</mat-label>
<mat-select [(ngModel)]="currentResource"
@@ -41,7 +41,7 @@
</mat-select>
</mat-form-field>
</div>
- <div *ngIf="selectedLinkType === 'dashboard'" fxLayout="column">
+ <div *ngIf="selectedLinkType.linkType === 'dashboard'" fxLayout="column" class="link-configuration">
<mat-form-field color="accent" fxFlex="100">
<mat-label>Dashboards</mat-label>
<mat-select (selectionChange)="changeLabel($event.value._id, $event.value.name, $event.value)"
@@ -53,7 +53,7 @@
</mat-select>
</mat-form-field>
</div>
- <div *ngIf="selectedLinkType === 'data-view'" fxLayout="column">
+ <div *ngIf="selectedLinkType.linkType === 'data-view'" fxLayout="column" class="link-configuration">
<mat-form-field color="accent" fxFlex="100">
<mat-label>Data Views</mat-label>
<mat-select (selectionChange)="changeLabel($event.value._id, $event.value.name, $event.value)"
@@ -65,10 +65,10 @@
</mat-select>
</mat-form-field>
</div>
- <div *ngIf="selectedLinkType === 'measurement'" fxLayout="column">
+ <div *ngIf="selectedLinkType.linkType === 'measurement'" fxLayout="column" class="link-configuration">
<mat-form-field color="accent" fxFlex="100">
<mat-label>Data Lake Storage</mat-label>
- <mat-select (selectionChange)="changeLabel($event.value._id, $event.value.name, $event.value)"
+ <mat-select (selectionChange)="changeLabel($event.value.elementId, $event.value.measureName, $event.value)"
[(value)]="currentResource"
fxFlex
required>
@@ -77,7 +77,13 @@
</mat-select>
</mat-form-field>
</div>
- <div fxFlex="100" fxLayout="column">
+ <div fxLayout="column" class="link-configuration">
+ <mat-form-field color="accent">
+ <mat-label>Label</mat-label>
+ <input matInput [(ngModel)]="clonedAssetLink.linkLabel" required>
+ </mat-form-field>
+ </div>
+ <div fxLayout="column" class="link-configuration">
<mat-form-field color="accent">
<mat-label>Resource ID</mat-label>
<input matInput [(ngModel)]="clonedAssetLink.resourceId" required [disabled]="true">
diff --git a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.scss b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.scss
index 704f843e4..e1f0e27ce 100644
--- a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.scss
+++ b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.scss
@@ -17,3 +17,14 @@
*/
@import 'src/scss/sp/sp-dialog';
+
+.link-type-selection {
+}
+
+.link-configuration {
+ padding: 10px;
+ width:100%;
+ margin:5px;
+ background: var(--color-bg-1);
+ border: 1px solid var(--color-bg-3);
+}
diff --git a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts
index 71d450979..ff14435ad 100644
--- a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts
+++ b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts
@@ -23,7 +23,7 @@ import {
AssetLinkType,
Dashboard,
DashboardService,
- DataLakeMeasure,
+ DataLakeMeasure, DatalakeRestService,
DataViewDataExplorerService,
GenericStorageService,
Pipeline,
@@ -62,19 +62,20 @@ export class EditAssetLinkDialogComponent implements OnInit {
allResources: any[] = [];
currentResource: any;
- selectedLinkType: string;
+ selectedLinkType: AssetLinkType;
constructor(private dialogRef: DialogRef<EditAssetLinkDialogComponent>,
private genericStorageService: GenericStorageService,
private pipelineService: PipelineService,
private dataViewService: DataViewDataExplorerService,
- private dashboardService: DashboardService) {
+ private dashboardService: DashboardService,
+ private dataLakeService: DatalakeRestService) {
}
ngOnInit(): void {
this.getAllResources();
this.clonedAssetLink = {...this.assetLink};
- this.selectedLinkType = this.getCurrAssetLinkType().linkType;
+ this.selectedLinkType = this.getCurrAssetLinkType();
}
getCurrAssetLinkType(): AssetLinkType {
@@ -95,7 +96,7 @@ export class EditAssetLinkDialogComponent implements OnInit {
this.pipelineService.getOwnPipelines(),
this.dataViewService.getDataViews(),
this.dashboardService.getDashboards(),
- this.dataViewService.getAllPersistedDataStreams()).subscribe(response => {
+ this.dataLakeService.getAllMeasurementSeries()).subscribe(response => {
this.pipelines = response[0];
this.dataViews = response[1];
this.dashboards = response[2];
@@ -103,16 +104,18 @@ export class EditAssetLinkDialogComponent implements OnInit {
this.allResources = [...this.pipelines, ...this.dataViews, ...this.dashboards, ...this.dataLakeMeasures];
if (!this.createMode) {
- this.currentResource = this.allResources.find(r => r._id === this.clonedAssetLink.resourceId);
+ this.currentResource = this.allResources.find(r => r._id === this.clonedAssetLink.resourceId ||
+ r.elementId === this.clonedAssetLink.resourceId);
}
});
}
onLinkTypeChanged(event: MatSelectChange): void {
this.selectedLinkType = event.value;
- const linkType = this.assetLinkTypes.find(a => a.linkType === this.selectedLinkType);
+ const linkType = this.assetLinkTypes.find(a => a.linkType === this.selectedLinkType.linkType);
this.clonedAssetLink.editingDisabled = false;
this.clonedAssetLink.linkType = linkType.linkType;
+ this.clonedAssetLink.navigationActive = linkType.navigationActive;
}
changeLabel(id: string, label: string, currentResource: any) {
diff --git a/ui/src/scss/_variables.scss b/ui/src/scss/_variables.scss
index 33d41be73..4ede67f5c 100644
--- a/ui/src/scss/_variables.scss
+++ b/ui/src/scss/_variables.scss
@@ -35,5 +35,6 @@ body {
--color-dashboard: rgb(76, 115, 164);
--color-adapter: rgb(182, 140, 97);
--color-stream: $sp-color-stream;
+ --color-pipeline: rgb(102, 185, 114);
}