fix(ssh-keys-sidebar): SSH keys sidebar loads invalid key if there ar…

…e duplicate names for different accounts - review fixes 1

src/app/shared/components/sidebar/sidebar.component.ts

@@ -39,7 +39,7 @@ export abstract class SidebarComponent<M extends BaseModel> implements OnInit {
     return (tabId === pathLastChild)
   }
 
-  protected pluckId(): Observable<string> {
+  private pluckId(): Observable<string> {
     return this.route.params.pluck('id').filter(id => !!id) as Observable<string>;
   }
 

src/app/shared/services/ssh-keypair.service.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import { VirtualMachine } from '../../vm/shared/vm.model';
 import { BackendResource } from '../decorators';
@@ -21,20 +21,12 @@ export interface SshKeyCreationData {
   entityModel: SSHKeyPair
 })
 export class SSHKeyPairService extends BaseBackendCachedService<SSHKeyPair> {
-  protected account: string;
-
   constructor(private asyncJobService: AsyncJobService,
-              protected http: HttpClient,
-              protected activatedRoute: ActivatedRoute) {
+              protected http: HttpClient) {
     super(http);
-
-    this.activatedRoute.queryParams.subscribe((params: Params) => {
-      this.account = params['account'];
-    });
   }
 
-  public getByName(name: string, account?: string): Observable<SSHKeyPair> {
-    const params = account ? { name, account } : { name };
+  public getByParams(params): Observable<SSHKeyPair> {
     return this.getList(params).map(sshKeys => sshKeys[0]);
   }
 

src/app/ssh-keys/ssh-key-sidebar/ssh-key-sidebar.component.ts

@@ -1,5 +1,5 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
+import { Component } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import { SidebarComponent } from '../../shared/components/sidebar/sidebar.component';
 import { SSHKeyPair } from '../../shared/models/ssh-keypair.model';
@@ -13,7 +13,7 @@ import { EntityDoesNotExistError } from '../../shared/components/sidebar/entity-
   selector: 'cs-ssh-key-sidebar',
   templateUrl: 'ssh-key-sidebar.component.html'
 })
-export class SshKeySidebarComponent extends SidebarComponent<SSHKeyPair> implements OnInit {
+export class SshKeySidebarComponent extends SidebarComponent<SSHKeyPair> {
   public description: string;
   public account: string;
 
@@ -25,21 +25,16 @@ export class SshKeySidebarComponent extends SidebarComponent<SSHKeyPair> impleme
     super(entityService, notificationService, route, router);
   }
 
-  public ngOnInit() {
-    this.getEntityAccount();
-
-    this.pluckId()
-      .switchMap(id => this.loadEntity(id, this.account))
-      .subscribe(entity => this.entity = entity);
-  }
-
   public onDescriptionChange(description: string): void {
     this.description = description;
     this.userTagService.setSshKeyDescription(this.entity, this.description).subscribe();
   }
 
-  protected loadEntity(name: string, account?: string): Observable<SSHKeyPair> {
-    return this.entityService.getByName(name, account)
+  protected loadEntity(name: string): Observable<SSHKeyPair> {
+    const account = this.route.snapshot.queryParams['account'];
+    const params = account ? { name, account } : { name };
+
+    return this.entityService.getByParams(params)
       .switchMap(sshKeyPair => {
         if (sshKeyPair) {
           return Observable.of(sshKeyPair);
@@ -58,10 +53,4 @@ export class SshKeySidebarComponent extends SidebarComponent<SSHKeyPair> impleme
         return sshKeyPair;
       });
   }
-
-  private getEntityAccount() {
-    this.route.queryParams.subscribe((params: Params) => {
-      this.account = params['account'];
-    });
-  }
 }