This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch STREAMPIPES-145 in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 6571665f8411cf1bd914ab2d447172bafaa76d99 Author: Dominik Riemer <[email protected]> AuthorDate: Sun Jul 12 00:28:00 2020 +0200 [STREAMPIPES-145] Migrate user-defined output strategy --- .../static-property.component.html | 4 +- .../custom-output-strategy.component.ts | 2 +- .../output-strategy/output-strategy.component.html | 14 ++-- .../output-strategy/output-strategy.component.scss | 6 ++ .../user-defined-output.component.html | 46 ++++++++++++ .../user-defined-output.component.ts | 84 ++++++++++++++++++++++ ui/src/app/editor-v2/editor.module.ts | 3 + 7 files changed, 149 insertions(+), 10 deletions(-) diff --git a/ui/src/app/connect/static-properties/static-property.component.html b/ui/src/app/connect/static-properties/static-property.component.html index a9e9bd6..eb68701 100644 --- a/ui/src/app/connect/static-properties/static-property.component.html +++ b/ui/src/app/connect/static-properties/static-property.component.html @@ -18,11 +18,11 @@ <div fxFlex="100" fxLayout="column"> <div fxFlex="100" fxLayout="row" class="static-property-panel"> - <div fxFlex="40" fxLayout="column"> + <div fxFlex="30" fxLayout="column"> <b>{{staticProperty.label}}</b> <mat-hint class="description">{{staticProperty.description}}</mat-hint> </div> - <div fxFlex="60"> + <div fxFlex="70"> <app-static-code-input *ngIf="isCodeInputStaticProperty(staticProperty)" [staticProperty]="staticProperty" [parentForm]="parentForm" diff --git a/ui/src/app/editor-v2/components/output-strategy/custom-output/custom-output-strategy.component.ts b/ui/src/app/editor-v2/components/output-strategy/custom-output/custom-output-strategy.component.ts index cc19057..e39c71a 100644 --- a/ui/src/app/editor-v2/components/output-strategy/custom-output/custom-output-strategy.component.ts +++ b/ui/src/app/editor-v2/components/output-strategy/custom-output/custom-output-strategy.component.ts @@ -20,7 +20,7 @@ import {Component, OnInit} from "@angular/core"; import {CustomOutputStrategy} from "../../../../core-model/gen/streampipes-model"; import {BaseOutputStrategy} from "../base/BaseOutputStrategy"; import {PropertySelectorService} from "../../../../services/property-selector.service"; -import {FormControl, Validators} from "@angular/forms"; +import {FormControl} from "@angular/forms"; @Component({ selector: 'custom-output-strategy', diff --git a/ui/src/app/editor-v2/components/output-strategy/output-strategy.component.html b/ui/src/app/editor-v2/components/output-strategy/output-strategy.component.html index 449a6ba..9e7a6c3 100644 --- a/ui/src/app/editor-v2/components/output-strategy/output-strategy.component.html +++ b/ui/src/app/editor-v2/components/output-strategy/output-strategy.component.html @@ -18,10 +18,10 @@ <div fxFlex="100" fxLayout="column"> <div fxFlex="100" fxLayout="row" class="static-property-panel"> - <div fxFlex="40" fxLayout="column"> + <div fxFlex="30" fxLayout="column"> <b>Select output</b> </div> - <div fxFlex="60"> + <div fxFlex="70"> <div class="customize-item-content" *ngIf="outputStrategy['@class'] === 'org.apache.streampipes.model.output.CustomOutputStrategy'"> <custom-output-strategy [outputStrategy]="outputStrategy" @@ -32,11 +32,11 @@ </div> <div class="customize-item-content" *ngIf="outputStrategy['@class'] === 'org.apache.streampipes.model.output.UserDefinedOutputStrategy'"> - <user-defined-output output-strategy="outputStrategy" - selected-element="ctrl.selectedElement" - customize-form="ctrl.customizeForm" - restricted-edit-mode="ctrl.restrictedEditMode"> - </user-defined-output> + <user-defined-output-strategy [outputStrategy]="outputStrategy" + [selectedElement]="selectedElement" + [parentForm]="parentForm" + [restrictedEditMode]="restrictedEditMode"> + </user-defined-output-strategy> </div> </div> </div> diff --git a/ui/src/app/editor-v2/components/output-strategy/output-strategy.component.scss b/ui/src/app/editor-v2/components/output-strategy/output-strategy.component.scss index 58ba04b..e513418 100644 --- a/ui/src/app/editor-v2/components/output-strategy/output-strategy.component.scss +++ b/ui/src/app/editor-v2/components/output-strategy/output-strategy.component.scss @@ -16,3 +16,9 @@ * */ +.static-property-panel { + border-left:5px solid gray; + padding-left: 10px; + margin-bottom: 10px; + margin-top: 10px; +} \ No newline at end of file diff --git a/ui/src/app/editor-v2/components/output-strategy/user-defined-output/user-defined-output.component.html b/ui/src/app/editor-v2/components/output-strategy/user-defined-output/user-defined-output.component.html index e40d375..026f929 100644 --- a/ui/src/app/editor-v2/components/output-strategy/user-defined-output/user-defined-output.component.html +++ b/ui/src/app/editor-v2/components/output-strategy/user-defined-output/user-defined-output.component.html @@ -16,3 +16,49 @@ ~ --> +<div fxFlex="100" fxLayout="column"> + <div fxFlex="100" fxLayout="row" fxLayoutAlign="start center" style="margin-bottom:20px;"> + <button mat-button mat-raised-button color="primary" class="small-button" + (click)="applyDefaultSchema()" + style="margin-right:10px;margin-left:10px;" [disabled]="restrictedEditMode">Use input schema + </button> + </div> + + <div fxFlex="100" fxLayout="row" *ngFor="let ep of outputStrategy.eventProperties; let i = index"> + <div fxLayout="column" fxFlex="30"> + <mat-form-field fxFlex> + <mat-label>Runtime name</mat-label> + <input [(ngModel)]="ep.runtimeName" fxFlex + matInput> + </mat-form-field> + </div> + <div fxLayout="column" fxFlex="30"> + <mat-form-field class="example-full-width"> + <mat-label>Runtime type</mat-label> + <mat-select [(ngModel)]="ep.runtimeType" [disabled]="restrictedEditMode"> + <mat-option *ngFor="let primitive of primitiveClasses" [value]="primitive.id"> + {{primitive.label}} + </mat-option> + </mat-select> + </mat-form-field> + </div> + <div fxLayout="column" fxFlex="30"> + <mat-form-field fxFlex> + <mat-label>Semantic type</mat-label> + <input [(ngModel)]="ep.domainProperties[0]" [disabled]="restrictedEditMode" fxFlex + matInput> + </mat-form-field> + </div> + <div fxLayout="column" fxFlex="10"> + <button mat-icon-button class="icon-button" (click)="removeProperty(ep)" [disabled]="restrictedEditMode"> + <mat-icon class="icon">remove</mat-icon> + </button> + </div> + </div> + <div> + <button mat-button mat-flat-button (click)="addProperty()" [disabled]="restrictedEditMode"> + <mat-icon class="icon">add</mat-icon> + <span>Add field</span> + </button> + </div> +</div> \ No newline at end of file diff --git a/ui/src/app/editor-v2/components/output-strategy/user-defined-output/user-defined-output.component.ts b/ui/src/app/editor-v2/components/output-strategy/user-defined-output/user-defined-output.component.ts index 58ba04b..c26ff64 100644 --- a/ui/src/app/editor-v2/components/output-strategy/user-defined-output/user-defined-output.component.ts +++ b/ui/src/app/editor-v2/components/output-strategy/user-defined-output/user-defined-output.component.ts @@ -16,3 +16,87 @@ * */ +import {Component, OnInit} from "@angular/core"; +import {BaseOutputStrategy} from "../base/BaseOutputStrategy"; +import { + EventPropertyPrimitive, + UserDefinedOutputStrategy +} from "../../../../core-model/gen/streampipes-model"; +import {FormControl} from "@angular/forms"; + +@Component({ + selector: 'user-defined-output-strategy', + templateUrl: './user-defined-output.component.html', + styleUrls: ['./user-defined-output.component.scss'] +}) +export class UserDefinedOutputStrategyComponent extends BaseOutputStrategy<UserDefinedOutputStrategy> implements OnInit{ + + private prefix = "urn:streampipes.org:spi:"; + private chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + + collectedPropertiesFirstStream: any; + collectedPropertiesSecondStream: any; + + primitiveClasses = [{"label": "String", "id": "http://www.w3.org/2001/XMLSchema#string"}, + {"label": "Boolean", "id": "http://www.w3.org/2001/XMLSchema#boolean"}, + {"label": "Integer", "id": "http://www.w3.org/2001/XMLSchema#integer"}, + {"label": "Long", "id": "http://www.w3.org/2001/XMLSchema#long"}, + {"label": "Double", "id": "http://www.w3.org/2001/XMLSchema#double"}, + {"label": "Float", "id": "http://www.w3.org/2001/XMLSchema#float"}]; + + constructor() { + super(); + } + + ngOnInit() { + this.parentForm.addControl("output-strategy", new FormControl()); + if (!this.outputStrategy.eventProperties) { + this.outputStrategy.eventProperties = []; + } + this.checkFormValidity() + } + + applyDefaultSchema() { + this.outputStrategy.eventProperties = + [...this.selectedElement.inputStreams[0].eventSchema.eventProperties]; + this.checkFormValidity(); + } + + removeProperty(ep: any) { + this.outputStrategy.eventProperties + .splice(this.outputStrategy.eventProperties.indexOf(ep), 1); + this.checkFormValidity(); + } + + addProperty() { + this.outputStrategy.eventProperties.push(this.makeDefaultProperty()); + this.checkFormValidity(); + } + + makeDefaultProperty() { + let ep = {} as EventPropertyPrimitive; + ep["@class"] = "org.apache.streampipes.model.schema.EventPropertyPrimitive"; + ep.domainProperties = []; + ep.elementId = "urn:streampipes.org:spi:eventpropertyprimitive:" + this.makeId(); + + return ep; + } + + makeId() { + return this.prefix + this.randomString(6); + } + + randomString(length) { + let result = ''; + for (let i = length; i > 0; --i) result += this.chars[Math.floor(Math.random() * this.chars.length)]; + return result; + } + + checkFormValidity() { + if (!this.outputStrategy.eventProperties || this.outputStrategy.eventProperties.length == 0) { + this.parentForm.controls["output-strategy"].setErrors({}); + } else { + this.parentForm.controls["output-strategy"].setErrors(undefined); + } + } +} \ No newline at end of file diff --git a/ui/src/app/editor-v2/editor.module.ts b/ui/src/app/editor-v2/editor.module.ts index 941c999..75b7242 100644 --- a/ui/src/app/editor-v2/editor.module.ts +++ b/ui/src/app/editor-v2/editor.module.ts @@ -59,6 +59,8 @@ import {MissingElementsForTutorialComponent} from "./dialog/missing-elements-for import {OutputStrategyComponent} from "./components/output-strategy/output-strategy.component"; import {CustomOutputStrategyComponent} from "./components/output-strategy/custom-output/custom-output-strategy.component"; import {PropertySelectionComponent} from "./components/output-strategy/property-selection/property-selection.component"; +import {UserDefinedOutputComponent} from "../editor/components/userdefinedoutput/user-defined-output.component"; +import {UserDefinedOutputStrategyComponent} from "./components/output-strategy/user-defined-output/user-defined-output.component"; @NgModule({ imports: [ @@ -86,6 +88,7 @@ import {PropertySelectionComponent} from "./components/output-strategy/property- MatchingErrorComponent, MissingElementsForTutorialComponent, OutputStrategyComponent, + UserDefinedOutputStrategyComponent, PipelineAssemblyComponent, PipelineElementComponent, PipelineElementDocumentationComponent,
