Release 2.2.23

[Snyk] Security upgrade snyk from 1.630.0 to 1.667.0

.github/workflows/main.yml

@@ -14,10 +14,10 @@ jobs:
     
     steps:
       - uses: actions/checkout@v2
-      - name: Setup node 12
+      - name: Setup node 14
         uses: actions/setup-node@v2
         with:
-          node-version: 12.x
+          node-version: 14.x
       - uses: c-hive/gha-yarn-cache@v1
       - name: Install JS dependencies
         run: yarn install

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gns3-web-ui",
-  "version": "2.2.22",
+  "version": "2.2.23",
   "author": {
     "name": "GNS3 Technology Inc.",
     "email": "developers@gns3.com"
@@ -41,26 +41,26 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^12.0.2",
-    "@angular/cdk": "^12.0.2",
-    "@angular/common": "^12.0.2",
-    "@angular/compiler": "^12.0.2",
-    "@angular/core": "^12.0.2",
-    "@angular/forms": "^12.0.2",
-    "@angular/material": "^12.0.2",
-    "@angular/platform-browser": "^12.0.2",
-    "@angular/platform-browser-dynamic": "^12.0.2",
-    "@angular/router": "^12.0.2",
-    "@sentry/browser": "^6.3.6",
-    "@types/jest": "^26.0.23",
-    "@types/mocha": "^8.2.2",
-    "@types/react": "^17.0.5",
-    "@types/react-dom": "^17.0.3",
+    "@angular/animations": "^12.1.4",
+    "@angular/cdk": "^12.1.4",
+    "@angular/common": "^12.1.4",
+    "@angular/compiler": "^12.1.4",
+    "@angular/core": "^12.1.4",
+    "@angular/forms": "^12.1.4",
+    "@angular/material": "^12.1.4",
+    "@angular/platform-browser": "^12.1.4",
+    "@angular/platform-browser-dynamic": "^12.1.4",
+    "@angular/router": "^12.1.4",
+    "@sentry/browser": "^6.10.0",
+    "@types/jest": "^26.0.24",
+    "@types/mocha": "^9.0.0",
+    "@types/react": "^17.0.15",
+    "@types/react-dom": "^17.0.9",
     "angular-draggable-droppable": "^4.6.0",
-    "angular-resizable-element": "^3.3.5",
-    "bootstrap": "^5.0.0",
+    "angular-resizable-element": "^3.4.0",
+    "bootstrap": "^5.0.2",
     "command-exists": "^1.2.9",
-    "core-js": "^3.12.1",
+    "core-js": "^3.16.0",
     "d3-ng2-service": "^2.2.0",
     "eev": "^0.1.5",
     "ini": "^2.0.0",
@@ -69,61 +69,61 @@
     "ng-circle-progress": "^1.6.0",
     "ng2-file-upload": "^1.4.0",
     "ngx-childprocess": "^0.0.6",
-    "ngx-device-detector": "^2.0.9",
+    "ngx-device-detector": "^2.1.1",
     "ngx-electron": "^2.2.0",
     "node-fetch": "^2.6.1",
     "notosans-fontface": "1.2.2",
-    "prettier-plugin-organize-imports": "^2.0.0",
+    "prettier-plugin-organize-imports": "^2.3.3",
     "rxjs": "^6.5.3",
     "rxjs-compat": "^6.5.3",
     "save-svg-as-png": "^1.4.17",
-    "snyk": "^1.589.0",
+    "snyk": "^1.671.0",
     "spark-md5": "^3.0.1",
     "svg-crowbar": "^0.6.5",
     "tree-kill": "^1.2.2",
-    "tslib": "^2.2.0",
+    "tslib": "^2.3.0",
     "typeface-roboto": "^1.1.13",
-    "xterm": "^4.11.0",
+    "xterm": "^4.13.0",
     "xterm-addon-attach": "^0.6.0",
     "xterm-addon-fit": "^0.5.0",
     "yargs": "^17.0.1",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^12.0.2",
-    "@angular/cli": "^12.0.2",
-    "@angular/compiler-cli": "^12.0.2",
-    "@angular/language-service": "^12.0.2",
-    "@sentry/cli": "^1.64.2",
-    "@sentry/electron": "^2.4.1",
-    "@types/jasmine": "^3.7.1",
-    "@types/jasminewd2": "^2.0.9",
-    "@types/node": "15.6.1",
+    "@angular-devkit/build-angular": "^12.1.4",
+    "@angular/cli": "^12.1.4",
+    "@angular/compiler-cli": "^12.1.4",
+    "@angular/language-service": "^12.1.4",
+    "@sentry/cli": "^1.67.2",
+    "@sentry/electron": "^2.5.1",
+    "@types/jasmine": "^3.8.2",
+    "@types/jasminewd2": "^2.0.10",
+    "@types/node": "16.4.7",
     "codelyzer": "^6.0.2",
-    "electron": "^13.0.1",
-    "electron-builder": "22.10.5",
+    "electron": "^13.1.7",
+    "electron-builder": "22.11.7",
     "file-loader": "^6.2.0",
-    "jasmine-core": "~3.7.1",
+    "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~7.0.0",
     "jquery": "^3.6.0",
-    "karma": "^6.3.2",
+    "karma": "^6.3.4",
     "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "^2.0.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.1",
-    "karma-jasmine-html-reporter": "^1.6.0",
+    "karma-jasmine-html-reporter": "^1.7.0",
     "license-checker": "^25.0.1",
     "popper.js": "^1.16.1",
-    "prettier": "^2.3.0",
+    "prettier": "^2.3.2",
     "protractor": "^7.0.0",
     "replace": "^1.2.1",
     "rxjs-tslint": "^0.1.8",
     "ts-mockito": "^2.6.1",
-    "ts-node": "~10.0.0",
+    "ts-node": "~10.1.0",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "4.2.4",
-    "webpack": "5.38.0",
+    "typescript": "4.3.5",
+    "webpack": "5.47.1",
     "yarn-upgrade-all": "^0.5.4"
   },
   "greenkeeper": {

src/app/components/project-map/project-map.component.ts

@@ -476,27 +476,27 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
 
     const onLinkContextMenu = this.linkWidget.onContextMenu.subscribe((eventLink: LinkContextMenu) => {
       const link = this.mapLinkToLink.convert(eventLink.link);
-      this.contextMenu.openMenuForListOfElements([], [], [], [link], eventLink.event.screenY - 60, eventLink.event.screenX);
+      this.contextMenu.openMenuForListOfElements([], [], [], [link], eventLink.event.pageY, eventLink.event.pageX);
     });
 
     const onEthernetLinkContextMenu = this.ethernetLinkWidget.onContextMenu.subscribe((eventLink: LinkContextMenu) => {
       const link = this.mapLinkToLink.convert(eventLink.link);
-      this.contextMenu.openMenuForListOfElements([], [], [], [link], eventLink.event.screenY - 60, eventLink.event.screenX);
+      this.contextMenu.openMenuForListOfElements([], [], [], [link], eventLink.event.pageY, eventLink.event.pageX);
     });
 
     const onSerialLinkContextMenu = this.serialLinkWidget.onContextMenu.subscribe((eventLink: LinkContextMenu) => {
       const link = this.mapLinkToLink.convert(eventLink.link);
-      this.contextMenu.openMenuForListOfElements([], [], [], [link], eventLink.event.screenY - 60, eventLink.event.screenX);
+      this.contextMenu.openMenuForListOfElements([], [], [], [link], eventLink.event.pageY, eventLink.event.pageX);
     });
 
     const onNodeContextMenu = this.nodeWidget.onContextMenu.subscribe((eventNode: NodeContextMenu) => {
       const node = this.mapNodeToNode.convert(eventNode.node);
-      this.contextMenu.openMenuForNode(node, eventNode.event.screenY - 60, eventNode.event.screenX);
+      this.contextMenu.openMenuForNode(node, eventNode.event.pageY, eventNode.event.pageX);
     });
 
     const onDrawingContextMenu = this.drawingsWidget.onContextMenu.subscribe((eventDrawing: DrawingContextMenu) => {
       const drawing = this.mapDrawingToDrawing.convert(eventDrawing.drawing);
-      this.contextMenu.openMenuForDrawing(drawing, eventDrawing.event.screenY - 60, eventDrawing.event.screenX);
+      this.contextMenu.openMenuForDrawing(drawing, eventDrawing.event.pageY, eventDrawing.event.pageX);
     });
 
     const onLabelContextMenu = this.labelWidget.onContextMenu.subscribe((eventLabel: LabelContextMenu) => {
@@ -512,8 +512,8 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
         this.contextMenu.openMenuForInterfaceLabel(
           linkNode,
           link,
-          eventInterfaceLabel.event.screenY - 60,
-          eventInterfaceLabel.event.screenX
+          eventInterfaceLabel.event.pageY,
+          eventInterfaceLabel.event.pageX
         );
       }
     );