From 1d75fefb68c50168f48a9a8b6e1ddddbbe1c72a5 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 20 Jun 2022 18:05:34 +0530
Subject: [PATCH 1/9] Resolve Allow Virtualbox, VMware and Docker templates to
 be created issue but not fully tested

---
 src/app/services/docker.service.ts            | 3 ++-
 src/app/services/virtual-box.service.ts       | 3 ++-
 src/app/services/vmware.service.ts            | 3 ++-
 src/environments/environment.electron.prod.ts | 4 +++-
 src/environments/environment.electron.ts      | 4 +++-
 src/environments/environment.github.prod.ts   | 4 +++-
 src/environments/environment.prod.ts          | 4 +++-
 src/environments/environment.ts               | 4 +++-
 8 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/app/services/docker.service.ts b/src/app/services/docker.service.ts
index 3e6b06d8..eaf9b26d 100644
--- a/src/app/services/docker.service.ts
+++ b/src/app/services/docker.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { DockerImage } from '../models/docker/docker-image';
 import { Server } from '../models/server';
@@ -18,7 +19,7 @@ export class DockerService {
   }
 
   getImages(server: Server): Observable<DockerImage[]> {
-    return this.httpServer.get<DockerImage[]>(server, '/compute/docker/images') as Observable<DockerImage[]>;
+    return this.httpServer.get<DockerImage[]>(server, `/computes/${environment.compute_id}/docker/images`) as Observable<DockerImage[]>;
   }
 
   addTemplate(server: Server, dockerTemplate: any): Observable<any> {
diff --git a/src/app/services/virtual-box.service.ts b/src/app/services/virtual-box.service.ts
index 88981d20..878f4bbb 100644
--- a/src/app/services/virtual-box.service.ts
+++ b/src/app/services/virtual-box.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { Server } from '../models/server';
 import { VirtualBoxTemplate } from '../models/templates/virtualbox-template';
@@ -37,6 +38,6 @@ export class VirtualBoxService {
   }
 
   getVirtualMachines(server: Server): Observable<VirtualBoxVm[]> {
-    return this.httpServer.get<VirtualBoxVm[]>(server, '/compute/virtualbox/vms') as Observable<VirtualBoxVm[]>;
+    return this.httpServer.get<VirtualBoxVm[]>(server, `/computes/${environment.compute_id}/virtualbox/vms`) as Observable<VirtualBoxVm[]>;
   }
 }
diff --git a/src/app/services/vmware.service.ts b/src/app/services/vmware.service.ts
index 0816afba..b2fea1de 100644
--- a/src/app/services/vmware.service.ts
+++ b/src/app/services/vmware.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { Server } from '../models/server';
 import { VmwareTemplate } from '../models/templates/vmware-template';
@@ -30,6 +31,6 @@ export class VmwareService {
   }
 
   getVirtualMachines(server: Server): Observable<VmwareVm[]> {
-    return this.httpServer.get<VmwareVm[]>(server, '/compute/vmware/vms') as Observable<VmwareVm[]>;
+    return this.httpServer.get<VmwareVm[]>(server, `/computes/${environment.vm_compute_id}/vmware/vms`) as Observable<VmwareVm[]>;
   }
 }
diff --git a/src/environments/environment.electron.prod.ts b/src/environments/environment.electron.prod.ts
index 8ab128f7..e2db7605 100644
--- a/src/environments/environment.electron.prod.ts
+++ b/src/environments/environment.electron.prod.ts
@@ -2,5 +2,7 @@ export const environment = {
   solarputty_download_url: '',
   production: true,
   electron: true,
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
diff --git a/src/environments/environment.electron.ts b/src/environments/environment.electron.ts
index 49d53902..2fdc6d84 100644
--- a/src/environments/environment.electron.ts
+++ b/src/environments/environment.electron.ts
@@ -2,5 +2,7 @@ export const environment = {
   production: false,
   electron: true,
   solarputty_download_url: '',
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
diff --git a/src/environments/environment.github.prod.ts b/src/environments/environment.github.prod.ts
index 558a4e58..4cf191a7 100644
--- a/src/environments/environment.github.prod.ts
+++ b/src/environments/environment.github.prod.ts
@@ -3,5 +3,7 @@ export const environment = {
   electron: false,
   githubio: true,
   solarputty_download_url: '',
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 8e7d5498..25eca5d5 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,5 +3,7 @@ export const environment = {
   electron: false,
   githubio: false,
   solarputty_download_url: '',
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 69ce3604..1e335911 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,7 +7,9 @@ export const environment = {
   electron: false,
   githubio: false,
   solarputty_download_url: '',
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
 
 /*

From a6b65fc8fec6224a53155392b7921257576ede2d Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 20 Jun 2022 18:11:55 +0530
Subject: [PATCH 2/9] Modify the unit test cases

---
 src/app/services/virtual-box.service.spec.ts | 2 +-
 src/app/services/vmware.service.spec.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/virtual-box.service.spec.ts b/src/app/services/virtual-box.service.spec.ts
index edcee5cf..f06651a1 100644
--- a/src/app/services/virtual-box.service.spec.ts
+++ b/src/app/services/virtual-box.service.spec.ts
@@ -106,7 +106,7 @@ describe('VirtualBoxService', () => {
   it('should get available virtual machines', inject([VirtualBoxService], (service: VirtualBoxService) => {
     service.getVirtualMachines(server).subscribe();
 
-    const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_version}/compute/virtualbox/vms`);
+    const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_version}/computes/${environment.compute_id}/virtualbox/vms`);
     expect(req.request.method).toEqual('GET');
   }));
 });
diff --git a/src/app/services/vmware.service.spec.ts b/src/app/services/vmware.service.spec.ts
index 172ae2a1..55214f61 100644
--- a/src/app/services/vmware.service.spec.ts
+++ b/src/app/services/vmware.service.spec.ts
@@ -104,7 +104,7 @@ describe('VmwareService', () => {
   it('should get available virtual machines', inject([VmwareService], (service: VmwareService) => {
     service.getVirtualMachines(server).subscribe();
 
-    const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_version}/compute/vmware/vms`);
+    const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_version}/computes/${environment.vm_compute_id}/vmware/vms`);
     expect(req.request.method).toEqual('GET');
   }));
 });

From 40ffe84b7749c7e9971fe2cc708f8bd180fed07d Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Tue, 21 Jun 2022 08:59:18 +0530
Subject: [PATCH 3/9] Removed vm_compute_id

---
 src/app/services/vmware.service.spec.ts       | 2 +-
 src/app/services/vmware.service.ts            | 2 +-
 src/environments/environment.electron.prod.ts | 3 +--
 src/environments/environment.electron.ts      | 3 +--
 src/environments/environment.github.prod.ts   | 3 +--
 src/environments/environment.prod.ts          | 3 +--
 src/environments/environment.ts               | 3 +--
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/app/services/vmware.service.spec.ts b/src/app/services/vmware.service.spec.ts
index 55214f61..9a1f38a0 100644
--- a/src/app/services/vmware.service.spec.ts
+++ b/src/app/services/vmware.service.spec.ts
@@ -104,7 +104,7 @@ describe('VmwareService', () => {
   it('should get available virtual machines', inject([VmwareService], (service: VmwareService) => {
     service.getVirtualMachines(server).subscribe();
 
-    const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_version}/computes/${environment.vm_compute_id}/vmware/vms`);
+    const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_version}/computes/${environment.compute_id}/vmware/vms`);
     expect(req.request.method).toEqual('GET');
   }));
 });
diff --git a/src/app/services/vmware.service.ts b/src/app/services/vmware.service.ts
index b2fea1de..6e051c80 100644
--- a/src/app/services/vmware.service.ts
+++ b/src/app/services/vmware.service.ts
@@ -31,6 +31,6 @@ export class VmwareService {
   }
 
   getVirtualMachines(server: Server): Observable<VmwareVm[]> {
-    return this.httpServer.get<VmwareVm[]>(server, `/computes/${environment.vm_compute_id}/vmware/vms`) as Observable<VmwareVm[]>;
+    return this.httpServer.get<VmwareVm[]>(server, `/computes/${environment.compute_id}/vmware/vms`) as Observable<VmwareVm[]>;
   }
 }
diff --git a/src/environments/environment.electron.prod.ts b/src/environments/environment.electron.prod.ts
index e2db7605..e858c20f 100644
--- a/src/environments/environment.electron.prod.ts
+++ b/src/environments/environment.electron.prod.ts
@@ -3,6 +3,5 @@ export const environment = {
   production: true,
   electron: true,
   current_version:'v3',
-  compute_id:'local',
-  vm_compute_id:'vm'
+  compute_id:'local'
 };
diff --git a/src/environments/environment.electron.ts b/src/environments/environment.electron.ts
index 2fdc6d84..4127f766 100644
--- a/src/environments/environment.electron.ts
+++ b/src/environments/environment.electron.ts
@@ -3,6 +3,5 @@ export const environment = {
   electron: true,
   solarputty_download_url: '',
   current_version:'v3',
-  compute_id:'local',
-  vm_compute_id:'vm'
+  compute_id:'local'
 };
diff --git a/src/environments/environment.github.prod.ts b/src/environments/environment.github.prod.ts
index 4cf191a7..963b2cc9 100644
--- a/src/environments/environment.github.prod.ts
+++ b/src/environments/environment.github.prod.ts
@@ -4,6 +4,5 @@ export const environment = {
   githubio: true,
   solarputty_download_url: '',
   current_version:'v3',
-  compute_id:'local',
-  vm_compute_id:'vm'
+  compute_id:'local'
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 25eca5d5..556ec8bd 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -4,6 +4,5 @@ export const environment = {
   githubio: false,
   solarputty_download_url: '',
   current_version:'v3',
-  compute_id:'local',
-  vm_compute_id:'vm'
+  compute_id:'local'
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 1e335911..0bb7a5fc 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -8,8 +8,7 @@ export const environment = {
   githubio: false,
   solarputty_download_url: '',
   current_version:'v3',
-  compute_id:'local',
-  vm_compute_id:'vm'
+  compute_id:'local'
 };
 
 /*

From 576c108da8021bbe799722c73fb8c99c62ed4266 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 4 Jul 2022 14:40:27 +0530
Subject: [PATCH 4/9] I have  added node menu  controls confirmation action
 dialog in Webui missing prompt for mass state changes of project #1342 issue.

---
 src/app/app.module.ts                         |  2 ++
 ...es-menu-confirmation-dialog.component.html | 18 +++++++++++
 ...es-menu-confirmation-dialog.component.scss | 16 ++++++++++
 ...menu-confirmation-dialog.component.spec.ts | 25 +++++++++++++++
 ...odes-menu-confirmation-dialog.component.ts | 27 ++++++++++++++++
 .../nodes-menu/nodes-menu.component.html      |  8 ++---
 .../nodes-menu/nodes-menu.component.ts        | 31 +++++++++++++++++--
 7 files changed, 120 insertions(+), 7 deletions(-)
 create mode 100644 src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
 create mode 100644 src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.scss
 create mode 100644 src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.spec.ts
 create mode 100644 src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c907b644..59d9e9f4 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -278,6 +278,7 @@ import { ImageManagerComponent } from './components/image-manager/image-manager.
 import { AddImageDialogComponent } from './components/image-manager/add-image-dialog/add-image-dialog.component';
 import { DeleteAllImageFilesDialogComponent } from './components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component';
 import { UploadingProcessbarComponent } from './common/uploading-processbar/uploading-processbar.component';
+import { NodesMenuConfirmationDialogComponent } from './components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component';
 
 @NgModule({
   declarations: [
@@ -472,6 +473,7 @@ import { UploadingProcessbarComponent } from './common/uploading-processbar/uplo
     AddImageDialogComponent,
     DeleteAllImageFilesDialogComponent,
     UploadingProcessbarComponent,
+    NodesMenuConfirmationDialogComponent,
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
new file mode 100644
index 00000000..5683855a
--- /dev/null
+++ b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
@@ -0,0 +1,18 @@
+<div class="row">
+  <div class="col-md-10">
+    <h5>Confirm {{ confirmActionData.actionType | titlecase }} All</h5>
+  </div>
+  <div class="col-md-2 txt-align">
+    <button mat-mini-fab color="warn" class="close-btn" mat-dialog-close>
+      <mat-icon class="close-icon">close</mat-icon>
+    </button>
+  </div>
+</div>
+<mat-divider></mat-divider>
+<mat-dialog-content> 
+    <p class="text-padding">Are you sure you want to {{confirmActionData.actionType}} all devices?</p>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close>No</button>
+  <button mat-button (click)="confirmAction()"  cdkFocusInitial>Yes</button>
+</mat-dialog-actions>
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.scss b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.scss
new file mode 100644
index 00000000..b55af6fc
--- /dev/null
+++ b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.scss
@@ -0,0 +1,16 @@
+.close-btn{
+    height: 30px;
+    width: 30px;
+    margin-left: 10px;
+    margin-bottom:10px
+}
+.close-icon{
+    font-size: 15px;
+}
+.text-padding{
+    padding: 15px 0 0 0;
+
+}
+.mat-dialog-actions {
+    min-height: 31px;
+}
\ No newline at end of file
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.spec.ts b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.spec.ts
new file mode 100644
index 00000000..26a42efd
--- /dev/null
+++ b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NodesMenuConfirmationDialogComponent } from './nodes-menu-confirmation-dialog.component';
+
+describe('NodesMenuConfirmationDialogComponent', () => {
+  let component: NodesMenuConfirmationDialogComponent;
+  let fixture: ComponentFixture<NodesMenuConfirmationDialogComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ NodesMenuConfirmationDialogComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NodesMenuConfirmationDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.ts b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.ts
new file mode 100644
index 00000000..3c912534
--- /dev/null
+++ b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.ts
@@ -0,0 +1,27 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+@Component({
+  selector: 'app-nodes-menu-confirmation-dialog',
+  templateUrl: './nodes-menu-confirmation-dialog.component.html',
+  styleUrls: ['./nodes-menu-confirmation-dialog.component.scss'],
+})
+export class NodesMenuConfirmationDialogComponent implements OnInit {
+  confirmActionData = {
+    actionType: 'start',
+    isAction:false
+  };
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    public dialogRef: MatDialogRef<NodesMenuConfirmationDialogComponent>
+  ) {}
+
+  ngOnInit(): void {
+    this.confirmActionData.actionType = this.data;
+  }
+
+  confirmAction() {
+    this.confirmActionData.isAction = true
+    this.dialogRef.close(this.confirmActionData);
+  }
+}
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.html b/src/app/components/project-map/nodes-menu/nodes-menu.component.html
index b495ad3c..7177ab12 100644
--- a/src/app/components/project-map/nodes-menu/nodes-menu.component.html
+++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.html
@@ -12,7 +12,7 @@
     matTooltip="Start/Resume all nodes"
     matTooltipClass="custom-tooltip"
     mat-icon-button
-    (click)="startNodes()"
+    (click)="confirmControlsActions('start')"
     class="menu-button"
   >
     <mat-icon>play_arrow</mat-icon>
@@ -21,7 +21,7 @@
     matTooltip="Suspend all nodes"
     matTooltipClass="custom-tooltip"
     mat-icon-button
-    (click)="suspendNodes()"
+    (click)="confirmControlsActions('suspend')"
     class="menu-button"
   >
     <mat-icon>pause</mat-icon>
@@ -30,7 +30,7 @@
     matTooltip="Stop all nodes"
     matTooltipClass="custom-tooltip"
     mat-icon-button
-    (click)="stopNodes()"
+    (click)="confirmControlsActions('stop')"
     class="menu-button"
   >
     <mat-icon>stop</mat-icon>
@@ -39,7 +39,7 @@
     matTooltip="Reload all nodes"
     matTooltipClass="custom-tooltip"
     mat-icon-button
-    (click)="reloadNodes()"
+    (click)="confirmControlsActions('reload')"
     class="menu-button"
   >
     <mat-icon>replay</mat-icon>
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts
index 839ccbbe..89fccc15 100644
--- a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts
+++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts
@@ -1,14 +1,16 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { MapSettingsService } from '../../../services/mapsettings.service';
+import { MatDialog } from '@angular/material/dialog';
 import { ElectronService } from 'ngx-electron';
 import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource';
 import { Project } from '../../../models/project';
 import { Server } from '../../../models/server';
+import { MapSettingsService } from '../../../services/mapsettings.service';
 import { NodeService } from '../../../services/node.service';
+import { NodeConsoleService } from '../../../services/nodeConsole.service';
 import { ServerService } from '../../../services/server.service';
 import { SettingsService } from '../../../services/settings.service';
 import { ToasterService } from '../../../services/toaster.service';
-import { NodeConsoleService } from '../../../services/nodeConsole.service';
+import { NodesMenuConfirmationDialogComponent } from './nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component';
 
 @Component({
   selector: 'app-nodes-menu',
@@ -28,7 +30,8 @@ export class NodesMenuComponent {
     private serverService: ServerService,
     private settingsService: SettingsService,
     private mapSettingsService: MapSettingsService,
-    private electronService: ElectronService
+    private electronService: ElectronService,
+    private dialog: MatDialog
   ) {}
 
   async startConsoleForAllNodes() {
@@ -83,4 +86,26 @@ export class NodesMenuComponent {
       this.toasterService.success('All nodes successfully reloaded');
     });
   }
+  public confirmControlsActions(type) {
+    const dialogRef = this.dialog.open(NodesMenuConfirmationDialogComponent, {
+      width: '500px',
+      maxHeight: '200px',
+      autoFocus: false,
+      disableClose: true,
+      data: type,
+    });
+
+    dialogRef.afterClosed().subscribe((confirmAction_result) => {
+      if (confirmAction_result.isAction && confirmAction_result.actionType == 'start') {
+        this.startNodes();
+      } else if (confirmAction_result.isAction && confirmAction_result.actionType == 'stop') {
+        this.stopNodes();
+      } else if (confirmAction_result.isAction && confirmAction_result.actionType == 'reload') {
+        this.reloadNodes();
+      } else if (confirmAction_result.isAction && confirmAction_result.actionType == 'suspend') {
+        this.suspendNodes();
+      } else {
+      }
+    });
+  }
 }

From 9c3667277c2ae412f953d6c061ea8b940017a9f4 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 4 Jul 2022 15:03:49 +0530
Subject: [PATCH 5/9] Resolve/write an unit test case.

---
 ...es-menu-confirmation-dialog.component.html |  2 +-
 ...es-menu-confirmation-dialog.component.scss |  3 +++
 ...menu-confirmation-dialog.component.spec.ts | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
index 5683855a..e1a15bb9 100644
--- a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
+++ b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-md-10">
-    <h5>Confirm {{ confirmActionData.actionType | titlecase }} All</h5>
+    <h5 class="heading-txt">Confirm {{ confirmActionData.actionType}} All</h5>
   </div>
   <div class="col-md-2 txt-align">
     <button mat-mini-fab color="warn" class="close-btn" mat-dialog-close>
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.scss b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.scss
index b55af6fc..c74494a9 100644
--- a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.scss
+++ b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.scss
@@ -13,4 +13,7 @@
 }
 .mat-dialog-actions {
     min-height: 31px;
+}
+.heading-txt{
+    text-transform: capitalize;
 }
\ No newline at end of file
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.spec.ts b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.spec.ts
index 26a42efd..ae514afe 100644
--- a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.spec.ts
+++ b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.spec.ts
@@ -1,4 +1,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatToolbarModule } from '@angular/material/toolbar';
 
 import { NodesMenuConfirmationDialogComponent } from './nodes-menu-confirmation-dialog.component';
 
@@ -8,6 +14,19 @@ describe('NodesMenuConfirmationDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports:[
+        MatIconModule,
+        MatToolbarModule,
+        MatMenuModule,
+        MatCheckboxModule,
+        MatDialogModule,
+        MatSnackBarModule,
+      ],
+      providers: [
+       
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+        { provide: MatDialogRef, useValue: {} },
+      ],
       declarations: [ NodesMenuConfirmationDialogComponent ]
     })
     .compileComponents();

From 5bddf9c5fca8e1bb10a4ab50cfc426c1171ee4b9 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Tue, 5 Jul 2022 08:59:48 +0530
Subject: [PATCH 6/9] I added reset all console connection control on nodes
 menu and  removed red circle from nodes action confirmation dialog

---
 .../nodes-menu-confirmation-dialog.component.html      |  7 +------
 .../project-map/nodes-menu/nodes-menu.component.html   | 10 ++++++++++
 .../project-map/nodes-menu/nodes-menu.component.ts     |  8 ++++++++
 src/app/services/node.service.ts                       |  3 +++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
index e1a15bb9..dae4f3f1 100644
--- a/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
+++ b/src/app/components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component.html
@@ -1,12 +1,7 @@
 <div class="row">
-  <div class="col-md-10">
+  <div class="col-md-12">
     <h5 class="heading-txt">Confirm {{ confirmActionData.actionType}} All</h5>
   </div>
-  <div class="col-md-2 txt-align">
-    <button mat-mini-fab color="warn" class="close-btn" mat-dialog-close>
-      <mat-icon class="close-icon">close</mat-icon>
-    </button>
-  </div>
 </div>
 <mat-divider></mat-divider>
 <mat-dialog-content> 
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.html b/src/app/components/project-map/nodes-menu/nodes-menu.component.html
index 7177ab12..7414dc46 100644
--- a/src/app/components/project-map/nodes-menu/nodes-menu.component.html
+++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.html
@@ -44,4 +44,14 @@
   >
     <mat-icon>replay</mat-icon>
   </button>
+
+  <button
+    matTooltip="Reset all console connections"
+    matTooltipClass="custom-tooltip"
+    mat-icon-button
+    (click)="confirmControlsActions('reset')"
+    class="menu-button"
+  >
+    <mat-icon>compare_arrows</mat-icon>
+  </button>
 </div>
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts
index 89fccc15..f19dda53 100644
--- a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts
+++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts
@@ -86,6 +86,13 @@ export class NodesMenuComponent {
       this.toasterService.success('All nodes successfully reloaded');
     });
   }
+
+  resetNodes() {
+    this.nodeService.resetAllNodes(this.server, this.project).subscribe(() => {
+      this.toasterService.success('Successfully reset all console connections');
+    });
+  }
+
   public confirmControlsActions(type) {
     const dialogRef = this.dialog.open(NodesMenuConfirmationDialogComponent, {
       width: '500px',
@@ -105,6 +112,7 @@ export class NodesMenuComponent {
       } else if (confirmAction_result.isAction && confirmAction_result.actionType == 'suspend') {
         this.suspendNodes();
       } else {
+        this.resetNodes()
       }
     });
   }
diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts
index 1d5d71d7..3b70fadb 100644
--- a/src/app/services/node.service.ts
+++ b/src/app/services/node.service.ts
@@ -55,6 +55,9 @@ export class NodeService {
   reloadAll(server: Server, project: Project) {
     return this.httpServer.post(server, `/projects/${project.project_id}/nodes/reload`, {});
   }
+  resetAllNodes(server: Server, project: Project) {
+    return this.httpServer.post(server, `/projects/${project.project_id}/nodes/console/reset`, {});
+  }
 
   createFromTemplate(
     server: Server,

From 379a39a98f2061f265abad994160485c71d011cb Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Wed, 6 Jul 2022 16:48:29 +0530
Subject: [PATCH 7/9] I have  resolved Support for project importation #1344
 issue

---
 src/app/components/project-map/project-map.component.html     | 4 ++--
 .../import-project-dialog/import-project-dialog.component.ts  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html
index fa9a4852..7ece4e04 100644
--- a/src/app/components/project-map/project-map.component.html
+++ b/src/app/components/project-map/project-map.component.html
@@ -139,11 +139,11 @@
         </button>
         <button mat-menu-item (click)="exportProject()">
           <mat-icon>call_made</mat-icon>
-          <span>Export portable project</span>
+          <span>Export project</span>
         </button>
         <button mat-menu-item (click)="importProject()">
           <mat-icon>call_received</mat-icon>
-          <span>Import portable project</span>
+          <span>Import project</span>
         </button>
         <button mat-menu-item (click)="closeProject()">
           <mat-icon>close</mat-icon>
diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
index 13a6ce61..6c38b6ac 100644
--- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
+++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
@@ -96,9 +96,8 @@ export class ImportProjectDialogComponent implements OnInit {
   importProject() {
     const url = this.prepareUploadPath();
     this.uploader.queue.forEach((elem) => (elem.url = url));
-
+    this.uploader.authToken = `Bearer ${this.server.authToken.toString()}`
     this.isFirstStepCompleted = true;
-
     const itemToUpload = this.uploader.queue[0];
     this.uploader.uploadItem(itemToUpload);
   }

From 9381578657d3cb75647015ba7da6e98aa96168f6 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Wed, 6 Jul 2022 20:27:44 +0530
Subject: [PATCH 8/9] 1. Improve progress bar and I used common progress bar.
 2.  Added cancel button 3. And modified the unit test cases

---
 .../uploading-processbar.component.html       |  2 +-
 .../uploading-processbar.component.ts         |  4 +-
 .../add-ios-template.component.ts             |  1 +
 .../add-iou-template.component.ts             |  1 +
 .../add-qemu-vm-template.component.ts         |  2 +-
 .../new-template-dialog.component.ts          |  1 +
 .../project-map/project-map.component.ts      |  5 ++-
 .../import-project-dialog.component.html      | 10 ++---
 .../import-project-dialog.component.spec.ts   |  8 ++++
 .../import-project-dialog.component.ts        | 39 +++++++++++++++++--
 10 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/app/common/uploading-processbar/uploading-processbar.component.html b/src/app/common/uploading-processbar/uploading-processbar.component.html
index 0c3d3742..4229bb76 100644
--- a/src/app/common/uploading-processbar/uploading-processbar.component.html
+++ b/src/app/common/uploading-processbar/uploading-processbar.component.html
@@ -1,4 +1,4 @@
-    <p>Image Uploading please wait .... {{uploadProgress}}%</p>
+    <p>{{upload_file_type}} Uploading please wait .... {{uploadProgress}}%</p>
     <div class="row proccessBar-row ">
         <div class="col-md-9 proccessBar-col">
             <mat-progress-bar mode="determinate" [value]="uploadProgress" aria-valuemin="0" aria-valuemax="100">
diff --git a/src/app/common/uploading-processbar/uploading-processbar.component.ts b/src/app/common/uploading-processbar/uploading-processbar.component.ts
index 061daa27..ef545a53 100644
--- a/src/app/common/uploading-processbar/uploading-processbar.component.ts
+++ b/src/app/common/uploading-processbar/uploading-processbar.component.ts
@@ -13,7 +13,7 @@ import { UploadServiceService } from './upload-service.service';
 export class UploadingProcessbarComponent implements OnInit {
   uploadProgress: number = 0
   subscription: Subscription;
-
+  upload_file_type:string
   constructor(
     @Inject(MAT_SNACK_BAR_DATA) public data,
     private _snackRef: MatSnackBarRef<UploadingProcessbarComponent>,
@@ -21,6 +21,8 @@ export class UploadingProcessbarComponent implements OnInit {
   ) { }
 
   ngOnInit() {
+   this.upload_file_type =  this.data.upload_file_type 
+    debugger
     this.subscription = this._US.currentCount.subscribe((count:number) => {
       this.uploadProgress = count;
       if (this.uploadProgress === 100 || this.uploadProgress == null ) {
diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
index 96f999d9..ad008017 100644
--- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
+++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
@@ -158,6 +158,7 @@ export class AddIosTemplateComponent implements OnInit, OnDestroy {
     this.uploader.uploadItem(itemToUpload);
     this.snackBar.openFromComponent(UploadingProcessbarComponent, {
       panelClass: 'uplaoding-file-snackabar',
+      data:{upload_file_type:'Image'}
     });
   }
 
diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
index 55cb18be..4a2762d5 100644
--- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
+++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
@@ -129,6 +129,7 @@ export class AddIouTemplateComponent implements OnInit, OnDestroy {
     this.uploader.uploadItem(itemToUpload);
     this.snackBar.openFromComponent(UploadingProcessbarComponent, {
       panelClass: 'uplaoding-file-snackabar',
+      data:{upload_file_type:'Image'}
     });
 
   }
diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
index 11d1b010..105558c9 100644
--- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
+++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
@@ -157,7 +157,7 @@ export class AddQemuVmTemplateComponent implements OnInit {
     
     if ((itemToUpload as any).options) (itemToUpload as any).options.disableMultipart = true; ((itemToUpload as any).options.headers =[{name:'Authorization',value:'Bearer ' + this.server.authToken}]) 
     this.uploader.uploadItem(itemToUpload);
-    this.snackBar.openFromComponent(UploadingProcessbarComponent,{panelClass: 'uplaoding-file-snackabar',});
+    this.snackBar.openFromComponent(UploadingProcessbarComponent,{panelClass: 'uplaoding-file-snackabar', data:{upload_file_type:'Image'}});
   }
 
   cancelUploading() {
diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
index 59a77d54..df656687 100644
--- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
+++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
@@ -728,6 +728,7 @@ export class NewTemplateDialogComponent implements OnInit {
   openSnackBar() {
     this.snackBar.openFromComponent(UploadingProcessbarComponent, {
       panelClass: 'uplaoding-file-snackabar',
+      data:{upload_file_type:'Image'}
     });
   }
 
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts
index df7936f1..de7b9d0f 100644
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@@ -943,6 +943,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
   }
 
   importProject() {
+    debugger
     let uuid: string = '';
     const dialogRef = this.dialog.open(ImportProjectDialogComponent, {
       width: '400px',
@@ -955,9 +956,9 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
       uuid = projectId;
     });
 
-    dialogRef.afterClosed().subscribe(() => {
+    dialogRef.afterClosed().subscribe((isCancel:boolean) => {
       subscription.unsubscribe();
-      if (uuid) {
+      if (uuid && !isCancel) {
         this.bottomSheet.open(NavigationDialogComponent);
         let bottomSheetRef = this.bottomSheet._openedBottomSheetRef;
         bottomSheetRef.instance.projectMessage = 'imported project';
diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.html b/src/app/components/projects/import-project-dialog/import-project-dialog.component.html
index dc620518..6f740854 100644
--- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.html
+++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.html
@@ -38,7 +38,7 @@
     <button class="delete-button" [hidden]="!isDeleteVisible">
       <mat-icon color="primary" (click)="onDeleteClick()" class="delete-icon">clear</mat-icon>
     </button>
-    <div mat-dialog-actions>
+    <div mat-dialog-actions  align="end">
       <button mat-button (click)="onNoClick()" color="accent">Cancel</button>
       <button
         mat-button
@@ -54,13 +54,13 @@
   </form>
 </div>
 <div [hidden]="!isFirstStepCompleted">
-  <div class="progress">
+  <!-- <div class="progress">
     <div class="progress-bar" role="progressbar" [ngStyle]="{ width: uploader.progress + '%' }"></div>
-  </div>
-  <div class="result-message-box">
+  </div> -->
+  <div class="">
     <span>{{ resultMessage }}</span>
   </div>
-  <div mat-dialog-actions>
+  <div mat-dialog-actions  align="end">
     <button
       mat-button
       [disabled]="!isFinishEnabled"
diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts
index 883d8fa6..634e2536 100644
--- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts
+++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts
@@ -18,6 +18,10 @@ import { Project } from '../../../models/project';
 import { Server } from '../../../models/server';
 import { ProjectService } from '../../../services/project.service';
 import { ImportProjectDialogComponent } from './import-project-dialog.component';
+import { ToasterService } from '../../../services/toaster.service';
+import { MockedToasterService } from '../../../services/toaster.service.spec';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+
 
 export class MockedProjectService {
   public projects: Project[] = [
@@ -62,6 +66,7 @@ describe('ImportProjectDialogComponent', () => {
   let server: Server;
   let debugElement: DebugElement;
   let fileSelectDirective: FileSelectDirective;
+  let mockedToasterService = new MockedToasterService()
 
   let dialogRef = {
     close: jasmine.createSpy('close'),
@@ -77,6 +82,7 @@ describe('ImportProjectDialogComponent', () => {
         MatDialogModule,
         MatFormFieldModule,
         MatInputModule,
+        MatSnackBarModule,
         NoopAnimationsModule,
         FileUploadModule,
         FormsModule,
@@ -87,6 +93,8 @@ describe('ImportProjectDialogComponent', () => {
         { provide: MatDialogRef, useValue: dialogRef },
         { provide: MAT_DIALOG_DATA, useValue: [] },
         { provide: ProjectService, useClass: MockedProjectService },
+        { provide: ToasterService, useValue: mockedToasterService },
+
       ],
       declarations: [ImportProjectDialogComponent],
     }).compileComponents();
diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
index 6c38b6ac..fbcb2960 100644
--- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
+++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Inject, OnInit } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { ToasterService } from '../../../services/toaster.service';
 import { FileItem, FileUploader, ParsedResponseHeaders } from 'ng2-file-upload';
 import { v4 as uuid } from 'uuid';
 import { Project } from '../../../models/project';
@@ -9,6 +10,9 @@ import { ServerResponse } from '../../../models/serverResponse';
 import { ProjectService } from '../../../services/project.service';
 import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
 import { ProjectNameValidator } from '../models/projectNameValidator';
+import { UploadServiceService } from '../../../common/uploading-processbar/upload-service.service';
+import { UploadingProcessbarComponent } from '../../../common/uploading-processbar/uploading-processbar.component';
+import { MatSnackBar } from '@angular/material/snack-bar';
 
 @Component({
   selector: 'app-import-project-dialog',
@@ -18,6 +22,7 @@ import { ProjectNameValidator } from '../models/projectNameValidator';
 })
 export class ImportProjectDialogComponent implements OnInit {
   uploader: FileUploader;
+  uploadProgress: number = 0;
   server: Server;
   isImportEnabled: boolean = false;
   isFinishEnabled: boolean = false;
@@ -35,7 +40,11 @@ export class ImportProjectDialogComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public data: any,
     private formBuilder: FormBuilder,
     private projectService: ProjectService,
-    private projectNameValidator: ProjectNameValidator
+    private projectNameValidator: ProjectNameValidator,
+    private toasterService : ToasterService,
+    private uploadServiceService: UploadServiceService,
+    private snackBar : MatSnackBar,
+
   ) {
     this.projectNameForm = this.formBuilder.group({
       projectName: new FormControl(null, [Validators.required, projectNameValidator.get]),
@@ -64,6 +73,16 @@ export class ImportProjectDialogComponent implements OnInit {
       this.resultMessage = 'Project was imported succesfully!';
       this.isFinishEnabled = true;
     };
+    this.uploader.onProgressItem = (progress: any) => {
+      this.uploadProgress = progress['progress'];
+      this.uploadServiceService.processBarCount(this.uploadProgress)
+    };
+
+    this.uploadServiceService.currentCancelItemDetails.subscribe((isCancel) => {
+      if (isCancel) {
+        this.cancelUploading()
+      }
+    })
   }
 
   get form() {
@@ -96,10 +115,12 @@ export class ImportProjectDialogComponent implements OnInit {
   importProject() {
     const url = this.prepareUploadPath();
     this.uploader.queue.forEach((elem) => (elem.url = url));
-    this.uploader.authToken = `Bearer ${this.server.authToken.toString()}`
+    this.uploader.authToken = `Bearer ${this.server.authToken}`
     this.isFirstStepCompleted = true;
     const itemToUpload = this.uploader.queue[0];
     this.uploader.uploadItem(itemToUpload);
+    this.snackBar.openFromComponent(UploadingProcessbarComponent,{panelClass: 'uplaoding-file-snackabar',data:{upload_file_type:'Project'}});
+
   }
 
   openConfirmationDialog(existingProject: Project) {
@@ -126,11 +147,11 @@ export class ImportProjectDialogComponent implements OnInit {
 
   onNoClick(): void {
     this.uploader.cancelAll();
-    this.dialogRef.close();
+    this.dialogRef.close(false);
   }
 
   onFinishClick(): void {
-    this.dialogRef.close();
+    this.dialogRef.close(false);
   }
 
   onDeleteClick(): void {
@@ -145,4 +166,14 @@ export class ImportProjectDialogComponent implements OnInit {
     const projectName = this.projectNameForm.controls['projectName'].value;
     return this.projectService.getUploadPath(this.server, this.uuid, projectName);
   }
+
+  cancelUploading() {
+    this.uploader.clearQueue();
+    this.uploadServiceService.processBarCount(null)
+    this.toasterService.warning('Image upload cancelled');
+    this.uploadServiceService.cancelFileUploading(false)
+    this.isFirstStepCompleted = false
+    this.uploader.cancelAll();
+    this.dialogRef.close(true);
+  }
 }

From e24aa1387b55cc27f1d44b513a45ebf41fbcb665 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Thu, 7 Jul 2022 11:09:33 +0530
Subject: [PATCH 9/9] Modified the file upload cancel message

---
 .../dynamips/add-ios-template/add-ios-template.component.ts     | 2 +-
 .../ios-on-unix/add-iou-template/add-iou-template.component.ts  | 2 +-
 .../new-template-dialog/new-template-dialog.component.ts        | 2 +-
 .../import-project-dialog/import-project-dialog.component.ts    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
index ad008017..19318b04 100644
--- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
+++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
@@ -276,7 +276,7 @@ export class AddIosTemplateComponent implements OnInit, OnDestroy {
   cancelUploading() {
     this.uploader.clearQueue();
     this.uploadServiceService.processBarCount(null)
-    this.toasterService.warning('Image upload cancelled');
+    this.toasterService.warning('File upload cancelled');
     // this.uploadServiceService.cancelFileUploading(false)
     // window.location.reload()
 
diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
index 4a2762d5..ac5fabd2 100644
--- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
+++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
@@ -137,7 +137,7 @@ export class AddIouTemplateComponent implements OnInit, OnDestroy {
   cancelUploading() {
     this.uploader.clearQueue();
     this.uploadServiceService.processBarCount(100)
-    this.toasterService.warning('Image upload cancelled');
+    this.toasterService.warning('File upload cancelled');
     // this.uploadServiceService.cancelFileUploading(false)
     // window.location.reload()
   }
diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
index df656687..e5405da1 100644
--- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
+++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
@@ -429,7 +429,7 @@ export class NewTemplateDialogComponent implements OnInit {
   cancelUploading() {
     this.uploaderImage.clearQueue();
     this.uploadServiceService.processBarCount(null)
-    this.toasterService.warning('Image upload cancelled');
+    this.toasterService.warning('File upload cancelled');
     this.uploadServiceService.cancelFileUploading(false)
 
   }
diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
index fbcb2960..b3ffe291 100644
--- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
+++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
@@ -170,7 +170,7 @@ export class ImportProjectDialogComponent implements OnInit {
   cancelUploading() {
     this.uploader.clearQueue();
     this.uploadServiceService.processBarCount(null)
-    this.toasterService.warning('Image upload cancelled');
+    this.toasterService.warning('File upload cancelled');
     this.uploadServiceService.cancelFileUploading(false)
     this.isFirstStepCompleted = false
     this.uploader.cancelAll();