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/07/27 11:04:02 UTC
[incubator-streampipes] 02/02: [STREAMPIPES-402] Add sidebar to
manage data explorer widget config
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 088682ed02208fb25addcb6506d82b7bf5dab95f
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue Jul 27 13:03:00 2021 +0200
[STREAMPIPES-402] Add sidebar to manage data explorer widget config
---
.../model/dashboard/DashboardModel.java | 24 ++-
ui/src/app/dashboard/models/dashboard.model.ts | 4 +-
...lorer-widget-appearance-settings.component.html | 0
...lorer-widget-appearance-settings.component.scss | 0
...plorer-widget-appearance-settings.component.ts} | 22 +--
.../data-explorer-designer-panel.component.html | 51 +++++++
.../data-explorer-designer-panel.component.scss} | 14 +-
.../data-explorer-designer-panel.component.ts | 68 +++++++++
.../data-explorer-dashboard-grid.component.html | 6 +-
.../data-explorer-dashboard-grid.component.scss | 12 +-
.../grid/data-explorer-dashboard-grid.component.ts | 38 ++++-
.../data-explorer-dashboard-panel.component.css | 18 +++
.../data-explorer-dashboard-panel.component.html | 38 +++--
.../data-explorer-dashboard-panel.component.ts | 19 ++-
.../time-selector/timeRangeSelector.component.html | 2 +-
.../data-explorer-dashboard-widget.component.html | 29 ++--
.../data-explorer-dashboard-widget.component.scss | 10 +-
.../data-explorer-dashboard-widget.component.ts | 18 ++-
.../components/widgets/image/image-config.ts | 1 -
.../config/table-widget-config.component.html | 0
.../config/table-widget-config.component.scss | 0
.../table/config/table-widget-config.component.ts} | 20 +--
.../app/data-explorer/data-explorer.component.html | 9 +-
ui/src/app/data-explorer/data-explorer.module.ts | 96 ++++++------
ui/src/scss/sp/layout.scss | 4 +-
ui/src/scss/sp/sp-theme.scss | 164 ++++++++++++---------
ui/src/scss/sp/widgets.scss | 2 +-
27 files changed, 471 insertions(+), 198 deletions(-)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
index 4301b7d..dcf43e6 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
@@ -22,7 +22,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import org.apache.streampipes.model.shared.annotation.TsModel;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@TsModel
public class DashboardModel {
@@ -38,10 +40,14 @@ public class DashboardModel {
private String description;
private boolean displayHeader;
+ private Map<String, Object> dashboardTimeSettings;
+ private Map<String, Object> dashboardGeneralSettings;
+
private List<DashboardItem> widgets;
public DashboardModel() {
-
+ this.dashboardTimeSettings = new HashMap<>();
+ this.dashboardGeneralSettings = new HashMap<>();
}
public String getCouchDbId() {
@@ -99,4 +105,20 @@ public class DashboardModel {
public void setDisplayHeader(boolean displayHeader) {
this.displayHeader = displayHeader;
}
+
+ public Map<String, Object> getDashboardTimeSettings() {
+ return dashboardTimeSettings;
+ }
+
+ public void setDashboardTimeSettings(Map<String, Object> dashboardTimeSettings) {
+ this.dashboardTimeSettings = dashboardTimeSettings;
+ }
+
+ public Map<String, Object> getDashboardGeneralSettings() {
+ return dashboardGeneralSettings;
+ }
+
+ public void setDashboardGeneralSettings(Map<String, Object> dashboardGeneralSettings) {
+ this.dashboardGeneralSettings = dashboardGeneralSettings;
+ }
}
diff --git a/ui/src/app/dashboard/models/dashboard.model.ts b/ui/src/app/dashboard/models/dashboard.model.ts
index 30fb8ef..6696514 100644
--- a/ui/src/app/dashboard/models/dashboard.model.ts
+++ b/ui/src/app/dashboard/models/dashboard.model.ts
@@ -32,6 +32,8 @@ export interface Dashboard {
description?: string;
displayHeader?: boolean;
widgets?: Array<DashboardItem>;
+ dashboardTimeSettings?: any;
+ dashboardGeneralSettings?: any;
_id?: string;
_rev?: string;
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.html b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.scss b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
similarity index 69%
copy from ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
copy to ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
index 178a2de..ea872b8 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
+++ b/ui/src/app/data-explorer/components/designer-panel/appearance-settings/data-explorer-widget-appearance-settings.component.ts
@@ -16,16 +16,18 @@
*
*/
-.m-20 {
- margin: 20px;
-}
+import {Component, OnInit} from '@angular/core';
+
+@Component({
+ selector: 'sp-data-explorer-designer-panel',
+ templateUrl: './data-explorer-designer-panel.component.html',
+ styleUrls: ['./data-explorer-designer-panel.component.scss'],
+})
+export class DataExplorerWidgetAppearanceSettingsComponent implements OnInit {
+
+
+ ngOnInit(): void {
+ }
-.h-100 {
- height:100%;
-}
-.dashboard-grid {
- display:flex;
- flex-direction: column;
- flex: 1 1 100%;
}
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.html b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.html
new file mode 100644
index 0000000..2745046
--- /dev/null
+++ b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.html
@@ -0,0 +1,51 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~
+ -->
+
+<div fxFlex="100" fxLayout="column" class="designer-panel-content">
+ <mat-tab-group [selectedIndex]="selectedIndex" (selectedIndexChange)="selectOptionsPanel($event)" color="accent"
+ class="small">
+ <mat-tab label="Data"></mat-tab>
+ <mat-tab label="Visualization"></mat-tab>
+ <mat-tab label="Appearance"></mat-tab>
+ </mat-tab-group>
+ <input [(ngModel)]="currentlyConfiguredWidget.dataLakeMeasure.measureName" *ngIf="currentlyConfiguredWidget">
+
+ <div fxFlex="100" fxLayout="column">
+ <div class="designer-panel-config" *ngIf="currentlyConfiguredWidget">
+ <div *ngIf="selectedIndex == 0">
+ <span>Data settings</span>
+ </div>
+ <div *ngIf="selectedIndex == 1">
+ Visualization
+ <div *ngIf="currentlyConfiguredWidget.widgetType === 'table'" class="h-100 p-0">
+ <sp-data-explorer-table-widget-config>
+
+ </sp-data-explorer-table-widget-config>
+ </div>
+ </div>
+ <div *ngIf="selectedIndex == 2">
+ Appearance
+ </div>
+ </div>
+
+ <div class="designer-panel-config" *ngIf="!currentlyConfiguredWidget" fxFlex="100"
+ fxLayoutAlign="center center" fxLayout="column">
+ <span>Select a widget to open configuration options.</span>
+ </div>
+ </div>
+</div>
diff --git a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss
similarity index 85%
copy from ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
copy to ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss
index 178a2de..70f39ee 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
+++ b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.scss
@@ -16,16 +16,6 @@
*
*/
-.m-20 {
- margin: 20px;
-}
-
-.h-100 {
- height:100%;
-}
-
-.dashboard-grid {
- display:flex;
- flex-direction: column;
- flex: 1 1 100%;
+.designer-panel-content {
+ padding: 10px;
}
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.ts b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.ts
new file mode 100644
index 0000000..994cdeb
--- /dev/null
+++ b/ui/src/app/data-explorer/components/designer-panel/data-explorer-designer-panel.component.ts
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import {
+ Component,
+ EventEmitter,
+ Input,
+ OnChanges,
+ OnInit,
+ Output,
+ QueryList,
+ SimpleChanges,
+ ViewChildren,
+ ViewEncapsulation
+} from '@angular/core';
+import {GridsterItemComponent, GridType} from 'angular-gridster2';
+import {DateRange} from '../../../core-model/datalake/DateRange';
+import {GridsterInfo} from '../../../dashboard/models/gridster-info.model';
+import {
+ IDataViewDashboard,
+ IDataViewDashboardConfig,
+ IDataViewDashboardItem
+} from '../../models/dataview-dashboard.model';
+import {DataViewDataExplorerService} from '../../services/data-view-data-explorer.service';
+import {RefreshDashboardService} from '../../services/refresh-dashboard.service';
+import {ResizeService} from '../../services/resize.service';
+import {
+ DashboardWidgetModel,
+ DataExplorerWidgetModel
+} from "../../../core-model/gen/streampipes-model";
+import {forkJoin} from "rxjs/internal/observable/forkJoin";
+import {Observable} from "rxjs";
+import {DataExplorerDashboardGridComponent} from "../grid/data-explorer-dashboard-grid.component";
+
+@Component({
+ selector: 'sp-data-explorer-designer-panel',
+ templateUrl: './data-explorer-designer-panel.component.html',
+ styleUrls: ['./data-explorer-designer-panel.component.scss'],
+})
+export class DataExplorerDesignerPanelComponent implements OnInit {
+
+ @Input() currentlyConfiguredWidget: DataExplorerWidgetModel;
+
+ selectedIndex: number = 0;
+
+ ngOnInit(): void {
+ }
+
+ selectOptionsPanel(index: number) {
+ this.selectedIndex = index;
+ }
+
+}
diff --git a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html
index 86ba2ed..058851f 100644
--- a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html
+++ b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.html
@@ -27,10 +27,12 @@
[viewDateRange]="viewDateRange"
(updateCallback)="propagateItemUpdate($event)"
(deleteCallback)="propagateItemRemoval($event)"
+ (configureWidgetCallback)="propagateWidgetSelection($event)"
[item]="item"
[widget]="item"
+ [configuredWidget]="configuredWidgets.get(item.id)"
[editMode]="editMode"
- [gridsterItemComponent]="gridsterItemComponent"></sp-data-explorer-dashboard-widget>
+ [gridsterItemComponent]="gridsterItemComponent" *ngIf="configuredWidgets.has(item.id)"></sp-data-explorer-dashboard-widget>
</gridster-item>
</ng-container>
-</gridster>
\ No newline at end of file
+</gridster>
diff --git a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.scss b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.scss
index b7b42ce..f90e375 100644
--- a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.scss
+++ b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.scss
@@ -17,11 +17,11 @@
*/
gridster.custom-gridster-style ::ng-deep {
- background: var(--color-bg-1);
+ background: var(--color-bg-3);
}
gridster.custom-gridster-style.edit ::ng-deep {
- background: var(--color-bg-1);
+ background: var(--color-bg-3);
}
gridster.scrollVertical ::ng-deep {
@@ -31,11 +31,11 @@ gridster.scrollVertical ::ng-deep {
}
::ng-deep gridster.custom-gridster-style>.gridster-row {
- border-bottom: 1px solid var(--color-bg-2);
- border-top: 1px solid var(--color-bg-2);
+ border-bottom: 1px solid var(--color-bg-1);
+ border-top: 1px solid var(--color-bg-1);
}
::ng-deep gridster.custom-gridster-style>div.gridster-column {
- border-left: 1px solid var(--color-bg-2);
- border-right: 1px solid var(--color-bg-2);
+ border-left: 1px solid var(--color-bg-1);
+ border-right: 1px solid var(--color-bg-1);
}
diff --git a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
index d983610..2c0e862 100644
--- a/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
+++ b/ui/src/app/data-explorer/components/grid/data-explorer-dashboard-grid.component.ts
@@ -39,7 +39,12 @@ import {
import {DataViewDataExplorerService} from '../../services/data-view-data-explorer.service';
import {RefreshDashboardService} from '../../services/refresh-dashboard.service';
import {ResizeService} from '../../services/resize.service';
-import {DataExplorerWidgetModel} from "../../../core-model/gen/streampipes-model";
+import {
+ DashboardWidgetModel,
+ DataExplorerWidgetModel
+} from "../../../core-model/gen/streampipes-model";
+import {forkJoin} from "rxjs/internal/observable/forkJoin";
+import {Observable} from "rxjs";
@Component({
selector: 'sp-data-explorer-dashboard-grid',
@@ -54,6 +59,8 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
@Input()
dashboard: IDataViewDashboard;
+ configuredWidgets: Map<String, DataExplorerWidgetModel> = new Map<String, DataExplorerWidgetModel>();
+
/**
* This is the date range (start, end) to view the data and is set in data-explorer.ts
*/
@@ -62,6 +69,7 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
@Output() deleteCallback: EventEmitter<IDataViewDashboardItem> = new EventEmitter<IDataViewDashboardItem>();
@Output() updateCallback: EventEmitter<DataExplorerWidgetModel> = new EventEmitter<DataExplorerWidgetModel>();
+ @Output() configureWidgetCallback: EventEmitter<DataExplorerWidgetModel> = new EventEmitter<DataExplorerWidgetModel>();
options: IDataViewDashboardConfig;
loaded = false;
@@ -69,7 +77,7 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
@ViewChildren(GridsterItemComponent) gridsterItemComponents: QueryList<GridsterItemComponent>;
constructor(private resizeService: ResizeService,
- private dashboardService: DataViewDataExplorerService,
+ private dataViewDataExplorerService: DataViewDataExplorerService,
private refreshDashboardService: RefreshDashboardService) {
}
@@ -92,8 +100,25 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
}),
itemInitCallback: ((item, itemComponent) => {
this.resizeService.notify({gridsterItem: item, gridsterItemComponent: itemComponent} as GridsterInfo);
+ window.dispatchEvent(new Event('resize'));
})
};
+
+ this.loadWidgetConfigs();
+ }
+
+ loadWidgetConfigs() {
+ this.dashboard.widgets.forEach(widget => {
+ this.loadWidgetConfig(widget.id);
+ });
+
+ }
+
+ loadWidgetConfig(widgetId: string) {
+ this.dataViewDataExplorerService.getWidget(widgetId).subscribe(response => {
+ this.configuredWidgets.set(widgetId, response);
+ console.log(this.configuredWidgets);
+ });
}
ngOnChanges(changes: SimpleChanges): void {
@@ -113,9 +138,18 @@ export class DataExplorerDashboardGridComponent implements OnInit, OnChanges {
this.updateCallback.emit(dashboardWidget);
}
+ propagateWidgetSelection(configuredWidget: DataExplorerWidgetModel) {
+ this.configureWidgetCallback.emit(configuredWidget);
+ this.options.api.optionsChanged();
+ }
+
toggleGrid() {
this.options.displayGrid = this.options.displayGrid === "none" ? "always" : "none";
this.options.api.optionsChanged();
}
+ triggerWidgetSelection(item: DataExplorerWidgetModel) {
+ this.configureWidgetCallback.emit(item);
+ }
+
}
diff --git a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
index 178a2de..8d6b93a 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
+++ b/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
@@ -29,3 +29,21 @@
flex-direction: column;
flex: 1 1 100%;
}
+
+.designer-panel-container {
+ width: 100%;
+ height: 100%;
+}
+
+.designer-panel {
+ width: 350px;
+ border: 1px solid var(--color-tab-border);
+}
+
+.designer-panel-title {
+ margin-left: 20px;
+}
+
+.designer-panel-header {
+ border-bottom:1px solid var(--color-tab-border);
+}
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 2890ba4..bacdaae 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
@@ -17,12 +17,32 @@
-->
<div fxFlex="100" fxLayout="column">
- <sp-data-explorer-dashboard-grid
- #dashboardGrid
- [editMode]="editMode"
- [dashboard]="dashboard"
- [viewDateRange]="viewDateRange"
- (updateCallback)="updateAndQueueItemForDeletion($event)"
- (deleteCallback)="removeAndQueueItemForDeletion($event)"
- class="h-100 dashboard-grid"></sp-data-explorer-dashboard-grid>
-</div>
\ No newline at end of file
+ <mat-drawer-container class="designer-panel-container h-100 dashboard-grid">
+ <mat-drawer #designerDrawer mode="side" opened position="end" class="designer-panel">
+ <div fxLayout="column" fxFlex>
+ <div fxLayout="row" class="sp-tab-bg designer-panel-header">
+ <div fxLayoutAlign="start center" class="designer-panel-title">Configure widget</div>
+ <div fxFlex fxLayoutAlign="end end">
+ <button mat-button mat-icon-button (click)="closeDrawer()">
+ <mat-icon>clear</mat-icon>
+ </button>
+ </div>
+ </div>
+ <sp-data-explorer-designer-panel [currentlyConfiguredWidget]="currentlyConfiguredWidget" 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"
+ [viewDateRange]="viewDateRange"
+ (configureWidgetCallback)="updateCurrentlyConfiguredWidget($event)"
+ (updateCallback)="updateAndQueueItemForDeletion($event)"
+ (deleteCallback)="removeAndQueueItemForDeletion($event)"
+ class="h-100 dashboard-grid"></sp-data-explorer-dashboard-grid>
+ </mat-drawer-content>
+ </mat-drawer-container>
+</div>
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 32da684..af110e3 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
@@ -25,8 +25,12 @@ import { DataExplorerAddVisualizationDialogComponent } from '../../dialogs/add-w
import { IDataViewDashboard, IDataViewDashboardItem } from '../../models/dataview-dashboard.model';
import { DataViewDataExplorerService } from '../../services/data-view-data-explorer.service';
import { RefreshDashboardService } from '../../services/refresh-dashboard.service';
-import {DataExplorerWidgetModel} from "../../../core-model/gen/streampipes-model";
+import {
+ DashboardWidgetModel,
+ DataExplorerWidgetModel
+} from "../../../core-model/gen/streampipes-model";
import {DataExplorerDashboardGridComponent} from "../grid/data-explorer-dashboard-grid.component";
+import {MatDrawer} from "@angular/material/sidenav";
@Component({
selector: 'sp-data-explorer-dashboard-panel',
@@ -51,6 +55,7 @@ export class DataExplorerDashboardPanelComponent implements OnInit {
editModeChange: EventEmitter<boolean> = new EventEmitter();
@ViewChild('dashboardGrid') dashboardGrid: DataExplorerDashboardGridComponent;
+ @ViewChild('designerDrawer') designerDrawer: MatDrawer;
public items: IDataViewDashboardItem[];
@@ -59,6 +64,8 @@ export class DataExplorerDashboardPanelComponent implements OnInit {
widgetIdsToRemove: string[] = [];
widgetsToUpdate: Map<string, DataExplorerWidgetModel> = new Map<string, DataExplorerWidgetModel>();
+ currentlyConfiguredWidget: DataExplorerWidgetModel;
+
constructor(private dataViewDataExplorerService: DataViewDataExplorerService,
public dialog: MatDialog,
private refreshDashboardService: RefreshDashboardService) {
@@ -146,4 +153,14 @@ export class DataExplorerDashboardPanelComponent implements OnInit {
toggleGrid(gridVisible: boolean) {
this.dashboardGrid.toggleGrid();
}
+
+ closeDrawer() {
+ this.designerDrawer.close();
+ this.dashboardGrid.options.api.optionsChanged();
+ }
+
+ updateCurrentlyConfiguredWidget(widget: DataExplorerWidgetModel) {
+ this.currentlyConfiguredWidget = widget;
+ this.designerDrawer.open();
+ }
}
diff --git a/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html
index 42ffa86..4f8e5b9 100644
--- a/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html
+++ b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html
@@ -46,7 +46,7 @@
(dateTimeChange)="changeCustomDateRange()">
<owl-date-time #dt2></owl-date-time>
</mat-form-field>
- <button mat-button class="button-icon icon-button-font-size mr--15" color="accent">
+ <button mat-button class="button-icon icon-button-font-size mr-15" color="accent">
<mat-icon (click)="increaseTime()">navigate_next</mat-icon>
</button>
</div>
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 38d23ec..6ff9f5b 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,19 +18,30 @@
<div class="h-100">
<div class="box">
- <div class="assemblyOptions sp-blue-bg m-0 row header h-40" *ngIf="editMode">
- <div fxFlex="100" fxLayout="row" fxLayoutAlign="start center">
- {{ title }}
+ <div class="widget-header">
+ <div class="m-0 row header h-40" *ngIf="editMode">
+ <div fxFlex="100" fxLayout="row" fxLayoutAlign="start center" class="widget-header-text">
+ {{ configuredWidget.dataLakeMeasure.measureName }}
</div>
- <div fxFlex="100" fxLayout="row" fxLayoutAlign="end center">
- <button mat-icon-button matTooltip="Download data" class="icon" (click)="downloadDataAsFile()" color="white">
- <i class="material-icons">get_app</i>
+ <div fxFlex="100" fxLayout="row" fxLayoutAlign="end center" *ngIf="editMode">
+ <button mat-icon-button (click)="triggerWidgetEditMode()">
+ <mat-icon>edit</mat-icon>
</button>
- <button mat-button mat-icon-button color="white" (click)="removeWidget()">
- <i class="material-icons">clear</i>
+ <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
+ <mat-icon>more_vert</mat-icon>
</button>
+ <mat-menu #menu="matMenu">
+ <button mat-menu-item (click)="downloadDataAsFile()">
+ <mat-icon>get_app</mat-icon>
+ <span>Download data</span>
+ </button>
+ <button mat-menu-item (click)="removeWidget()">
+ <mat-icon>clear</mat-icon>
+ <span>Delete widget</span>
+ </button>
+ </mat-menu>
</div>
-
+ </div>
</div>
<div class="h-100 p-0 row content gridster-item-content ml-0 mr-0">
<div *ngIf="widgetLoaded" class="h-100">
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 f6b17de..7173caa 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
@@ -46,7 +46,6 @@
display: flex;
flex-flow: column;
height: 100%;
- border:3px solid var(--content-box-color);
}
.box .row.content {
@@ -57,3 +56,12 @@
flex: 0 1 auto;
}
+.widget-header-text {
+ font-size: 14pt;
+ font-weight: bold;
+}
+
+.widget-header {
+ padding: 15px;
+}
+
diff --git a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
index 2b30366..6b28393 100644
--- a/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
+++ b/ui/src/app/data-explorer/components/widget/data-explorer-dashboard-widget.component.ts
@@ -37,6 +37,9 @@ export class DataExplorerDashboardWidgetComponent implements OnInit {
widget: IDataViewDashboardItem;
@Input()
+ configuredWidget: DataExplorerWidgetModel;
+
+ @Input()
editMode: boolean;
@Input()
@@ -53,21 +56,20 @@ export class DataExplorerDashboardWidgetComponent implements OnInit {
@Output() deleteCallback: EventEmitter<IDataViewDashboardItem> = new EventEmitter<IDataViewDashboardItem>();
@Output() updateCallback: EventEmitter<DataExplorerWidgetModel> = new EventEmitter<DataExplorerWidgetModel>();
+ @Output() configureWidgetCallback: EventEmitter<DataExplorerWidgetModel> = new EventEmitter<DataExplorerWidgetModel>();
+
title = '';
widgetLoaded = false;
- configuredWidget: DataExplorerWidgetModel;
constructor(private dataViewDataExplorerService: DataViewDataExplorerService,
private dialog: MatDialog) {
}
ngOnInit(): void {
- this.dataViewDataExplorerService.getWidget(this.widget.id).subscribe(response => {
- this.configuredWidget = response;
- this.widgetLoaded = true;
- this.title = this.configuredWidget.dataLakeMeasure.measureName;
- });
+ console.log(this.configuredWidget);
+ this.widgetLoaded = true;
+ this.title = this.configuredWidget.dataLakeMeasure.measureName;
}
removeWidget() {
@@ -99,4 +101,8 @@ export class DataExplorerDashboardWidgetComponent implements OnInit {
panelClass: 'custom-dialog-container'
});
}
+
+ triggerWidgetEditMode() {
+ this.configureWidgetCallback.emit(this.configuredWidget);
+ }
}
diff --git a/ui/src/app/data-explorer/components/widgets/image/image-config.ts b/ui/src/app/data-explorer/components/widgets/image/image-config.ts
index 220ab13..806a855 100644
--- a/ui/src/app/data-explorer/components/widgets/image/image-config.ts
+++ b/ui/src/app/data-explorer/components/widgets/image/image-config.ts
@@ -16,7 +16,6 @@
*
*/
-import { EpRequirements } from '../../../sdk/ep-requirements';
import { WidgetConfig } from '../base/base-config';
import {DashboardWidgetSettings} from "../../../../core-model/gen/streampipes-model";
import {WidgetConfigBuilder} from "../../../../dashboard/registry/widget-config-builder";
diff --git a/ui/src/app/data-explorer/components/widgets/table/config/table-widget-config.component.html b/ui/src/app/data-explorer/components/widgets/table/config/table-widget-config.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/ui/src/app/data-explorer/components/widgets/table/config/table-widget-config.component.scss b/ui/src/app/data-explorer/components/widgets/table/config/table-widget-config.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css b/ui/src/app/data-explorer/components/widgets/table/config/table-widget-config.component.ts
similarity index 72%
copy from ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
copy to ui/src/app/data-explorer/components/widgets/table/config/table-widget-config.component.ts
index 178a2de..d16ae17 100644
--- a/ui/src/app/data-explorer/components/panel/data-explorer-dashboard-panel.component.css
+++ b/ui/src/app/data-explorer/components/widgets/table/config/table-widget-config.component.ts
@@ -16,16 +16,16 @@
*
*/
-.m-20 {
- margin: 20px;
-}
+import { Component, OnInit } from '@angular/core';
-.h-100 {
- height:100%;
-}
+@Component({
+ selector: 'sp-data-explorer-table-widget-config',
+ templateUrl: './table-widget-config.component.html',
+ styleUrls: ['./table-widget-config.component.scss']
+})
+export class TableWidgetConfigComponent implements OnInit {
+
+ ngOnInit(): void {
+ }
-.dashboard-grid {
- display:flex;
- flex-direction: column;
- flex: 1 1 100%;
}
diff --git a/ui/src/app/data-explorer/data-explorer.component.html b/ui/src/app/data-explorer/data-explorer.component.html
index 561857c..655696f 100644
--- a/ui/src/app/data-explorer/data-explorer.component.html
+++ b/ui/src/app/data-explorer/data-explorer.component.html
@@ -31,20 +31,15 @@
</div>
<div class="fixed-height data-explorer-options sp-tab-bg" fxLayout="row" *ngIf="selectedIndex > 0">
<div class="data-explorer-options-item pl-10" fxLayoutAlign="start center" fxLayout="row">
- <button mat-button color="accent" matTooltip="Save" [matTooltipPosition]="'above'" (click)="saveDashboard()">
+ <button mat-button mat-raised-button color="accent" matTooltip="Save" [matTooltipPosition]="'above'" (click)="saveDashboard()">
<mat-icon>save</mat-icon> <span>Save</span>
</button>
</div>
<div class="data-explorer-options-item" fxLayoutAlign="start center" fxLayout="row">
- <button mat-button color="accent" matTooltip="Add visualization" [matTooltipPosition]="'above'" (click)="addVisualization()">
+ <button mat-button mat-raised-button color="accent" matTooltip="Add visualization" [matTooltipPosition]="'above'" (click)="addVisualization()">
<mat-icon>add</mat-icon> <span>Add visualization</span>
</button>
</div>
- <div class="data-explorer-options-item" fxLayoutAlign="start center" fxLayout="row">
- <mat-slide-toggle color="accent" [(ngModel)]="gridVisible" (ngModelChange)="toggleGrid()">
- <span>Show grid</span>
- </mat-slide-toggle>
- </div>
<div class="data-explorer-options-item" fxLayoutAlign="end center" fxFlex fxLayout="row">
<sp-time-range-selector *ngIf="selectedIndex" (dateRangeEmitter)="updateDateRange($event)"></sp-time-range-selector>
</div>
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
index 8560b80..16b081c 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -16,57 +16,59 @@
*
*/
-import { CdkTableModule } from '@angular/cdk/table';
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { FlexLayoutModule } from '@angular/flex-layout';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatNativeDateModule } from '@angular/material/core';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatGridListModule } from '@angular/material/grid-list';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatSliderModule } from '@angular/material/slider';
-import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { MatTabsModule } from '@angular/material/tabs';
+import {CdkTableModule} from '@angular/cdk/table';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {FlexLayoutModule} from '@angular/flex-layout';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {MatChipsModule} from '@angular/material/chips';
+import {MatNativeDateModule} from '@angular/material/core';
+import {MatDatepickerModule} from '@angular/material/datepicker';
+import {MatGridListModule} from '@angular/material/grid-list';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {MatSliderModule} from '@angular/material/slider';
+import {MatSnackBarModule} from '@angular/material/snack-bar';
+import {MatTabsModule} from '@angular/material/tabs';
import {
OWL_DATE_TIME_FORMATS,
OwlDateTimeModule,
OwlNativeDateTimeModule
} from '@danielmoncada/angular-datetime-picker';
-import { NgxChartsModule } from '@swimlane/ngx-charts';
-import { GridsterModule } from 'angular-gridster2';
-import { PlotlyViaWindowModule } from 'angular-plotly.js';
-import { ColorPickerModule } from 'ngx-color-picker';
-import { DatalakeRestService } from '../core-services/datalake/datalake-rest.service';
-import { SemanticTypeUtilsService } from '../core-services/semantic-type/semantic-type-utils.service';
-import { SharedDatalakeRestService } from '../core-services/shared/shared-dashboard.service';
-import { CoreUiModule } from '../core-ui/core-ui.module';
-import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
-import { DataDownloadDialog } from './components/datadownloadDialog/dataDownload.dialog';
-import { DataExplorerDashboardGridComponent } from './components/grid/data-explorer-dashboard-grid.component';
-import { DataExplorerDashboardOverviewComponent } from './components/overview/data-explorer-dashboard-overview.component';
-import { DataExplorerDashboardPanelComponent } from './components/panel/data-explorer-dashboard-panel.component';
-import { TimeRangeSelectorComponent } from './components/time-selector/timeRangeSelector.component';
-import { DataExplorerDashboardWidgetComponent } from './components/widget/data-explorer-dashboard-widget.component';
-import { ImageWidgetComponent } from './components/widgets/image/image-widget.component';
-import { LineChartWidgetComponent } from './components/widgets/line-chart/line-chart-widget.component';
-import { TableWidgetComponent } from './components/widgets/table/table-widget.component';
-import { AggregateConfigurationComponent } from './components/widgets/utils/aggregate-configuration/aggregate-configuration.component';
-import { LoadDataSpinnerComponent } from './components/widgets/utils/load-data-spinner/load-data-spinner.component';
-import { NoDataInDateRangeComponent } from './components/widgets/utils/no-data/no-data-in-date-range.component';
-import { SelectPropertiesComponent } from './components/widgets/utils/select-properties/select-properties.component';
-import { DataExplorerComponent } from './data-explorer.component';
-import { DataExplorerAddVisualizationDialogComponent } from './dialogs/add-widget/data-explorer-add-visualization-dialog.component';
-import { DataExplorerEditDataViewDialogComponent } from './dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component';
-import { DataViewDataExplorerService } from './services/data-view-data-explorer.service';
-import { RefreshDashboardService } from './services/refresh-dashboard.service';
-import { ResizeService } from './services/resize.service';
-import { GroupConfigurationComponent } from './components/widgets/utils/group-configuration/group-configuration.component';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import {NgxChartsModule} from '@swimlane/ngx-charts';
+import {GridsterModule} from 'angular-gridster2';
+import {PlotlyViaWindowModule} from 'angular-plotly.js';
+import {ColorPickerModule} from 'ngx-color-picker';
+import {DatalakeRestService} from '../core-services/datalake/datalake-rest.service';
+import {SemanticTypeUtilsService} from '../core-services/semantic-type/semantic-type-utils.service';
+import {SharedDatalakeRestService} from '../core-services/shared/shared-dashboard.service';
+import {CoreUiModule} from '../core-ui/core-ui.module';
+import {CustomMaterialModule} from '../CustomMaterial/custom-material.module';
+import {DataDownloadDialog} from './components/datadownloadDialog/dataDownload.dialog';
+import {DataExplorerDashboardGridComponent} from './components/grid/data-explorer-dashboard-grid.component';
+import {DataExplorerDashboardOverviewComponent} from './components/overview/data-explorer-dashboard-overview.component';
+import {DataExplorerDashboardPanelComponent} from './components/panel/data-explorer-dashboard-panel.component';
+import {TimeRangeSelectorComponent} from './components/time-selector/timeRangeSelector.component';
+import {DataExplorerDashboardWidgetComponent} from './components/widget/data-explorer-dashboard-widget.component';
+import {ImageWidgetComponent} from './components/widgets/image/image-widget.component';
+import {LineChartWidgetComponent} from './components/widgets/line-chart/line-chart-widget.component';
+import {TableWidgetComponent} from './components/widgets/table/table-widget.component';
+import {AggregateConfigurationComponent} from './components/widgets/utils/aggregate-configuration/aggregate-configuration.component';
+import {LoadDataSpinnerComponent} from './components/widgets/utils/load-data-spinner/load-data-spinner.component';
+import {NoDataInDateRangeComponent} from './components/widgets/utils/no-data/no-data-in-date-range.component';
+import {SelectPropertiesComponent} from './components/widgets/utils/select-properties/select-properties.component';
+import {DataExplorerComponent} from './data-explorer.component';
+import {DataExplorerAddVisualizationDialogComponent} from './dialogs/add-widget/data-explorer-add-visualization-dialog.component';
+import {DataExplorerEditDataViewDialogComponent} from './dialogs/edit-dashboard/data-explorer-edit-data-view-dialog.component';
+import {DataViewDataExplorerService} from './services/data-view-data-explorer.service';
+import {RefreshDashboardService} from './services/refresh-dashboard.service';
+import {ResizeService} from './services/resize.service';
+import {GroupConfigurationComponent} from './components/widgets/utils/group-configuration/group-configuration.component';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
// tslint:disable-next-line:max-line-length
-import { PointSelectionInfoComponent } from './components/widgets/line-chart/components/point-selection-info/point-selection-info.component';
-import { ColorService } from './components/widgets/line-chart/services/color.service';
+import {PointSelectionInfoComponent} from './components/widgets/line-chart/components/point-selection-info/point-selection-info.component';
+import {ColorService} from './components/widgets/line-chart/services/color.service';
+import {DataExplorerDesignerPanelComponent} from "./components/designer-panel/data-explorer-designer-panel.component";
+import {TableWidgetConfigComponent} from "./components/widgets/table/config/table-widget-config.component";
const dashboardWidgets = [];
@@ -119,6 +121,7 @@ export const MY_NATIVE_FORMATS = {
DataExplorerDashboardOverviewComponent,
DataExplorerDashboardPanelComponent,
DataExplorerDashboardWidgetComponent,
+ DataExplorerDesignerPanelComponent,
DataExplorerAddVisualizationDialogComponent,
DataExplorerEditDataViewDialogComponent,
TableWidgetComponent,
@@ -131,7 +134,8 @@ export const MY_NATIVE_FORMATS = {
SelectPropertiesComponent,
PointSelectionInfoComponent,
AggregateConfigurationComponent,
- GroupConfigurationComponent
+ GroupConfigurationComponent,
+ TableWidgetConfigComponent,
],
providers: [
DatalakeRestService,
diff --git a/ui/src/scss/sp/layout.scss b/ui/src/scss/sp/layout.scss
index 1feaaad..7981bcc 100644
--- a/ui/src/scss/sp/layout.scss
+++ b/ui/src/scss/sp/layout.scss
@@ -73,8 +73,6 @@
}
-
-
.w-100 {
width: 100%;
}
@@ -85,7 +83,7 @@
.page-container-nav {
line-height:24px;
- border-bottom:1px solid var(--color-bg-2);
+ border-bottom:1px solid var(--color-tab-border);
}
.text-center {
diff --git a/ui/src/scss/sp/sp-theme.scss b/ui/src/scss/sp/sp-theme.scss
index 8b9e4db..894fc16 100644
--- a/ui/src/scss/sp/sp-theme.scss
+++ b/ui/src/scss/sp/sp-theme.scss
@@ -138,79 +138,105 @@ $accent-dark: map-get($custom-theme-dark, accent);
$accent: map-get($custom-theme-light, accent);
+.small .mat-tab-label {
+ height: 24px;
+ padding: 0 12px;
+ cursor: pointer;
+ box-sizing: border-box;
+ opacity: .6;
+ min-width: 80px;
+ text-align: center;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ white-space: nowrap;
+ position: relative;
+}
+
+.small .mat-tab-label-content {
+ text-transform: none;
+ font-size: 11pt;
+
+}
+
.dark-mode {
- @include angular-material-theme($custom-theme-dark);
-
- .base-style {
- color: rgba(255, 255, 255, 0.87);
- background: #121212;
- }
-
- .mat-toolbar.mat-primary {
- color: #121212;
- }
-
- .mat-tooltip.tooltip {
- background-color: rgba(255, 255, 255, 0.87);
- font-size: 12px;
- }
-
- --color-primary: #{mat-color($primary)};
- --color-accent: #{mat-color($accent-dark)};
- --color-bg-0: #121212;
- --color-bg-1: #282828;
- --color-bg-2: #404040;
- --color-bg-3: #424242;
- --color-bg-4: #5f5f5f;
- --color-bg-dialog: rgb(66, 66, 66);
- --color-shadow: #c4c4c4;
- --color-pe: #404040;
- --color-default-text: rgba(255, 255, 255, 0.87);
- --color-warn: #b36161;
-
- --color-navigation-bg: #{mat-color($primary)};
- --color-navigation-link-text: #121212;
- --color-navigation-text: #121212;
- --color-navigation-selected: #{mat-color($primary)};
- --color-navigation-hover: #{mat-color($primary, 600)};
- --color-navigation-bg-selected: #121212;
- --color-navigation-divider: #{mat-color($primary)};
-
- --content-box-color: #404040;
- --canvas-color: linear-gradient(90deg, rgba(50, 50, 50, 0.5) 10%, transparent 0%), linear-gradient(rgba(50, 50, 50, 0.5) 10%, transparent 0%);
+ @include angular-material-theme($custom-theme-dark);
+
+ .base-style {
+ color: rgba(255, 255, 255, 0.87);
+ background: #121212;
+ }
+
+ .mat-toolbar.mat-primary {
+ color: #121212;
+ }
+
+ .mat-tooltip.tooltip {
+ background-color: rgba(255, 255, 255, 0.87);
+ font-size: 12px;
+ }
+
+ --color-primary: #{mat-color($primary)};
+ --color-accent: #{mat-color($accent-dark)};
+ --color-bg-0: #121212;
+ --color-bg-1: #282828;
+ --color-bg-2: #404040;
+ --color-bg-3: #424242;
+ --color-bg-4: #5f5f5f;
+ --color-bg-dialog: rgb(66, 66, 66);
+ --color-shadow: #c4c4c4;
+ --color-pe: #404040;
+ --color-default-text: rgba(255, 255, 255, 0.87);
+ --color-warn: #b36161;
+
+ --color-tab-border : #cccccc;
+
+ --color-navigation-bg: #{mat-color($primary)};
+ --color-navigation-link-text: #121212;
+ --color-navigation-text: #121212;
+ --color-navigation-selected: #{mat-color($primary)};
+ --color-navigation-hover: #{mat-color($primary, 600)};
+ --color-navigation-bg-selected: #121212;
+ --color-navigation-divider: #{mat-color($primary)};
+
+ --content-box-color: #404040;
+ --canvas-color: linear-gradient(90deg, rgba(50, 50, 50, 0.5) 10%, transparent 0%), linear-gradient(rgba(50, 50, 50, 0.5) 10%, transparent 0%);
}
.light-mode {
- @include angular-material-theme($custom-theme-light);
-
- .base-style {
- color: #121212;
- background: #FFFFFF;
- }
-
- --color-primary: #{mat-color($primary)};
- --color-accent: #{mat-color($accent)};
- --color-bg-0: #FFFFFF;
- --color-bg-1: #FAFAFA;
- --color-bg-2: #f1f1f1;
- --color-bg-3: rgb(224, 224, 224);
- --color-bg-4: rgb(212, 212, 212);
- --color-bg-dialog: #FFFFFF;
- --color-shadow: #555;
- --color-pe: #FFFFFF;
- --color-default-text: #121212;
- --color-warn: #B71C1C;
-
- --color-navigation-bg: #{mat-color($primary)};
- --color-navigation-link-text: #FFFFFF;
- --color-navigation-text: #FFFFFF;
- --color-navigation-selected: #{mat-color($primary)};
- --color-navigation-hover: #{mat-color($primary, 600)};
- --color-navigation-bg-selected: #FFFFFF;
- --color-navigation-divider: #{mat-color($primary)};
-
- --content-box-color: rgb(156, 156, 156);
- --canvas-color: linear-gradient(90deg, rgba(208, 208, 208, 0.5) 10%, transparent 0%), linear-gradient(rgba(208, 208, 208, 0.5) 10%, transparent 0%);
+ @include angular-material-theme($custom-theme-light);
+
+ .base-style {
+ color: #121212;
+ background: #FFFFFF;
+ }
+
+
+ --color-primary: #{mat-color($primary)};
+ --color-accent: #{mat-color($accent)};
+ --color-bg-0: #FFFFFF;
+ --color-bg-1: #FAFAFA;
+ --color-bg-2: #f1f1f1;
+ --color-bg-3: rgb(224, 224, 224);
+ --color-bg-4: rgb(212, 212, 212);
+ --color-bg-dialog: #FFFFFF;
+ --color-shadow: #555;
+ --color-pe: #FFFFFF;
+ --color-default-text: #121212;
+ --color-warn: #B71C1C;
+
+ --color-tab-border : #cccccc;
+
+ --color-navigation-bg: #{mat-color($primary)};
+ --color-navigation-link-text: #FFFFFF;
+ --color-navigation-text: #FFFFFF;
+ --color-navigation-selected: #{mat-color($primary)};
+ --color-navigation-hover: #{mat-color($primary, 600)};
+ --color-navigation-bg-selected: #FFFFFF;
+ --color-navigation-divider: #{mat-color($primary)};
+
+ --content-box-color: rgb(156, 156, 156);
+ --canvas-color: linear-gradient(90deg, rgba(208, 208, 208, 0.5) 10%, transparent 0%), linear-gradient(rgba(208, 208, 208, 0.5) 10%, transparent 0%);
}
diff --git a/ui/src/scss/sp/widgets.scss b/ui/src/scss/sp/widgets.scss
index d573d72..aa8f5e6 100644
--- a/ui/src/scss/sp/widgets.scss
+++ b/ui/src/scss/sp/widgets.scss
@@ -23,7 +23,7 @@
.widget-inner-options {
background: var(--color-bg-1);
- border-bottom: 1px solid var(--color-bg-2);
+ border-bottom: 1px solid var(--color-tab-border);
padding: 5px;
height: 40px;
}