Merge pull request #456 from GNS3/Update-dependencies-June-2019

Angular 8 Upgrade
2024-12-23 23:02:22 +00:00 · 2019-07-26 12:35:20 +02:00 · 2019-07-26 12:35:20 +02:00 · 28d05a70cf
commit 28d05a70cf
parent da7ecf3446 485e41c329
34 changed files with 2786 additions and 2853 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -14,7 +14,7 @@ init:
  - git config --global core.autocrlf input

 install:
-  - ps: Install-Product node 8 x64
+  - ps: Install-Product node 11 x64
  - yarn install

 build_script:
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -8,6 +8,11 @@ jobs:
    steps:
      - checkout

+      - run:
+          name: Install nodejs
+          command: |
+            brew upgrade node
+
      - run:
          name: Set timezone and check current datetime
          command: |
--- a/.travis.yml
+++ b/.travis.yml
@ -1,7 +1,7 @@
 language: node_js

 node_js:
-   - '10' # use node for latest
+   - '11' # use node for latest

 # Issue with Travis: https://github.com/travis-ci/travis-ci/issues/8836#issuecomment-356362524
 sudo: required
--- a/package.json
+++ b/package.json
@ -38,73 +38,73 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "^7.2.14",
-    "@angular/cdk": "^7.3.7",
-    "@angular/common": "^7.2.14",
-    "@angular/compiler": "^7.2.14",
-    "@angular/core": "^7.2.14",
-    "@angular/forms": "^7.2.14",
-    "@angular/http": "^7.2.14",
-    "@angular/material": "^7.3.7",
-    "@angular/platform-browser": "^7.2.14",
-    "@angular/platform-browser-dynamic": "^7.2.14",
-    "@angular/router": "^7.2.14",
+    "@angular/animations": "^8.1.2",
+    "@angular/cdk": "^8.1.1",
+    "@angular/common": "^8.1.2",
+    "@angular/compiler": "^8.1.2",
+    "@angular/core": "^8.1.2",
+    "@angular/forms": "^8.1.2",
+    "@angular/http": "^7.2.15",
+    "@angular/material": "^8.1.1",
+    "@angular/platform-browser": "^8.1.2",
+    "@angular/platform-browser-dynamic": "^8.1.2",
+    "@angular/router": "^8.1.2",
    "angular-persistence": "^1.0.1",
    "angular2-hotkeys": "^2.1.4",
    "angular2-indexeddb": "^1.2.3",
    "bootstrap": "4.3.1",
    "command-exists": "^1.2.8",
-    "core-js": "^3.0.1",
-    "css-tree": "^1.0.0-alpha.29",
+    "core-js": "^3.1.4",
+    "css-tree": "^1.0.0-alpha.33",
    "d3-ng2-service": "^2.1.0",
    "hammerjs": "^2.0.8",
    "ini": "^1.3.5",
    "material-design-icons": "^3.0.1",
    "ng2-file-upload": "^1.3.0",
    "ngx-electron": "^2.1.1",
-    "node-fetch": "^2.4.1",
+    "node-fetch": "^2.6.0",
    "notosans-fontface": "^1.1.0",
-    "raven-js": "^3.27.0",
-    "rxjs": "^6.5.1",
-    "rxjs-compat": "^6.5.1",
+    "raven-js": "^3.27.2",
+    "rxjs": "^6.5.2",
+    "rxjs-compat": "^6.5.2",
    "tree-kill": "^1.2.1",
-    "typeface-roboto": "^0.0.54",
-    "yargs": "^13.2.2",
-    "zone.js": "^0.9.0"
+    "typeface-roboto": "^0.0.75",
+    "yargs": "^13.3.0",
+    "zone.js": "^0.9.1"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.13.8",
-    "@angular/cli": "^7.3.8",
-    "@angular/compiler-cli": "^7.2.14",
-    "@angular/language-service": "^7.2.14",
-    "@sentry/cli": "^1.41.2",
-    "@sentry/electron": "^0.17.1",
-    "@types/jasmine": "~3.3.12",
+    "@angular-devkit/build-angular": "~0.801.2",
+    "@angular/cli": "^8.1.2",
+    "@angular/compiler-cli": "^8.1.2",
+    "@angular/language-service": "^8.1.2",
+    "@sentry/cli": "^1.47.0",
+    "@sentry/electron": "^0.17.3",
+    "@types/jasmine": "~3.3.15",
    "@types/jasminewd2": "~2.0.6",
-    "@types/node": "~12.0.0",
-    "codelyzer": "~5.0.1",
-    "electron": "5.0.2",
-    "electron-builder": "20.39.0",
+    "@types/node": "~12.6.8",
+    "codelyzer": "~5.1.0",
+    "electron": "5.0.8",
+    "electron-builder": "21.1.5",
    "jasmine-core": "~3.4.0",
    "jasmine-spec-reporter": "~4.2.1",
-    "jquery": "^3.4.0",
-    "karma": "~4.1.0",
-    "karma-chrome-launcher": "~2.2.0",
+    "jquery": "^3.4.1",
+    "karma": "~4.2.0",
+    "karma-chrome-launcher": "~3.0.0",
    "karma-cli": "~2.0.0",
-    "karma-coverage-istanbul-reporter": "^2.0.5",
+    "karma-coverage-istanbul-reporter": "^2.1.0",
    "karma-jasmine": "~2.0.1",
    "karma-jasmine-html-reporter": "^1.4.2",
    "license-checker": "^25.0.1",
    "node-sass": "^4.12.0",
    "popper.js": "^1.15.0",
-    "prettier": "^1.17.0",
+    "prettier": "^1.18.2",
    "protractor": "~5.4.2",
    "replace": "^1.1.0",
-    "ts-mockito": "^2.3.1",
-    "ts-node": "~8.1.0",
-    "tslint": "~5.16.0",
+    "ts-mockito": "^2.4.2",
+    "ts-node": "~8.3.0",
+    "tslint": "~5.18.0",
    "tslint-config-prettier": "^1.18.0",
-    "typescript": "<3.3.0"
+    "typescript": ">=3.4.0 <3.5.0"
  },
  "greenkeeper": {
    "ignore": [
--- a/src/app/cartography/components/d3-map/d3-map.component.ts
+++ b/src/app/cartography/components/d3-map/d3-map.component.ts
@ -48,8 +48,8 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy {
  @Input() width = 1500;
  @Input() height = 600;

-  @ViewChild('svg') svgRef: ElementRef;
-  @ViewChild('textEditor') textEditor: TextEditorComponent;
+  @ViewChild('svg', {static: false}) svgRef: ElementRef;
+  @ViewChild('textEditor', {static: false}) textEditor: TextEditorComponent;

  private parentNativeElement: any;
  private svg: Selection<SVGSVGElement, any, null, undefined>;
--- a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts
+++ b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts
@ -13,7 +13,7 @@ export class TextComponent implements OnInit, DoCheck {

  @Input('app-text') text: TextElement;

-  @ViewChild('text') textRef: ElementRef;
+  @ViewChild('text', {static: false}) textRef: ElementRef;

  lines: string[] = [];

--- a/src/app/cartography/components/experimental-map/experimental-map.component.ts
+++ b/src/app/cartography/components/experimental-map/experimental-map.component.ts
@ -43,7 +43,7 @@ export class ExperimentalMapComponent implements OnInit, OnChanges, OnDestroy {
  @Input() width = 1500;
  @Input() height = 600;

-  @ViewChild('svg') svg: ElementRef;
+  @ViewChild('svg', {static: false}) svg: ElementRef;

  private changesDetected: Subscription;

--- a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts
+++ b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts
@ -10,7 +10,7 @@ import { CssFixer } from '../../../helpers/css-fixer';
 export class InterfaceLabelComponent implements OnInit {
  @Input('app-interface-label') ignore: any;

-  @ViewChild('textSvg') textRef: ElementRef;
+  @ViewChild('textSvg', {static: false}) textRef: ElementRef;

  private label = {
    x: 0,
--- a/src/app/cartography/components/experimental-map/link/link.component.ts
+++ b/src/app/cartography/components/experimental-map/link/link.component.ts
@ -26,7 +26,7 @@ export class LinkComponent implements OnInit, OnDestroy {
  @Input('node-changed') nodeChanged: EventEmitter<Node>;
  @Input('show-interface-labels') showInterfaceLabels: boolean;

-  @ViewChild('path') path: ElementRef;
+  @ViewChild('path', {static: false}) path: ElementRef;

  private ethernetLinkStrategy = new EthernetLinkStrategy();
  private serialLinkStrategy = new SerialLinkStrategy();
--- a/src/app/cartography/components/experimental-map/node/node.component.ts
+++ b/src/app/cartography/components/experimental-map/node/node.component.ts
@ -30,8 +30,8 @@ import { DraggedDataEvent } from '../../../events/event-source';
 export class NodeComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit {
  static NODE_LABEL_MARGIN = 3;

-  @ViewChild('label') label: ElementRef;
-  @ViewChild('image') imageRef: ElementRef;
+  @ViewChild('label', {static: false}) label: ElementRef;
+  @ViewChild('image', {static: false}) imageRef: ElementRef;

  @Input('app-node') node: MapNode;
  @Input('symbols') symbols: Symbol[];
--- a/src/app/cartography/components/text-editor/text-editor.component.ts
+++ b/src/app/cartography/components/text-editor/text-editor.component.ts
@ -14,7 +14,7 @@ import { MapScaleService } from '../../../services/mapScale.service';
  styleUrls: ['./text-editor.component.scss']
 })
 export class TextEditorComponent implements OnInit, OnDestroy {
-  @ViewChild('temporaryTextElement') temporaryTextElement: ElementRef;
+  @ViewChild('temporaryTextElement', {static: false}) temporaryTextElement: ElementRef;
  @Input('svg') svg: SVGSVGElement;

  leftPosition: string = '0px';
--- a/src/app/components/adbutler/adbutler.component.ts
+++ b/src/app/components/adbutler/adbutler.component.ts
@ -14,7 +14,7 @@ export class AdbutlerComponent implements OnInit, AfterViewInit, OnDestroy {
  sparkCounter: number;
  divId: string;

-  @ViewChild('code') code: ElementRef;
+  @ViewChild('code', {static: false}) code: ElementRef;

  constructor() { }

--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts
@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone
 export class CloudNodesTemplatesComponent implements OnInit {
    server: Server;
    cloudNodesTemplates: CloudTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts
@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone
 export class EthernetHubsTemplatesComponent implements OnInit {
    server: Server;
    ethernetHubsTemplates: EthernetHubTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts
@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone
 export class EthernetSwitchesTemplatesComponent implements OnInit {
    server: Server;
    ethernetSwitchesTemplates: EthernetSwitchTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
+++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
@ -15,7 +15,7 @@ import { DockerService } from '../../../../services/docker.service';
 export class DockerTemplatesComponent implements OnInit {
    server: Server;
    dockerTemplates: DockerTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
+++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
@ -16,7 +16,7 @@ import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 export class IosTemplatesComponent implements OnInit {
    server: Server;
    iosTemplates: IosTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
+++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
@ -15,7 +15,7 @@ import { IouService } from '../../../../services/iou.service';
 export class IouTemplatesComponent implements OnInit {
    server: Server;
    iouTemplates: IouTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
+++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
@ -34,7 +34,7 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
    displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type'];
    generalSettingsForm: FormGroup;

-    @ViewChild("customAdaptersConfigurator") 
+    @ViewChild("customAdaptersConfigurator", {static: false}) 
        customAdaptersConfigurator: CustomAdaptersComponent;

    constructor(
--- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
+++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/
 export class QemuVmTemplatesComponent implements OnInit {
    server: Server;
    qemuTemplates: QemuTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
@ -29,7 +29,7 @@ export class VirtualBoxTemplateDetailsComponent implements OnInit {
    generalSettingsForm: FormGroup;
    networkForm: FormGroup

-    @ViewChild("customAdaptersConfigurator") 
+    @ViewChild("customAdaptersConfigurator", {static: false}) 
        customAdaptersConfigurator: CustomAdaptersComponent;

    constructor(
--- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts
@ -16,7 +16,7 @@ import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 export class VirtualBoxTemplatesComponent implements OnInit {
    server: Server;
    virtualBoxTemplates: VirtualBoxTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
+++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
@ -28,7 +28,7 @@ export class VmwareTemplateDetailsComponent implements OnInit {
    onCloseOptions = [];
    networkTypes = [];

-    @ViewChild("customAdaptersConfigurator") 
+    @ViewChild("customAdaptersConfigurator", {static: false}) 
        customAdaptersConfigurator: CustomAdaptersComponent;

    constructor(
--- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts
+++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts
@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/
 export class VmwareTemplatesComponent implements OnInit {
    server: Server;
    vmwareTemplates: VmwareTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts
+++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts
@ -14,7 +14,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/
 export class VpcsTemplatesComponent implements OnInit {
    server: Server;
    vpcsTemplates: VpcsTemplate[] = [];
-    @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent;
+    @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;

    constructor(
        private route: ActivatedRoute,
--- a/src/app/components/project-map/context-menu/context-menu.component.spec.ts
+++ b/src/app/components/project-map/context-menu/context-menu.component.spec.ts
@ -47,15 +47,6 @@ describe('ContextMenuComponent', () => {
    expect(component.isElectronApp).toBeTruthy();
  });

-  it('should reset capabilities while opening menu for node', () => {
-    component.contextMenu = { openMenu() {} } as MatMenuTrigger;
-    var spy = spyOn<any>(component, 'resetCapabilities');
-
-    component.openMenuForNode(null, 0, 0);
-
-    expect(spy.calls.any()).toBeTruthy();
-  });
-
  it('should reset capabilities while opening menu for drawing', () => {
    component.contextMenu = { openMenu() {} } as MatMenuTrigger;
    let drawing = {} as Drawing;
--- a/src/app/components/project-map/context-menu/context-menu.component.ts
+++ b/src/app/components/project-map/context-menu/context-menu.component.ts
@ -22,7 +22,7 @@ export class ContextMenuComponent implements OnInit {
  @Input() project: Project;
  @Input() server: Server;

-  @ViewChild(MatMenuTrigger) contextMenu: MatMenuTrigger;
+  @ViewChild(MatMenuTrigger, {static: false}) contextMenu: MatMenuTrigger;

  topPosition;
  leftPosition;
--- a/src/app/components/project-map/draw-link-tool/draw-link-tool.component.ts
+++ b/src/app/components/project-map/draw-link-tool/draw-link-tool.component.ts
@ -19,7 +19,7 @@ import { NodeToMapNodeConverter } from '../../../cartography/converters/map/node
 })
 export class DrawLinkToolComponent implements OnInit, OnDestroy {
  @Input() links: Link[];
-  @ViewChild(NodeSelectInterfaceComponent) nodeSelectInterfaceMenu: NodeSelectInterfaceComponent;
+  @ViewChild(NodeSelectInterfaceComponent, {static: false}) nodeSelectInterfaceMenu: NodeSelectInterfaceComponent;

  private nodeClicked$: Subscription;

--- a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts
+++ b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts
@ -26,7 +26,7 @@ import { RotationValidator } from '../../../../validators/rotation-validator';
  styleUrls: ['./text-editor.component.scss']
 })
 export class TextEditorDialogComponent implements OnInit {
-  @ViewChild('textArea') textArea: ElementRef;
+  @ViewChild('textArea', {static: false}) textArea: ElementRef;

  server: Server;
  project: Project;
--- a/src/app/components/project-map/node-select-interface/node-select-interface.component.ts
+++ b/src/app/components/project-map/node-select-interface/node-select-interface.component.ts
@ -15,7 +15,7 @@ export class NodeSelectInterfaceComponent implements OnInit {
  @Input() links: Link[];
  @Output() onChooseInterface = new EventEmitter<any>();

-  @ViewChild(MatMenuTrigger) contextMenu: MatMenuTrigger;
+  @ViewChild(MatMenuTrigger, {static: false}) contextMenu: MatMenuTrigger;

  protected topPosition;
  protected leftPosition;
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@ -78,9 +78,9 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
  protected settings: Settings;
  private inReadOnlyMode = false;

-  @ViewChild(ContextMenuComponent) contextMenu: ContextMenuComponent;
-  @ViewChild(D3MapComponent) mapChild: D3MapComponent;
-  @ViewChild(ProjectMapMenuComponent) projectMapMenuComponent: ProjectMapMenuComponent;
+  @ViewChild(ContextMenuComponent, {static: false}) contextMenu: ContextMenuComponent;
+  @ViewChild(D3MapComponent, {static: false}) mapChild: D3MapComponent;
+  @ViewChild(ProjectMapMenuComponent, {static: false}) projectMapMenuComponent: ProjectMapMenuComponent;

  private subscriptions: Subscription[] = [];

--- a/src/app/components/projects/projects.component.ts
+++ b/src/app/components/projects/projects.component.ts
@ -29,7 +29,7 @@ export class ProjectsComponent implements OnInit {
  displayedColumns = ['name', 'actions'];
  settings: Settings;

-  @ViewChild(MatSort) sort: MatSort;
+  @ViewChild(MatSort, {static: true}) sort: MatSort;

  constructor(
    private route: ActivatedRoute,
--- a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
@ -20,7 +20,7 @@ export class TemplateListDialogComponent implements OnInit {
  dataSource: TemplateDataSource;
  displayedColumns = ['name'];

-  @ViewChild('filter') filter: ElementRef;
+  @ViewChild('filter', {static: false}) filter: ElementRef;

  constructor(
    public dialogRef: MatDialogRef<TemplateListDialogComponent>,
--- a/yarn.lock
+++ b/yarn.lock