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/05/25 16:36:37 UTC
[incubator-streampipes] branch STREAMPIPES-537-NEW updated: [STREAMPIPES-537] Minor changes in data eplorer panel
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-537-NEW
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-537-NEW by this push:
new 0fb49706c [STREAMPIPES-537] Minor changes in data eplorer panel
0fb49706c is described below
commit 0fb49706cc286a7f37e38967a9ebc852363496f0
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed May 25 18:31:25 2022 +0200
[STREAMPIPES-537] Minor changes in data eplorer panel
---
.idea/runConfigurations/all_extensions_jvm.xml | 2 +-
.idea/runConfigurations/backend.xml | 2 +-
ui/cypress.json | 2 +-
.../data-explorer-dashboard-panel.component.html | 51 ++++++++++++++--------
.../data-explorer-dashboard-panel.component.ts | 3 +-
5 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/.idea/runConfigurations/all_extensions_jvm.xml b/.idea/runConfigurations/all_extensions_jvm.xml
index 1521eed35..9e7a24f74 100644
--- a/.idea/runConfigurations/all_extensions_jvm.xml
+++ b/.idea/runConfigurations/all_extensions_jvm.xml
@@ -9,7 +9,7 @@
<env name="SP_DATA_LAKE_HOST" value="localhost" />
<env name="SP_DATA_LAKE_PORT" value="8086" />
<env name="SP_IMAGE_STORAGE_LOCATION" value=".streampipes/spImages/" />
- <env name="SP_HOST" value="192.168.0.35" />
+ <env name="SP_HOST" value="10.0.61.59" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.apache.streampipes.extensions.all.jvm.AllExtensionsInit" />
<module name="streampipes-extensions-all-jvm" />
diff --git a/.idea/runConfigurations/backend.xml b/.idea/runConfigurations/backend.xml
index 296cdb0f2..e80cb7f07 100644
--- a/.idea/runConfigurations/backend.xml
+++ b/.idea/runConfigurations/backend.xml
@@ -14,7 +14,7 @@
<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="192.168.0.35" />
+ <env name="SP_HOST" value="10.0.61.59" />
</envs>
<method v="2">
<option name="Make" enabled="true" />
diff --git a/ui/cypress.json b/ui/cypress.json
index b36abd549..02563ffcb 100644
--- a/ui/cypress.json
+++ b/ui/cypress.json
@@ -8,7 +8,7 @@
"runMode": 1,
"openMode": 0
},
- "baseUrl": "http://localhost:80",
+ "baseUrl": "http://localhost:8082",
"trashAssetsBeforeRuns": false,
"videoCompression": false,
"viewportWidth": 1920,
diff --git a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html
index 04f052674..bdb6ebe89 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html
+++ b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.html
@@ -27,12 +27,19 @@
<mat-icon>arrow_back</mat-icon>
</button>
<div class="data-explorer-options-item pl-10" fxLayoutAlign="start center" fxLayout="row" *ngIf="editMode">
- <button mat-button mat-raised-button color="accent" matTooltip="Save" class="edit-menu-btn"
- [matTooltipPosition]="'above'" (click)="persistDashboardChanges()"
- data-cy="save-data-explorer-widget-btn">
+ <button mat-button mat-raised-button
+ color="accent"
+ matTooltip="Save"
+ class="edit-menu-btn"
+ [matTooltipPosition]="'above'"
+ (click)="persistDashboardChanges()"
+ data-cy="save-data-explorer-widget-btn">
<mat-icon>save</mat-icon> <span>Save</span>
</button>
- <button mat-button mat-raised-button class="mat-basic mr-10 edit-menu-btn" (click)="discardChanges()">
+ <button mat-button
+ mat-raised-button
+ class="mat-basic mr-10 edit-menu-btn"
+ (click)="discardChanges()">
<i class="material-icons">clear</i>
<span> Discard</span>
</button>
@@ -51,17 +58,16 @@
<mat-icon>more_vert</mat-icon>
</button>
<mat-menu #menu="matMenu">
- <button mat-menu-item (click)="triggerEditMode()"
- *ngIf="!editMode && hasDataExplorerWritePrivileges" data-cy="options-edit-dashboard">
+ <button mat-menu-item
+ (click)="triggerEditMode()"
+ *ngIf="!editMode && hasDataExplorerWritePrivileges"
+ data-cy="options-edit-dashboard">
<mat-icon>edit</mat-icon>
<span>Edit dashboard</span>
</button>
- <!-- TODO reimplement with new logig-->
- <!-- <button mat-menu-item (click)="getDashboards(selectedDataViewDashboard._id)">
- <mat-icon>refresh</mat-icon>
- <span>Reload dashboard</span>
- </button> -->
- <button mat-menu-item (click)="timeRangeVisible = true" *ngIf="!editMode && !timeRangeVisible">
+ <button mat-menu-item
+ (click)="timeRangeVisible = true"
+ *ngIf="!editMode && !timeRangeVisible">
<mat-icon>alarm_on</mat-icon>
<span>Show time range selector</span>
</button>
@@ -81,19 +87,28 @@
<div fxFlex="100" fxLayout="column">
<mat-drawer-container class="designer-panel-container h-100 dashboard-grid">
- <mat-drawer #designerDrawer [opened]="showDesignerPanel" (opened)="triggerResize()"
- (closed)="triggerResize()" mode="side" position="end" class="designer-panel">
+ <mat-drawer #designerDrawer
+ [opened]="showDesignerPanel"
+ (opened)="triggerResize()"
+ (closed)="triggerResize()"
+ mode="side"
+ position="end"
+ class="designer-panel">
<div fxLayout="column" fxFlex="100">
<sp-data-explorer-designer-panel #designerPanel
- [currentlyConfiguredWidget]="currentlyConfiguredWidget" [dataLakeMeasure]="dataLakeMeasure"
- [newWidgetMode]="newWidgetMode" (addWidgetEmitter)="addWidget($event)"
+ [currentlyConfiguredWidget]="currentlyConfiguredWidget"
+ [dataLakeMeasure]="dataLakeMeasure"
+ [newWidgetMode]="newWidgetMode"
+ (addWidgetEmitter)="addWidget($event)"
(closeDesignerPanelEmitter)="closeDesignerPanel()" fxFlex="100">
</sp-data-explorer-designer-panel>
</div>
</mat-drawer>
<mat-drawer-content class="h-100 dashboard-grid">
- <sp-data-explorer-dashboard-grid #dashboardGrid [editMode]="editMode" [dashboard]="dashboard"
- [timeSettings]="timeSettings" [currentlyConfiguredWidgetId]="currentlyConfiguredWidgetId"
+ <sp-data-explorer-dashboard-grid #dashboardGrid
+ [editMode]="editMode" [dashboard]="dashboard"
+ [timeSettings]="timeSettings"
+ [currentlyConfiguredWidgetId]="currentlyConfiguredWidgetId"
(configureWidgetCallback)="updateCurrentlyConfiguredWidget($event)"
(updateCallback)="updateAndQueueItemForDeletion($event)"
(deleteCallback)="removeAndQueueItemForDeletion($event)"
diff --git a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
index a119fde6b..3dd87f981 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
+++ b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.ts
@@ -55,7 +55,6 @@ export class DataExplorerDashboardPanelComponent implements OnInit {
/**
* This is the date range (start, end) to view the data and is set in data-explorer.ts
*/
- // TODO maybe remove and use directly from dashboard object
timeSettings: TimeSettings;
editMode: boolean = false;
@@ -267,7 +266,7 @@ export class DataExplorerDashboardPanelComponent implements OnInit {
deleteDashboard(dashboard: Dashboard) {
this.dashboardService.deleteDashboard(dashboard).subscribe((result) => {
- // TODO relink to all dashboards
+ this.goBackToOverview();
});
}