From abdd739f064b107b653bf058b187fd65c2f839cb Mon Sep 17 00:00:00 2001
From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com>
Date: Tue, 11 May 2021 01:35:07 +0200
Subject: [PATCH] Console in new tab for many nodes at one click

---
 .../http-console-new-tab-action.component.ts              | 2 +-
 .../project-map/context-menu/context-menu.component.html  | 2 +-
 src/app/components/project-map/project-map.component.html | 1 -
 src/app/components/project-map/project-map.component.ts   | 8 --------
 src/index.html                                            | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts
index 42624197..0c8f096a 100644
--- a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts
@@ -23,7 +23,7 @@ export class HttpConsoleNewTabActionComponent implements OnInit {
         let urlString = `/static/web-ui/${url[1]}/${url[2]}/${url[3]}/${url[4]}/nodes/${n.node_id}`;
         window.open(urlString);
       } else {
-        this.toasterService.error('To open console please start the node');
+        this.toasterService.error('To open console please start the node ' + n.name);
       }
     });
   }
diff --git a/src/app/components/project-map/context-menu/context-menu.component.html b/src/app/components/project-map/context-menu/context-menu.component.html
index 9dc61b2f..63bba5b6 100644
--- a/src/app/components/project-map/context-menu/context-menu.component.html
+++ b/src/app/components/project-map/context-menu/context-menu.component.html
@@ -13,7 +13,7 @@
       [nodes]="nodes"
     ></app-http-console-action>
     <app-http-console-new-tab-action
-      *ngIf="!projectService.isReadOnly(project) && nodes.length === 1"
+      *ngIf="!projectService.isReadOnly(project) && nodes.length > 0"
       [server]="server"
       [nodes]="nodes"
     ></app-http-console-new-tab-action>
diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html
index b4e24a25..686d5306 100644
--- a/src/app/components/project-map/project-map.component.html
+++ b/src/app/components/project-map/project-map.component.html
@@ -64,7 +64,6 @@
       <div class="menu-button-group">
         <app-nodes-menu [server]="server" [project]="project"></app-nodes-menu>
         <app-context-menu [project]="project" [server]="server"></app-context-menu>
-        <app-context-console-menu [project]="project" [server]="server"></app-context-console-menu>
       </div>
     </div>
     <div>
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts
index e74201ba..db9f6370 100644
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@@ -74,7 +74,6 @@ import { ImportProjectDialogComponent } from '../projects/import-project-dialog/
 import { NavigationDialogComponent } from '../projects/navigation-dialog/navigation-dialog.component';
 import { SaveProjectDialogComponent } from '../projects/save-project-dialog/save-project-dialog.component';
 import { NodeAddedEvent } from '../template/template-list-dialog/template-list-dialog.component';
-import { ContextConsoleMenuComponent } from './context-console-menu/context-console-menu.component';
 import { ContextMenuComponent } from './context-menu/context-menu.component';
 import { NodeCreatedLabelStylesFixer } from './helpers/node-created-label-styles-fixer';
 import { NewTemplateDialogComponent } from './new-template-dialog/new-template-dialog.component';
@@ -120,7 +119,6 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
   public isLightThemeEnabled: boolean = false;
 
   @ViewChild(ContextMenuComponent) contextMenu: ContextMenuComponent;
-  @ViewChild(ContextConsoleMenuComponent) consoleContextMenu: ContextConsoleMenuComponent;
   @ViewChild(D3MapComponent) mapChild: D3MapComponent;
   @ViewChild(ProjectMapMenuComponent) projectMapMenuComponent: ProjectMapMenuComponent;
 
@@ -513,11 +511,6 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
       this.contextMenu.openMenuForListOfElements(drawings, nodes, labels, links, event.pageY, event.pageX);
     });
 
-    const onContextConsoleMenu = this.nodeWidget.onContextConsoleMenu.subscribe((eventNode: NodeContextMenu) => {
-      const node = this.mapNodeToNode.convert(eventNode.node);
-      this.consoleContextMenu.openMenu(node, eventNode.event.pageY, eventNode.event.pageX);
-    });
-
     this.projectMapSubscription.add(onLinkContextMenu);
     this.projectMapSubscription.add(onEthernetLinkContextMenu);
     this.projectMapSubscription.add(onSerialLinkContextMenu);
@@ -526,7 +519,6 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
     this.projectMapSubscription.add(onContextMenu);
     this.projectMapSubscription.add(onLabelContextMenu);
     this.projectMapSubscription.add(onInterfaceLabelContextMenu);
-    this.projectMapSubscription.add(onContextConsoleMenu);
     this.mapChangeDetectorRef.detectChanges();
   }
 
diff --git a/src/index.html b/src/index.html
index 4ae7015b..0332bc23 100644
--- a/src/index.html
+++ b/src/index.html
@@ -35,7 +35,7 @@
     </script>
   </head>
   <!-- <body class="mat-app-background" oncontextmenu="return false;"> -->
-  <body class="mat-app-background">
+  <body class="mat-app-background" oncontextmenu="return false;">
     <app-root></app-root>
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-5D6FZL9923"></script>