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/06/11 13:34:20 UTC
[incubator-streampipes] branch STREAMPIPES-145 updated:
[STREAMPIPES-145] Move dialog templates to core-ui module
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
The following commit(s) were added to refs/heads/STREAMPIPES-145 by this push:
new c2f4e9f [STREAMPIPES-145] Move dialog templates to core-ui module
c2f4e9f is described below
commit c2f4e9f91be1ecb9e170a561e27a2c8f94e12a4a
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Thu Jun 11 15:34:03 2020 +0200
[STREAMPIPES-145] Move dialog templates to core-ui module
---
ui/src/app/core-ui/core-ui.module.ts | 14 +++++++++++++-
.../dialog/base-dialog/base-dialog.component.ts | 0
.../dialog/base-dialog/base-dialog.config.ts | 0
.../dialog/base-dialog/base-dialog.model.ts | 0
.../dialog/base-dialog/base-dialog.service.ts | 0
.../dialog/base-dialog/dialog-ref.ts | 0
.../dialog/panel-dialog/panel-dialog.component.html | 0
.../dialog/panel-dialog/panel-dialog.component.scss | 0
.../dialog/panel-dialog/panel-dialog.component.ts | 0
.../dialog/panel-dialog/panel-dialog.config.ts | 0
.../dialog/standard-dialog/standard-dialog.component.html | 0
.../dialog/standard-dialog/standard-dialog.component.scss | 0
.../dialog/standard-dialog/standard-dialog.component.ts | 0
.../dialog/standard-dialog/standard-dialog.config.ts | 0
.../editor-v2/components/pipeline/pipeline.component.ts | 7 ++-----
.../app/editor-v2/dialog/customize/customize.component.ts | 2 +-
ui/src/app/editor-v2/editor.module.ts | 15 ++++-----------
17 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/ui/src/app/core-ui/core-ui.module.ts b/ui/src/app/core-ui/core-ui.module.ts
index da4936e..070e01b 100644
--- a/ui/src/app/core-ui/core-ui.module.ts
+++ b/ui/src/app/core-ui/core-ui.module.ts
@@ -46,6 +46,11 @@ import { PolygonLabelingService } from './image/services/PolygonLabeling.service
import { ReactLabelingService } from './image/services/ReactLabeling.service';
import { CocoFormatService } from "./image/services/CocoFormat.service";
import { LabelingModeService } from "./image/services/LabelingMode.service";
+import {StandardDialogComponent} from "./dialog/standard-dialog/standard-dialog.component";
+import {PanelDialogComponent} from "./dialog/panel-dialog/panel-dialog.component";
+import {DialogService} from "./dialog/base-dialog/base-dialog.service";
+import {PortalModule} from "@angular/cdk/portal";
+import {OverlayModule} from "@angular/cdk/overlay";
// PlotlyViaCDNModule.plotlyjs = PlotlyJS;
@NgModule({
@@ -62,7 +67,9 @@ import { LabelingModeService } from "./image/services/LabelingMode.service";
MatNativeDateModule,
PlotlyViaWindowModule,
MatSliderModule,
- MatChipsModule
+ MatChipsModule,
+ PortalModule,
+ OverlayModule,
],
declarations: [
ImageComponent,
@@ -73,6 +80,8 @@ import { LabelingModeService } from "./image/services/LabelingMode.service";
ImageAnnotationsComponent,
ImageCategorizeComponent,
ImageViewerComponent,
+ StandardDialogComponent,
+ PanelDialogComponent
],
providers: [
MatDatepickerModule,
@@ -82,12 +91,15 @@ import { LabelingModeService } from "./image/services/LabelingMode.service";
BrushLabelingService,
CocoFormatService,
LabelingModeService,
+ DialogService
],
entryComponents: [
],
exports: [
ImageComponent,
ImageLabelingComponent,
+ StandardDialogComponent,
+ PanelDialogComponent
]
})
export class CoreUiModule {
diff --git a/ui/src/app/editor-v2/dialog/base-dialog/base-dialog.component.ts b/ui/src/app/core-ui/dialog/base-dialog/base-dialog.component.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/base-dialog/base-dialog.component.ts
rename to ui/src/app/core-ui/dialog/base-dialog/base-dialog.component.ts
diff --git a/ui/src/app/editor-v2/dialog/base-dialog/base-dialog.config.ts b/ui/src/app/core-ui/dialog/base-dialog/base-dialog.config.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/base-dialog/base-dialog.config.ts
rename to ui/src/app/core-ui/dialog/base-dialog/base-dialog.config.ts
diff --git a/ui/src/app/editor-v2/dialog/base-dialog/base-dialog.model.ts b/ui/src/app/core-ui/dialog/base-dialog/base-dialog.model.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/base-dialog/base-dialog.model.ts
rename to ui/src/app/core-ui/dialog/base-dialog/base-dialog.model.ts
diff --git a/ui/src/app/editor-v2/dialog/base-dialog/base-dialog.service.ts b/ui/src/app/core-ui/dialog/base-dialog/base-dialog.service.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/base-dialog/base-dialog.service.ts
rename to ui/src/app/core-ui/dialog/base-dialog/base-dialog.service.ts
diff --git a/ui/src/app/editor-v2/dialog/base-dialog/dialog-ref.ts b/ui/src/app/core-ui/dialog/base-dialog/dialog-ref.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/base-dialog/dialog-ref.ts
rename to ui/src/app/core-ui/dialog/base-dialog/dialog-ref.ts
diff --git a/ui/src/app/editor-v2/dialog/panel-dialog/panel-dialog.component.html b/ui/src/app/core-ui/dialog/panel-dialog/panel-dialog.component.html
similarity index 100%
rename from ui/src/app/editor-v2/dialog/panel-dialog/panel-dialog.component.html
rename to ui/src/app/core-ui/dialog/panel-dialog/panel-dialog.component.html
diff --git a/ui/src/app/editor-v2/dialog/panel-dialog/panel-dialog.component.scss b/ui/src/app/core-ui/dialog/panel-dialog/panel-dialog.component.scss
similarity index 100%
rename from ui/src/app/editor-v2/dialog/panel-dialog/panel-dialog.component.scss
rename to ui/src/app/core-ui/dialog/panel-dialog/panel-dialog.component.scss
diff --git a/ui/src/app/editor-v2/dialog/panel-dialog/panel-dialog.component.ts b/ui/src/app/core-ui/dialog/panel-dialog/panel-dialog.component.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/panel-dialog/panel-dialog.component.ts
rename to ui/src/app/core-ui/dialog/panel-dialog/panel-dialog.component.ts
diff --git a/ui/src/app/editor-v2/dialog/panel-dialog/panel-dialog.config.ts b/ui/src/app/core-ui/dialog/panel-dialog/panel-dialog.config.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/panel-dialog/panel-dialog.config.ts
rename to ui/src/app/core-ui/dialog/panel-dialog/panel-dialog.config.ts
diff --git a/ui/src/app/editor-v2/dialog/standard-dialog/standard-dialog.component.html b/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.html
similarity index 100%
rename from ui/src/app/editor-v2/dialog/standard-dialog/standard-dialog.component.html
rename to ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.html
diff --git a/ui/src/app/editor-v2/dialog/standard-dialog/standard-dialog.component.scss b/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.scss
similarity index 100%
rename from ui/src/app/editor-v2/dialog/standard-dialog/standard-dialog.component.scss
rename to ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.scss
diff --git a/ui/src/app/editor-v2/dialog/standard-dialog/standard-dialog.component.ts b/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/standard-dialog/standard-dialog.component.ts
rename to ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.ts
diff --git a/ui/src/app/editor-v2/dialog/standard-dialog/standard-dialog.config.ts b/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.config.ts
similarity index 100%
rename from ui/src/app/editor-v2/dialog/standard-dialog/standard-dialog.config.ts
rename to ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.config.ts
diff --git a/ui/src/app/editor-v2/components/pipeline/pipeline.component.ts b/ui/src/app/editor-v2/components/pipeline/pipeline.component.ts
index 20eb19f..a0dbc2c 100644
--- a/ui/src/app/editor-v2/components/pipeline/pipeline.component.ts
+++ b/ui/src/app/editor-v2/components/pipeline/pipeline.component.ts
@@ -38,8 +38,8 @@ import {
} from "../../../core-model/gen/streampipes-model";
import {ObjectProvider} from "../../services/object-provider.service";
import {CustomizeComponent} from "../../dialog/customize/customize.component";
-import {PanelType} from "../../dialog/base-dialog/base-dialog.model";
-import {DialogService} from "../../dialog/base-dialog/base-dialog.service";
+import {PanelType} from "../../../core-ui/dialog/base-dialog/base-dialog.model";
+import {DialogService} from "../../../core-ui/dialog/base-dialog/base-dialog.service";
@Component({
selector: 'pipeline',
@@ -352,9 +352,6 @@ export class PipelineComponent implements OnInit {
}
showCustomizeDialog(pipelineElement: PipelineElementConfig) {
- const inputMap = {};
- inputMap["pipelineElement"] = pipelineElement;
-
const dialogRef = this.dialogService.open(CustomizeComponent,{
panelType: PanelType.SLIDE_IN_PANEL,
title: "Customize " + pipelineElement.payload.name,
diff --git a/ui/src/app/editor-v2/dialog/customize/customize.component.ts b/ui/src/app/editor-v2/dialog/customize/customize.component.ts
index 70377aa..788d35e 100644
--- a/ui/src/app/editor-v2/dialog/customize/customize.component.ts
+++ b/ui/src/app/editor-v2/dialog/customize/customize.component.ts
@@ -18,7 +18,7 @@
import {Component, Input, OnInit} from "@angular/core";
import {InvocablePipelineElementUnion, PipelineElementConfig} from "../../model/editor.model";
-import {DialogRef} from "../base-dialog/dialog-ref";
+import {DialogRef} from "../../../core-ui/dialog/base-dialog/dialog-ref";
import {JsplumbService} from "../../services/jsplumb.service";
import {EventSchema} from "../../../core-model/gen/streampipes-model";
diff --git a/ui/src/app/editor-v2/editor.module.ts b/ui/src/app/editor-v2/editor.module.ts
index 14b3cd0..08f173c 100644
--- a/ui/src/app/editor-v2/editor.module.ts
+++ b/ui/src/app/editor-v2/editor.module.ts
@@ -45,14 +45,13 @@ import {PipelineElementOptionsComponent} from "./components/pipeline-element-opt
import {PipelineElementRecommendationService} from "./services/pipeline-element-recommendation.service";
import {PortalModule} from "@angular/cdk/portal";
import {OverlayModule} from "@angular/cdk/overlay";
-import {PanelDialogComponent} from "./dialog/panel-dialog/panel-dialog.component";
import {CustomizeComponent} from "./dialog/customize/customize.component";
import {MatProgressSpinnerModule} from "@angular/material/progress-spinner";
-import {StandardDialogComponent} from "./dialog/standard-dialog/standard-dialog.component";
-import {DialogService} from "./dialog/base-dialog/base-dialog.service";
+import {CoreUiModule} from "../core-ui/core-ui.module";
@NgModule({
imports: [
+ CoreUiModule,
CommonModule,
MatTabsModule,
FlexLayoutModule,
@@ -62,8 +61,6 @@ import {DialogService} from "./dialog/base-dialog/base-dialog.service";
CustomMaterialModule,
FormsModule,
ConnectModule,
- PortalModule,
- OverlayModule,
MatProgressSpinnerModule
],
declarations: [
@@ -73,9 +70,7 @@ import {DialogService} from "./dialog/base-dialog/base-dialog.service";
PipelineElementIconStandComponent,
PipelineElementComponent,
PipelineElementOptionsComponent,
- PipelineComponent,
- PanelDialogComponent,
- StandardDialogComponent
+ PipelineComponent
],
providers: [
EditorService,
@@ -89,7 +84,6 @@ import {DialogService} from "./dialog/base-dialog/base-dialog.service";
JsplumbService,
JsplumbConfigService,
ObjectProvider,
- DialogService,
PipelineEditorService,
PipelinePositioningService,
PipelineValidationService,
@@ -111,8 +105,7 @@ import {DialogService} from "./dialog/base-dialog/base-dialog.service";
EditorComponent
],
entryComponents: [
- EditorComponent,
- PanelDialogComponent
+ EditorComponent
]
})
export class EditorModule {