fix: #138

fix: #113

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [0.6.0](https://github.com/Noovolari/leapp/compare/v0.5.3...v0.6.0) (2021-06-30)
+### [0.6.0](https://github.com/Noovolari/leapp/compare/v0.5.3...v0.6.0) (2021-06-30)
 
 ### Features
 

src/app/components/session/session-card/session-card.component.html

@@ -50,10 +50,13 @@
       <ng-select bindLabel="region" bindValue="region" [items]="awsRegions" [(ngModel)]="selectedSsmRegion" placeholder="Select a Region for finding instances" (change)="changeSsmRegion($event, session);"></ng-select>
 
       <div class="loader" *ngIf="ssmLoading"><i class="fa fa-spinner fa-spin"></i></div>
-      <div class="list-of-ssm" *ngIf="!ssmLoading && instances.length > 0">
-        <b>Select an EC2 Instance:</b><br>
-        <input class="form-control" type="text" placeholder="search by..." (keyup)="searchSSMInstance($event)" />
-        <ul class="ssm-ul">
+      <div class="list-of-ssm" *ngIf="!ssmLoading">
+        <ng-container *ngIf="!ssmLoading && !firstTimeSsm">
+          <b>Select an EC2 Instance:</b><br>
+          <input class="form-control" type="text" placeholder="search by..." (keyup)="searchSSMInstance($event)" />
+        </ng-container>
+
+        <ul class="ssm-ul" *ngIf="instances.length > 0">
           <li *ngFor="let instance of instances" class="ssm-card">
             <div>
               <span><b>{{instance.Name.length >= 24 ? instance.Name.substr(0, 21) + '...' : instance.Name}}</b> - {{instance.IPAddress}}</span>

src/app/components/session/session-card/session-card.component.ts

@@ -45,6 +45,7 @@ export class SessionCardComponent implements OnInit {
   selectedSsmRegion;
   selectedDefaultRegion;
   openSsm = false;
+  firstTimeSsm = true;
   awsRegions = [];
   regionOrLocations = [];
   instances = [];
@@ -181,6 +182,8 @@ export class SessionCardComponent implements OnInit {
     // Reset things before opening the modal
     this.instances = [];
     this.ssmLoading = false;
+    this.firstTimeSsm = true;
+    this.selectedSsmRegion = null;
     this.modalRef = this.modalService.show(this.ssmModalTemplate, { class: 'ssm-modal'});
   }
 
@@ -205,12 +208,14 @@ export class SessionCardComponent implements OnInit {
     if (this.selectedSsmRegion) {
       // Start process
       this.ssmLoading = true;
+      this.firstTimeSsm = true;
       // Generate valid temporary credentials for the SSM and EC2 client
       const credentials = await (this.sessionService as AwsSessionService).generateCredentials(session.sessionId);
       // Get the instances
       this.instances = await this.ssmService.getSsmInstances(credentials, this.selectedSsmRegion);
       this.duplicateInstances = this.instances;
       this.ssmLoading = false;
+      this.firstTimeSsm = false;
     }
   }