From f106ca51da9eb2066ce12502eb27419de64bf733 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 18 Jul 2022 12:29:52 +0530
Subject: [PATCH 1/9] Add cosmetic change

---
 src/app/components/projects/projects.component.html |  4 ++--
 src/app/components/projects/projects.component.scss | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/app/components/projects/projects.component.html b/src/app/components/projects/projects.component.html
index b19b140a..0ae7fd75 100644
--- a/src/app/components/projects/projects.component.html
+++ b/src/app/components/projects/projects.component.html
@@ -30,8 +30,8 @@
         </ng-container>
 
         <ng-container matColumnDef="actions">
-          <mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
-          <mat-cell *matCellDef="let row" style="text-align: right">
+          <mat-header-cell *matHeaderCellDef class="action"> Actions </mat-header-cell>
+          <mat-cell  class="action" *matCellDef="let row" style="text-align: right">
             <button
               mat-icon-button
               matTooltip="Open project"
diff --git a/src/app/components/projects/projects.component.scss b/src/app/components/projects/projects.component.scss
index 96d13262..d9e64026 100644
--- a/src/app/components/projects/projects.component.scss
+++ b/src/app/components/projects/projects.component.scss
@@ -19,3 +19,14 @@
 .row {
   display: flex;
 }
+table {
+  width: 100%;
+}
+
+// mat-header-cell, mat-cell {
+//   justify-content: center;
+// }
+
+.action{
+  justify-content: center;
+}
\ No newline at end of file

From 8c444059adfcd30c59174f1f7122a23c04f27b3b Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Tue, 19 Jul 2022 17:36:19 +0530
Subject: [PATCH 2/9] I have improved on the projects page like this 1.Allow to
 delete multiple projects at once (similar to what is done in the image
 manager). 2. Add an export project action in the actions column. The export
 icon could be improved. 3.Replace "Duplicate" action by "Save project as"
 (with same icon as on project settings menu). 4.Delete 'Go to system status'
 button and add 'System status' entry to top right menu. 5.Delete 'Go to
 preferences' button and add 'Template preferences' entry to top right menu.
 6.Add "Image manager" entry to the top right menu

---
 src/app/app.module.ts                         |  2 +
 .../project-map/project-map.component.ts      |  1 +
 ...rmation-delete-all-projects.component.html | 34 +++++++++
 ...rmation-delete-all-projects.component.scss |  0
 ...tion-delete-all-projects.component.spec.ts | 25 ++++++
 ...firmation-delete-all-projects.component.ts | 48 ++++++++++++
 .../projects/projects.component.html          | 46 +++++++++--
 .../components/projects/projects.component.ts | 76 ++++++++++++++++++-
 .../default-layout.component.html             | 13 ++++
 .../default-layout.component.ts               | 20 ++++-
 10 files changed, 253 insertions(+), 12 deletions(-)
 create mode 100644 src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
 create mode 100644 src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.scss
 create mode 100644 src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
 create mode 100644 src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2aa88f01..45dae901 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -280,6 +280,7 @@ import { DeleteAllImageFilesDialogComponent } from './components/image-manager/d
 import { UploadingProcessbarComponent } from './common/uploading-processbar/uploading-processbar.component';
 import { ExportPortableProjectComponent } from './components/export-portable-project/export-portable-project.component';
 import { NodesMenuConfirmationDialogComponent } from './components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component';
+import { ConfirmationDeleteAllProjectsComponent } from './components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component';
 
 @NgModule({
   declarations: [
@@ -476,6 +477,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n
     UploadingProcessbarComponent,
     ExportPortableProjectComponent,
     NodesMenuConfirmationDialogComponent,
+    ConfirmationDeleteAllProjectsComponent,
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts
index 25d624d9..13e607d9 100644
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@@ -999,6 +999,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
       this.exportPortableProjectDialog();
     }
   }
+  
   exportPortableProjectDialog() {
     const dialogRef = this.dialog.open(ExportPortableProjectComponent, {
       width: '700px',
diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
new file mode 100644
index 00000000..37d22562
--- /dev/null
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
@@ -0,0 +1,34 @@
+<div *ngIf="!isDelete && !isUsedFiles">
+    <h1 mat-dialog-title>Do you want delete all files ?.</h1>
+    <div mat-dialog-content>
+        <p>Your selected files</p>
+        <p *ngFor="let file of deleteData?.deleteFilesPaths; let i = index">{{i+1}}. {{file?.filename}}</p>
+    </div>
+    <div mat-dialog-actions align="end">
+        <button mat-button (click)="deleteAll()">Delete</button>
+        <button mat-button mat-dialog-close cdkFocusInitial>Cancel</button>
+    </div>
+</div>
+<div *ngIf="isDelete && !isUsedFiles">
+    <h1 align="center" mat-dialog-title>Please wait.</h1>
+
+    <div mat-dialog-content align="center">
+        <mat-spinner color="accent"></mat-spinner>
+
+    </div>
+</div>
+
+<div *ngIf="isDelete && isUsedFiles">
+    <div mat-dialog-content>
+        <div *ngIf="deleteFliesDetails.length > 0">
+            <h5>Project can't be deleted because image used in one or more template.</h5>
+            <p *ngFor="let message of deleteFliesDetails; let i = index" [ngClass]="{'deleted-error-text': message?.error?.message}"><span *ngIf="message !=null">{{i+1}}. {{message?.error?.message}}</span></p>
+        </div>
+        <div *ngIf="fileNotDeleted.length > 0">
+            <h5 class="delete-text">{{fileNotDeleted.length}} Projects deleted successfully.</h5>
+        </div>
+    </div>
+    <div mat-dialog-actions align="end">
+        <button mat-raised-button color="primary" (click)="dialogRef.close(false)">Close</button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.scss b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
new file mode 100644
index 00000000..8acf87e4
--- /dev/null
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ConfirmationDeleteAllProjectsComponent } from './confirmation-delete-all-projects.component';
+
+describe('ConfirmationDeleteAllProjectsComponent', () => {
+  let component: ConfirmationDeleteAllProjectsComponent;
+  let fixture: ComponentFixture<ConfirmationDeleteAllProjectsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ConfirmationDeleteAllProjectsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ConfirmationDeleteAllProjectsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts
new file mode 100644
index 00000000..19d4b136
--- /dev/null
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts
@@ -0,0 +1,48 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { ProjectService } from '@services/project.service';
+import { ToasterService } from '@services/toaster.service';
+import { Observable, of } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-confirmation-delete-all-projects',
+  templateUrl: './confirmation-delete-all-projects.component.html',
+  styleUrls: ['./confirmation-delete-all-projects.component.scss']
+})
+export class ConfirmationDeleteAllProjectsComponent implements OnInit {
+  isDelete: boolean = false;
+  isUsedFiles: boolean = false;
+  deleteFliesDetails: any = []
+  fileNotDeleted: any = []
+
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public deleteData: any,
+    public dialogRef: MatDialogRef<ConfirmationDeleteAllProjectsComponent>,
+    private projectService: ProjectService,
+    private toasterService: ToasterService
+  ) { }
+
+  ngOnInit(): void {
+  }
+
+  async deleteAll() {
+    this.isDelete = true
+    await this.deleteFile()
+  }
+
+  deleteFile() {
+    const calls = [];
+    this.deleteData.deleteFilesPaths.forEach(project => {
+      calls.push(this.projectService.delete(this.deleteData.server, project.project_id).pipe(catchError(error => of(error))))
+    });
+    Observable.forkJoin(calls).subscribe(responses => {
+      this.deleteFliesDetails = responses.filter(x => x !== null)
+      this.fileNotDeleted = responses.filter(x => x === null)
+      this.isUsedFiles = true;
+      this.isDelete = true
+    });
+
+  }
+
+}
diff --git a/src/app/components/projects/projects.component.html b/src/app/components/projects/projects.component.html
index 0ae7fd75..65d92452 100644
--- a/src/app/components/projects/projects.component.html
+++ b/src/app/components/projects/projects.component.html
@@ -2,8 +2,8 @@
   <div class="default-header">
     <div class="row">
       <h1 class="col">Projects</h1>
-      <button class="col" mat-raised-button (click)="goToSystemStatus()" class="add-button">Go to system status</button>
-      <button class="col" mat-raised-button (click)="goToPreferences()" class="add-button">Go to preferences</button>
+      <!-- <button class="col" mat-raised-button (click)="goToSystemStatus()" class="add-button">Go to system status</button>
+      <button class="col" mat-raised-button (click)="goToPreferences()" class="add-button">Go to preferences</button> -->
       <button class="col" mat-raised-button color="primary" (click)="addBlankProject()" class="add-button">
         Add blank project
       </button>
@@ -22,6 +22,21 @@
   <div class="default-content">
     <div class="mat-elevation-z8">
       <mat-table #table [dataSource]="dataSource | projectsfilter: searchText" matSort>
+        <ng-container matColumnDef="select">
+          <mat-header-cell *matHeaderCellDef>
+            <mat-checkbox (change)="$event ? selectAllImages() : null" [checked]="selection.hasValue() && isAllSelected()"
+              [indeterminate]="selection.hasValue() && !isAllSelected()">
+            </mat-checkbox>
+          </mat-header-cell>
+          <mat-cell *matCellDef="let row">
+            <mat-checkbox (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(row) : null"
+              [checked]="selection.isSelected(row)">
+            </mat-checkbox>
+          </mat-cell>
+
+        </ng-container>
+
+
         <ng-container matColumnDef="name">
           <mat-header-cell *matHeaderCellDef mat-sort-header> Name </mat-header-cell>
           <mat-cell *matCellDef="let row">
@@ -52,22 +67,37 @@
             </button>
             <button
               mat-icon-button
-              matTooltip="Duplicate project"
+              matTooltip="Save project as"
               matTooltipClass="custom-tooltip"
               (click)="duplicate(row)"
               *ngIf="row.status == 'closed'"
             >
-              <mat-icon aria-label="Duplicate project">filter_2</mat-icon>
+              <mat-icon aria-label="Save project as">save</mat-icon>
             </button>
             <button
               mat-icon-button
-              matTooltip="Delete project"
+              matTooltip="Export project"
               matTooltipClass="custom-tooltip"
-              (click)="delete(row)"
-              *ngIf="row.status == 'closed'"
+              (click)="exportSelectProject(row)"
+              
             >
-              <mat-icon aria-label="Delete project">delete</mat-icon>
+            <mat-icon aria-label="Export project">arrow_downward</mat-icon>
+
             </button>
+            
+          </mat-cell>
+        </ng-container>
+
+        <ng-container matColumnDef="delete" >
+          <mat-header-cell *matHeaderCellDef  class="action"> 
+            <button mat-button   matTooltip="Delete all projects"   matTooltipClass="custom-tooltip"*ngIf="(selection.hasValue() && isAllSelected())  || selection.selected.length > 1" (click)="deleteAllFiles()" aria-label="Example icon button with a delete icon">
+             <mat-icon>delete</mat-icon>
+            </button>
+          </mat-header-cell>
+          <mat-cell *matCellDef="let row"   class="action">
+            <button  mat-icon-button  matTooltip="Delete project"   matTooltipClass="custom-tooltip" (click)="delete(row)" *ngIf="row.status == 'closed' && selection.isSelected(row)" aria-label="Example icon button with a delete icon" >
+            <mat-icon aria-label="Delete project">delete</mat-icon>
+          </button>
           </mat-cell>
         </ng-container>
 
diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts
index 606f5e16..f88065d8 100644
--- a/src/app/components/projects/projects.component.ts
+++ b/src/app/components/projects/projects.component.ts
@@ -1,9 +1,10 @@
-import { DataSource } from '@angular/cdk/collections';
+import { DataSource, SelectionModel } from '@angular/cdk/collections';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatBottomSheet } from '@angular/material/bottom-sheet';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSort, MatSortable } from '@angular/material/sort';
 import { ActivatedRoute, Router } from '@angular/router';
+import { ExportPortableProjectComponent } from '@components/export-portable-project/export-portable-project.component';
 import { ElectronService } from 'ngx-electron';
 import { BehaviorSubject, merge, Observable } from 'rxjs';
 import { map } from 'rxjs//operators';
@@ -17,6 +18,7 @@ import { ToasterService } from '../../services/toaster.service';
 import { AddBlankProjectDialogComponent } from './add-blank-project-dialog/add-blank-project-dialog.component';
 import { ChooseNameDialogComponent } from './choose-name-dialog/choose-name-dialog.component';
 import { ConfirmationBottomSheetComponent } from './confirmation-bottomsheet/confirmation-bottomsheet.component';
+import { ConfirmationDeleteAllProjectsComponent } from './confirmation-delete-all-projects/confirmation-delete-all-projects.component';
 import { ImportProjectDialogComponent } from './import-project-dialog/import-project-dialog.component';
 import { NavigationDialogComponent } from './navigation-dialog/navigation-dialog.component';
 
@@ -29,10 +31,12 @@ export class ProjectsComponent implements OnInit {
   server: Server;
   projectDatabase = new ProjectDatabase();
   dataSource: ProjectDataSource;
-  displayedColumns = ['name', 'actions'];
+  displayedColumns = ['select', 'name', 'actions', 'delete'];
   settings: Settings;
-
+  project: Project;
   searchText: string = '';
+  isAllDelete: boolean = false;
+  selection = new SelectionModel(true, []);
 
   @ViewChild(MatSort, { static: true }) sort: MatSort;
 
@@ -188,6 +192,70 @@ export class ProjectsComponent implements OnInit {
       }
     });
   }
+
+  deleteAllFiles() {
+    const dialogRef = this.dialog.open(ConfirmationDeleteAllProjectsComponent, {
+      width: '550px',
+      maxHeight: '650px',
+      autoFocus: false,
+      disableClose: true,
+      data: {
+        server: this.server,
+        deleteFilesPaths: this.selection.selected
+      }
+    });
+
+    dialogRef.afterClosed().subscribe((isAllfilesdeleted: boolean) => {
+      if (isAllfilesdeleted) {
+        this.unChecked()
+        this.refresh()
+        this.toasterService.success('All files deleted');
+      } else {
+        this.unChecked()
+        this.refresh()
+        return false;
+      }
+    });
+  }
+
+  isAllSelected() {
+    const numSelected = this.selection.selected.length;
+    const numRows = this.projectDatabase.data.length;
+    return numSelected === numRows;
+  }
+
+  selectAllImages() {
+    this.isAllSelected() ? this.unChecked() : this.allChecked();
+  }
+
+  unChecked() {
+    this.selection.clear();
+    this.isAllDelete = false;
+  }
+
+  allChecked() {
+    this.projectDatabase.data.forEach((row) => this.selection.select(row));
+    this.isAllDelete = true;
+  }
+
+exportSelectProject(project: Project){
+  this.project = project
+  if(this.project.project_id){
+    this.exportPortableProjectDialog()
+  }
+
+}
+  exportPortableProjectDialog() {
+    const dialogRef = this.dialog.open(ExportPortableProjectComponent, {
+      width: '700px',
+      maxHeight: '850px',
+      autoFocus: false,
+      disableClose: true,
+      data: {serverDetails:this.server,projectDetails:this.project},
+    });
+
+    dialogRef.afterClosed().subscribe((isAddes: boolean) => {});
+  }
 }
 
 export class ProjectDatabase {
@@ -208,6 +276,8 @@ export class ProjectDatabase {
       this.dataChange.next(this.data.slice());
     }
   }
+
+  
 }
 
 export class ProjectDataSource extends DataSource<any> {
diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html
index 5466a65c..348f07ae 100644
--- a/src/app/layouts/default-layout/default-layout.component.html
+++ b/src/app/layouts/default-layout/default-layout.component.html
@@ -19,6 +19,19 @@
     </button>
 
     <mat-menu #menu="matMenu">
+      <button mat-menu-item (click)="goToSystemStatus()">
+        <mat-icon>info</mat-icon>
+        <span>System status</span>
+      </button>
+      <button mat-menu-item (click)="goToPreferences()">
+        <mat-icon>settings_applications</mat-icon>
+        <span>Template preferences</span>
+      </button>
+      <button mat-menu-item>
+        <!-- [routerLink]="['/controller', controller.id, 'image-manager']" -->
+        <mat-icon>collections</mat-icon>
+        <span>Image manager</span>
+      </button>
       <button mat-menu-item routerLink="/settings">
         <mat-icon>settings</mat-icon>
         <span>Settings</span>
diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts
index 57e47444..223cb83b 100644
--- a/src/app/layouts/default-layout/default-layout.component.ts
+++ b/src/app/layouts/default-layout/default-layout.component.ts
@@ -29,6 +29,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
   recentlyOpenedServerId: string;
   recentlyOpenedProjectId: string;
   serverIdProjectList: string;
+  controller: Server;
 
   constructor(
     private electronService: ElectronService,
@@ -37,11 +38,15 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     private toasterService: ToasterService,
     private progressService: ProgressService,
     private router: Router,
-    private serverService: ServerService
+    private serverService: ServerService,
+    private route: ActivatedRoute,
+
   ) {}
 
   ngOnInit() {
     this.checkIfUserIsLoginPage();
+    this.controller = this.route.snapshot.data['server'];
+
     this.routeSubscription = this.router.events.subscribe((val) => {
       if (val instanceof NavigationEnd) this.checkIfUserIsLoginPage();
     });
@@ -110,6 +115,18 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
       .catch((error) => this.toasterService.error('Cannot navigate to the last opened project'));
   }
 
+  goToPreferences() {
+    this.router
+      .navigate(['/controller', this.controller.id, 'preferences'])
+      .catch((error) => this.toasterService.error('Cannot navigate to the preferences'));
+  }
+
+  goToSystemStatus() {
+    this.router
+      .navigate(['/controller', this.controller.id, 'systemstatus'])
+      .catch((error) => this.toasterService.error('Cannot navigate to the system status'));
+  }
+
   @HostListener('window:beforeunload', ['$event'])
   async onBeforeUnload($event) {
     if (!this.shouldStopServersOnClosing) {
@@ -124,6 +141,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     window.close();
     return false;
   }
+ 
 
   ngOnDestroy() {
     this.serverStatusSubscription.unsubscribe();

From 3bbd755d0a37626624829c844f2e9301e7eb6f67 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Tue, 19 Jul 2022 17:56:31 +0530
Subject: [PATCH 3/9] add route

---
 .../default-layout.component.html             |  3 +-
 .../default-layout.component.ts               | 35 +++++++++++--------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html
index 348f07ae..f5d8c421 100644
--- a/src/app/layouts/default-layout/default-layout.component.html
+++ b/src/app/layouts/default-layout/default-layout.component.html
@@ -27,8 +27,7 @@
         <mat-icon>settings_applications</mat-icon>
         <span>Template preferences</span>
       </button>
-      <button mat-menu-item>
-        <!-- [routerLink]="['/controller', controller.id, 'image-manager']" -->
+      <button mat-menu-item (click)="goToImageManager()">
         <mat-icon>collections</mat-icon>
         <span>Image manager</span>
       </button>
diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts
index 223cb83b..b4c15303 100644
--- a/src/app/layouts/default-layout/default-layout.component.ts
+++ b/src/app/layouts/default-layout/default-layout.component.ts
@@ -1,15 +1,14 @@
 import { Component, HostListener, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
-import { NavigationEnd } from '@angular/router';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
-import { ServerService } from '../../services/server.service';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { ElectronService } from 'ngx-electron';
 import { Subscription } from 'rxjs';
 import { ProgressService } from '../../common/progress/progress.service';
+import { Server } from '../../models/server';
 import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service';
 import { ServerManagementService } from '../../services/server-management.service';
+import { ServerService } from '../../services/server.service';
 import { ToasterService } from '../../services/toaster.service';
 import { version } from './../../version';
-import { Server } from '../../models/server';
 
 @Component({
   selector: 'app-default-layout',
@@ -39,8 +38,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     private progressService: ProgressService,
     private router: Router,
     private serverService: ServerService,
-    private route: ActivatedRoute,
-
+    private route: ActivatedRoute
   ) {}
 
   ngOnInit() {
@@ -50,7 +48,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     this.routeSubscription = this.router.events.subscribe((val) => {
       if (val instanceof NavigationEnd) this.checkIfUserIsLoginPage();
     });
-    
+
     this.recentlyOpenedServerId = this.recentlyOpenedProjectService.getServerId();
     this.recentlyOpenedProjectId = this.recentlyOpenedProjectService.getProjectId();
     this.serverIdProjectList = this.recentlyOpenedProjectService.getServerIdProjectList();
@@ -74,21 +72,21 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
   }
 
   goToUserInfo() {
-    let serverId = this.router.url.split("/server/")[1].split("/")[0];
+    let serverId = this.router.url.split('/server/')[1].split('/')[0];
     this.serverService.get(+serverId).then((server: Server) => {
       this.router.navigate(['/server', server.id, 'loggeduser']);
     });
   }
 
   goToDocumentation() {
-    let serverId = this.router.url.split("/server/")[1].split("/")[0];
+    let serverId = this.router.url.split('/server/')[1].split('/')[0];
     this.serverService.get(+serverId).then((server: Server) => {
       (window as any).open(`http://${server.host}:${server.port}/docs`);
     });
   }
 
   checkIfUserIsLoginPage() {
-    if (this.router.url.includes("login")) {
+    if (this.router.url.includes('login')) {
       this.isLoginPage = true;
     } else {
       this.isLoginPage = false;
@@ -96,10 +94,10 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
   }
 
   logout() {
-    let serverId = this.router.url.split("/server/")[1].split("/")[0];
+    let serverId = this.router.url.split('/server/')[1].split('/')[0];
     this.serverService.get(+serverId).then((server: Server) => {
       server.authToken = null;
-      this.serverService.update(server).then(val => this.router.navigate(['/server', server.id, 'login']));
+      this.serverService.update(server).then((val) => this.router.navigate(['/server', server.id, 'login']));
     });
   }
 
@@ -116,14 +114,22 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
   }
 
   goToPreferences() {
+    let controllerId = this.router.url.split('/server/')[1].split('/')[0];
     this.router
-      .navigate(['/controller', this.controller.id, 'preferences'])
+      .navigate(['/server', controllerId, 'preferences'])
       .catch((error) => this.toasterService.error('Cannot navigate to the preferences'));
   }
 
   goToSystemStatus() {
+    let controllerId = this.router.url.split('/server/')[1].split('/')[0];
     this.router
-      .navigate(['/controller', this.controller.id, 'systemstatus'])
+      .navigate(['/server', controllerId, 'systemstatus'])
+      .catch((error) => this.toasterService.error('Cannot navigate to the system status'));
+  }
+  goToImageManager() {
+    let controllerId = this.router.url.split('/server/')[1].split('/')[0];
+    this.router
+      .navigate(['/server', controllerId, 'image-manager'])
       .catch((error) => this.toasterService.error('Cannot navigate to the system status'));
   }
 
@@ -141,7 +147,6 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     window.close();
     return false;
   }
- 
 
   ngOnDestroy() {
     this.serverStatusSubscription.unsubscribe();

From 845f1f1ad8841a144d5d62f58facb205400af221 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Tue, 19 Jul 2022 18:18:46 +0530
Subject: [PATCH 4/9] I complete unit test case  to confirmations for delete
 all project

---
 ...tion-delete-all-projects.component.spec.ts | 29 +++++++++++++++++++
 ...firmation-delete-all-projects.component.ts |  4 +--
 .../components/projects/projects.component.ts |  2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
index 8acf87e4..0b9f4d37 100644
--- a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
@@ -1,13 +1,42 @@
 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 { MatToolbarModule } from '@angular/material/toolbar';
+import { MockedProjectService } from '../../../services/project.service.spec';
+import { MockedToasterService } from '../../../services/toaster.service.spec';
+import { ProjectService } from '../../../services/project.service';
+import { ServerService } from '../../../services/server.service';
+import { MockedServerService } from '../../../services/server.service.spec';
+import { ToasterService } from '../../../services/toaster.service';
 
 import { ConfirmationDeleteAllProjectsComponent } from './confirmation-delete-all-projects.component';
 
 describe('ConfirmationDeleteAllProjectsComponent', () => {
   let component: ConfirmationDeleteAllProjectsComponent;
   let fixture: ComponentFixture<ConfirmationDeleteAllProjectsComponent>;
+  let mockedServerService = new MockedServerService();
+  let mockedImageManagerService = new MockedProjectService()
+  let mockedToasterService = new MockedToasterService()
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [
+        MatIconModule,
+        MatToolbarModule,
+        MatMenuModule,
+        MatCheckboxModule,
+        MatDialogModule,
+      ],
+      providers: [
+        { provide: ServerService, useValue: mockedServerService },
+        { provide: ProjectService, useValue: mockedImageManagerService },
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+        { provide: MatDialogRef, useValue: {} },
+        { provide: ToasterService, useValue: mockedToasterService },
+
+      ],
       declarations: [ ConfirmationDeleteAllProjectsComponent ]
     })
     .compileComponents();
diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts
index 19d4b136..a28b2bb2 100644
--- a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { ProjectService } from '@services/project.service';
-import { ToasterService } from '@services/toaster.service';
+import { ProjectService } from '../../../services/project.service';
+import { ToasterService } from '../../../services/toaster.service';
 import { Observable, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts
index f88065d8..09a84403 100644
--- a/src/app/components/projects/projects.component.ts
+++ b/src/app/components/projects/projects.component.ts
@@ -4,7 +4,7 @@ import { MatBottomSheet } from '@angular/material/bottom-sheet';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSort, MatSortable } from '@angular/material/sort';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ExportPortableProjectComponent } from '@components/export-portable-project/export-portable-project.component';
+import { ExportPortableProjectComponent } from '../../components/export-portable-project/export-portable-project.component';
 import { ElectronService } from 'ngx-electron';
 import { BehaviorSubject, merge, Observable } from 'rxjs';
 import { map } from 'rxjs//operators';

From a6661a24c6f81ee9afaaec7fe7743051abd6f008 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Thu, 21 Jul 2022 14:16:55 +0530
Subject: [PATCH 5/9] Resolve all commented issue

---
 .../choose-name-dialog/choose-name-dialog.component.html      | 4 ++--
 .../confirmation-delete-all-projects.component.html           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.html b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.html
index 42d261a1..22505eb6 100644
--- a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.html
+++ b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.html
@@ -1,4 +1,4 @@
-<h1 mat-dialog-title>Please choose name for exporting project</h1>
+<h1 mat-dialog-title>Save project as</h1>
 
 <div class="modal-form-container">
   <mat-form-field class="form-field">
@@ -8,5 +8,5 @@
 
 <div mat-dialog-actions>
   <button mat-button (click)="onCloseClick()" color="accent">Cancel</button>
-  <button mat-button (click)="onSaveClick()" tabindex="2" mat-raised-button color="primary">Apply</button>
+  <button mat-button (click)="onSaveClick()" tabindex="2" mat-raised-button color="primary">Save project</button>
 </div>
diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
index 37d22562..24a2fe51 100644
--- a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="!isDelete && !isUsedFiles">
-    <h1 mat-dialog-title>Do you want delete all files ?.</h1>
+    <h1 mat-dialog-title>Do you want delete all projects?.</h1>
     <div mat-dialog-content>
         <p>Your selected files</p>
         <p *ngFor="let file of deleteData?.deleteFilesPaths; let i = index">{{i+1}}. {{file?.filename}}</p>

From dc94d22822786c05d712e60da1e66b4eed019900 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Sat, 23 Jul 2022 10:58:17 +0200
Subject: [PATCH 6/9] Finish merging code from master-3.0

---
 ...tion-delete-all-projects.component.spec.ts |  8 +++---
 ...firmation-delete-all-projects.component.ts |  2 +-
 .../components/projects/projects.component.ts |  6 ++---
 .../default-layout.component.html             | 13 +++++++---
 .../default-layout.component.ts               | 26 ++-----------------
 5 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
index 0b9f4d37..6bcf137d 100644
--- a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.spec.ts
@@ -7,8 +7,8 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MockedProjectService } from '../../../services/project.service.spec';
 import { MockedToasterService } from '../../../services/toaster.service.spec';
 import { ProjectService } from '../../../services/project.service';
-import { ServerService } from '../../../services/server.service';
-import { MockedServerService } from '../../../services/server.service.spec';
+import { ControllerService } from '../../../services/controller.service';
+import { MockedControllerService } from '../../../services/controller.service.spec';
 import { ToasterService } from '../../../services/toaster.service';
 
 import { ConfirmationDeleteAllProjectsComponent } from './confirmation-delete-all-projects.component';
@@ -16,7 +16,7 @@ import { ConfirmationDeleteAllProjectsComponent } from './confirmation-delete-al
 describe('ConfirmationDeleteAllProjectsComponent', () => {
   let component: ConfirmationDeleteAllProjectsComponent;
   let fixture: ComponentFixture<ConfirmationDeleteAllProjectsComponent>;
-  let mockedServerService = new MockedServerService();
+  let mockedControllerService = new MockedControllerService();
   let mockedImageManagerService = new MockedProjectService()
   let mockedToasterService = new MockedToasterService()
 
@@ -30,7 +30,7 @@ describe('ConfirmationDeleteAllProjectsComponent', () => {
         MatDialogModule,
       ],
       providers: [
-        { provide: ServerService, useValue: mockedServerService },
+        { provide: ControllerService, useValue: mockedControllerService },
         { provide: ProjectService, useValue: mockedImageManagerService },
         { provide: MAT_DIALOG_DATA, useValue: {} },
         { provide: MatDialogRef, useValue: {} },
diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts
index a28b2bb2..44bb97ec 100644
--- a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.ts
@@ -34,7 +34,7 @@ export class ConfirmationDeleteAllProjectsComponent implements OnInit {
   deleteFile() {
     const calls = [];
     this.deleteData.deleteFilesPaths.forEach(project => {
-      calls.push(this.projectService.delete(this.deleteData.server, project.project_id).pipe(catchError(error => of(error))))
+      calls.push(this.projectService.delete(this.deleteData.controller, project.project_id).pipe(catchError(error => of(error))))
     });
     Observable.forkJoin(calls).subscribe(responses => {
       this.deleteFliesDetails = responses.filter(x => x !== null)
diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts
index 6d02f93b..29ba473d 100644
--- a/src/app/components/projects/projects.component.ts
+++ b/src/app/components/projects/projects.component.ts
@@ -200,7 +200,7 @@ export class ProjectsComponent implements OnInit {
       autoFocus: false,
       disableClose: true,
       data: {
-        server: this.server,
+        controller: this.controller,
         deleteFilesPaths: this.selection.selected
       }
     });
@@ -251,7 +251,7 @@ exportSelectProject(project: Project){
       maxHeight: '850px',
       autoFocus: false,
       disableClose: true,
-      data: {serverDetails:this.server,projectDetails:this.project},
+      data: {controllerDetails:this.controller,projectDetails:this.project},
     });
 
     dialogRef.afterClosed().subscribe((isAddes: boolean) => {});
@@ -276,8 +276,6 @@ export class ProjectDatabase {
       this.dataChange.next(this.data.slice());
     }
   }
-
-  
 }
 
 export class ProjectDataSource extends DataSource<any> {
diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html
index 0988670a..b2e84204 100644
--- a/src/app/layouts/default-layout/default-layout.component.html
+++ b/src/app/layouts/default-layout/default-layout.component.html
@@ -19,15 +19,22 @@
     </button>
 
     <mat-menu #menu="matMenu">
-      <button mat-menu-item (click)="goToSystemStatus()">
+      <button mat-menu-item
+              [disabled]="!controllerId"
+              [routerLink]="['controller', controllerId, 'systemstatus']">
         <mat-icon>info</mat-icon>
         <span>System status</span>
       </button>
-      <button mat-menu-item (click)="goToPreferences()">
+      <button mat-menu-item
+              [disabled]="!controllerId"
+              [routerLink]="['controller', controllerId, 'preferences']">
         <mat-icon>settings_applications</mat-icon>
         <span>Template preferences</span>
       </button>
-      <button mat-menu-item (click)="goToImageManager()">
+      <button mat-menu-item
+              [disabled]="!controllerId"
+              [routerLink]="['controller', controllerId, 'image-manager']">
+
         <mat-icon>collections</mat-icon>
         <span>Image manager</span>
       </button>
diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts
index fbd2fc7e..d0940b74 100644
--- a/src/app/layouts/default-layout/default-layout.component.ts
+++ b/src/app/layouts/default-layout/default-layout.component.ts
@@ -36,7 +36,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     private controllerManagement: ControllerManagementService,
     private toasterService: ToasterService,
     private progressService: ProgressService,
-    private router: Router,
+    public router: Router,
     private route: ActivatedRoute,
     private controllerService: ControllerService
   ) {
@@ -50,8 +50,6 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
   ngOnInit() {
 
     this.checkIfUserIsLoginPage();
-    this.controller = this.route.snapshot.data['server'];
-
     this.routeSubscription = this.router.events.subscribe((val) => {
       if (val instanceof NavigationEnd) this.checkIfUserIsLoginPage();
     });
@@ -85,7 +83,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
   }
 
   checkIfUserIsLoginPage() {
-    if (this.router.url.includes('login')) {
+    if (this.router.url.includes("login")) {
       this.isLoginPage = true;
     } else {
       this.isLoginPage = false;
@@ -111,26 +109,6 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
       .catch((error) => this.toasterService.error('Cannot navigate to the last opened project'));
   }
 
-  goToPreferences() {
-    let controllerId = this.router.url.split('/server/')[1].split('/')[0];
-    this.router
-      .navigate(['/server', controllerId, 'preferences'])
-      .catch((error) => this.toasterService.error('Cannot navigate to the preferences'));
-  }
-
-  goToSystemStatus() {
-    let controllerId = this.router.url.split('/server/')[1].split('/')[0];
-    this.router
-      .navigate(['/server', controllerId, 'systemstatus'])
-      .catch((error) => this.toasterService.error('Cannot navigate to the system status'));
-  }
-  goToImageManager() {
-    let controllerId = this.router.url.split('/server/')[1].split('/')[0];
-    this.router
-      .navigate(['/server', controllerId, 'image-manager'])
-      .catch((error) => this.toasterService.error('Cannot navigate to the system status'));
-  }
-
   @HostListener('window:beforeunload', ['$event'])
   async onBeforeUnload($event) {
     if (!this.shouldStopControllersOnClosing) {

From 97a04a2fba22b598311b39c210c1acd933e7a9a5 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 25 Jul 2022 11:49:21 +0530
Subject: [PATCH 7/9] Resolve  the top-right menu url  issue

---
 src/app/app-routing.module.ts                          |  6 +++---
 .../default-layout/default-layout.component.html       | 10 ++++++++--
 .../layouts/default-layout/default-layout.component.ts |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index f87fd595..b7e80bbf 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -92,9 +92,9 @@ const routes: Routes = [
         canActivate: [LoginGuard],
         resolve: { controller: ControllerResolve },
       },
-      { path: 'help', component: HelpComponent },
-      { path: 'settings', component: SettingsComponent },
-      { path: 'settings/console', component: ConsoleComponent },
+      { path: 'controller/:controller_id/help', component: HelpComponent },
+      { path: 'controller/:controller_id/settings', component: SettingsComponent },
+      { path: 'controller/:controller_id/settings/console', component: ConsoleComponent },
       {
         path: 'controller/:controller_id/management/users/:user_id',
         component: UserDetailComponent,
diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html
index b2e84204..f3d77d67 100644
--- a/src/app/layouts/default-layout/default-layout.component.html
+++ b/src/app/layouts/default-layout/default-layout.component.html
@@ -38,7 +38,10 @@
         <mat-icon>collections</mat-icon>
         <span>Image manager</span>
       </button>
-      <button mat-menu-item routerLink="/settings">
+      <button mat-menu-item
+      [disabled]="!controllerId"
+      [routerLink]="['controller', controllerId, 'settings']"
+      >
         <mat-icon>settings</mat-icon>
         <span>Settings</span>
       </button>
@@ -48,7 +51,10 @@
         <mat-icon>groups</mat-icon>
         <span>Management</span>
       </button>
-      <button mat-menu-item routerLink="/help">
+      <button mat-menu-item 
+      [disabled]="!controllerId"
+      [routerLink]="['controller', controllerId, 'help']"
+      >
         <mat-icon>help</mat-icon>
         <span>Help</span>
       </button>
diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts
index d0940b74..571ad42f 100644
--- a/src/app/layouts/default-layout/default-layout.component.ts
+++ b/src/app/layouts/default-layout/default-layout.component.ts
@@ -41,6 +41,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     private controllerService: ControllerService
   ) {
     this.router.events.subscribe((data) => {
+      debugger
       if (data instanceof NavigationEnd) {
         this.controllerId = this.route.children[0].snapshot.paramMap.get("controller_id");
       }

From 9b6e927c7b14675944d9b3c80f304b10a2e2e632 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Tue, 26 Jul 2022 09:18:03 +0530
Subject: [PATCH 8/9] Remove unused code and change  string into Your selected
 files => Your selected projects

---
 ...confirmation-delete-all-projects.component.html |  2 +-
 .../components/projects/projects.component.html    |  2 --
 src/app/components/projects/projects.component.ts  | 14 +-------------
 .../default-layout/default-layout.component.ts     |  1 -
 src/app/services/project.service.ts                |  1 -
 5 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
index 24a2fe51..83090f3a 100644
--- a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="!isDelete && !isUsedFiles">
     <h1 mat-dialog-title>Do you want delete all projects?.</h1>
     <div mat-dialog-content>
-        <p>Your selected files</p>
+        <p>Your selected projects</p>
         <p *ngFor="let file of deleteData?.deleteFilesPaths; let i = index">{{i+1}}. {{file?.filename}}</p>
     </div>
     <div mat-dialog-actions align="end">
diff --git a/src/app/components/projects/projects.component.html b/src/app/components/projects/projects.component.html
index 00dd536e..73b8f436 100644
--- a/src/app/components/projects/projects.component.html
+++ b/src/app/components/projects/projects.component.html
@@ -2,8 +2,6 @@
   <div class="default-header">
     <div class="row">
       <h1 class="col">Projects</h1>
-      <!-- <button class="col" mat-raised-button (click)="goToSystemStatus()" class="add-button">Go to system status</button>
-      <button class="col" mat-raised-button (click)="goToPreferences()" class="add-button">Go to preferences</button> -->
       <button class="col" mat-raised-button color="primary" (click)="addBlankProject()" class="add-button">
         Add blank project
       </button>
diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts
index 29ba473d..d1c41224 100644
--- a/src/app/components/projects/projects.component.ts
+++ b/src/app/components/projects/projects.component.ts
@@ -69,18 +69,6 @@ export class ProjectsComponent implements OnInit {
     this.projectService.projectListSubject.subscribe(() => this.refresh());
   }
 
-  goToPreferences() {
-    this.router
-      .navigate(['/controller', this.controller.id, 'preferences'])
-      .catch((error) => this.toasterService.error('Cannot navigate to the preferences'));
-  }
-
-  goToSystemStatus() {
-    this.router
-      .navigate(['/controller', this.controller.id, 'systemstatus'])
-      .catch((error) => this.toasterService.error('Cannot navigate to the system status'));
-  }
-
   refresh() {
     this.projectService.list(this.controller).subscribe(
       (projects: Project[]) => {
@@ -209,7 +197,7 @@ export class ProjectsComponent implements OnInit {
       if (isAllfilesdeleted) {
         this.unChecked()
         this.refresh()
-        this.toasterService.success('All files deleted');
+        this.toasterService.success('All projects deleted');
       } else {
         this.unChecked()
         this.refresh()
diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts
index 571ad42f..d0940b74 100644
--- a/src/app/layouts/default-layout/default-layout.component.ts
+++ b/src/app/layouts/default-layout/default-layout.component.ts
@@ -41,7 +41,6 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     private controllerService: ControllerService
   ) {
     this.router.events.subscribe((data) => {
-      debugger
       if (data instanceof NavigationEnd) {
         this.controllerId = this.route.children[0].snapshot.paramMap.get("controller_id");
       }
diff --git a/src/app/services/project.service.ts b/src/app/services/project.service.ts
index 49035b3a..2573aace 100644
--- a/src/app/services/project.service.ts
+++ b/src/app/services/project.service.ts
@@ -73,7 +73,6 @@ export class ProjectService {
   }
 
   links(controller:Controller , project_id: string) {
-    debugger
     return this.httpController.get<Link[]>(controller, `/projects/${project_id}/links`);
   }
 

From 7601a7583171ff28f2e6128d07a0c5a68a178112 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 26 Jul 2022 23:36:01 +0200
Subject: [PATCH 9/9] Remove '.'

---
 .../confirmation-delete-all-projects.component.html           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
index 83090f3a..dfe40ca5 100644
--- a/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
+++ b/src/app/components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="!isDelete && !isUsedFiles">
-    <h1 mat-dialog-title>Do you want delete all projects?.</h1>
+    <h1 mat-dialog-title>Do you want delete all projects?</h1>
     <div mat-dialog-content>
         <p>Your selected projects</p>
         <p *ngFor="let file of deleteData?.deleteFilesPaths; let i = index">{{i+1}}. {{file?.filename}}</p>
@@ -31,4 +31,4 @@
     <div mat-dialog-actions align="end">
         <button mat-raised-button color="primary" (click)="dialogRef.close(false)">Close</button>
     </div>
-</div>
\ No newline at end of file
+</div>