This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch various-ui-fixes in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit f8fa7a3a66a822b4b34cdc9c76b94f17f09d0b2b Author: Dominik Riemer <[email protected]> AuthorDate: Tue Oct 21 13:55:13 2025 +0200 fix: Minor various layout issues in the UI --- .../src/lib/model/types/data-type.ts | 11 ++++ .../basic-inner-panel.component.html | 1 + .../basic-inner-panel.component.scss | 18 ++++-- .../basic-inner-panel.component.ts | 3 + .../select-export/select-format.component.ts | 2 +- .../data-retention-dialog.component.ts | 1 - .../delete-export-provider-dialog.component.ts | 2 +- .../export-provider-dialog.component.ts | 6 +- .../edit-dashboard-dialog.component.html | 2 +- .../pipeline-overview.component.html | 65 ---------------------- ui/src/scss/sp/_variables.scss | 1 + 11 files changed, 37 insertions(+), 75 deletions(-) diff --git a/ui/projects/streampipes/platform-services/src/lib/model/types/data-type.ts b/ui/projects/streampipes/platform-services/src/lib/model/types/data-type.ts index 74e75ac9ea..7c14f431bb 100644 --- a/ui/projects/streampipes/platform-services/src/lib/model/types/data-type.ts +++ b/ui/projects/streampipes/platform-services/src/lib/model/types/data-type.ts @@ -45,4 +45,15 @@ export class DataType { public static isStringType(datatype: string): boolean { return datatype === DataType.STRING; } + + public static getAllTypes(): { id: string; label: string }[] { + return [ + { id: DataType.STRING, label: 'String' }, + { id: DataType.INTEGER, label: 'Integer' }, + { id: DataType.LONG, label: 'Long' }, + { id: DataType.FLOAT, label: 'Float' }, + { id: DataType.DOUBLE, label: 'Double' }, + { id: DataType.BOOLEAN, label: 'Boolean' }, + ]; + } } diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.html index db4ec28b7f..d5698211ec 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.html +++ b/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.html @@ -24,6 +24,7 @@ > <div class="general-panel-header" + [ngClass]="headerBackground ? 'bg-highlight' : 'bg-no-highlight'" fxLayout="row" fxLayoutAlign="start center" *ngIf="!hideToolbar" diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.scss b/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.scss index 17dec7eb5b..fa4f329fd1 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.scss +++ b/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.scss @@ -22,12 +22,13 @@ } .general-panel { - border: 1px solid var(--color-bg-2); + border-bottom: 1px solid var(--color-bg-2); + border-left: 1px solid var(--color-bg-2); + border-right: 1px solid var(--color-bg-2); } .general-panel-header { margin-top: -1px; - background: var(--color-bg-2); height: 40px; min-height: 40px; max-height: 40px; @@ -36,11 +37,20 @@ padding: 10px 12px; } +.bg-highlight { + background: var(--color-bg-2); +} + +.bg-no-highlight { + border-left: 1px solid var(--color-bg-2); + border-right: 1px solid var(--color-bg-2); + border-top: 1px solid var(--color-bg-2); +} + .content-box-title { margin-left: 5px; padding-left: 5px; border-left: 3px solid var(--color-primary); - font-weight: 500; - font-size: 13pt; + font-weight: 400; white-space: nowrap; } diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.ts index 928438a533..453dded956 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.ts +++ b/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.ts @@ -39,4 +39,7 @@ export class SpBasicInnerPanelComponent { @Input() hideToolbar = false; + + @Input() + headerBackground = true; } diff --git a/ui/src/app/configuration/dialog/data-retention-dialog/components/select-export/select-format.component.ts b/ui/src/app/configuration/dialog/data-retention-dialog/components/select-export/select-format.component.ts index c6b8a54c17..4f5f16d726 100644 --- a/ui/src/app/configuration/dialog/data-retention-dialog/components/select-export/select-format.component.ts +++ b/ui/src/app/configuration/dialog/data-retention-dialog/components/select-export/select-format.component.ts @@ -19,10 +19,10 @@ import { Component, inject, Input, OnInit } from '@angular/core'; import { DataExplorerDataConfig, + ExportProviderService, ExportProviderSettings, } from '@streampipes/platform-services'; import { RetentionTimeConfig } from '@streampipes/platform-services'; -import { ExportProviderService } from 'projects/streampipes/platform-services/src/lib/apis/export-provider.service'; @Component({ selector: 'sp-data-export', diff --git a/ui/src/app/configuration/dialog/data-retention-dialog/data-retention-dialog.component.ts b/ui/src/app/configuration/dialog/data-retention-dialog/data-retention-dialog.component.ts index f7d7c90d84..2db4496f78 100644 --- a/ui/src/app/configuration/dialog/data-retention-dialog/data-retention-dialog.component.ts +++ b/ui/src/app/configuration/dialog/data-retention-dialog/data-retention-dialog.component.ts @@ -24,7 +24,6 @@ import { ExportProviderSettings, RetentionTimeConfig, } from '@streampipes/platform-services'; -import { ExportProviderService } from 'projects/streampipes/platform-services/src/lib/apis/export-provider.service'; @Component({ selector: 'sp-data-retention-dialog', diff --git a/ui/src/app/configuration/dialog/delete-export-provider/delete-export-provider-dialog.component.ts b/ui/src/app/configuration/dialog/delete-export-provider/delete-export-provider-dialog.component.ts index 9349fcd2aa..067b1a9b61 100644 --- a/ui/src/app/configuration/dialog/delete-export-provider/delete-export-provider-dialog.component.ts +++ b/ui/src/app/configuration/dialog/delete-export-provider/delete-export-provider-dialog.component.ts @@ -18,7 +18,7 @@ import { Component, inject, Input } from '@angular/core'; import { DialogRef } from '@streampipes/shared-ui'; -import { ExportProviderService } from 'projects/streampipes/platform-services/src/lib/apis/export-provider.service'; +import { ExportProviderService } from '@streampipes/platform-services'; @Component({ selector: 'sp-delete-export-provider-dialog', diff --git a/ui/src/app/configuration/dialog/export-provider-dialog/export-provider-dialog.component.ts b/ui/src/app/configuration/dialog/export-provider-dialog/export-provider-dialog.component.ts index ebf0afb436..5305516f89 100644 --- a/ui/src/app/configuration/dialog/export-provider-dialog/export-provider-dialog.component.ts +++ b/ui/src/app/configuration/dialog/export-provider-dialog/export-provider-dialog.component.ts @@ -24,8 +24,10 @@ import { Validators, } from '@angular/forms'; import { DialogRef } from '@streampipes/shared-ui'; -import { ExportProviderSettings } from '@streampipes/platform-services'; -import { ExportProviderService } from 'projects/streampipes/platform-services/src/lib/apis/export-provider.service'; +import { + ExportProviderService, + ExportProviderSettings, +} from '@streampipes/platform-services'; @Component({ selector: 'sp-export-provider-dialog', diff --git a/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html index 3da870685e..8c2f062889 100644 --- a/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html +++ b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html @@ -137,7 +137,7 @@ </div> </div> <mat-divider></mat-divider> - <div class="sp-dialog-actions actions-align-left"> + <div class="sp-dialog-actions actions-align-left" fxLayoutGap="10px"> <button [disabled]="dvname.invalid" mat-button diff --git a/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.html b/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.html index b8137d0644..c79a69b7e4 100644 --- a/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.html +++ b/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.html @@ -217,69 +217,4 @@ <span>{{ 'Delete' | translate }}</span> </button> </ng-template> - - <!-- <ng-container matColumnDef="action">--> - <!-- <th mat-header-cell *matHeaderCellDef></th>--> - <!-- <td mat-cell *matCellDef="let pipeline">--> - <!-- <div fxLayout="row" fxLayoutAlign="end center">--> - <!-- <button--> - <!-- mat-icon-button--> - <!-- [matTooltip]="'Show pipeline' | translate"--> - <!-- matTooltipPosition="above"--> - <!-- (click)="--> - <!-- pipelineOperationsService.showPipelineDetails(--> - <!-- pipeline._id--> - <!-- )--> - <!-- "--> - <!-- >--> - <!-- <i class="material-icons">search</i>--> - <!-- </button>--> - <!-- <button--> - <!-- color="accent"--> - <!-- mat-icon-button--> - <!-- [matTooltip]="'Modify pipeline' | translate"--> - <!-- matTooltipPosition="above"--> - <!-- *ngIf="hasPipelineWritePrivileges"--> - <!-- (click)="--> - <!-- pipelineOperationsService.modifyPipeline(pipeline._id)--> - <!-- "--> - <!-- data-cy="modify-pipeline-btn"--> - <!-- >--> - <!-- <i class="material-icons">mode_edit</i>--> - <!-- </button>--> - <!-- <button--> - <!-- color="accent"--> - <!-- mat-icon-button--> - <!-- [matTooltip]="'Permissions' | translate"--> - <!-- matTooltipPosition="above"--> - <!-- *ngIf="isAdmin"--> - <!-- (click)="--> - <!-- pipelineOperationsService.showPermissionsDialog(--> - <!-- pipeline,--> - <!-- refreshPipelinesEmitter--> - <!-- )--> - <!-- "--> - <!-- data-cy="open-manage-permissions"--> - <!-- >--> - <!-- <i class="material-icons">share</i>--> - <!-- </button>--> - <!-- <button--> - <!-- color="accent"--> - <!-- mat-icon-button--> - <!-- [matTooltip]="'Delete pipeline' | translate"--> - <!-- matTooltipPosition="above"--> - <!-- *ngIf="hasPipelineWritePrivileges"--> - <!-- (click)="--> - <!-- pipelineOperationsService.showDeleteDialog(--> - <!-- pipeline,--> - <!-- refreshPipelinesEmitter--> - <!-- )--> - <!-- "--> - <!-- data-cy="delete-pipeline"--> - <!-- >--> - <!-- <i class="material-icons">delete</i>--> - <!-- </button>--> - <!-- </div>--> - <!-- </td>--> - <!-- </ng-container>--> </sp-table> diff --git a/ui/src/scss/sp/_variables.scss b/ui/src/scss/sp/_variables.scss index 9f77125c08..8e49406405 100644 --- a/ui/src/scss/sp/_variables.scss +++ b/ui/src/scss/sp/_variables.scss @@ -81,6 +81,7 @@ $sp-color-error: #b71c1c; --mat-select-panel-background-color: var(--color-bg-0); --mat-sidenav-container-shape: 0; --mat-sidenav-container-divider-color: var(--color-bg-3); + --mat-standard-button-toggle-height: 30px; } .dark-mode {
