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 2021/08/11 20:29:41 UTC
[incubator-streampipes] branch STREAMPIPES-319 updated (6354270 ->
c1e3b9c)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 6354270 [STREAMPIPES-404] Update all tests to reset system in before
new 0436983 [STREAMPIPES-395] Use custom colors in data explorer widgets
new a81054e [STREAMPIPES-402] Fix wrong sizing of widgets
new c1e3b9c Merge branch 'STREAMPIPES-319' of github.com:apache/incubator-streampipes into STREAMPIPES-319
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:
.../data-explorer-dashboard-widget.component.html | 6 ++----
.../data-explorer-dashboard-widget.component.scss | 21 +++++++++++++++++++--
.../widgets/table/table-widget.component.html | 7 ++-----
.../widgets/table/table-widget.component.scss | 9 +++++++++
ui/src/scss/sp/widgets.scss | 1 +
5 files changed, 33 insertions(+), 11 deletions(-)
[incubator-streampipes] 01/03: [STREAMPIPES-395] Use custom colors
in data explorer widgets
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 0436983bae42a57207cb257efc7336375ee6c867
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Wed Aug 11 15:41:43 2021 +0200
[STREAMPIPES-395] Use custom colors in data explorer widgets
---
.../components/widgets/table/table-widget.component.html | 2 +-
.../components/widgets/table/table-widget.component.scss | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html
index b87a9ec..64b6511 100644
--- a/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html
+++ b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html
@@ -16,7 +16,7 @@
~
-->
-<div class="widget-content" [ngStyle]="{height: gridsterItemComponent.height}">
+<div class="widget-content" [ngStyle]="{height: gridsterItemComponent.height, background: dataExplorerWidget.baseAppearanceConfig.backgroundColor, color: dataExplorerWidget.baseAppearanceConfig.textColor}">
<div class="widget-inner-content">
<!-- <div style=" overflow-y: auto;" [style.max-height.px]="gridsterItem.rows * 100 - 40">-->
diff --git a/ui/src/app/data-explorer/components/widgets/table/table-widget.component.scss b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.scss
index d762083..401d1c9 100644
--- a/ui/src/app/data-explorer/components/widgets/table/table-widget.component.scss
+++ b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.scss
@@ -21,6 +21,7 @@
.table-widget {
width: 100%;
background: inherit;
+ color: inherit;
}
.title-panel {
@@ -35,3 +36,11 @@
tr.mat-row, tr.mat-footer-row {
height: 24px;
}
+
+.table-widget .mat-cell {
+ color: inherit;
+}
+
+.table-widget .mat-header-cell {
+ color: inherit;
+}
[incubator-streampipes] 03/03: Merge branch 'STREAMPIPES-319' of
github.com:apache/incubator-streampipes into STREAMPIPES-319
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit c1e3b9c9ae9d6385b01002df96e36d41366ffb70
Merge: a81054e 6354270
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Wed Aug 11 22:29:30 2021 +0200
Merge branch 'STREAMPIPES-319' of github.com:apache/incubator-streampipes into STREAMPIPES-319
.../backend/StreamPipesResourceConfig.java | 3 +-
.../container/master/general/ResetManagement.java | 78 +++++++++++
streampipes-pipeline-management/pom.xml | 16 ++-
.../streampipes/manager/file/FileManager.java | 20 +++
.../manager/pipeline/PipelineManager.java | 108 +++++++++++++++
.../manager/pipeline/TestPipelineExecution.java | 33 -----
.../manager/pipeline/TestPipelineManager.java | 148 +++++++++++++++++++++
.../manager/pipeline/TestPipelineStorage.java | 42 ------
streampipes-rest/pom.xml | 5 +
.../streampipes/rest/impl/PipelineElementFile.java | 14 +-
.../streampipes/rest/impl/PipelineResource.java | 40 +++---
.../streampipes/rest/impl/ResetResource.java | 50 +++++++
.../rest/management/PipelineManagement.java | 1 +
ui/cypress/support/general/InitStreamPipesTest.ts | 47 +++++++
.../general/resetStreamPipes.ts} | 25 ++--
ui/cypress/support/index.ts | 4 +
ui/cypress/support/utils/AdapterUtils.ts | 8 --
ui/cypress/support/utils/PipelineUtils.ts | 4 +-
.../support/utils/ProcessingElementTestUtils.ts | 5 -
ui/cypress/tests/adapter/fileStream.ts | 12 +-
ui/cypress/tests/adapter/machineDataSimulator.ts | 7 +
.../adapter/randomDataSimulatorStream.spec.ts | 6 +
.../tests/fileManagement/testFileManagement.ts | 18 +--
ui/cypress/tests/installation/installation.ts | 4 +-
ui/cypress/tests/pipeline/pipelineTest.ts | 43 +++---
.../tests/pipelineElement/AllPipelineElements.ts | 10 +-
.../tests/pipelineElement/SinglePipelineElement.ts | 9 +-
27 files changed, 571 insertions(+), 189 deletions(-)
[incubator-streampipes] 02/03: [STREAMPIPES-402] Fix wrong sizing
of widgets
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit a81054e10aea0f3e449d03fc503ad9fea933c302
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Wed Aug 11 22:29:13 2021 +0200
[STREAMPIPES-402] Fix wrong sizing of widgets
---
.../data-explorer-dashboard-widget.component.html | 6 ++----
.../data-explorer-dashboard-widget.component.scss | 21 +++++++++++++++++++--
.../widgets/table/table-widget.component.html | 7 ++-----
ui/src/scss/sp/widgets.scss | 1 +
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html
index 09d98ab..928181f 100644
--- a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html
+++ b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.html
@@ -18,8 +18,7 @@
<div class="h-100 shadow">
<div class="box" [ngStyle]="{background: configuredWidget.baseAppearanceConfig.backgroundColor, color: configuredWidget.baseAppearanceConfig.textColor}">
- <div class="widget-header">
- <div class="m-0 row header h-40">
+ <div class="widget-header h-40">
<div fxFlex="100" fxLayout="row" fxLayoutAlign="start center" class="widget-header-text">
{{ configuredWidget.baseAppearanceConfig.widgetTitle }}
</div>
@@ -42,8 +41,7 @@
</mat-menu>
</div>
</div>
- </div>
- <div class="h-100 p-0 row content gridster-item-content ml-0 mr-0">
+ <div class="widget-content p-0 gridster-item-content ml-0 mr-0">
<div *ngIf="widgetLoaded" class="h-100">
<div *ngIf="configuredWidget.widgetType === 'table'" class="h-100 p-0">
<sp-data-explorer-table-widget
diff --git a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.scss b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.scss
index 3474819..18741fa 100644
--- a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.scss
+++ b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.scss
@@ -27,7 +27,7 @@
}
.h-40 {
- height:35px;
+ height:40px;
}
.p-0 {
@@ -62,6 +62,23 @@
}
.widget-header {
- padding: 15px;
+ padding-left: 15px;
+}
+
+::-webkit-scrollbar-track {
+ background: rgba(0,0,0,0.15);
+}
+
+::-webkit-scrollbar {
+ width: 15px;
+ height: 15px;
+}
+
+::-webkit-scrollbar-thumb {
+ background: rgba(0,0,0,0.25);
+}
+
+::-webkit-scrollbar-thumb:hover {
+ background: rgba(0,0,0,0.35);
}
diff --git a/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html
index 64b6511..2b1ea3b 100644
--- a/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html
+++ b/ui/src/app/data-explorer/components/widgets/table/table-widget.component.html
@@ -16,11 +16,9 @@
~
-->
-<div class="widget-content" [ngStyle]="{height: gridsterItemComponent.height, background: dataExplorerWidget.baseAppearanceConfig.backgroundColor, color: dataExplorerWidget.baseAppearanceConfig.textColor}">
- <div class="widget-inner-content">
-<!-- <div style=" overflow-y: auto;" [style.max-height.px]="gridsterItem.rows * 100 - 40">-->
+<div fxLayout="column" fxFlex="100" [ngStyle]="{background: dataExplorerWidget.baseAppearanceConfig.backgroundColor, color: dataExplorerWidget.baseAppearanceConfig.textColor}">
- <sp-load-data-spinner *ngIf="showIsLoadingData"></sp-load-data-spinner>
+ <sp-load-data-spinner *ngIf="showIsLoadingData" class="h-100"></sp-load-data-spinner>
<sp-no-data-in-date-range *ngIf="showNoDataInDateRange" [viewDateRange]="timeSettings"></sp-no-data-in-date-range>
@@ -56,6 +54,5 @@
<tr mat-row *matRowDef="let row; columns: dataExplorerWidget.dataConfig.columnNames;"></tr>
</table>
- </div>
</div>
diff --git a/ui/src/scss/sp/widgets.scss b/ui/src/scss/sp/widgets.scss
index aa8f5e6..26b6539 100644
--- a/ui/src/scss/sp/widgets.scss
+++ b/ui/src/scss/sp/widgets.scss
@@ -19,6 +19,7 @@
.widget-content {
width:100%;
height: calc(100% - 40px);
+ overflow-y: auto;
}
.widget-inner-options {