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 2020/08/24 12:10:14 UTC
[incubator-streampipes] branch dev updated (6a9f58a -> 6c7f689)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 6a9f58a [STREAMPIPES-206] Remove deprecated UI models
new b3ab9f8 [STREAMPIPES-206] Remove obsolete UI dependencies
new 6c7f689 [STREAMPIPES-206] Move static property renderer to core-ui module
The 2 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:
ui/package.json | 5 +-
ui/src/app/connect/connect.module.ts | 84 +++++---------------
.../shared/shared-dashboard.service.ts | 2 +-
ui/src/app/core-ui/core-ui.module.ts | 64 ++++++++++++++-
.../base/abstract-static-property.ts | 2 +-
.../base/abstract-validated-static-property.ts | 0
.../filter/display-recommended.pipe.ts | 0
.../static-properties/input.validator.ts | 0
.../static-alternatives.component.css | 0
.../static-alternatives.component.html | 0
.../static-alternatives.component.ts | 0
.../static-any-input.component.css | 0
.../static-any-input.component.html | 0
.../static-any-input/static-any-input.component.ts | 90 +++++++++++-----------
.../static-code-input.component.html | 0
.../static-code-input.component.scss | 0
.../static-code-input.component.ts | 0
.../static-collection.component.css | 0
.../static-collection.component.html | 0
.../static-collection.component.ts | 2 +-
.../static-color-picker.component.css | 0
.../static-color-picker.component.html | 0
.../static-color-picker.component.ts | 2 +-
.../static-file-input.component.css | 0
.../static-file-input.component.html | 0
.../static-file-input.component.ts | 0
.../static-file-input/static-file-rest.service.ts | 0
.../static-free-input.component.html | 0
.../static-free-input.component.scss | 2 +-
.../static-free-input.component.ts | 2 +-
.../static-group/static-group.component.css | 0
.../static-group/static-group.component.html | 0
.../static-group/static-group.component.ts | 0
.../static-mapping-nary.component.html | 0
.../static-mapping-nary.component.scss | 2 +-
.../static-mapping-nary.component.ts | 0
.../static-mapping-unary.component.css | 0
.../static-mapping-unary.component.html | 0
.../static-mapping-unary.component.ts | 0
.../static-mapping/static-mapping.ts | 0
.../static-one-of-input.component.css | 0
.../static-one-of-input.component.html | 0
.../static-one-of-input.component.ts | 0
.../static-property-util.service.ts | 0
.../static-property.component.css | 0
.../static-property.component.html | 0
.../static-properties/static-property.component.ts | 2 +-
...atic-runtime-resolvable-any-input.component.css | 0
...tic-runtime-resolvable-any-input.component.html | 0
...tatic-runtime-resolvable-any-input.component.ts | 0
.../base-runtime-resolvable-input.ts | 2 +-
.../runtime-resolvable.service.ts | 0
...ic-runtime-resolvable-oneof-input.component.css | 0
...c-runtime-resolvable-oneof-input.component.html | 0
...tic-runtime-resolvable-oneof-input.component.ts | 0
.../static-secret-input.component.css | 0
.../static-secret-input.component.html | 0
.../static-secret-input.component.ts | 2 +-
ui/src/app/dashboard/dashboard.module.ts | 12 ---
ui/src/app/data-explorer/data-explorer.module.ts | 9 +--
.../services/data-view-data-explorer.service.ts | 1 -
ui/src/app/editor/editor.module.ts | 2 -
.../pipeline-details/pipeline-details.module.ts | 4 +-
ui/src/app/services/rest-api.service.ts | 5 +-
64 files changed, 142 insertions(+), 154 deletions(-)
rename ui/src/app/{connect => core-ui}/static-properties/base/abstract-static-property.ts (95%)
rename ui/src/app/{connect => core-ui}/static-properties/base/abstract-validated-static-property.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/filter/display-recommended.pipe.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/input.validator.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-alternatives/static-alternatives.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-alternatives/static-alternatives.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-alternatives/static-alternatives.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-any-input/static-any-input.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-any-input/static-any-input.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-any-input/static-any-input.component.ts (97%)
rename ui/src/app/{connect => core-ui}/static-properties/static-code-input/static-code-input.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-code-input/static-code-input.component.scss (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-code-input/static-code-input.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-collection/static-collection.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-collection/static-collection.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-collection/static-collection.component.ts (96%)
rename ui/src/app/{connect => core-ui}/static-properties/static-color-picker/static-color-picker.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-color-picker/static-color-picker.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-color-picker/static-color-picker.component.ts (96%)
rename ui/src/app/{connect => core-ui}/static-properties/static-file-input/static-file-input.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-file-input/static-file-input.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-file-input/static-file-input.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-file-input/static-file-rest.service.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-free-input/static-free-input.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-free-input/static-free-input.component.scss (96%)
rename ui/src/app/{connect => core-ui}/static-properties/static-free-input/static-free-input.component.ts (97%)
rename ui/src/app/{connect => core-ui}/static-properties/static-group/static-group.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-group/static-group.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-group/static-group.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-mapping-nary/static-mapping-nary.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-mapping-nary/static-mapping-nary.component.scss (95%)
rename ui/src/app/{connect => core-ui}/static-properties/static-mapping-nary/static-mapping-nary.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-mapping-unary/static-mapping-unary.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-mapping-unary/static-mapping-unary.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-mapping-unary/static-mapping-unary.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-mapping/static-mapping.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-one-of-input/static-one-of-input.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-one-of-input/static-one-of-input.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-one-of-input/static-one-of-input.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-property-util.service.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-property.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-property.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-property.component.ts (98%)
rename ui/src/app/{connect => core-ui}/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts (98%)
rename ui/src/app/{connect => core-ui}/static-properties/static-runtime-resolvable-input/runtime-resolvable.service.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-secret-input/static-secret-input.component.css (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-secret-input/static-secret-input.component.html (100%)
rename ui/src/app/{connect => core-ui}/static-properties/static-secret-input/static-secret-input.component.ts (96%)
[incubator-streampipes] 02/02: [STREAMPIPES-206] Move static
property renderer to core-ui module
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 6c7f689a4957ef3715db9d011fc443888380f897
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Aug 24 14:09:58 2020 +0200
[STREAMPIPES-206] Move static property renderer to core-ui module
---
ui/src/app/connect/connect.module.ts | 84 +++++---------------
ui/src/app/core-ui/core-ui.module.ts | 64 ++++++++++++++-
.../base/abstract-static-property.ts | 2 +-
.../base/abstract-validated-static-property.ts | 0
.../filter/display-recommended.pipe.ts | 0
.../static-properties/input.validator.ts | 0
.../static-alternatives.component.css | 0
.../static-alternatives.component.html | 0
.../static-alternatives.component.ts | 0
.../static-any-input.component.css | 0
.../static-any-input.component.html | 0
.../static-any-input/static-any-input.component.ts | 90 +++++++++++-----------
.../static-code-input.component.html | 0
.../static-code-input.component.scss | 0
.../static-code-input.component.ts | 0
.../static-collection.component.css | 0
.../static-collection.component.html | 0
.../static-collection.component.ts | 2 +-
.../static-color-picker.component.css | 0
.../static-color-picker.component.html | 0
.../static-color-picker.component.ts | 2 +-
.../static-file-input.component.css | 0
.../static-file-input.component.html | 0
.../static-file-input.component.ts | 0
.../static-file-input/static-file-rest.service.ts | 0
.../static-free-input.component.html | 0
.../static-free-input.component.scss | 2 +-
.../static-free-input.component.ts | 2 +-
.../static-group/static-group.component.css | 0
.../static-group/static-group.component.html | 0
.../static-group/static-group.component.ts | 0
.../static-mapping-nary.component.html | 0
.../static-mapping-nary.component.scss | 2 +-
.../static-mapping-nary.component.ts | 0
.../static-mapping-unary.component.css | 0
.../static-mapping-unary.component.html | 0
.../static-mapping-unary.component.ts | 0
.../static-mapping/static-mapping.ts | 0
.../static-one-of-input.component.css | 0
.../static-one-of-input.component.html | 0
.../static-one-of-input.component.ts | 0
.../static-property-util.service.ts | 0
.../static-property.component.css | 0
.../static-property.component.html | 0
.../static-properties/static-property.component.ts | 2 +-
...atic-runtime-resolvable-any-input.component.css | 0
...tic-runtime-resolvable-any-input.component.html | 0
...tatic-runtime-resolvable-any-input.component.ts | 0
.../base-runtime-resolvable-input.ts | 2 +-
.../runtime-resolvable.service.ts | 0
...ic-runtime-resolvable-oneof-input.component.css | 0
...c-runtime-resolvable-oneof-input.component.html | 0
...tic-runtime-resolvable-oneof-input.component.ts | 0
.../static-secret-input.component.css | 0
.../static-secret-input.component.html | 0
.../static-secret-input.component.ts | 2 +-
ui/src/app/dashboard/dashboard.module.ts | 4 -
ui/src/app/data-explorer/data-explorer.module.ts | 5 +-
ui/src/app/editor/editor.module.ts | 2 -
.../pipeline-details/pipeline-details.module.ts | 4 +-
60 files changed, 138 insertions(+), 133 deletions(-)
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index cb32efc..dd6cd78 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -33,8 +33,6 @@ import {FormatFormComponent} from './format-form/format-form.component';
import {EditEventPropertyPrimitiveComponent} from './dialog/edit-event-property/components/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 {CustomMaterialModule} from '../CustomMaterial/custom-material.module';
import {RestService} from './rest.service';
@@ -43,9 +41,7 @@ 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 {StaticPropertyUtilService} from '../core-ui/static-properties/static-property-util.service';
import {TransformationRuleService} from './transformation-rule.service';
import {ConnectService} from './connect.service';
import {AdapterDescriptionComponent} from './data-marketplace/adapter-description/adapter-description.component';
@@ -57,33 +53,17 @@ 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 {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 {FilterPipe} from './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/components/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 {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 {EditDataTypeComponent} from './dialog/edit-event-property/components/edit-data-type/edit-data-type.component';
@@ -93,19 +73,16 @@ import {EditEventPropertyComponent} from './dialog/edit-event-property/edit-even
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';
-import {DisplayRecommendedPipe} from "./static-properties/filter/display-recommended.pipe";
import {TourProviderService} from "../services/tour/tour-provider.service";
-import {RuntimeResolvableService} from "./static-properties/static-runtime-resolvable-input/runtime-resolvable.service";
-
+import {CoreUiModule} from "../core-ui/core-ui.module";
@NgModule({
imports: [
BrowserModule,
+ CoreUiModule,
FormsModule,
ReactiveFormsModule,
CommonModule,
- CodemirrorModule,
FlexLayoutModule,
MatGridListModule,
CustomMaterialModule,
@@ -117,57 +94,38 @@ import {RuntimeResolvableService} from "./static-properties/static-runtime-resol
MatSliderModule,
PlatformServicesModule,
TreeModule.forRoot(),
- ColorPickerModule,
- QuillModule.forRoot()
],
exports: [
- StaticPropertyComponent,
PipelineElementRuntimeInfoComponent
],
declarations: [
- NewAdapterComponent,
- FormatFormComponent,
+ AdapterDescriptionComponent,
+ AdapterExportDialog,
+ AdapterStartedDialog,
+ AdapterUploadDialog,
+ ConnectComponent,
+ DataMarketplaceComponent,
EventSchemaComponent,
EditEventPropertyPrimitiveComponent,
EditEventPropertyComponent,
EventPropertyRowComponent,
EditEventPropertyListComponent,
- StaticPropertyComponent,
- AdapterStartedDialog,
- AdapterExportDialog,
- AdapterUploadDialog,
- StaticFreeInputComponent,
- StaticSecretInputComponent,
- StaticFileInputComponent,
- StaticMappingNaryComponent,
- StaticMappingUnaryComponent,
- DisplayRecommendedPipe,
- TimestampPipe,
- StaticAnyInput,
- FormatListComponent,
- FormatComponent,
- DataMarketplaceComponent,
- AdapterDescriptionComponent,
- ConnectComponent,
- StaticOneOfInputComponent,
- StaticRuntimeResolvableAnyInputComponent,
- StaticRuntimeResolvableOneOfInputComponent,
+ EditUnitTransformationComponent,
+ EditTimestampPropertyComponent,
+ EditDataTypeComponent,
+ EventSchemaPreviewComponent,
FileManagementComponent,
FilterPipe,
- EventSchemaPreviewComponent,
- StaticGroupComponent,
- StaticAlternativesComponent,
- StaticCollectionComponent,
- StaticColorPickerComponent,
- StaticCodeInputComponent,
+ FormatComponent,
+ FormatFormComponent,
+ FormatListComponent,
+ NewAdapterComponent,
PipelineElementRuntimeInfoComponent,
- EditUnitTransformationComponent,
- EditTimestampPropertyComponent,
- EditDataTypeComponent
+ TimestampPipe
],
providers: [
RestService,
- RuntimeResolvableService,
+
ConnectService,
DataTypesService,
TransformationRuleService,
@@ -175,10 +133,8 @@ import {RuntimeResolvableService} from "./static-properties/static-runtime-resol
DataMarketplaceService,
IconService,
UnitProviderService,
- DisplayRecommendedPipe,
TimestampPipe,
FileRestService,
- StaticFileRestService,
PropertySelectorService,
xsService,
TourProviderService
diff --git a/ui/src/app/core-ui/core-ui.module.ts b/ui/src/app/core-ui/core-ui.module.ts
index 0517366..82bcb4b 100644
--- a/ui/src/app/core-ui/core-ui.module.ts
+++ b/ui/src/app/core-ui/core-ui.module.ts
@@ -52,12 +52,35 @@ import {DialogService} from "./dialog/base-dialog/base-dialog.service";
import {PortalModule} from "@angular/cdk/portal";
import {OverlayModule} from "@angular/cdk/overlay";
import {ConfirmDialogComponent} from "./dialog/confirm-dialog/confirm-dialog.component";
+import {StaticAnyInput} from "./static-properties/static-any-input/static-any-input.component";
+import {StaticPropertyComponent} from "./static-properties/static-property.component";
+import {StaticFreeInputComponent} from "./static-properties/static-free-input/static-free-input.component";
+import {StaticSecretInputComponent} from "./static-properties/static-secret-input/static-secret-input.component";
+import {StaticFileInputComponent} from "./static-properties/static-file-input/static-file-input.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 {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 {StaticColorPickerComponent} from "./static-properties/static-color-picker/static-color-picker.component";
+import {StaticCodeInputComponent} from "./static-properties/static-code-input/static-code-input.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 {RuntimeResolvableService} from "./static-properties/static-runtime-resolvable-input/runtime-resolvable.service";
+import {StaticFileRestService} from "./static-properties/static-file-input/static-file-rest.service";
+import {DisplayRecommendedPipe} from "./static-properties/filter/display-recommended.pipe";
+import {ColorPickerModule} from "ngx-color-picker";
+import {QuillModule} from "ngx-quill";
+import {CodemirrorModule} from "@ctrl/ngx-codemirror";
// PlotlyViaCDNModule.plotlyjs = PlotlyJS;
@NgModule({
imports: [
CommonModule,
+ ColorPickerModule,
FlexLayoutModule,
+ CodemirrorModule,
CustomMaterialModule,
ReactiveFormsModule,
FormsModule,
@@ -71,9 +94,11 @@ import {ConfirmDialogComponent} from "./dialog/confirm-dialog/confirm-dialog.com
MatChipsModule,
PortalModule,
OverlayModule,
+ QuillModule.forRoot()
],
declarations: [
ConfirmDialogComponent,
+ DisplayRecommendedPipe,
ImageComponent,
ImageContainerComponent,
ImageLabelingComponent,
@@ -83,17 +108,35 @@ import {ConfirmDialogComponent} from "./dialog/confirm-dialog/confirm-dialog.com
ImageCategorizeComponent,
ImageViewerComponent,
StandardDialogComponent,
- PanelDialogComponent
+ PanelDialogComponent,
+ StaticAnyInput,
+ StaticPropertyComponent,
+ StaticFreeInputComponent,
+ StaticSecretInputComponent,
+ StaticFileInputComponent,
+ StaticMappingNaryComponent,
+ StaticMappingUnaryComponent,
+ StaticGroupComponent,
+ StaticAlternativesComponent,
+ StaticCollectionComponent,
+ StaticColorPickerComponent,
+ StaticCodeInputComponent,
+ StaticOneOfInputComponent,
+ StaticRuntimeResolvableAnyInputComponent,
+ StaticRuntimeResolvableOneOfInputComponent,
],
providers: [
MatDatepickerModule,
ColorService,
+ DisplayRecommendedPipe,
ReactLabelingService,
PolygonLabelingService,
BrushLabelingService,
CocoFormatService,
LabelingModeService,
- DialogService
+ DialogService,
+ RuntimeResolvableService,
+ StaticFileRestService,
],
entryComponents: [
],
@@ -102,7 +145,22 @@ import {ConfirmDialogComponent} from "./dialog/confirm-dialog/confirm-dialog.com
ImageLabelingComponent,
StandardDialogComponent,
PanelDialogComponent,
- ConfirmDialogComponent
+ ConfirmDialogComponent,
+ StaticAnyInput,
+ StaticPropertyComponent,
+ StaticFreeInputComponent,
+ StaticSecretInputComponent,
+ StaticFileInputComponent,
+ StaticMappingNaryComponent,
+ StaticMappingUnaryComponent,
+ StaticGroupComponent,
+ StaticAlternativesComponent,
+ StaticCollectionComponent,
+ StaticColorPickerComponent,
+ StaticCodeInputComponent,
+ StaticOneOfInputComponent,
+ StaticRuntimeResolvableAnyInputComponent,
+ StaticRuntimeResolvableOneOfInputComponent,
]
})
export class CoreUiModule {
diff --git a/ui/src/app/connect/static-properties/base/abstract-static-property.ts b/ui/src/app/core-ui/static-properties/base/abstract-static-property.ts
similarity index 95%
rename from ui/src/app/connect/static-properties/base/abstract-static-property.ts
rename to ui/src/app/core-ui/static-properties/base/abstract-static-property.ts
index c15dd02..f4cb726 100644
--- a/ui/src/app/connect/static-properties/base/abstract-static-property.ts
+++ b/ui/src/app/core-ui/static-properties/base/abstract-static-property.ts
@@ -23,7 +23,7 @@ import {
} from "../../../core-model/gen/streampipes-model";
import {Directive, EventEmitter, Input, Output} from "@angular/core";
import {FormGroup} from "@angular/forms";
-import {ConfigurationInfo} from "../../model/ConfigurationInfo";
+import {ConfigurationInfo} from "../../../connect/model/ConfigurationInfo";
import {InvocablePipelineElementUnion} from "../../../editor/model/editor.model";
@Directive()
diff --git a/ui/src/app/connect/static-properties/base/abstract-validated-static-property.ts b/ui/src/app/core-ui/static-properties/base/abstract-validated-static-property.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/base/abstract-validated-static-property.ts
rename to ui/src/app/core-ui/static-properties/base/abstract-validated-static-property.ts
diff --git a/ui/src/app/connect/static-properties/filter/display-recommended.pipe.ts b/ui/src/app/core-ui/static-properties/filter/display-recommended.pipe.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/filter/display-recommended.pipe.ts
rename to ui/src/app/core-ui/static-properties/filter/display-recommended.pipe.ts
diff --git a/ui/src/app/connect/static-properties/input.validator.ts b/ui/src/app/core-ui/static-properties/input.validator.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/input.validator.ts
rename to ui/src/app/core-ui/static-properties/input.validator.ts
diff --git a/ui/src/app/connect/static-properties/static-alternatives/static-alternatives.component.css b/ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-alternatives/static-alternatives.component.css
rename to ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.css
diff --git a/ui/src/app/connect/static-properties/static-alternatives/static-alternatives.component.html b/ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-alternatives/static-alternatives.component.html
rename to ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.html
diff --git a/ui/src/app/connect/static-properties/static-alternatives/static-alternatives.component.ts b/ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-alternatives/static-alternatives.component.ts
rename to ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.ts
diff --git a/ui/src/app/connect/static-properties/static-any-input/static-any-input.component.css b/ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-any-input/static-any-input.component.css
rename to ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.css
diff --git a/ui/src/app/connect/static-properties/static-any-input/static-any-input.component.html b/ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-any-input/static-any-input.component.html
rename to ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.html
diff --git a/ui/src/app/connect/static-properties/static-any-input/static-any-input.component.ts b/ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.ts
similarity index 97%
rename from ui/src/app/connect/static-properties/static-any-input/static-any-input.component.ts
rename to ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.ts
index bfd9d26..3c9da80 100644
--- a/ui/src/app/connect/static-properties/static-any-input/static-any-input.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.ts
@@ -1,45 +1,45 @@
-/*
- * 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, OnInit, Output} from '@angular/core';
-import {AbstractStaticPropertyRenderer} from "../base/abstract-static-property";
-import {AnyStaticProperty} from "../../../core-model/gen/streampipes-model";
-
-@Component({
- selector: 'app-static-any-input',
- templateUrl: './static-any-input.component.html',
- styleUrls: ['./static-any-input.component.css'],
-})
-export class StaticAnyInput extends AbstractStaticPropertyRenderer<AnyStaticProperty> implements OnInit {
-
- @Output() inputEmitter: EventEmitter<Boolean> = new EventEmitter<Boolean>();
-
-
- ngOnInit() {
- for (let option of this.staticProperty.options) {
- option.selected = false;
- }
- this.inputEmitter.emit(true);
- }
-
- select(elementId: string) {
- this.staticProperty.options
- .filter(option => option.elementId === elementId)
- .forEach(option => option.selected = !(option.selected));
- }
-}
+/*
+ * 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, OnInit, Output} from '@angular/core';
+import {AbstractStaticPropertyRenderer} from "../base/abstract-static-property";
+import {AnyStaticProperty} from "../../../core-model/gen/streampipes-model";
+
+@Component({
+ selector: 'app-static-any-input',
+ templateUrl: './static-any-input.component.html',
+ styleUrls: ['./static-any-input.component.css'],
+})
+export class StaticAnyInput extends AbstractStaticPropertyRenderer<AnyStaticProperty> implements OnInit {
+
+ @Output() inputEmitter: EventEmitter<Boolean> = new EventEmitter<Boolean>();
+
+
+ ngOnInit() {
+ for (let option of this.staticProperty.options) {
+ option.selected = false;
+ }
+ this.inputEmitter.emit(true);
+ }
+
+ select(elementId: string) {
+ this.staticProperty.options
+ .filter(option => option.elementId === elementId)
+ .forEach(option => option.selected = !(option.selected));
+ }
+}
diff --git a/ui/src/app/connect/static-properties/static-code-input/static-code-input.component.html b/ui/src/app/core-ui/static-properties/static-code-input/static-code-input.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-code-input/static-code-input.component.html
rename to ui/src/app/core-ui/static-properties/static-code-input/static-code-input.component.html
diff --git a/ui/src/app/connect/static-properties/static-code-input/static-code-input.component.scss b/ui/src/app/core-ui/static-properties/static-code-input/static-code-input.component.scss
similarity index 100%
rename from ui/src/app/connect/static-properties/static-code-input/static-code-input.component.scss
rename to ui/src/app/core-ui/static-properties/static-code-input/static-code-input.component.scss
diff --git a/ui/src/app/connect/static-properties/static-code-input/static-code-input.component.ts b/ui/src/app/core-ui/static-properties/static-code-input/static-code-input.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-code-input/static-code-input.component.ts
rename to ui/src/app/core-ui/static-properties/static-code-input/static-code-input.component.ts
diff --git a/ui/src/app/connect/static-properties/static-collection/static-collection.component.css b/ui/src/app/core-ui/static-properties/static-collection/static-collection.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-collection/static-collection.component.css
rename to ui/src/app/core-ui/static-properties/static-collection/static-collection.component.css
diff --git a/ui/src/app/connect/static-properties/static-collection/static-collection.component.html b/ui/src/app/core-ui/static-properties/static-collection/static-collection.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-collection/static-collection.component.html
rename to ui/src/app/core-ui/static-properties/static-collection/static-collection.component.html
diff --git a/ui/src/app/connect/static-properties/static-collection/static-collection.component.ts b/ui/src/app/core-ui/static-properties/static-collection/static-collection.component.ts
similarity index 96%
rename from ui/src/app/connect/static-properties/static-collection/static-collection.component.ts
rename to ui/src/app/core-ui/static-properties/static-collection/static-collection.component.ts
index 7fdc3b1..fe4d118 100644
--- a/ui/src/app/connect/static-properties/static-collection/static-collection.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-collection/static-collection.component.ts
@@ -17,7 +17,7 @@
*/
import {Component, OnInit} from '@angular/core';
-import {ConfigurationInfo} from '../../model/ConfigurationInfo';
+import {ConfigurationInfo} from '../../../connect/model/ConfigurationInfo';
import {StaticPropertyUtilService} from '../static-property-util.service';
import {CollectionStaticProperty} from "../../../core-model/gen/streampipes-model";
import {AbstractValidatedStaticPropertyRenderer} from "../base/abstract-validated-static-property";
diff --git a/ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.css b/ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.css
rename to ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.css
diff --git a/ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.html b/ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.html
rename to ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.html
diff --git a/ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.ts b/ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.ts
similarity index 96%
rename from ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.ts
rename to ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.ts
index 0f723af..01afa83 100644
--- a/ui/src/app/connect/static-properties/static-color-picker/static-color-picker.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.ts
@@ -17,7 +17,7 @@
*/
import {Component, OnInit} from "@angular/core";
-import {ConfigurationInfo} from "../../model/ConfigurationInfo";
+import {ConfigurationInfo} from "../../../connect/model/ConfigurationInfo";
import {StaticPropertyUtilService} from "../static-property-util.service";
import {FormGroup, Validators} from "@angular/forms";
import {ColorPickerStaticProperty} from "../../../core-model/gen/streampipes-model";
diff --git a/ui/src/app/connect/static-properties/static-file-input/static-file-input.component.css b/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-file-input/static-file-input.component.css
rename to ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.css
diff --git a/ui/src/app/connect/static-properties/static-file-input/static-file-input.component.html b/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-file-input/static-file-input.component.html
rename to ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.html
diff --git a/ui/src/app/connect/static-properties/static-file-input/static-file-input.component.ts b/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-file-input/static-file-input.component.ts
rename to ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.ts
diff --git a/ui/src/app/connect/static-properties/static-file-input/static-file-rest.service.ts b/ui/src/app/core-ui/static-properties/static-file-input/static-file-rest.service.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-file-input/static-file-rest.service.ts
rename to ui/src/app/core-ui/static-properties/static-file-input/static-file-rest.service.ts
diff --git a/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.html b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-free-input/static-free-input.component.html
rename to ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.html
diff --git a/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.scss b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.scss
similarity index 96%
rename from ui/src/app/connect/static-properties/static-free-input/static-free-input.component.scss
rename to ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.scss
index f5740bb..7226a22 100644
--- a/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.scss
+++ b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import '../../../../scss/sp/colors';
+@import 'src/scss/sp/colors';
#formWrapper {
height: 60px;
diff --git a/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.ts b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.ts
similarity index 97%
rename from ui/src/app/connect/static-properties/static-free-input/static-free-input.component.ts
rename to ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.ts
index a47f58f..0cb54bb 100644
--- a/ui/src/app/connect/static-properties/static-free-input/static-free-input.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.ts
@@ -19,7 +19,7 @@
import {Component, OnInit, ViewChild} from '@angular/core';
import {ValidatorFn, Validators} from '@angular/forms';
import {StaticPropertyUtilService} from '../static-property-util.service';
-import {ConfigurationInfo} from "../../model/ConfigurationInfo";
+import {ConfigurationInfo} from "../../../connect/model/ConfigurationInfo";
import {FreeTextStaticProperty} from "../../../core-model/gen/streampipes-model";
import {xsService} from "../../../NS/XS.service";
import {ValidateNumber, ValidateString, ValidateUrl} from "../input.validator";
diff --git a/ui/src/app/connect/static-properties/static-group/static-group.component.css b/ui/src/app/core-ui/static-properties/static-group/static-group.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-group/static-group.component.css
rename to ui/src/app/core-ui/static-properties/static-group/static-group.component.css
diff --git a/ui/src/app/connect/static-properties/static-group/static-group.component.html b/ui/src/app/core-ui/static-properties/static-group/static-group.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-group/static-group.component.html
rename to ui/src/app/core-ui/static-properties/static-group/static-group.component.html
diff --git a/ui/src/app/connect/static-properties/static-group/static-group.component.ts b/ui/src/app/core-ui/static-properties/static-group/static-group.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-group/static-group.component.ts
rename to ui/src/app/core-ui/static-properties/static-group/static-group.component.ts
diff --git a/ui/src/app/connect/static-properties/static-mapping-nary/static-mapping-nary.component.html b/ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-mapping-nary/static-mapping-nary.component.html
rename to ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.html
diff --git a/ui/src/app/connect/static-properties/static-mapping-nary/static-mapping-nary.component.scss b/ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.scss
similarity index 95%
rename from ui/src/app/connect/static-properties/static-mapping-nary/static-mapping-nary.component.scss
rename to ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.scss
index 07d10de..c0633fb 100644
--- a/ui/src/app/connect/static-properties/static-mapping-nary/static-mapping-nary.component.scss
+++ b/ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import '../../../../scss/sp/buttons';
+@import 'src/scss/sp/buttons';
p {
float: left;
diff --git a/ui/src/app/connect/static-properties/static-mapping-nary/static-mapping-nary.component.ts b/ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-mapping-nary/static-mapping-nary.component.ts
rename to ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.ts
diff --git a/ui/src/app/connect/static-properties/static-mapping-unary/static-mapping-unary.component.css b/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-mapping-unary/static-mapping-unary.component.css
rename to ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.css
diff --git a/ui/src/app/connect/static-properties/static-mapping-unary/static-mapping-unary.component.html b/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-mapping-unary/static-mapping-unary.component.html
rename to ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.html
diff --git a/ui/src/app/connect/static-properties/static-mapping-unary/static-mapping-unary.component.ts b/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-mapping-unary/static-mapping-unary.component.ts
rename to ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.ts
diff --git a/ui/src/app/connect/static-properties/static-mapping/static-mapping.ts b/ui/src/app/core-ui/static-properties/static-mapping/static-mapping.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-mapping/static-mapping.ts
rename to ui/src/app/core-ui/static-properties/static-mapping/static-mapping.ts
diff --git a/ui/src/app/connect/static-properties/static-one-of-input/static-one-of-input.component.css b/ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-one-of-input/static-one-of-input.component.css
rename to ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.css
diff --git a/ui/src/app/connect/static-properties/static-one-of-input/static-one-of-input.component.html b/ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-one-of-input/static-one-of-input.component.html
rename to ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.html
diff --git a/ui/src/app/connect/static-properties/static-one-of-input/static-one-of-input.component.ts b/ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-one-of-input/static-one-of-input.component.ts
rename to ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.ts
diff --git a/ui/src/app/connect/static-properties/static-property-util.service.ts b/ui/src/app/core-ui/static-properties/static-property-util.service.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-property-util.service.ts
rename to ui/src/app/core-ui/static-properties/static-property-util.service.ts
diff --git a/ui/src/app/connect/static-properties/static-property.component.css b/ui/src/app/core-ui/static-properties/static-property.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-property.component.css
rename to ui/src/app/core-ui/static-properties/static-property.component.css
diff --git a/ui/src/app/connect/static-properties/static-property.component.html b/ui/src/app/core-ui/static-properties/static-property.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-property.component.html
rename to ui/src/app/core-ui/static-properties/static-property.component.html
diff --git a/ui/src/app/connect/static-properties/static-property.component.ts b/ui/src/app/core-ui/static-properties/static-property.component.ts
similarity index 98%
rename from ui/src/app/connect/static-properties/static-property.component.ts
rename to ui/src/app/core-ui/static-properties/static-property.component.ts
index 27546ba..723495e 100644
--- a/ui/src/app/connect/static-properties/static-property.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-property.component.ts
@@ -21,7 +21,7 @@ import {Logger} from '../../shared/logger/default-log.service';
import {xsService} from '../../NS/XS.service';
import {StaticPropertyUtilService} from './static-property-util.service';
-import {ConfigurationInfo} from "../model/ConfigurationInfo";
+import {ConfigurationInfo} from "../../connect/model/ConfigurationInfo";
import {
AnyStaticProperty,
CodeInputStaticProperty,
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.css b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.css
rename to ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.css
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html
rename to ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.ts b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.ts
rename to ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.ts
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts
similarity index 98%
rename from ui/src/app/connect/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts
rename to ui/src/app/core-ui/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts
index 43ffc80..a90a69b 100644
--- a/ui/src/app/connect/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-input/base-runtime-resolvable-input.ts
@@ -26,7 +26,7 @@ import {
import {RuntimeResolvableService} from "./runtime-resolvable.service";
import {Observable} from "rxjs";
import {Directive, Input, OnChanges, SimpleChanges} from "@angular/core";
-import {ConfigurationInfo} from "../../model/ConfigurationInfo";
+import {ConfigurationInfo} from "../../../connect/model/ConfigurationInfo";
@Directive()
export abstract class BaseRuntimeResolvableInput<T extends RuntimeResolvableAnyStaticProperty | RuntimeResolvableOneOfStaticProperty>
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-input/runtime-resolvable.service.ts b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-input/runtime-resolvable.service.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-runtime-resolvable-input/runtime-resolvable.service.ts
rename to ui/src/app/core-ui/static-properties/static-runtime-resolvable-input/runtime-resolvable.service.ts
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.css b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.css
rename to ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.css
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html
rename to ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html
diff --git a/ui/src/app/connect/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts
similarity index 100%
rename from ui/src/app/connect/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts
rename to ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts
diff --git a/ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.css b/ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.css
similarity index 100%
rename from ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.css
rename to ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.css
diff --git a/ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.html b/ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.html
similarity index 100%
rename from ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.html
rename to ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.html
diff --git a/ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.ts b/ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.ts
similarity index 96%
rename from ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.ts
rename to ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.ts
index 95f288a..81f3643 100644
--- a/ui/src/app/connect/static-properties/static-secret-input/static-secret-input.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.ts
@@ -19,7 +19,7 @@
import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {Validators} from '@angular/forms';
import {StaticPropertyUtilService} from '../static-property-util.service';
-import {ConfigurationInfo} from "../../model/ConfigurationInfo";
+import {ConfigurationInfo} from "../../../connect/model/ConfigurationInfo";
import {SecretStaticProperty} from "../../../core-model/gen/streampipes-model";
import {AbstractValidatedStaticPropertyRenderer} from "../base/abstract-validated-static-property";
diff --git a/ui/src/app/dashboard/dashboard.module.ts b/ui/src/app/dashboard/dashboard.module.ts
index a838ee5..7c8ea1a 100644
--- a/ui/src/app/dashboard/dashboard.module.ts
+++ b/ui/src/app/dashboard/dashboard.module.ts
@@ -31,7 +31,6 @@ import {AddVisualizationDialogComponent} from "./dialogs/add-widget/add-visualiz
import {MatGridListModule} from "@angular/material/grid-list";
import {ElementIconText} from "../services/get-element-icon-text.service";
import {DashboardService} from "./services/dashboard.service";
-import {ConnectModule} from "../connect/connect.module";
import {NumberWidgetComponent} from "./components/widgets/number/number-widget.component";
import {streamPipesStompConfig} from "./services/websocket.config";
import {InjectableRxStompConfig, RxStompService, rxStompServiceFactory} from "@stomp/ng2-stompjs";
@@ -62,15 +61,12 @@ import {CoreUiModule} from "../core-ui/core-ui.module";
CommonModule,
CoreUiModule,
MatTabsModule,
- FlexLayoutModule,
GridsterModule,
- CommonModule,
FlexLayoutModule,
CustomMaterialModule,
FormsModule,
ColorPickerModule,
MatGridListModule,
- ConnectModule,
NgxChartsModule,
CdkTableModule,
LeafletModule
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
index 4776203..f49940e 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -38,7 +38,6 @@ import {NgxChartsModule} from '@swimlane/ngx-charts';
import {GridsterModule} from 'angular-gridster2';
import {PlotlyViaWindowModule} from 'angular-plotly.js';
import {ColorPickerModule} from 'ngx-color-picker';
-import {ConnectModule} from '../connect/connect.module';
import {DatalakeRestService} from '../core-services/datalake/datalake-rest.service';
import {SemanticTypeUtilsService} from '../core-services/semantic-type/semantic-type-utils.service';
import {SharedDatalakeRestService} from '../core-services/shared/shared-dashboard.service';
@@ -91,16 +90,14 @@ export const MY_NATIVE_FORMATS = {
@NgModule({
imports: [
CommonModule,
+ CoreUiModule,
MatTabsModule,
- FlexLayoutModule,
GridsterModule,
- CommonModule,
FlexLayoutModule,
CustomMaterialModule,
FormsModule,
ColorPickerModule,
MatGridListModule,
- ConnectModule,
NgxChartsModule,
CdkTableModule,
MatSnackBarModule,
diff --git a/ui/src/app/editor/editor.module.ts b/ui/src/app/editor/editor.module.ts
index b95b08c..9d4ed0e 100644
--- a/ui/src/app/editor/editor.module.ts
+++ b/ui/src/app/editor/editor.module.ts
@@ -26,7 +26,6 @@ import {FormsModule, ReactiveFormsModule} from "@angular/forms";
import {ElementIconText} from "../services/get-element-icon-text.service";
import {SemanticTypeUtilsService} from '../core-services/semantic-type/semantic-type-utils.service';
import {EditorComponent} from "./editor.component";
-import {ConnectModule} from "../connect/connect.module";
import {EditorService} from "./services/editor.service";
import {PipelineElementIconStandComponent} from "./components/pipeline-element-icon-stand/pipeline-element-icon-stand.component";
import {PipelineAssemblyComponent} from "./components/pipeline-assembly/pipeline-assembly.component";
@@ -73,7 +72,6 @@ import {UserDefinedOutputStrategyComponent} from "./components/output-strategy/u
FlexLayoutModule,
CustomMaterialModule,
FormsModule,
- ConnectModule,
MatProgressSpinnerModule,
ShowdownModule,
ReactiveFormsModule
diff --git a/ui/src/app/pipeline-details/pipeline-details.module.ts b/ui/src/app/pipeline-details/pipeline-details.module.ts
index 09b4213..850a77f 100644
--- a/ui/src/app/pipeline-details/pipeline-details.module.ts
+++ b/ui/src/app/pipeline-details/pipeline-details.module.ts
@@ -32,10 +32,11 @@ import {PipelineStatusComponent} from "./components/status/pipeline-status.compo
import {PipelineElementsComponent} from "./components/elements/pipeline-elements.component";
import {PipelineElementsRowComponent} from "./components/elements/pipeline-elements-row.component";
import {QuickEditComponent} from "./components/edit/quickedit.component";
-import {ConnectModule} from "../connect/connect.module";
+import {CoreUiModule} from "../core-ui/core-ui.module";
@NgModule({
imports: [
+ CoreUiModule,
FlexLayoutModule,
FormsModule,
MatTabsModule,
@@ -44,7 +45,6 @@ import {ConnectModule} from "../connect/connect.module";
CommonModule,
MatProgressSpinnerModule,
EditorModule,
- ConnectModule,
FormsModule,
ReactiveFormsModule
],
[incubator-streampipes] 01/02: [STREAMPIPES-206] Remove obsolete UI
dependencies
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit b3ab9f85972d473d4c7719ee9335cef00f94fa0e
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Aug 24 12:48:07 2020 +0200
[STREAMPIPES-206] Remove obsolete UI dependencies
---
ui/package.json | 5 +----
ui/src/app/core-services/shared/shared-dashboard.service.ts | 2 +-
ui/src/app/dashboard/dashboard.module.ts | 8 --------
ui/src/app/data-explorer/data-explorer.module.ts | 4 ----
.../app/data-explorer/services/data-view-data-explorer.service.ts | 1 -
ui/src/app/services/rest-api.service.ts | 5 ++---
6 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/ui/package.json b/ui/package.json
index 12a8c0a..aa3586d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -59,7 +59,6 @@
"jquery-ui-dist": "1.12.1",
"jquery.panzoom": "2.0.5",
"jshint": "2.11.1",
- "jsonld": "0.4.12",
"jsplumb": "2.1.3",
"jszip": "3.2.1",
"konva": "3.2.4",
@@ -67,7 +66,6 @@
"lodash": "4.17.20",
"material-design-icons": "3.0.1",
"moment": "2.24.0",
- "ng-dynamic-component": "4.0.3",
"ng-file-upload": "9.0.13",
"ng-pick-datetime": "7.0.0",
"ng-prettyjson": "0.1.8",
@@ -82,7 +80,6 @@
"quill": "1.3.7",
"roboto-fontface": "0.10.0",
"rxjs": "6.6.2",
- "rxjs-compat": "6.3.3",
"shepherd.js": "2.4.0",
"showdown": "1.9.1",
"systemjs": "0.21.6",
@@ -94,7 +91,7 @@
"@angular-devkit/build-angular": "~0.1000.6",
"@angular/cli": "10.0.6",
"@angular/compiler-cli": "10.0.9",
- "@ngtools/webpack": "9.0.2",
+ "@ngtools/webpack": "^10.0.7",
"@types/angular": "^1.6.43",
"@types/jasmine": "~2.8.3",
"@types/jqueryui": "^1.12.7",
diff --git a/ui/src/app/core-services/shared/shared-dashboard.service.ts b/ui/src/app/core-services/shared/shared-dashboard.service.ts
index 57fddfe..c5df99b 100644
--- a/ui/src/app/core-services/shared/shared-dashboard.service.ts
+++ b/ui/src/app/core-services/shared/shared-dashboard.service.ts
@@ -18,10 +18,10 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
import { Dashboard } from '../../dashboard/models/dashboard.model';
import { AuthStatusService } from '../../services/auth-status.service';
import {map} from "rxjs/operators";
+import {Observable} from "rxjs";
@Injectable()
export class SharedDatalakeRestService {
diff --git a/ui/src/app/dashboard/dashboard.module.ts b/ui/src/app/dashboard/dashboard.module.ts
index 172b6eb..a838ee5 100644
--- a/ui/src/app/dashboard/dashboard.module.ts
+++ b/ui/src/app/dashboard/dashboard.module.ts
@@ -21,7 +21,6 @@ import {CommonModule} from '@angular/common';
import {FlexLayoutModule} from '@angular/flex-layout';
import {GridsterModule} from 'angular-gridster2';
import {DashboardComponent} from './dashboard.component';
-import {DynamicModule} from 'ng-dynamic-component';
import {DashboardPanelComponent} from "./components/panel/dashboard-panel.component";
import {MatTabsModule} from "@angular/material/tabs";
import {DashboardWidgetComponent} from "./components/widget/dashboard-widget.component";
@@ -58,18 +57,11 @@ import {TrafficLightWidgetComponent} from "./components/widgets/trafficlight/tra
import {StandaloneDashboardComponent} from "./components/standalone/standalone-dashboard.component";
import {CoreUiModule} from "../core-ui/core-ui.module";
-const dashboardWidgets = [
-
-];
-
@NgModule({
imports: [
CommonModule,
CoreUiModule,
MatTabsModule,
- DynamicModule.withComponents(
- dashboardWidgets
- ),
FlexLayoutModule,
GridsterModule,
CommonModule,
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
index 9164145..4776203 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -37,7 +37,6 @@ import {
import {NgxChartsModule} from '@swimlane/ngx-charts';
import {GridsterModule} from 'angular-gridster2';
import {PlotlyViaWindowModule} from 'angular-plotly.js';
-import {DynamicModule} from 'ng-dynamic-component';
import {ColorPickerModule} from 'ngx-color-picker';
import {ConnectModule} from '../connect/connect.module';
import {DatalakeRestService} from '../core-services/datalake/datalake-rest.service';
@@ -93,9 +92,6 @@ export const MY_NATIVE_FORMATS = {
imports: [
CommonModule,
MatTabsModule,
- DynamicModule.withComponents(
- dashboardWidgets
- ),
FlexLayoutModule,
GridsterModule,
CommonModule,
diff --git a/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts b/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
index 940143b..2d22abc 100644
--- a/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
+++ b/ui/src/app/data-explorer/services/data-view-data-explorer.service.ts
@@ -19,7 +19,6 @@
import {HttpClient} from '@angular/common/http';
import {Injectable} from '@angular/core';
import {Observable} from 'rxjs';
-import 'rxjs-compat/add/observable/of';
import {map} from 'rxjs/operators';
import {DatalakeRestService} from '../../core-services/datalake/datalake-rest.service';
import {SharedDatalakeRestService} from '../../core-services/shared/shared-dashboard.service';
diff --git a/ui/src/app/services/rest-api.service.ts b/ui/src/app/services/rest-api.service.ts
index 13fadfa..33879c9 100644
--- a/ui/src/app/services/rest-api.service.ts
+++ b/ui/src/app/services/rest-api.service.ts
@@ -19,12 +19,11 @@
//import _ from 'lodash';
-import {Inject, Injectable} from "@angular/core";
-import * as angular from 'angular';
+import {Injectable} from "@angular/core";
import {AuthStatusService} from "./auth-status.service";
import {PlatformServicesCommons} from "../platform-services/apis/commons.service";
import {HttpClient} from "@angular/common/http";
-import { Observable } from 'rxjs/Observable';
+import {Observable} from "rxjs";
@Injectable()
export class RestApi {