Redirect to stream-defs page when stream(s) created

Author: BoykoAlex

ui/package.json

@@ -37,7 +37,7 @@
     "ngx-pagination": "3.0.1",
     "rxjs": "5.5.2",
     "sockjs-client": "1.1.4",
-    "spring-flo": "0.7.0-beta",
+    "spring-flo": "git://github.com/spring-projects/spring-flo#0ee041142d50044512b091b504e9ab9df3ffcd48",
     "stompjs": "2.3.3",
     "tixif-ngx-busy": "0.0.5",
     "zone.js": "0.8.18",

ui/src/app/streams/stream-create-dialog/stream-create-dialog.component.ts

@@ -8,6 +8,7 @@ import { StreamsService } from '../streams.service';
 import { ToastyService } from 'ng2-toasty';
 import { Properties } from 'spring-flo';
 import { Subscription } from 'rxjs/Subscription';
+import { Router } from '@angular/router';
 
 /**
  * Stores progress percentage.
@@ -53,7 +54,8 @@ export class StreamCreateDialogComponent implements OnInit {
     private bsModalRef: BsModalRef,
     private toastyService: ToastyService,
     private parserService: ParserService,
-    private streamService: StreamsService
+    private streamService: StreamsService,
+    private router: Router
   ) {}
 
   ngOnInit() {
@@ -237,6 +239,7 @@ export class StreamCreateDialogComponent implements OnInit {
             this.bsModalRef.hide();
             this.toastyService.success('Stream(s) have been created successfully');
           }, PROGRESS_BAR_WAIT_TIME);
+          this.router.navigate(['streams/definitions']);
         } else {
           // There are more streams to create, so create the next one
           this.waitForStreamDef(def.name, 0).then(() => {

ui/src/app/streams/stream-create/stream-create.component.ts

@@ -105,7 +105,12 @@ export class StreamCreateComponent implements OnInit, OnDestroy {
     const bsModalRef = this.bsModalService
       .show(StreamCreateDialogComponent);
     bsModalRef.content.setDsl(this.dsl);
-    bsModalRef.content.successCallback = () => this.editorContext.clearGraph();
+    bsModalRef.content.successCallback = () => {
+      this.editorContext.clearGraph();
+      // At this moment graph <-> dsl syncing is off because neither DSL editor nor graph editor has focus on
+      // Therefore, kick off the text update manually.
+      this.editorContext.updateText();
+    };
   }
 
   contentAssist(doc: CodeMirror.EditorFromTextArea) {