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 c6cdc93aac65294f0d8c725cf2a7a60b555e2323 Merge: db5372f 5a22947 Author: Dominik Riemer <[email protected]> AuthorDate: Thu Jul 2 22:14:55 2020 +0200 Merge branch 'STREAMPIPES-145' of github.com:apache/incubator-streampipes into STREAMPIPES-145 ui/src/app/connect/connect.module.ts | 143 ++++++++-------- .../edit-event-property-list.component.css} | 0 .../edit-event-property-list.component.html} | 0 .../edit-event-property-list.component.ts} | 15 +- .../edit-event-property-primitive.component.css} | 0 .../edit-event-property-primitive.component.html | 70 ++++++++ .../edit-event-property-primitive.component.ts | 89 ++++++++++ .../edit-event-property.component.css} | 0 .../edit-event-property.component.html} | 30 ++-- .../edit-event-property.component.ts} | 27 ++- .../unit-transformation.component.css} | 0 .../unit-transformation.component.html | 49 ++++++ .../unit-transformation.component.ts | 137 +++++++++++++++ .../event-property-primitive.component.html | 123 -------------- .../event-property-primitive.component.ts | 186 --------------------- .../event-property-row.component.ts | 4 +- .../static-code-input.component.ts | 6 +- 17 files changed, 458 insertions(+), 421 deletions(-) diff --cc ui/src/app/connect/connect.module.ts index e9aa0dd,99e5465..f7c0b3a --- a/ui/src/app/connect/connect.module.ts +++ b/ui/src/app/connect/connect.module.ts @@@ -16,84 -16,84 +16,86 @@@ * */ - import {CommonModule} from '@angular/common'; - import {NgModule} from '@angular/core'; - import {FlexLayoutModule} from '@angular/flex-layout'; - import {FormsModule, ReactiveFormsModule} from '@angular/forms'; - import {MatFormFieldModule} from '@angular/material/form-field'; - import {MatGridListModule} from '@angular/material/grid-list'; - import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; - import {BrowserModule} from '@angular/platform-browser'; + import { CommonModule } from '@angular/common'; + import { NgModule } from '@angular/core'; + import { FlexLayoutModule } from '@angular/flex-layout'; + import { FormsModule, ReactiveFormsModule } from '@angular/forms'; + import { MatFormFieldModule } from '@angular/material/form-field'; + import { MatGridListModule } from '@angular/material/grid-list'; + import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; + import { BrowserModule } from '@angular/platform-browser'; - import {ConnectComponent} from './connect.component'; - import {NewAdapterComponent} from './new-adapter/new-adapter.component'; + import { ConnectComponent } from './connect.component'; + import { NewAdapterComponent } from './new-adapter/new-adapter.component'; - import {FormatFormComponent} from './format-form/format-form.component'; + import { FormatFormComponent } from './format-form/format-form.component'; - import {EventPropertyPrimitiveComponent} from './schema-editor/event-property-primitive/event-property-primitive.component'; - import {EventPropertyComponent} from './schema-editor/event-property/event-property.component'; - import {EventSchemaComponent} from './schema-editor/event-schema/event-schema.component'; + import { EditEventPropertyPrimitiveComponent } from './dialog/edit-event-property-primitive/edit-event-property-primitive.component'; + import { EventSchemaComponent } from './schema-editor/event-schema/event-schema.component'; - import {StaticPropertyComponent} from './static-properties/static-property.component'; + import { StaticPropertyComponent } from './static-properties/static-property.component'; - import {CustomMaterialModule} from '../CustomMaterial/custom-material.module'; + import { CustomMaterialModule } from '../CustomMaterial/custom-material.module'; - import {RestService} from './rest.service'; + import { RestService } from './rest.service'; - import {MatInputModule} from '@angular/material/input'; - import {DragulaModule} from 'ng2-dragula'; - import {AdapterStartedDialog} from './new-adapter/component/adapter-started-dialog.component'; - import {DataTypesService} from './schema-editor/data-type.service'; - import {StaticFreeInputComponent} from './static-properties/static-free-input/static-free-input.component'; - import {StaticPropertyUtilService} from './static-properties/static-property-util.service'; - import {TransformationRuleService} from './transformation-rule.service'; - import {StaticSecretInputComponent} from "./static-properties/static-secret-input/static-secret-input.component"; + import { MatInputModule } from '@angular/material/input'; + import { DragulaModule } from 'ng2-dragula'; + import { AdapterStartedDialog } from './new-adapter/component/adapter-started-dialog.component'; + import { DataTypesService } from './schema-editor/data-type.service'; + import { StaticFreeInputComponent } from './static-properties/static-free-input/static-free-input.component'; + import { StaticPropertyUtilService } from './static-properties/static-property-util.service'; + import { StaticSecretInputComponent } from './static-properties/static-secret-input/static-secret-input.component'; + import { TransformationRuleService } from './transformation-rule.service'; - import {ShepherdService} from '../services/tour/shepherd.service'; - import {ConnectService} from './connect.service'; - import {AdapterDescriptionComponent} from './data-marketplace/adapter-description/adapter-description.component'; - import {DataMarketplaceComponent} from './data-marketplace/data-marketplace.component'; - import {DataMarketplaceService} from './data-marketplace/data-marketplace.service'; - import {FormatComponent} from './format-component/format.component'; - import {FormatListComponent} from './format-list-component/format-list.component'; - import {UnitProviderService} from './schema-editor/unit-provider.service'; - import {SelectStaticPropertiesComponent} from './select-static-properties-component/select-static-properties.component'; - import {StaticAnyInput} from './static-properties/static-any-input/static-any-input.component'; - import {StaticOneOfInputComponent} from './static-properties/static-one-of-input/static-one-of-input.component'; - import {IconService} from './new-adapter/icon.service'; - import {StaticFileInputComponent} from './static-properties/static-file-input/static-file-input.component'; - import {StaticFileRestService} from './static-properties/static-file-input/static-file-rest.service'; - import {FileManagementComponent} from './file-management/file-management.component'; - import {FileRestService} from './file-management/service/filerest.service'; - import {StaticRuntimeResolvableAnyInputComponent} from "./static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component"; - import {StaticRuntimeResolvableOneOfInputComponent} from "./static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component"; - import {StaticGroupComponent} from './static-properties/static-group/static-group.component'; - import {StaticAlternativesComponent} from './static-properties/static-alternatives/static-alternatives.component'; - import {StaticCollectionComponent} from './static-properties/static-collection/static-collection.component'; + import { ShepherdService } from '../services/tour/shepherd.service'; + import { ConnectService } from './connect.service'; + import { AdapterDescriptionComponent } from './data-marketplace/adapter-description/adapter-description.component'; + import { DataMarketplaceComponent } from './data-marketplace/data-marketplace.component'; + import { DataMarketplaceService } from './data-marketplace/data-marketplace.service'; + import { FileManagementComponent } from './file-management/file-management.component'; + import { FileRestService } from './file-management/service/filerest.service'; + import { FormatComponent } from './format-component/format.component'; + import { FormatListComponent } from './format-list-component/format-list.component'; + import { IconService } from './new-adapter/icon.service'; + import { UnitProviderService } from './schema-editor/unit-provider.service'; + import { SelectStaticPropertiesComponent } from './select-static-properties-component/select-static-properties.component'; + import { StaticAlternativesComponent } from './static-properties/static-alternatives/static-alternatives.component'; + import { StaticAnyInput } from './static-properties/static-any-input/static-any-input.component'; + import { StaticCollectionComponent } from './static-properties/static-collection/static-collection.component'; + import { StaticFileInputComponent } from './static-properties/static-file-input/static-file-input.component'; + import { StaticFileRestService } from './static-properties/static-file-input/static-file-rest.service'; + import { StaticGroupComponent } from './static-properties/static-group/static-group.component'; + import { StaticOneOfInputComponent } from './static-properties/static-one-of-input/static-one-of-input.component'; + import { StaticRuntimeResolvableAnyInputComponent } from './static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component'; + import { StaticRuntimeResolvableOneOfInputComponent } from './static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component'; - import {FilterPipe} from '../connect/data-marketplace/filter.pipe'; - import {AdapterExportDialog} from './data-marketplace/adapter-export/adapter-export-dialog.component'; - import {AdapterUploadDialog} from './data-marketplace/adapter-upload/adapter-upload-dialog.component'; - import {EventPropertyListComponent} from './schema-editor/event-property-list/event-property-list.component'; - import {StaticMappingNaryComponent} from './static-properties/static-mapping-nary/static-mapping-nary.component'; - import {StaticMappingUnaryComponent} from './static-properties/static-mapping-unary/static-mapping-unary.component'; - import {TimestampPipe} from './filter/timestamp.pipe'; - import {PlatformServicesModule} from '../platform-services/platform.module'; + import { FilterPipe } from '../connect/data-marketplace/filter.pipe'; + import { PlatformServicesModule } from '../platform-services/platform.module'; + import { AdapterExportDialog } from './data-marketplace/adapter-export/adapter-export-dialog.component'; + import { AdapterUploadDialog } from './data-marketplace/adapter-upload/adapter-upload-dialog.component'; + import { EditEventPropertyListComponent } from './dialog/edit-event-property-list/edit-event-property-list.component'; + import { TimestampPipe } from './filter/timestamp.pipe'; + import { StaticMappingNaryComponent } from './static-properties/static-mapping-nary/static-mapping-nary.component'; + import { StaticMappingUnaryComponent } from './static-properties/static-mapping-unary/static-mapping-unary.component'; - import {TreeModule} from 'angular-tree-component'; - import {EventSchemaPreviewComponent} from './schema-editor/event-schema-preview/event-schema-preview.component'; - import {EventPropertyRowComponent} from "./schema-editor/event-property-row/event-property-row.component"; - import {PropertySelectorService} from "../services/property-selector.service"; - import {StaticColorPickerComponent} from "./static-properties/static-color-picker/static-color-picker.component"; - import {ColorPickerModule} from "ngx-color-picker"; - import {PipelineElementRuntimeInfoComponent} from "./new-adapter/component/runtime-info/pipeline-element-runtime-info.component"; - import {xsService} from "../NS/XS.service"; - import {MatSliderModule} from "@angular/material/slider"; - import { QuillModule } from 'ngx-quill' - import {MatChipsModule} from "@angular/material/chips"; +import {StaticCodeInputComponent} from "./static-properties/static-code-input/static-code-input.component"; +import { CodemirrorModule } from '@ctrl/ngx-codemirror'; + import { MatChipsModule } from '@angular/material/chips'; + import { MatSliderModule } from '@angular/material/slider'; + import { TreeModule } from 'angular-tree-component'; + import { ColorPickerModule } from 'ngx-color-picker'; + import { QuillModule } from 'ngx-quill'; + import { xsService } from '../NS/XS.service'; + import { PropertySelectorService } from '../services/property-selector.service'; + import { EditEventPropertyComponent } from './dialog/edit-event-property/edit-event-property.component'; + import { UnitTransformationComponent } from './dialog/unit-transformation/unit-transformation.component'; + import { PipelineElementRuntimeInfoComponent } from './new-adapter/component/runtime-info/pipeline-element-runtime-info.component'; + import { EventPropertyRowComponent } from './schema-editor/event-property-row/event-property-row.component'; + import { EventSchemaPreviewComponent } from './schema-editor/event-schema-preview/event-schema-preview.component'; + import { StaticColorPickerComponent } from './static-properties/static-color-picker/static-color-picker.component'; + @NgModule({ imports: [ @@@ -156,8 -155,8 +158,9 @@@ StaticAlternativesComponent, StaticCollectionComponent, StaticColorPickerComponent, + StaticCodeInputComponent, - PipelineElementRuntimeInfoComponent + PipelineElementRuntimeInfoComponent, + UnitTransformationComponent ], providers: [ RestService, diff --cc ui/src/app/connect/static-properties/static-code-input/static-code-input.component.ts index dc60fd7,0000000..1dc8f60 mode 100644,000000..100644 --- a/ui/src/app/connect/static-properties/static-code-input/static-code-input.component.ts +++ b/ui/src/app/connect/static-properties/static-code-input/static-code-input.component.ts @@@ -1,106 -1,0 +1,106 @@@ +/* + * 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 {AbstractStaticPropertyRenderer} from "../base/abstract-static-property"; +import { + CodeInputStaticProperty, + CollectionStaticProperty +} from "../../../core-model/gen/streampipes-model"; +import {AbstractValidatedStaticPropertyRenderer} from "../base/abstract-validated-static-property"; +import {AfterViewInit, Component, OnInit, ViewChild} from "@angular/core"; + - import CodeMirror from 'codemirror'; +import 'codemirror/mode/javascript/javascript'; +import 'codemirror/addon/edit/closebrackets'; +import 'codemirror/addon/hint/show-hint'; +import 'codemirror/addon/hint/javascript-hint'; +import 'codemirror/addon/lint/javascript-lint'; +import 'codemirror/addon/lint/lint'; +import {JSHINT} from 'jshint'; ++import * as CodeMirror from "codemirror"; + +(<any>window).JSHINT = JSHINT; + +@Component({ + selector: 'app-static-code-input', + templateUrl: './static-code-input.component.html', + styleUrls: ['./static-code-input.component.scss'] +}) +export class StaticCodeInputComponent + extends AbstractValidatedStaticPropertyRenderer<CodeInputStaticProperty> implements OnInit, AfterViewInit { + + editorOptions = { + mode: "javascript", + autoRefresh: true, + theme: 'dracula', + autoCloseBrackets: true, + lineNumbers: true, + lineWrapping: true, + gutters: ["CodeMirror-lint-markers"], + lint: true, + extraKeys: { + "Ctrl-Space": "autocomplete" + } + }; + + + constructor() { + super(); + } + + ngOnInit() { + if (!this.staticProperty.value || this.staticProperty.value === "") { + this.staticProperty.value = this.staticProperty.codeTemplate; + } + + } + + ngAfterViewInit() { + this.enableCodeHints(); + } + + onStatusChange(status: any) { + } + + onValueChange(value: any) { + } + + resetCode() { + this.staticProperty.value = this.staticProperty.codeTemplate; + }; + + enableCodeHints() { - var jsHint = CodeMirror.hint.javascript; - CodeMirror.hint.javascript = (cm) => { ++ var jsHint = (CodeMirror as any).hint.javascript; ++ (CodeMirror as any).hint.javascript = (cm) => { + let cursor = cm.getCursor(); + let token = cm.getTokenAt(cursor); + let inner = {from: cm.getCursor(), to: cm.getCursor(), list: []}; + let previousCursor = {line: cursor.line, ch: (cursor.ch - 1), sticky: null} + let previousToken = cm.getTokenAt(previousCursor); + if (token.string === "." && previousToken.string === "event") { + this.eventSchemas[0].eventProperties.forEach(ep => { + inner.list.unshift(ep.runtimeName); + }) + } else { + inner = jsHint(cm); + } + return inner; + }; + } + + +}
