Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug fix pipeline editor #3360

Merged
merged 2 commits into from
Nov 29, 2024
+61 −3
Merged

Bug fix pipeline editor #3360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dea485
Add warning that live dashboard is deprecated
Marcelfrueh Nov 29, 2024
b4d6b44
fix: Resolve minor issues in pipeline editor
Marcelfrueh Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,22 @@ <h5>Possible placeholders:</h5>
(click)="applyPlaceholder(property.runtimeName)"
color="accent"
*ngFor="let property of eventSchemas[0].eventProperties"
style="margin-right: 5px; margin-bottom: 5px"
>#{{ property.runtimeName }}#
</mat-chip>
</mat-chip-list>
</div>
</div>
<div fxFlex="100" *ngIf="staticProperty.multiLine">
<quill-editor
fxFlex="100"
*ngIf="staticProperty.htmlFontFormat"
#textEditor
formControlName="{{ fieldName }}"
[modules]="quillModulesFontFormat"
></quill-editor>
<quill-editor
fxFlex="100"
*ngIf="!staticProperty.htmlFontFormat"
#textEditor
formControlName="{{ fieldName }}"
Expand Down
4 changes: 4 additions & 0 deletions ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ form {
float: left;
}

tags {
margin-bottom: 50px;
}

::ng-deep.mat-accent ::ng-deep.mat-slider-track-fill,
.mat-accent ::ng-deep.mat-slider-thumb,
.mat-accent ::ng-deep.mat-slider-thumb-label {
Expand Down
11 changes: 11 additions & 0 deletions ui/src/app/dashboard/components/overview/dashboard-overview.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@
</button>
</div>

<div fxLayout="column">
<div class="warning" fxLayout="row" fxLayoutAlign="start center">
<i class="material-icons warning-icon">warning</i>
<span
>Warning: The Live Dashboard will be removed in future
versions. The live refresh feature has been integrated into
the Data Explorer. Please migrate your current dashboards to
the Data Explorer!</span
>
</div>
</div>
<div fxFlex="100" fxLayout="column">
<sp-basic-header-title-component
title="Dashboards"
Expand Down
15 changes: 15 additions & 0 deletions ui/src/app/dashboard/components/overview/dashboard-overview.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,18 @@
display: inline;
margin-right: 10px;
}

.warning {
border: 1px solid #dea843;
background: #ececc9;
padding: 10px;
display: flex;
align-items: center;
gap: 8px;
box-sizing: border-box;
}

.warning-icon {
color: #dea843;
font-size: 24px;
}
7 changes: 6 additions & 1 deletion ...icon-stand/pipeline-element-icon-stand-row/pipeline-element-icon-stand-row.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@
</div>
</div>
<div fxFlex fxLayoutAlign="start start" fxLayout="column">
<div class="element-name" fxLayoutAlign="start start">
<div
[ngClass]="{
'element-name-hover': currentMouseOver,
'element-name': !currentMouseOver
}"
>
{{ element.name }}
</div>
<div
Expand Down
13 changes: 13 additions & 0 deletions ...icon-stand/pipeline-element-icon-stand-row/pipeline-element-icon-stand-row.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@
.element-name {
font-size: 11pt;
font-weight: 500;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
white-space: nowrap;
max-width: 170px;
}

.element-name-hover {
font-size: 11pt;
font-weight: 500;
word-wrap: break-word;
overflow-wrap: anywhere;
word-break: break-word;
}

.element-description {
Expand Down
2 changes: 1 addition & 1 deletion .../editor/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
}

.search-field {
width: 180px;
width: 230px;
}

.group-outer {
Expand Down
6 changes: 5 additions & 1 deletion ...itor/components/pipeline/dropped-pipeline-element/dropped-pipeline-element.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@
[pipelineElement]="pipelineElementConfig.payload"
></sp-pipeline-element>
</div>
<div class="editor-pe-info" [ngClass]="'pe-info-' + pipelineElementConfig.type">
<div
class="editor-pe-info"
[ngClass]="'pe-info-' + pipelineElementConfig.type"
matTooltip="{{ pipelineElementConfig.payload.name }}"
>
{{ pipelineElementConfig.payload.name }}
</div>
<sp-pipeline-element-statistics
Expand Down
3 changes: 3 additions & 0 deletions ui/src/scss/sp/pipeline-element-options.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
text-align: center;
box-shadow: 0 0 2px #555;
-webkit-animation: slidein 0.5s;
overflow: hidden;
text-overflow: ellipsis;
display: block;
}

@keyframes slidein {
Expand Down
Loading