[incubator-streampipes] branch STREAMPIPES-545 updated: [hotfix] Fix injection of editor services

[ri...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch STREAMPIPES-545
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


The following commit(s) were added to refs/heads/STREAMPIPES-545 by this push:
     new 09b7b4942 [hotfix] Fix injection of editor services
     new 98e94e983 Merge branch 'STREAMPIPES-545' of github.com:apache/incubator-streampipes into STREAMPIPES-545
09b7b4942 is described below

commit 09b7b4942d2c68a378461fabc88538365036ca55
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Mon Aug 1 22:29:50 2022 +0200

    [hotfix] Fix injection of editor services
---
 ui/src/app/editor/editor.module.ts                  | 21 ---------------------
 ui/src/app/editor/services/editor.service.ts        |  2 +-
 .../app/editor/services/jsplumb-config.service.ts   |  2 +-
 .../app/editor/services/jsplumb-endpoint.service.ts |  2 +-
 .../app/editor/services/jsplumb-factory.service.ts  |  2 +-
 ui/src/app/editor/services/jsplumb.service.ts       |  5 +++--
 .../app/editor/services/object-provider.service.ts  |  2 +-
 .../services/pipeline-canvas-scrolling.service.ts   |  2 +-
 .../app/editor/services/pipeline-editor.service.ts  |  2 +-
 .../services/pipeline-element-dragged.service.ts    |  2 +-
 .../pipeline-element-recommendation.service.ts      |  2 +-
 .../editor/services/pipeline-positioning.service.ts |  2 +-
 .../app/editor/services/pipeline-style.service.ts   |  2 +-
 .../editor/services/pipeline-validation.service.ts  |  2 +-
 14 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/ui/src/app/editor/editor.module.ts b/ui/src/app/editor/editor.module.ts
index 92d4ddccd..284ce1faa 100644
--- a/ui/src/app/editor/editor.module.ts
+++ b/ui/src/app/editor/editor.module.ts
@@ -29,13 +29,8 @@ 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';
 import { PipelineElementComponent } from './components/pipeline-element/pipeline-element.component';
-import { PipelinePositioningService } from './services/pipeline-positioning.service';
-import { JsplumbService } from './services/jsplumb.service';
-import { JsplumbConfigService } from './services/jsplumb-config.service';
 import { PipelineEditorService } from './services/pipeline-editor.service';
-import { PipelineValidationService } from './services/pipeline-validation.service';
 import { PipelineComponent } from './components/pipeline/pipeline.component';
-import { ObjectProvider } from './services/object-provider.service';
 import { PipelineElementOptionsComponent } from './components/pipeline-element-options/pipeline-element-options.component';
 import { PipelineElementRecommendationService } from './services/pipeline-element-recommendation.service';
 import { CustomizeComponent } from './dialog/customize/customize.component';
@@ -60,11 +55,8 @@ import { ConnectModule } from '../connect/connect.module';
 import { EnabledPipelineElementFilter } from './filter/enabled-pipeline-element.filter';
 import { PipelineElementDraggedService } from './services/pipeline-element-dragged.service';
 import { PipelineCanvasScrollingService } from './services/pipeline-canvas-scrolling.service';
-import { JsplumbEndpointService } from './services/jsplumb-endpoint.service';
-import { JsplumbFactoryService } from './services/jsplumb-factory.service';
 import { PipelineElementPreviewComponent } from './components/pipeline-element-preview/pipeline-element-preview.component';
 import { PipelineElementDiscoveryComponent } from './dialog/pipeline-element-discovery/pipeline-element-discovery.component';
-import { PipelineStyleService } from './services/pipeline-style.service';
 import { PlatformServicesModule } from '@streampipes/platform-services';
 import { PipelineElementIconStandRowComponent } from './components/pipeline-element-icon-stand-row/pipeline-element-icon-stand-row.component';
 import { PipelineElementTypeFilterPipe } from './services/pipeline-element-type-filter.pipe';
@@ -120,20 +112,7 @@ import { PipelineElementGroupFilterPipe } from './services/pipeline-element-grou
         WelcomeTourComponent
     ],
     providers: [
-        EditorService,
         SemanticTypeUtilsService,
-        JsplumbFactoryService,
-        JsplumbEndpointService,
-        JsplumbService,
-        JsplumbConfigService,
-        ObjectProvider,
-        PipelineCanvasScrollingService,
-        PipelineElementDraggedService,
-        PipelineEditorService,
-        PipelinePositioningService,
-        PipelineStyleService,
-        PipelineValidationService,
-        PipelineElementRecommendationService,
         SafeCss,
     ],
     exports: [
diff --git a/ui/src/app/editor/services/editor.service.ts b/ui/src/app/editor/services/editor.service.ts
index fcde9add1..99c19e397 100644
--- a/ui/src/app/editor/services/editor.service.ts
+++ b/ui/src/app/editor/services/editor.service.ts
@@ -37,7 +37,7 @@ import { DialogService, PanelType } from '@streampipes/shared-ui';
 import { HelpComponent } from '../dialog/help/help.component';
 import { map } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class EditorService {
 
     private pipelineElementConfigured = new Subject<string>();
diff --git a/ui/src/app/editor/services/jsplumb-config.service.ts b/ui/src/app/editor/services/jsplumb-config.service.ts
index f43742bde..76d0f38d9 100644
--- a/ui/src/app/editor/services/jsplumb-config.service.ts
+++ b/ui/src/app/editor/services/jsplumb-config.service.ts
@@ -22,7 +22,7 @@ import { BezierConnector } from '@jsplumb/connector-bezier';
 import { EndpointTypeDescriptor } from '@jsplumb/core';
 import { ArrowOverlayOptions } from '@jsplumb/common';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class JsplumbConfigService {
 
   constructor() {
diff --git a/ui/src/app/editor/services/jsplumb-endpoint.service.ts b/ui/src/app/editor/services/jsplumb-endpoint.service.ts
index fc554e4be..e9786dd8c 100644
--- a/ui/src/app/editor/services/jsplumb-endpoint.service.ts
+++ b/ui/src/app/editor/services/jsplumb-endpoint.service.ts
@@ -19,7 +19,7 @@
 import { Injectable } from '@angular/core';
 import { JsplumbConfigService } from './jsplumb-config.service';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class JsplumbEndpointService {
 
   constructor(private jsplumbConfigService: JsplumbConfigService) {
diff --git a/ui/src/app/editor/services/jsplumb-factory.service.ts b/ui/src/app/editor/services/jsplumb-factory.service.ts
index a0f98c914..a895e7215 100644
--- a/ui/src/app/editor/services/jsplumb-factory.service.ts
+++ b/ui/src/app/editor/services/jsplumb-factory.service.ts
@@ -23,7 +23,7 @@ import { BrowserJsPlumbInstance, ContainmentType, newInstance } from '@jsplumb/b
 import { PipelineElementDraggedService } from './pipeline-element-dragged.service';
 import { JsplumbConfigService } from './jsplumb-config.service';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class JsplumbFactoryService {
 
     pipelineEditorInstance: BrowserJsPlumbInstance;
diff --git a/ui/src/app/editor/services/jsplumb.service.ts b/ui/src/app/editor/services/jsplumb.service.ts
index efb4390ce..127d608f8 100644
--- a/ui/src/app/editor/services/jsplumb.service.ts
+++ b/ui/src/app/editor/services/jsplumb.service.ts
@@ -38,7 +38,7 @@ import { JsplumbEndpointService } from './jsplumb-endpoint.service';
 import { JsplumbFactoryService } from './jsplumb-factory.service';
 import { EditorService } from './editor.service';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class JsplumbService {
 
   idCounter = 0;
@@ -98,7 +98,8 @@ export class JsplumbService {
           pipelineElementConfig.payload,
           true,
           false);
-      }, 100);
+        this.getBridge(false).repaintEverything();
+      }, 10);
     }
 
   }
diff --git a/ui/src/app/editor/services/object-provider.service.ts b/ui/src/app/editor/services/object-provider.service.ts
index 9a6086508..95375edaf 100644
--- a/ui/src/app/editor/services/object-provider.service.ts
+++ b/ui/src/app/editor/services/object-provider.service.ts
@@ -23,7 +23,7 @@ import { DataSinkInvocation, Pipeline } from '@streampipes/platform-services';
 import { EditorService } from './editor.service';
 import { JsplumbFactoryService } from './jsplumb-factory.service';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class ObjectProvider {
 
     constructor(private restApi: RestApi,
diff --git a/ui/src/app/editor/services/pipeline-canvas-scrolling.service.ts b/ui/src/app/editor/services/pipeline-canvas-scrolling.service.ts
index 5be904d3d..764b1f7de 100644
--- a/ui/src/app/editor/services/pipeline-canvas-scrolling.service.ts
+++ b/ui/src/app/editor/services/pipeline-canvas-scrolling.service.ts
@@ -19,7 +19,7 @@
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class PipelineCanvasScrollingService {
 
   public canvasScrollXSubject: Subject<number> = new Subject<number>();
diff --git a/ui/src/app/editor/services/pipeline-editor.service.ts b/ui/src/app/editor/services/pipeline-editor.service.ts
index 1057188d9..2e3dfeb33 100644
--- a/ui/src/app/editor/services/pipeline-editor.service.ts
+++ b/ui/src/app/editor/services/pipeline-editor.service.ts
@@ -18,7 +18,7 @@
 
 import { Injectable } from '@angular/core';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class PipelineEditorService {
 
     constructor() {
diff --git a/ui/src/app/editor/services/pipeline-element-dragged.service.ts b/ui/src/app/editor/services/pipeline-element-dragged.service.ts
index 16ae51e4c..c5c2bc5bd 100644
--- a/ui/src/app/editor/services/pipeline-element-dragged.service.ts
+++ b/ui/src/app/editor/services/pipeline-element-dragged.service.ts
@@ -20,7 +20,7 @@ import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs';
 import { PipelineElementPosition } from '../model/editor.model';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class PipelineElementDraggedService {
 
   public pipelineElementMovedSubject: Subject<PipelineElementPosition> = new Subject<PipelineElementPosition>();
diff --git a/ui/src/app/editor/services/pipeline-element-recommendation.service.ts b/ui/src/app/editor/services/pipeline-element-recommendation.service.ts
index 129c15991..ae676f938 100644
--- a/ui/src/app/editor/services/pipeline-element-recommendation.service.ts
+++ b/ui/src/app/editor/services/pipeline-element-recommendation.service.ts
@@ -24,7 +24,7 @@ import {
   SpDataStream
 } from '@streampipes/platform-services';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class PipelineElementRecommendationService {
 
     constructor() {
diff --git a/ui/src/app/editor/services/pipeline-positioning.service.ts b/ui/src/app/editor/services/pipeline-positioning.service.ts
index 2293d0b95..1f8b281d4 100644
--- a/ui/src/app/editor/services/pipeline-positioning.service.ts
+++ b/ui/src/app/editor/services/pipeline-positioning.service.ts
@@ -33,7 +33,7 @@ import { JsplumbFactoryService } from './jsplumb-factory.service';
 import { ObjectProvider } from './object-provider.service';
 import { Connection } from '@jsplumb/core';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class PipelinePositioningService {
 
   constructor(private jsplumbService: JsplumbService,
diff --git a/ui/src/app/editor/services/pipeline-style.service.ts b/ui/src/app/editor/services/pipeline-style.service.ts
index 42a14f367..9d6dabe5c 100644
--- a/ui/src/app/editor/services/pipeline-style.service.ts
+++ b/ui/src/app/editor/services/pipeline-style.service.ts
@@ -23,7 +23,7 @@ import { Endpoint } from '@jsplumb/core';
 import { JsplumbFactoryService } from './jsplumb-factory.service';
 import { PipelineElementConfig, PipelineElementConfigurationStatus } from '../model/editor.model';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class PipelineStyleService {
 
   constructor(private jsPlumbConfigService: JsplumbConfigService,
diff --git a/ui/src/app/editor/services/pipeline-validation.service.ts b/ui/src/app/editor/services/pipeline-validation.service.ts
index 779b83e87..e3607fa0d 100644
--- a/ui/src/app/editor/services/pipeline-validation.service.ts
+++ b/ui/src/app/editor/services/pipeline-validation.service.ts
@@ -25,7 +25,7 @@ import { JsplumbFactoryService } from './jsplumb-factory.service';
 import { UserErrorMessage } from '../../core-model/base/UserErrorMessage';
 import { Connection } from '@jsplumb/core';
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class PipelineValidationService {
 
     errorMessages: any = [];