Merge pull request #1515 from GNS3/2.2

grossmj · web-flow · commit 93aabe0cbc39 · 2024-07-09T00:31:25.000+02:00
Release v2.2.48
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gns3-web-ui",
-  "version": "2.2.47",
+  "version": "2.2.49.dev1",
   "author": {
     "name": "GNS3 Technology Inc.",
     "email": "developers@gns3.com"
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,4 +1,4 @@
 <div [ngClass]="{ dark: darkThemeEnabled, light: !darkThemeEnabled }">
   <router-outlet></router-outlet>
-  <app-adbutler></app-adbutler>
+  <!-- <app-adbutler></app-adbutler> -->
 </div>
diff --git a/src/app/cartography/widgets/interface-status.ts b/src/app/cartography/widgets/interface-status.ts
@@ -90,7 +90,7 @@ export class InterfaceStatusWidget implements Widget {
           .merge(status_started_enter)
           .attr('class', 'status_started')
           .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
           })
           .attr('height', 20)
           .attr('x', (ls: LinkStatus) => ls.x - 30)
@@ -122,7 +122,7 @@ export class InterfaceStatusWidget implements Widget {
           .merge(status_stopped_enter)
           .attr('class', 'status_stopped')
           .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
           })
           .attr('height', 20)
           .attr('x', (ls: LinkStatus) => ls.x - 30)
@@ -154,7 +154,7 @@ export class InterfaceStatusWidget implements Widget {
           .merge(status_suspended_enter)
           .attr('class', 'status_suspended')
           .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
           })
           .attr('height', 20)
           .attr('x', (ls: LinkStatus) => ls.x - 30)
diff --git a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.html b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.html
@@ -4,7 +4,7 @@
 </button>
 <button
   mat-menu-item
-  *ngIf="node.node_type === 'docker' || node.node_type === 'dynamips'"
+  *ngIf="node.node_type === 'docker' || node.node_type === 'dynamips' || node.node_type === 'qemu'"
   (click)="openConsole(auxiliary=true)"
 >
   <mat-icon>web_asset</mat-icon>
diff --git a/src/index.html b/src/index.html
@@ -38,15 +38,15 @@
   <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>
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-0BT7QQV1W1></script>
     <script>
       window.dataLayer = window.dataLayer || [];
       function gtag() {
         dataLayer.push(arguments);
       }
       gtag('js', new Date());
 
-      gtag('config', 'G-5D6FZL9923');
+      gtag('config', 'G-0BT7QQV1W1');
     </script>
   </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gns3-web-ui",`
`3`		`- "version": "2.2.47",`
	`3`	`+ "version": "2.2.49.dev1",`
`4`	`4`	`"author": {`
`5`	`5`	`"name": "GNS3 Technology Inc.",`
`6`	`6`	`"email": "[email protected]"`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`</button>`
`5`	`5`	`<button`
`6`	`6`	`mat-menu-item`
`7`		`- *ngIf="node.node_type === 'docker' \|\| node.node_type === 'dynamips'"`
	`7`	`+ *ngIf="node.node_type === 'docker' \|\| node.node_type === 'dynamips' \|\| node.node_type === 'qemu'"`
`8`	`8`	`(click)="openConsole(auxiliary=true)"`
`9`	`9`	`>`
`10`	`10`	`<mat-icon>web_asset</mat-icon>`