fix(sg): do not redirect to the new SG after its creation (#1147)

PR Close #1096

src/app/reducers/security-groups/redux/sg.effects.ts

@@ -51,8 +51,7 @@ export class SecurityGroupEffects {
   @Effect({ dispatch: false })
   createSecurityGroupSuccess$: Observable<Action> = this.actions$
     .ofType(securityGroup.CREATE_SECURITY_GROUP_SUCCESS)
-    .do((action: securityGroup.CreateSecurityGroupSuccess) =>
-      this.onSecurityGroupCreated(action.payload));
+    .do(() => this.dialog.closeAll());
 
   @Effect()
   deleteSecurityGroup$: Observable<Action> = this.actions$
@@ -159,13 +158,6 @@ export class SecurityGroupEffects {
     }
   }
 
-  private onSecurityGroupCreated(securityGroup: SecurityGroup): void {
-    this.dialog.closeAll();
-    this.router.navigate(['../security-group', securityGroup.id], {
-      queryParamsHandling: 'preserve'
-    });
-  }
-
   private deleteSecurityGroup(securityGroup: SecurityGroup): Observable<any> {
     return this.securityGroupService.deleteGroup(securityGroup);
   }

src/app/reducers/templates/redux/template.effects.ts

@@ -132,6 +132,14 @@ export class TemplateEffects {
         });
     });
 
+  @Effect({ dispatch: false })
+  registerAndCreateTemplateSuccess$: Observable<Action> = this.actions$
+    .ofType(
+      template.TEMPLATE_REGISTER_SUCCESS,
+      template.TEMPLATE_CREATE_SUCCESS
+    )
+    .do(() => this.dialog.closeAll());
+
   @Effect()
   setTemplateGroup$: Observable<Action> = this.actions$
     .ofType(template.SET_TEMPLATE_GROUP)

src/app/security-group/containers/security-group-creation.container.ts

@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
 import { State } from '../../reducers/index';
 import { Store } from '@ngrx/store';
-import { Router } from '@angular/router';
 
 import * as securityGroupActions from '../../reducers/security-groups/redux/sg.actions';
 import * as fromSecurityGroups from '../../reducers/security-groups/redux/sg.reducers';
@@ -12,27 +11,17 @@ import * as fromSecurityGroups from '../../reducers/security-groups/redux/sg.red
     <cs-security-group-creation
       [mode]="viewMode$ | async"
       [creationInProgress]="isLoading$ | async"
-      (cancel)="onCancel()"
       (createSecurityGroup)="onSecurityGroupCreation($event)"
     ></cs-security-group-creation>`
 })
 export class SecurityGroupCreationContainerComponent {
   readonly isLoading$ = this.store.select(fromSecurityGroups.isFormLoading);
   readonly viewMode$ = this.store.select(fromSecurityGroups.viewMode);
 
-  constructor(
-    private store: Store<State>,
-    private router: Router
-  ) {
+  constructor(private store: Store<State>) {
   }
 
   public onSecurityGroupCreation(creationParams) {
     this.store.dispatch(new securityGroupActions.CreateSecurityGroup(creationParams));
   }
-
-  public onCancel(): void {
-    this.router.navigate(['../security-group'], {
-      queryParamsHandling: 'preserve'
-    });
-  }
 }

src/app/security-group/sg-creation/security-group-creation-dialog.component.ts

@@ -1,5 +1,7 @@
 import { Component } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
 import { MatDialog, MatDialogConfig } from '@angular/material';
+
 import { SecurityGroupCreationContainerComponent } from '../containers/security-group-creation.container';
 
 
@@ -8,13 +10,19 @@ import { SecurityGroupCreationContainerComponent } from '../containers/security-
   template: ``
 })
 export class SecurityGroupCreationDialogComponent {
-  constructor(private dialog: MatDialog) {
+  constructor(
+    private dialog: MatDialog,
+    private router: Router,
+    private route: ActivatedRoute
+  ) {
     this.dialog.open(SecurityGroupCreationContainerComponent, <MatDialogConfig>{
       data: { },
       disableClose: true,
       width: '405px'
-    })
+    }).afterClosed()
+      .subscribe(() => this.router.navigate(['../'], {
+        queryParamsHandling: 'preserve',
+        relativeTo: this.route
+      }));
   }
-
-
 }

src/app/security-group/sg-creation/security-group-creation.component.html

@@ -52,7 +52,6 @@ <h3 *ngIf="isModeShared" class="mat-dialog-title">
         mat-button
         color="primary"
         matDialogClose
-        (click)="cancel.emit()"
         type="button"
       >
         {{ 'COMMON.CANCEL' | translate }}

src/app/security-group/sg-creation/security-group-creation.component.ts

@@ -1,10 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  Input,
-  Output
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
 import { Rules } from '../../shared/components/security-group-builder/rules';
 import { SecurityGroupViewMode } from '../sg-view-mode';
 
@@ -26,7 +20,6 @@ export interface SecurityGroupCreationParams {
 export class SecurityGroupCreationComponent {
   @Input() public creationInProgress = false;
   @Input() public mode: SecurityGroupViewMode;
-  @Output() public cancel = new EventEmitter();
   @Output() public createSecurityGroup = new EventEmitter<SecurityGroupCreationParams>();
 
   public name = '';

src/app/template/template-creation/containers/template-creation.container.ts

@@ -62,7 +62,6 @@ export class TemplateCreationContainerComponent {
     } else {
       this.store.dispatch(new templateActions.RegisterTemplate(params));
     }
-    this.dialogRef.close();
   }
 }