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 2022/07/10 10:09:41 UTC
[incubator-streampipes] branch STREAMPIPES-558 updated (dbfd35bad -> 633821a0f)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
from dbfd35bad [STREAMPIPES-558] Add options toolbar to adapter overview component
new 4bfdaca1a [STREAMPIPES-558] Improve layout of guess schema view
new 858a4d32b [STREAMPIPES-558] Improve user guidance of field configuration dialog
new 633821a0f [hotfix] Use default value for machine simulator frequency
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:
.../machine/MachineDataStreamAdapter.java | 2 +-
.../new-adapter/new-adapter.component.html | 6 +-
.../event-property-row.component.html | 24 +--
.../event-property-row.component.scss | 16 ++
.../event-property-row.component.ts | 30 +++-
ui/src/app/connect/connect.module.ts | 17 ++-
.../edit-event-property-list.component.html | 21 ---
.../edit-event-property-list.component.scss | 18 ---
.../edit-event-property-list.component.ts | 32 ----
.../edit-event-property-primitive.component.html | 49 ------
.../edit-event-property-primitive.component.scss | 21 ---
.../edit-event-property-primitive.component.ts | 64 --------
.../edit-data-type/edit-data-type.component.html | 5 +-
.../edit-data-type/edit-data-type.component.scss | 0
.../edit-data-type/edit-data-type.component.ts | 2 +-
.../edit-schema-transformation.component.html | 80 ++++++++++
.../edit-schema-transformation.component.scss} | 0
.../edit-schema-transformation.component.ts | 78 ++++++++++
.../edit-unit-transformation.component.html | 115 +++++++-------
.../edit-unit-transformation.component.ts | 18 +++
.../edit-correction-value.component.html | 10 +-
.../edit-correction-value.component.scss | 0
.../edit-correction-value.component.ts | 0
.../edit-timestamp-property.component.html | 15 +-
.../edit-timestamp-property.component.scss | 0
.../edit-timestamp-property.component.ts | 0
.../edit-value-transformation.component.html | 55 +++++++
.../edit-value-transformation.component.scss} | 0
.../edit-value-transformation.component.ts} | 38 +++--
.../ep-settings-section.component.html} | 16 +-
.../ep-settings-section.component.scss} | 14 +-
.../ep-settings-section.component.ts} | 18 +--
.../edit-event-property.component.html | 166 ++++++++++++---------
.../edit-event-property.component.scss | 6 +
.../edit-event-property.component.ts | 83 +++++------
ui/src/scss/sp/layout.scss | 32 ++++
ui/src/scss/sp/widgets.scss | 7 +-
37 files changed, 604 insertions(+), 454 deletions(-)
delete mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.html
delete mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.scss
delete mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
delete mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.html
delete mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.scss
delete mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-schema-transformation}/edit-data-type/edit-data-type.component.html (89%)
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-schema-transformation}/edit-data-type/edit-data-type.component.scss (100%)
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-schema-transformation}/edit-data-type/edit-data-type.component.ts (94%)
create mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.html
copy ui/src/app/{apidocs/apidocs.component.scss => connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.scss} (100%)
create mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.ts
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-value-transformation}/edit-correction-value/edit-correction-value.component.html (83%)
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-value-transformation}/edit-correction-value/edit-correction-value.component.scss (100%)
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-value-transformation}/edit-correction-value/edit-correction-value.component.ts (100%)
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-value-transformation}/edit-timestamp-property/edit-timestamp-property.component.html (79%)
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-value-transformation}/edit-timestamp-property/edit-timestamp-property.component.scss (100%)
rename ui/src/app/connect/dialog/edit-event-property/components/{ => edit-value-transformation}/edit-timestamp-property/edit-timestamp-property.component.ts (100%)
create mode 100644 ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.html
copy ui/src/app/{apidocs/apidocs.component.scss => connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.scss} (100%)
copy ui/src/app/{editor/components/pipeline-element-documentation/pipeline-element-documentation.component.ts => connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.ts} (55%)
copy ui/src/app/{core-ui/split-section/split-section.component.html => connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.html} (65%)
copy ui/src/app/{editor/components/output-strategy/output-strategy.component.scss => connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.scss} (88%)
copy ui/src/app/{core-ui/image/image.component.ts => connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.ts} (77%)
[incubator-streampipes] 02/03: [STREAMPIPES-558] Improve user guidance of field configuration dialog
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 858a4d32bc92b34f982444c88aea27be1b63291b
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sun Jul 10 12:09:11 2022 +0200
[STREAMPIPES-558] Improve user guidance of field configuration dialog
---
.../event-property-row.component.html | 6 +-
.../event-property-row.component.ts | 30 +++-
ui/src/app/connect/connect.module.ts | 17 ++-
.../edit-event-property-primitive.component.html | 49 ------
.../edit-data-type/edit-data-type.component.html | 5 +-
.../edit-data-type/edit-data-type.component.scss | 0
.../edit-data-type/edit-data-type.component.ts | 2 +-
.../edit-schema-transformation.component.html | 80 ++++++++++
.../edit-schema-transformation.component.scss} | 1 -
.../edit-schema-transformation.component.ts | 78 ++++++++++
.../edit-unit-transformation.component.html | 115 +++++++-------
.../edit-unit-transformation.component.ts | 18 +++
.../edit-correction-value.component.html | 10 +-
.../edit-correction-value.component.scss | 0
.../edit-correction-value.component.ts | 0
.../edit-timestamp-property.component.html | 15 +-
.../edit-timestamp-property.component.scss | 0
.../edit-timestamp-property.component.ts | 0
.../edit-value-transformation.component.html | 55 +++++++
.../edit-value-transformation.component.scss} | 4 -
.../edit-value-transformation.component.ts} | 38 ++---
.../ep-settings-section.component.html} | 18 ++-
.../ep-settings-section.component.scss} | 14 +-
.../ep-settings-section.component.ts} | 21 ++-
.../edit-event-property.component.html | 166 ++++++++++++---------
.../edit-event-property.component.scss | 6 +
.../edit-event-property.component.ts | 83 +++++------
ui/src/scss/sp/widgets.scss | 7 +-
28 files changed, 544 insertions(+), 294 deletions(-)
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
index 31e7c672b..47ac53898 100644
--- a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
+++ b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
@@ -21,12 +21,12 @@
<b>
{{ label }}
</b>
- <span class="timestamp-property" *ngIf="timestampProperty" fxLayoutAlign="start center" fxLayout="row">
+ <div class="timestamp-property" *ngIf="timestampProperty" fxLayoutAlign="start center" fxLayout="row">
<mat-icon *ngIf="timestampProperty" class="timestamp-icon" fxLayout="row" fxLayoutAlign="start center">
access_time
</mat-icon>
- marked as timestamp
- </span>
+ <span style="margin-left: -5px;">marked as timestamp</span>
+ </div>
<p style="margin: 0px 10px 10px;" *ngIf="isList">[List]</p>
</div>
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts
index 514d79e81..6a0c178bd 100644
--- a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts
+++ b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.ts
@@ -29,6 +29,7 @@ import {
EventSchema
} from '@streampipes/platform-services';
import { EditEventPropertyComponent } from '../../../../dialog/edit-event-property/edit-event-property.component';
+import { DialogService, PanelType } from '@streampipes/shared-ui';
@Component({
selector: 'event-property-row',
@@ -53,7 +54,8 @@ export class EventPropertyRowComponent implements OnInit, OnChanges {
isList = false;
timestampProperty = false;
- constructor(private dialog: MatDialog) {
+ constructor(private dialog: MatDialog,
+ private dialogService: DialogService) {
}
@@ -109,16 +111,30 @@ export class EventPropertyRowComponent implements OnInit, OnChanges {
}
public openEditDialog(data): void {
- const dialogRef = this.dialog.open(EditEventPropertyComponent, {
+ const dialogRef = this.dialogService.open(EditEventPropertyComponent, {
+ panelType: PanelType.SLIDE_IN_PANEL,
+ title: 'Edit field ' + data.runtimeName,
+ width: '50vw',
data: {
- property: data,
- isEditable: this.isEditable
+ 'property': data,
+ 'isEditable': this.isEditable
}
});
- dialogRef.afterClosed().subscribe(result => {
- this.timestampProperty = this.isTimestampProperty(this.node.data);
- this.refreshTreeEmitter.emit();
+
+ dialogRef.afterClosed().subscribe(refresh => {
+ this.timestampProperty = this.isTimestampProperty(this.node.data);
+ this.refreshTreeEmitter.emit();
});
+ // const dialogRef = this.dialog.open(EditEventPropertyComponent, {
+ // data: {
+ // property: data,
+ // isEditable: this.isEditable
+ // }
+ // });
+ // dialogRef.afterClosed().subscribe(result => {
+ // this.timestampProperty = this.isTimestampProperty(this.node.data);
+ // this.refreshTreeEmitter.emit();
+ // });
}
public selectProperty(id: string, eventProperties: any): void {
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index 6a1e08d8e..5d9361aec 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -26,8 +26,6 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { ConnectComponent } from './connect.component';
import { NewAdapterComponent } from './components/new-adapter/new-adapter.component';
-
-import { EditEventPropertyPrimitiveComponent } from './dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component';
import { EventSchemaComponent } from './components/new-adapter/schema-editor/event-schema/event-schema.component';
import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
@@ -52,14 +50,13 @@ import { UnitProviderService } from './services/unit-provider.service';
import { AdapterFilterPipe } from './filter/adapter-filter.pipe';
import { AdapterExportDialog } from './dialog/adapter-export/adapter-export-dialog.component';
import { AdapterUploadDialog } from './dialog/adapter-upload/adapter-upload-dialog.component';
-import { EditEventPropertyListComponent } from './dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component';
import { TimestampPipe } from './filter/timestamp.pipe';
import { MatChipsModule } from '@angular/material/chips';
import { MatSliderModule } from '@angular/material/slider';
import { TreeModule } from '@circlon/angular-tree-component';
import { XsService } from '../NS/xs.service';
-import { EditDataTypeComponent } from './dialog/edit-event-property/components/edit-data-type/edit-data-type.component';
-import { EditTimestampPropertyComponent } from './dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component';
+import { EditDataTypeComponent } from './dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component';
+import { EditTimestampPropertyComponent } from './dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component';
import { EditUnitTransformationComponent } from './dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component';
import { EditEventPropertyComponent } from './dialog/edit-event-property/edit-event-property.component';
import { PipelineElementRuntimeInfoComponent } from './components/runtime-info/pipeline-element-runtime-info.component';
@@ -67,7 +64,7 @@ import { EventPropertyRowComponent } from './components/new-adapter/schema-edito
import { EventSchemaPreviewComponent } from './components/new-adapter/schema-editor/event-schema-preview/event-schema-preview.component';
import { CoreUiModule } from '../core-ui/core-ui.module';
// tslint:disable-next-line:max-line-length
-import { EditCorrectionValueComponent } from './dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component';
+import { EditCorrectionValueComponent } from './dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component';
import { ExistingAdaptersComponent } from './components/existing-adapters/existing-adapters.component';
// tslint:disable-next-line:max-line-length
import { SpecificAdapterConfigurationComponent } from './components/new-adapter/specific-adapter-configuration/specific-adapter-configuration.component';
@@ -84,6 +81,9 @@ import { FormatItemJsonComponent } from './components/new-adapter/format-configu
import { RouterModule } from '@angular/router';
import { SharedUiModule } from '@streampipes/shared-ui';
import { SpConnectFilterToolbarComponent } from './components/filter-toolbar/filter-toolbar.component';
+import { EditSchemaTransformationComponent } from './dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component';
+import { EditValueTransformationComponent } from './dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component';
+import { SpEpSettingsSectionComponent } from './dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component';
@NgModule({
imports: [
@@ -134,11 +134,11 @@ import { SpConnectFilterToolbarComponent } from './components/filter-toolbar/fil
DataMarketplaceComponent,
DeleteAdapterDialogComponent,
EventSchemaComponent,
- EditEventPropertyPrimitiveComponent,
EditEventPropertyComponent,
EventPropertyRowComponent,
- EditEventPropertyListComponent,
EditUnitTransformationComponent,
+ EditSchemaTransformationComponent,
+ EditValueTransformationComponent,
EditTimestampPropertyComponent,
EditDataTypeComponent,
EventSchemaPreviewComponent,
@@ -157,6 +157,7 @@ import { SpConnectFilterToolbarComponent } from './components/filter-toolbar/fil
ErrorMessageComponent,
LoadingMessageComponent,
SchemaEditorHeaderComponent,
+ SpEpSettingsSectionComponent,
StartAdapterConfigurationComponent,
FormatItemJsonComponent,
SpConnectFilterToolbarComponent
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.html
deleted file mode 100644
index def40397f..000000000
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
- ~ 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 class="divBorder">
- <sp-edit-timestamp-property
- *ngIf="isTimestampProperty"
- [cachedProperty]= "cachedProperty"
- showEditTimestampProperty="!isTimestampProperty">
- </sp-edit-timestamp-property>
-
- <sp-edit-data-type
- *ngIf="!isTimestampProperty"
- [cachedProperty]= "cachedProperty"
- (dataTypeChanged)="setShowUnitTransformation()">
- </sp-edit-data-type>
-
- <sp-edit-unit-transformation
- *ngIf="!isTimestampProperty"
- [cachedProperty]= "cachedProperty"
- [showUnitTransformation]="!hideUnitTransformation">
- </sp-edit-unit-transformation>
-
- <div fxLayout="row" fxLayoutAlign="start" *ngIf="addedByUser">
- <mat-form-field class="doubleWidth">
- <input matInput
- placeholder="Static Value"
- name="static_value"
- id="static_value"
- data-cy="connect-edit-field-static-value"
- [(ngModel)]="cachedProperty.staticValue">
- </mat-form-field>
- </div>
-
-</div>
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component.html
similarity index 89%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.html
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component.html
index 7e8c9f4db..05ed0e3f8 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component.html
@@ -16,8 +16,9 @@
~
-->
-<mat-form-field class="doubleWidth" color="accent">
- <mat-select placeholder="Runtime Type"
+<mat-form-field class="w-100" color="accent" fxFlex="100">
+ <mat-label>Field data type</mat-label>
+ <mat-select placeholder="Data Type"
[(ngModel)]="cachedProperty.runtimeType"
(selectionChange)="valueChanged()"
data-cy="connect-change-runtime-type">
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.scss b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component.scss
similarity index 100%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.scss
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component.scss
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component.ts
similarity index 94%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component.ts
index 77e0d823d..b303e8c06 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-data-type/edit-data-type.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { DataTypesService } from '../../../../services/data-type.service';
+import { DataTypesService } from '../../../../../services/data-type.service';
@Component({
selector: 'sp-edit-data-type',
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.html
new file mode 100644
index 000000000..98cc26fd1
--- /dev/null
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.html
@@ -0,0 +1,80 @@
+<!--
+ ~ 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 class="general-options-panel" fxLayout="column">
+ <div class="general-options-header"><span>Schema</span></div>
+ <sp-ep-settings-section sectionTitle="Field runtime name"
+ sectionDescription="Identifies the field in the underlying runtime format">
+ <div attr.id="input-runtime-name-{{cachedProperty.label}}"
+ fxFlex="100">
+ <mat-form-field class="w-100" color="accent">
+ <mat-label>Field runtime name</mat-label>
+ <input matInput
+ placeholder="RuntimeName"
+ name="runtimename"
+ id="runtimename"
+ data-cy="connect-edit-field-runtime-name"
+ [(ngModel)]="cachedProperty.runtimeName">
+ </mat-form-field>
+ </div>
+ </sp-ep-settings-section>
+
+ <sp-ep-settings-section sectionTitle="Field semantic type"
+ sectionDescription="Identifies field semantics, e.g., oil temperature"
+ fxLayout="column"
+ fxFlex="100"
+ *ngIf="isPrimitiveProperty">
+ <div fxFlex="100" fxLayout="column" style="margin-bottom: 5px;">
+ <mat-checkbox name="timestampCheckbox"
+ (change)="editTimestampDomainProperty($event.checked)"
+ [checked]="isTimestampProperty"
+ color="accent"
+ data-cy="sp-mark-as-timestamp">
+ Mark as timestamp
+ </mat-checkbox>
+ </div>
+ <div *ngIf="isPrimitiveProperty" fxFlex="100" fxLayout="column">
+ <mat-form-field class="w-100" color="accent" fxFlex="100">
+ <input matInput placeholder="Semantic Type"
+ class="dmainProperty"
+ name="domainproperty"
+ id="domainproperty"
+ [(ngModel)]="cachedProperty.domainProperties[0]"
+ [matAutocomplete]="st"
+ [disabled]="isTimestampProperty"
+ [matAutocompleteDisabled]="isTimestampProperty"
+ [formControl]="domainPropertyControl">
+ <mat-autocomplete #st="matAutocomplete" [panelWidth]="'300px'">
+ <mat-option *ngFor="let semanticType of semanticTypes | async" [value]="semanticType"
+ style="font-size: 10pt;">
+ {{semanticType}}
+ </mat-option>
+ </mat-autocomplete>
+ </mat-form-field>
+ </div>
+ </sp-ep-settings-section>
+
+ <sp-ep-settings-section sectionTitle="Field data type"
+ sectionDescription="The data type of the field values"
+ *ngIf="!isTimestampProperty">
+ <sp-edit-data-type
+ [cachedProperty]="cachedProperty"
+ (dataTypeChanged)="dataTypeChanged.emit($event)">
+ </sp-edit-data-type>
+ </sp-ep-settings-section>
+</div>
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.scss b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.scss
similarity index 99%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.scss
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.scss
index 58ba04bdd..13cbc4aac 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.scss
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.scss
@@ -15,4 +15,3 @@
* limitations under the License.
*
*/
-
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.ts
new file mode 100644
index 000000000..b58d49996
--- /dev/null
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.ts
@@ -0,0 +1,78 @@
+/*
+ * 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, OnInit, Output } from '@angular/core';
+import { EventPropertyUnion, SemanticTypesService } from '@streampipes/platform-services';
+import { debounceTime, distinctUntilChanged, startWith, switchMap } from 'rxjs/operators';
+import { FormControl } from '@angular/forms';
+import { Observable } from 'rxjs';
+
+@Component({
+ selector: 'sp-edit-schema-transformation',
+ templateUrl: './edit-schema-transformation.component.html',
+ styleUrls: ['./edit-schema-transformation.component.scss']
+})
+export class EditSchemaTransformationComponent implements OnInit {
+
+ soTimestamp = 'http://schema.org/DateTime';
+
+ @Input()
+ cachedProperty: any;
+
+ @Input() isTimestampProperty: boolean;
+ @Input() isNestedProperty: boolean;
+ @Input() isListProperty: boolean;
+ @Input() isPrimitiveProperty: boolean;
+
+ @Output() dataTypeChanged = new EventEmitter<boolean>();
+ @Output() timestampSemanticsChanged = new EventEmitter<boolean>();
+
+ domainPropertyControl = new FormControl();
+ semanticTypes: Observable<string[]>;
+
+ constructor(private semanticTypesService: SemanticTypesService) {
+
+ }
+
+ ngOnInit(): void {
+ this.semanticTypes = this.domainPropertyControl.valueChanges
+ .pipe(
+ startWith(''),
+ debounceTime(400),
+ distinctUntilChanged(),
+ switchMap(val => {
+ return val ? this.semanticTypesService.getSemanticTypes(val) : [];
+ })
+ );
+ }
+
+ editTimestampDomainProperty(checked: boolean) {
+ if (checked) {
+ this.isTimestampProperty = true;
+ this.cachedProperty.domainProperties = [this.soTimestamp];
+ this.cachedProperty.propertyScope = 'HEADER_PROPERTY';
+ this.cachedProperty.runtimeType = 'http://www.w3.org/2001/XMLSchema#long';
+ } else {
+ this.cachedProperty.domainProperties = [];
+ this.cachedProperty.propertyScope = 'MEASUREMENT_PROPERTY';
+ this.isTimestampProperty = false;
+ }
+ this.timestampSemanticsChanged.emit(this.isTimestampProperty);
+ }
+
+}
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.html
index edc51e223..2d2562160 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.html
@@ -16,57 +16,70 @@
~
-->
-<div fxLayout="row" fxLayoutAlign="start" *ngIf="showUnitTransformation">
- <div class="form-group" fxFlexAlign="center" style="width: 155px">
- <mat-form-field *ngIf="!hadMeasurementUnit" class="example-full-width" style="width: 155px" color="accent">
- <input matInput
- placeholder="Unit"
- [matAutocomplete]="auto"
- [formControl]="stateCtrl"
- [attr.disabled]="transformUnitEnable ? '' : null"
- data-cy="connect-schema-unit-from-dropdown">
- <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn" [panelWidth]="'300px'">
- <mat-option
- *ngFor="let unit of filteredUnits | async"
- [value]="unit.label"
- [attr.data-cy]="unit.resource">
- {{unit.label}}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
- <mat-form-field *ngIf="hadMeasurementUnit"
- class="example-full-width"
- style="width: 155px"
- color="accent">
- <input matInput
- placeholder="Unit"
- disabled
- [(ngModel)]="oldMeasurementUnitDipsplay"
- data-cy="connect-schema-unit-from-input">
- </mat-form-field>
+<div class="general-options-panel" fxLayout="column">
+ <span class="general-options-header">Unit Transformation</span>
- </div>
- <button mat-button
- (click)="transformUnit()"
- color="accent"
- class="form-group"
- fxFlexAlign="center"
- style="min-width: 60px; max-width: 60px"
- data-cy="connect-schema-unit-transform-btn">
- <mat-icon *ngIf="!transformUnitEnable">arrow_forward</mat-icon>
- <mat-icon *ngIf="transformUnitEnable" style="transform: rotate(180deg)">arrow_forward</mat-icon>
- </button>
- <mat-form-field class="example-full-width" style="width: 155px" *ngIf="transformUnitEnable" color="accent">
- <mat-select placeholder="New Unit"
- [(ngModel)]="selectUnit"
- [formControl]="newUnitStateCtrl"
- [compareWith]="compareFn"
- data-cy="connect-schema-unit-to-dropdown">
- <mat-option *ngFor="let unit of possibleUnitTransformations" [value]="unit"
- (click)="changeTargetUnit(unit)">
- {{unit.label}}
- </mat-option>
- </mat-select>
- </mat-form-field>
+ <sp-ep-settings-section sectionTitle="Unit conversion"
+ sectionDescription="Converts the field value from the given measurement unit to the provided target unit"
+ fxFlex="100"
+ *ngIf="isPrimitiveProperty && !isTimestampProperty && isNumericProperty">
+ <div fxLayout="row">
+ <div class="w-100" fxLayoutAlign="start center" fxFlex="45">
+ <mat-form-field *ngIf="!hadMeasurementUnit" class="w-100" color="accent" fxFlex="100">
+ <input matInput
+ placeholder="Unit"
+ [matAutocomplete]="auto"
+ [formControl]="stateCtrl"
+ [attr.disabled]="transformUnitEnable ? '' : null"
+ data-cy="connect-schema-unit-from-dropdown">
+ <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn" [panelWidth]="'300px'">
+ <mat-option
+ *ngFor="let unit of filteredUnits | async"
+ [value]="unit.label"
+ [attr.data-cy]="unit.resource">
+ {{unit.label}}
+ </mat-option>
+ </mat-autocomplete>
+ </mat-form-field>
+ <mat-form-field *ngIf="hadMeasurementUnit"
+ class="example-full-width"
+ style="width: 155px"
+ color="accent">
+ <input matInput
+ placeholder="Unit"
+ disabled
+ [(ngModel)]="oldMeasurementUnitDipsplay"
+ data-cy="connect-schema-unit-from-input">
+ </mat-form-field>
+
+ </div>
+ <div fxFlex="10" fxLayoutAlign="center center">
+ <button mat-button
+ (click)="transformUnit()"
+ color="accent"
+ class="form-group"
+ fxFlexAlign="center"
+ style="min-width: 60px; max-width: 60px"
+ data-cy="connect-schema-unit-transform-btn">
+ <mat-icon *ngIf="!transformUnitEnable">arrow_forward</mat-icon>
+ <mat-icon *ngIf="transformUnitEnable" style="transform: rotate(180deg)">arrow_forward</mat-icon>
+ </button>
+ </div>
+ <div fxFlex="45" fxLayoutAlign="start center">
+ <mat-form-field class="w-100" *ngIf="transformUnitEnable" color="accent" fxFlex="100">
+ <mat-select placeholder="New Unit"
+ [(ngModel)]="selectUnit"
+ [formControl]="newUnitStateCtrl"
+ [compareWith]="compareFn"
+ data-cy="connect-schema-unit-to-dropdown">
+ <mat-option *ngFor="let unit of possibleUnitTransformations" [value]="unit"
+ (click)="changeTargetUnit(unit)">
+ {{unit.label}}
+ </mat-option>
+ </mat-select>
+ </mat-form-field>
+ </div>
+ </div>
+ </sp-ep-settings-section>
</div>
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
index 3c0415184..a796c5cea 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
@@ -32,6 +32,13 @@ import { UnitProviderService } from '../../../../services/unit-provider.service'
export class EditUnitTransformationComponent implements OnInit {
@Input() cachedProperty: any;
+
+ @Input() isTimestampProperty: boolean;
+ @Input() isNestedProperty: boolean;
+ @Input() isListProperty: boolean;
+ @Input() isPrimitiveProperty: boolean;
+ @Input() isNumericProperty: boolean;
+
@Input() showUnitTransformation: boolean;
private transformUnitEnable = false;
@@ -133,5 +140,16 @@ export class EditUnitTransformationComponent implements OnInit {
(this.cachedProperty as any).measurementUnitTmp = unit.resource;
this.newUnitStateCtrl.setValue(unit);
}
+
+ // setShowUnitTransformation() {
+ // this.hideUnitTransformation = this.isTimestampProperty ||
+ // !this.dataTypesService.isNumeric(this.cachedProperty.runtimeType);
+ //
+ // if (this.dataTypesService.isNumeric(this.cachedProperty.runtimeType)) {
+ // this.isNumericDataType.emit(true);
+ // } else {
+ // this.isNumericDataType.emit(false);
+ // }
+ // }
}
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component.html
similarity index 83%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.html
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component.html
index 049ebd825..c09542ba5 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component.html
@@ -17,18 +17,18 @@
-->
<div fxLayout="row" fxLayoutAlign="start">
- <div class="form-group" fxFlexAlign="center">
- <mat-form-field class="example-full-width" style="margin-right: 10px" color="accent">
+ <div fxFlex="70" fxLayoutAlign="start center">
+ <mat-form-field class="w-100" style="margin-right: 10px" color="accent">
<input matInput
name="correction"
placeholder="Correction Value"
[(ngModel)]="cachedProperty.correctionValue"
(change)="valueChanged()"
- data-cy="connect-schema-correction-value">
+ data-cy="connect-schema-correction-value">
</mat-form-field>
</div>
- <div class="form-group" fxFlexAlign="center">
- <mat-form-field class="example-full-width" color="accent">
+ <div fxFlex="30" fxLayoutAlign="start center">
+ <mat-form-field class="w-100" color="accent">
<mat-select
required
placeholder="Math Operator"
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.scss b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component.scss
similarity index 100%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.scss
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component.scss
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component.ts
similarity index 100%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.ts
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-correction-value/edit-correction-value.component.ts
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component.html
similarity index 79%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.html
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component.html
index 111b1376a..83c88345e 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component.html
@@ -17,7 +17,7 @@
-->
<div fxLayout="row" fxLayoutAlign="start">
- <mat-form-field class="doubleWidth" color="accent">
+ <mat-form-field class="w-100" color="accent" fxFlex="100">
<mat-select placeholder="Timestamp converter (unix timestamp)"
[(value)]="cachedProperty.timestampTransformationMode"
data-cy="connect-timestamp-converter">
@@ -31,16 +31,23 @@
<div fxLayout="row" fxLayoutAlign="start">
<div class="form-group" fxFlexAlign="center">
- <mat-form-field class="doubleWidth" *ngIf="cachedProperty.timestampTransformationMode === 'formatString'" color="accent">
+ <mat-form-field class="w-100"
+ *ngIf="cachedProperty.timestampTransformationMode === 'formatString'"
+ color="accent"
+ fxFlex="100">
<input matInput
placeholder="E.g. yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
data-cy="connect-timestamp-string-regex"
[(ngModel)]="cachedProperty.timestampTransformationFormatString">
</mat-form-field>
- <mat-form-field class="doubleWidth" *ngIf="cachedProperty.timestampTransformationMode === 'timeUnit'" color="accent">
+ <mat-form-field class="w-100"
+ *ngIf="cachedProperty.timestampTransformationMode === 'timeUnit'"
+ color="accent"
+ fxFlex="100">
<mat-select placeholder="Current time unit" [(value)]="selectedTimeMultiplier">
<mat-option value="milliseconds" (click)="cachedProperty.timestampTransformationMultiplier = 0">
- Milliseconds</mat-option>
+ Milliseconds
+ </mat-option>
<mat-option value="second" (click)="cachedProperty.timestampTransformationMultiplier = 1000">Seconds
</mat-option>
</mat-select>
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.scss b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component.scss
similarity index 100%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.scss
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component.scss
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component.ts
similarity index 100%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.ts
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component.ts
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.html
new file mode 100644
index 000000000..9703ccfd2
--- /dev/null
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.html
@@ -0,0 +1,55 @@
+<!--
+ ~ 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 class="general-options-panel" fxLayout="column">
+ <span class="general-options-header">Value Transformation</span>
+ <sp-ep-settings-section sectionTitle="Timestamp conversion"
+ sectionDescription="Formula to convert the field value to a UNIX timestamp in milliseconds"
+ fxLayout="column"
+ fxFlex="100"
+ *ngIf="isTimestampProperty">
+ <sp-edit-timestamp-property
+ [cachedProperty]="cachedProperty"
+ showEditTimestampProperty="!isTimestampProperty">
+ </sp-edit-timestamp-property>
+ </sp-ep-settings-section>
+ <sp-ep-settings-section sectionTitle="Value conversion"
+ sectionDescription="Converts the original field values using the provided formula"
+ fxLayout="column"
+ fxFlex="100"
+ *ngIf="isNumericProperty && !isTimestampProperty">
+ <sp-edit-correction-value
+ [cachedProperty]="cachedProperty">
+ <!--(correctionValueChanged)="enableSaveBtn($event)"-->
+ </sp-edit-correction-value>
+ </sp-ep-settings-section>
+ <sp-ep-settings-section sectionTitle="Static value assignment"
+ sectionDescription="Assigns a static value to each incoming event"
+ fxLayout="column"
+ fxFlex="100"
+ *ngIf="addedByUser">
+ <mat-form-field class="w-100" fxFlex="100">
+ <input matInput
+ placeholder="Static Value"
+ name="static_value"
+ id="static_value"
+ data-cy="connect-edit-field-static-value"
+ [(ngModel)]="cachedProperty.staticValue">
+ </mat-form-field>
+ </sp-ep-settings-section>
+</div>
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.scss b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.scss
similarity index 94%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.scss
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.scss
index 7a945ed0f..13cbc4aac 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.scss
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.scss
@@ -15,7 +15,3 @@
* limitations under the License.
*
*/
-
-.doubleWidth {
- width: 370px !important;
-}
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.ts
similarity index 54%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
rename to ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.ts
index 182685ebb..ec035d921 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-primitive/edit-event-property-primitive.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-value-transformation/edit-value-transformation.component.ts
@@ -16,47 +16,33 @@
*
*/
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { DataTypesService } from '../../../../services/data-type.service';
+import { Component, Input, OnInit } from '@angular/core';
@Component({
- selector: 'sp-edit-event-property-primitive',
- templateUrl: './edit-event-property-primitive.component.html',
- styleUrls: ['./edit-event-property-primitive.component.scss']
+ selector: 'sp-edit-value-transformation',
+ templateUrl: './edit-value-transformation.component.html',
+ styleUrls: ['./edit-value-transformation.component.scss']
})
-export class EditEventPropertyPrimitiveComponent implements OnInit {
+export class EditValueTransformationComponent implements OnInit {
- @Input() cachedProperty: any;
- @Input() index: number;
- @Input() isTimestampProperty: boolean;
- @Output() isNumericDataType = new EventEmitter<boolean>();
+ @Input()
+ cachedProperty: any;
- hideUnitTransformation: boolean;
+ @Input() isTimestampProperty: boolean;
+ @Input() isNestedProperty: boolean;
+ @Input() isListProperty: boolean;
+ @Input() isPrimitiveProperty: boolean;
+ @Input() isNumericProperty: boolean;
addedByUser: boolean;
- constructor(private dataTypesService: DataTypesService) {
- }
-
ngOnInit(): void {
- this.setShowUnitTransformation();
this.addedByUser = this.staticValueAddedByUser();
if (!this.cachedProperty.staticValue) {
this.cachedProperty.staticValue = '';
}
}
- setShowUnitTransformation() {
- this.hideUnitTransformation = this.isTimestampProperty ||
- !this.dataTypesService.isNumeric(this.cachedProperty.runtimeType);
-
- if (this.dataTypesService.isNumeric(this.cachedProperty.runtimeType)) {
- this.isNumericDataType.emit(true);
- } else {
- this.isNumericDataType.emit(false);
- }
- }
-
staticValueAddedByUser() {
return this.cachedProperty.elementId.startsWith('http://eventProperty.de/staticValue/');
}
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.html b/ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.html
similarity index 59%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.html
rename to ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.html
index 92c744bb9..be870a1a3 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.html
@@ -15,7 +15,17 @@
~ limitations under the License.
~
-->
-
-<sp-edit-data-type
- [cachedProperty]= "cachedProperty.eventProperty">
-</sp-edit-data-type>
+<div fxLayout="column" fxFlex="100">
+ <div fxLayout="row" fxFlex="100" class="ep-settings-section ep-settings-section-border">
+ <div fxFlex="30" style="margin-right: 10px;">
+ <div fxLayout="column" fxFlex="100">
+ <b>{{sectionTitle}}</b>
+ <mat-hint class="description">{{sectionDescription}}</mat-hint>
+ </div>
+ </div>
+ <div fxFlex fxLayout="column">
+ <ng-content fxLayout="column" fxFlex="100"></ng-content>
+ </div>
+ </div>
+<!-- <mat-divider></mat-divider>-->
+</div>
diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.scss b/ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.scss
similarity index 79%
copy from ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.scss
copy to ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.scss
index 03fa4b4b5..5074a34ae 100644
--- a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.scss
+++ b/ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.scss
@@ -16,11 +16,17 @@
*
*/
-.doubleWidth {
- width: 370px !important;
+.ep-settings-section {
+ padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ margin-right: 5px;
}
-.mat-dialog-actions {
- justify-content: flex-end;
+.ep-settings-section-border {
+ border-left:5px solid gray;
}
+.description {
+ font-size: 10px;
+}
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.ts
similarity index 69%
rename from ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
rename to ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.ts
index 6c95c1321..7700e3e6e 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-event-property-list/edit-event-property-list.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/ep-settings-section/ep-settings-section.component.ts
@@ -16,17 +16,24 @@
*
*/
-import { Component, Input } from '@angular/core';
+
+import { Component, Input, OnInit } from '@angular/core';
@Component({
- selector: 'sp-edit-event-property-list',
- templateUrl: './edit-event-property-list.component.html',
- styleUrls: ['./edit-event-property-list.component.scss']
+ selector: 'sp-ep-settings-section',
+ templateUrl: './ep-settings-section.component.html',
+ styleUrls: ['./ep-settings-section.component.scss']
})
-export class EditEventPropertyListComponent {
+export class SpEpSettingsSectionComponent implements OnInit {
+
+ @Input()
+ sectionTitle: string;
+
+ @Input()
+ sectionDescription: string;
- constructor() { }
+ ngOnInit(): void {
+ }
- @Input() cachedProperty: any;
}
diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html
index a67a46119..132efac8b 100644
--- a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html
@@ -16,83 +16,103 @@
~
-->
-<h2 mat-dialog-title>Edit field {{property.runtimeName}}</h2>
-<mat-dialog-content>
- <form #propertyForm="ngForm">
- <div fxLayout="row" fxLayoutAlign="start">
- <div class="form-group" fxFlexAlign="center">
- <mat-form-field class="example-full-width" style="margin-right: 10px" color="accent">
- <input matInput placeholder="Label" name="label" id="label" [(ngModel)]="cachedProperty.label">
- </mat-form-field>
- </div>
- <div attr.id="input-runtime-name-{{cachedProperty.label}}" class="form-group" fxFlexAlign="center">
- <mat-form-field class="example-full-width" color="accent">
- <input matInput
- placeholder="RuntimeName"
- name="runtimename"
- id="runtimename"
- data-cy="connect-edit-field-runtime-name"
- [(ngModel)]="cachedProperty.runtimeName">
- </mat-form-field>
- </div>
- </div>
+<div class="sp-dialog-container">
+ <div class="sp-dialog-content p-15">
+ <div fxFlex="100"
+ fxLayout="column">
+ <form #propertyForm="ngForm"
+ fxLayout="column">
+ <div fxLayout="column"
+ fxLayoutAlign="start"
+ fxFlex="100">
+ <div class="general-options-panel"
+ fxLayout="column"
+ fxFlex="100">
+ <span class="general-options-header">Basics</span>
+ <sp-ep-settings-section sectionTitle="Field label"
+ sectionDescription="A label for better readability">
+ <mat-form-field class="w-100"
+ color="accent">
+ <input matInput
+ placeholder="Label"
+ name="label"
+ id="label"
+ [(ngModel)]="cachedProperty.label">
+ </mat-form-field>
+ </sp-ep-settings-section>
+ <sp-ep-settings-section sectionTitle="Field description"
+ sectionDescription="A description for better readability">
+ <mat-form-field class="full-width"
+ color="accent">
+ <textarea matInput
+ name="description"
+ placeholder="Description"
+ id="description"
+ [(ngModel)]="cachedProperty.description" cols="20" rows="2">
+ </textarea>
+ </mat-form-field>
+ </sp-ep-settings-section>
+ </div>
- <div class="form-group">
- <mat-form-field class="doubleWidth" color="accent">
- <textarea matInput name="description" placeholder="Description" id="description"
- [(ngModel)]="cachedProperty.description" cols="20" rows="2"></textarea>
- </mat-form-field>
- </div>
- <sp-edit-correction-value
- *ngIf="isNumericProperty && !isTimestampProperty"
- [cachedProperty]="cachedProperty"
- (correctionValueChanged)="enableSaveBtn($event)">
- </sp-edit-correction-value>
+ <sp-edit-schema-transformation [cachedProperty]="cachedProperty"
+ [isTimestampProperty]="isTimestampProperty"
+ [isNestedProperty]="isEventPropertyNested"
+ [isListProperty]="isEventPropertyList"
+ [isPrimitiveProperty]="isEventPropertyPrimitive"
+ *ngIf="!isEventPropertyNested"
+ (dataTypeChanged)="handleDataTypeChange($event)"
+ (timestampSemanticsChanged)="handleTimestampChange($event)"
+ #schemaTransformationComponent>
- <div class="form-group">
- <mat-form-field class="doubleWidth" color="accent">
- <input matInput placeholder="Semantic Type" class="dmainProperty" name="domainproperty" id="domainproperty"
- [(ngModel)]="cachedProperty.domainProperties[0]"
- [matAutocomplete]="st"
- [formControl]="domainPropertyControl">
- <mat-autocomplete #st="matAutocomplete" [panelWidth]="'300px'">
- <mat-option *ngFor="let semanticType of semanticTypes | async" [value]="semanticType" style="font-size: 10pt;">
- {{semanticType}}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
- <div *ngIf="!isEventPropertyNested">
- <mat-checkbox name="timestampCheckbox"
- (change)="editTimestampDomainProperty($event.checked)"
- [checked]="isTimestampProperty"
- color="accent"
- data-cy="sp-mark-as-timestamp">
- Mark as timestamp
- </mat-checkbox>
- </div>
- </div>
- </form>
+ </sp-edit-schema-transformation>
+
+ <sp-edit-value-transformation [cachedProperty]="cachedProperty"
+ *ngIf="isEventPropertyPrimitive"
+ [isTimestampProperty]="isTimestampProperty"
+ [isNumericProperty]="isNumericProperty"
+ [isNestedProperty]="isEventPropertyNested"
+ [isListProperty]="isEventPropertyList"
+ [isPrimitiveProperty]="isEventPropertyPrimitive"
+ #valueTransformationComponent>
+ </sp-edit-value-transformation>
+
+ <sp-edit-unit-transformation *ngIf="!isTimestampProperty && isEventPropertyPrimitive"
+ [cachedProperty]="cachedProperty"
+ [isTimestampProperty]="isTimestampProperty"
+ [isNumericProperty]="isNumericProperty"
+ [isPrimitiveProperty]="isEventPropertyPrimitive"
+ #unitTransformationComponent>
+ </sp-edit-unit-transformation>
- <sp-edit-event-property-primitive
- *ngIf="isEventPropertyPrimitive"
- [isTimestampProperty]="isTimestampProperty"
- [cachedProperty]="cachedProperty"
- (isNumericDataType)="isNumericDataType($event)">
- </sp-edit-event-property-primitive>
- <sp-edit-event-property-list
- *ngIf="isEventPropertyList"
- [cachedProperty]="cachedProperty">
- </sp-edit-event-property-list>
-</mat-dialog-content>
+ </div>
-<mat-dialog-actions>
- <button mat-button mat-raised-button class="mat-basic" mat-dialog-close>Close</button>
- <button mat-button mat-raised-button color="accent"
- [disabled]="isSaveBtnEnabled"
- (click)="save();
+
+ </form>
+
+ <!-- <sp-edit-event-property-primitive-->
+ <!-- *ngIf="isEventPropertyPrimitive"-->
+ <!-- [isTimestampProperty]="isTimestampProperty"-->
+ <!-- [cachedProperty]="cachedProperty"-->
+ <!-- (isNumericDataType)="isNumericDataType($event)">-->
+ <!-- </sp-edit-event-property-primitive>-->
+ <!-- <sp-edit-event-property-list-->
+ <!-- *ngIf="isEventPropertyList"-->
+ <!-- [cachedProperty]="cachedProperty">-->
+ <!-- </sp-edit-event-property-list>-->
+ </div>
+ </div>
+ <mat-divider></mat-divider>
+ <div class="sp-dialog-actions">
+ <button mat-button mat-raised-button color="accent"
+ [disabled]="isSaveBtnEnabled"
+ (click)="save();
isSaveBtnEnabled = false"
- data-cy="sp-save-edit-property">
- Save</button>
-</mat-dialog-actions>
+ style="margin-right: 10px;"
+ data-cy="sp-save-edit-property">
+ Save
+ </button>
+ <button mat-button mat-raised-button class="mat-basic" (click)="dialogRef.close()">Close</button>
+ </div>
+</div>
diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.scss b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.scss
index 03fa4b4b5..85d8c6aa3 100644
--- a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.scss
+++ b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.scss
@@ -16,6 +16,8 @@
*
*/
+@import '../../../../scss/sp/sp-dialog.scss';
+
.doubleWidth {
width: 370px !important;
}
@@ -24,3 +26,7 @@
justify-content: flex-end;
}
+.full-width {
+ width: 100%;
+}
+
diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
index d7c71890f..75ba40afd 100644
--- a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
@@ -16,20 +16,21 @@
*
*/
-import { Component, EventEmitter, Inject, OnInit, Output } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import {
- EventPropertyList,
- EventPropertyNested,
- EventPropertyPrimitive,
- EventPropertyUnion,
- SemanticTypesService
+ EventPropertyList,
+ EventPropertyNested,
+ EventPropertyPrimitive,
+ EventPropertyUnion,
+ SemanticTypesService
} from '@streampipes/platform-services';
import { SemanticTypeUtilsService } from '../../../core-services/semantic-type/semantic-type-utils.service';
import { DataTypesService } from '../../services/data-type.service';
-import { Observable } from 'rxjs';
-import { debounceTime, distinctUntilChanged, startWith, switchMap } from 'rxjs/operators';
+import { DialogRef } from '../../../../../dist/streampipes/shared-ui';
+import { EditSchemaTransformationComponent } from './components/edit-schema-transformation/edit-schema-transformation.component';
+import { EditValueTransformationComponent } from './components/edit-value-transformation/edit-value-transformation.component';
+import { EditUnitTransformationComponent } from './components/edit-unit-transformation/edit-unit-transformation.component';
@Component({
selector: 'sp-edit-event-property',
@@ -38,13 +39,16 @@ import { debounceTime, distinctUntilChanged, startWith, switchMap } from 'rxjs/o
})
export class EditEventPropertyComponent implements OnInit {
- soTimestamp = 'http://schema.org/DateTime';
+ @Input() property: EventPropertyUnion;
+ @Input() isEditable: boolean;
@Output() propertyChange = new EventEmitter<EventPropertyUnion>();
+ schemaTransformationComponent: EditSchemaTransformationComponent;
+ valueTransformationComponent: EditValueTransformationComponent;
+ unitTransformationComponent: EditUnitTransformationComponent;
+
cachedProperty: any;
- property: any;
- isEditable: boolean;
isTimestampProperty = false;
isEventPropertyPrimitive: boolean;
@@ -53,15 +57,11 @@ export class EditEventPropertyComponent implements OnInit {
isNumericProperty: boolean;
isSaveBtnEnabled: boolean;
- semanticTypes: Observable<string[]>;
-
private propertyForm: FormGroup;
- domainPropertyControl = new FormControl();
private runtimeDataTypes;
- constructor(@Inject(MAT_DIALOG_DATA) public data: any,
- private dialogRef: MatDialogRef<EditEventPropertyComponent>,
+ constructor(public dialogRef: DialogRef<EditEventPropertyComponent>,
private formBuilder: FormBuilder,
private dataTypeService: DataTypesService,
private semanticTypeUtilsService: SemanticTypeUtilsService,
@@ -69,8 +69,6 @@ export class EditEventPropertyComponent implements OnInit {
}
ngOnInit(): void {
- this.property = this.data.property;
- this.isEditable = this.data.isEditable;
this.cachedProperty = this.copyEp(this.property);
this.runtimeDataTypes = this.dataTypeService.getDataTypes();
this.isTimestampProperty = this.semanticTypeUtilsService.isTimestamp(this.cachedProperty);
@@ -80,15 +78,7 @@ export class EditEventPropertyComponent implements OnInit {
this.isNumericProperty = this.semanticTypeUtilsService.isNumeric(this.cachedProperty) ||
this.dataTypeService.isNumeric(this.cachedProperty.runtimeType);
this.createForm();
- this.semanticTypes = this.domainPropertyControl.valueChanges
- .pipe(
- startWith(''),
- debounceTime(400),
- distinctUntilChanged(),
- switchMap(val => {
- return val ? this.semanticTypesService.getSemanticTypes(val) : [];
- })
- );
+
}
copyEp(ep: EventPropertyUnion) {
@@ -131,19 +121,6 @@ export class EditEventPropertyComponent implements OnInit {
return (this.property.elementId.startsWith('http://eventProperty.de/staticValue/'));
}
- editTimestampDomainProperty(checked: boolean) {
- if (checked) {
- this.isTimestampProperty = true;
- this.cachedProperty.domainProperties = [this.soTimestamp];
- this.cachedProperty.propertyScope = 'HEADER_PROPERTY';
- this.cachedProperty.runtimeType = 'http://www.w3.org/2001/XMLSchema#long';
- } else {
- this.cachedProperty.domainProperties = [];
- this.cachedProperty.propertyScope = 'MEASUREMENT_PROPERTY';
- this.isTimestampProperty = false;
- }
- }
-
save(): void {
this.property.label = this.cachedProperty.label;
this.property.description = this.cachedProperty.description;
@@ -176,7 +153,7 @@ export class EditEventPropertyComponent implements OnInit {
(this.property as any).correctionValue = (this.cachedProperty as any).correctionValue;
(this.property as any).operator = (this.cachedProperty as any).operator;
}
- this.dialogRef.close({ data: this.property });
+ this.dialogRef.close({data: this.property});
}
enableSaveBtn($event: boolean) {
@@ -191,4 +168,24 @@ export class EditEventPropertyComponent implements OnInit {
}
this.isNumericProperty = $event;
}
+
+ handleDataTypeChange(changed: boolean) {
+ this.isNumericProperty = this.dataTypeService.isNumeric(this.cachedProperty.runtimeType);
+ }
+
+ handleTimestampChange(isTimestamp: boolean) {
+ this.isTimestampProperty = isTimestamp;
+ }
+
+ @ViewChild('schemaTransformationComponent') set schemaTransformation(comp: EditSchemaTransformationComponent) {
+ this.schemaTransformationComponent = comp;
+ }
+
+ @ViewChild('unitTransformationComponent') set unitTransformation(comp: EditUnitTransformationComponent) {
+ this.unitTransformationComponent = comp;
+ }
+
+ @ViewChild('valueTransformationComponent') set valueTransformation(comp: EditValueTransformationComponent) {
+ this.valueTransformationComponent = comp;
+ }
}
diff --git a/ui/src/scss/sp/widgets.scss b/ui/src/scss/sp/widgets.scss
index 58f8c6ed9..fca4f0612 100644
--- a/ui/src/scss/sp/widgets.scss
+++ b/ui/src/scss/sp/widgets.scss
@@ -42,14 +42,17 @@
.general-options-panel {
margin-top: 4px;
- margin-bottom: 4px;
+ margin-bottom: 8px;
border: 1px solid var(--color-bg-3);
background: var(--color-bg-1);
padding: 5px;
}
.general-options-header {
- margin-right: 10px;
+ //margin-right: 10px;
margin-bottom: 10px;
font-weight: bold;
+ border-left: 4px solid var(--color-primary);
+ padding-left: 5px;
+ font-size: 13pt;
}
[incubator-streampipes] 03/03: [hotfix] Use default value for machine simulator frequency
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 633821a0f673af88dac056125be517d4d02dd275
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sun Jul 10 12:09:29 2022 +0200
[hotfix] Use default value for machine simulator frequency
---
.../iiot/adapters/simulator/machine/MachineDataStreamAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataStreamAdapter.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataStreamAdapter.java
index e661a7cda..aaf7a90ee 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataStreamAdapter.java
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataStreamAdapter.java
@@ -59,7 +59,7 @@ public class MachineDataStreamAdapter extends SpecificDataStreamAdapter {
.withAssets(Assets.DOCUMENTATION, Assets.ICON)
.withLocales(Locales.EN)
.category(AdapterType.Debugging)
- .requiredIntegerParameter(Labels.withId(WAIT_TIME_MS))
+ .requiredIntegerParameter(Labels.withId(WAIT_TIME_MS), 1000)
.requiredSingleValueSelection(Labels.withId(SELECTED_SIMULATOR_OPTION), Options.from(
"flowrate", "pressure", "waterlevel"))
.build();
[incubator-streampipes] 01/03: [STREAMPIPES-558] Improve layout of guess schema view
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 4bfdaca1a88a328fa18fd0d4fdd4016d6515dce0
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sat Jul 9 12:21:21 2022 +0200
[STREAMPIPES-558] Improve layout of guess schema view
---
.../new-adapter/new-adapter.component.html | 6 ++--
.../event-property-row.component.html | 24 ++++++++++------
.../event-property-row.component.scss | 16 +++++++++++
ui/src/scss/sp/layout.scss | 32 ++++++++++++++++++++++
4 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/ui/src/app/connect/components/new-adapter/new-adapter.component.html b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
index 765d60e63..ff3275fb9 100644
--- a/ui/src/app/connect/components/new-adapter/new-adapter.component.html
+++ b/ui/src/app/connect/components/new-adapter/new-adapter.component.html
@@ -19,12 +19,12 @@
<sp-basic-view [padding]="true" [showBackLink]="false">
<div nav fxFlex="100" fxLayout="row" fxLayoutAlign="end center">
- <button mat-icon-button (click)="removeSelection()">
+ <button mat-icon-button (click)="removeSelection()" matTooltip="Cancel">
<i class="material-icons">close</i>
</button>
</div>
<div fxLayout="column" fxLayoutAlign="center stretch" *ngIf="adapter">
- <div fxLayout="column" fxFlex="100" class="p-10">
+ <div fxLayout="column" fxFlex="100">
<div fxLayout="row" fxLayoutAlign="start center">
<mat-icon *ngIf="isDataSetDescription" class="historic">lens</mat-icon>
<mat-icon *ngIf="isDataStreamDescription" class="real-time">lens
@@ -69,7 +69,7 @@
</mat-step>
<mat-step>
- <ng-template matStepLabel>Define Event Schema</ng-template>
+ <ng-template matStepLabel>Configure fields</ng-template>
<sp-event-schema #eschema fxLayout="column" fxFlex="100"
[(isEditable)]="isEditable"
[adapterDescription]="adapter"
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
index df176591a..31e7c672b 100644
--- a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
+++ b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.html
@@ -17,24 +17,28 @@
-->
<div fxLayout="row">
- <div fxFlex="1 1 auto" fxLayout="row">
+ <div fxFlex="1 1 auto" fxLayout="row" fxLayoutAlign="start center">
<b>
{{ label }}
</b>
- <mat-icon *ngIf="timestampProperty"
- style="font-size: 15px; padding: 4px;">
- access_time
- </mat-icon>
+ <span class="timestamp-property" *ngIf="timestampProperty" fxLayoutAlign="start center" fxLayout="row">
+ <mat-icon *ngIf="timestampProperty" class="timestamp-icon" fxLayout="row" fxLayoutAlign="start center">
+ access_time
+ </mat-icon>
+ marked as timestamp
+ </span>
<p style="margin: 0px 10px 10px;" *ngIf="isList">[List]</p>
</div>
- <div fxFlex="15" *ngIf="isPrimitive">
- <mat-select [(ngModel)]="node.data.propertyScope"
+ <div fxFlex="15" *ngIf="isPrimitive" fxLayoutAlign="center center">
+ <mat-form-field class="small-select" color="accent">
+ <mat-select [(ngModel)]="node.data.propertyScope" panelClass="small-select"
[attr.data-cy]="'property-scope-' + label">
<mat-option value="MEASUREMENT_PROPERTY">Measurement</mat-option>
<mat-option value="DIMENSION_PROPERTY">Dimension</mat-option>
<mat-option value="HEADER_PROPERTY">Header</mat-option>
</mat-select>
+ </mat-form-field>
</div>
<div fxFlex="0 1 auto" fxLayoutAlign="center center"
@@ -43,12 +47,14 @@
<mat-icon matTooltip="Add a Nested Property">queue</mat-icon>
</button>
</div>
- <div fxFlex="0 1 auto" fxLayoutAlign="center center"
+ <div fxFlex="0 1 auto"
+ fxLayoutAlign="center center"
+ class="ml-5 mr-5"
*ngIf="isNested || isPrimitive || isList">
<button [disabled]="!isEditable" color="accent" mat-button
(click)="openEditDialog(node.data)"
[attr.data-cy]="'edit-' + label.toLowerCase()">
- <mat-icon>edit</mat-icon>
+ <mat-icon>edit</mat-icon> Edit field
</button>
</div>
<div fxFlex="0 1 auto" fxLayoutAlign="center center">
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.scss b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.scss
index a3becc8ef..aa6f60f17 100644
--- a/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.scss
+++ b/ui/src/app/connect/components/new-adapter/schema-editor/event-property-row/event-property-row.component.scss
@@ -28,3 +28,19 @@
.checkbox-selected {
opacity: 1 !important;
}
+
+.timestamp-property {
+ margin-left: 15px;
+ border-radius: 10px;
+ background: var(--color-processor);
+ padding: 0px 10px;
+ font-size: 12px;
+ color: #FFFFFF;
+}
+
+.timestamp-icon {
+ font-size: 12px;
+}
+
+
+
diff --git a/ui/src/scss/sp/layout.scss b/ui/src/scss/sp/layout.scss
index 2ed106575..64ae3550b 100644
--- a/ui/src/scss/sp/layout.scss
+++ b/ui/src/scss/sp/layout.scss
@@ -88,6 +88,9 @@
margin-right: 5px;
}
+.ml-5 {
+ margin-left: 5px;
+}
.mr-15 {
margin-right: 15px;
@@ -163,3 +166,32 @@ img {
.mat-expansion-panel-body {
padding: 0 !important;
}
+
+.small-select mat-select {
+ background-color: rgba(58, 40, 8, 0.12);
+ padding: 6px 10px 6px 10px;
+ box-sizing: border-box;
+ border-radius: 5px;
+}
+
+.small-select .mat-select-value {
+ font-size: 16px;
+ color: var(--color-accent);
+}
+
+.small-select .mat-form-field-underline {
+ display: none;
+}
+
+.small-select mat-select-trigger div>i {
+ margin-right: 8px;
+}
+
+.small-select .mat-form-field-infix {
+ padding: 0;
+ border-top: 0;
+}
+
+.small-select .mat-form-field-wrapper {
+ padding-bottom: 0;
+}