Angular 8 Upgrade

This commit is contained in:
Piotr Pekala 2019-07-25 01:25:47 -07:00
parent da7ecf3446
commit c2bff662ec
31 changed files with 1654 additions and 1577 deletions

View File

@ -38,73 +38,73 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^7.2.14", "@angular/animations": "^8.1.2",
"@angular/cdk": "^7.3.7", "@angular/cdk": "^8.1.1",
"@angular/common": "^7.2.14", "@angular/common": "^8.1.2",
"@angular/compiler": "^7.2.14", "@angular/compiler": "^8.1.2",
"@angular/core": "^7.2.14", "@angular/core": "^8.1.2",
"@angular/forms": "^7.2.14", "@angular/forms": "^8.1.2",
"@angular/http": "^7.2.14", "@angular/http": "^7.2.15",
"@angular/material": "^7.3.7", "@angular/material": "^8.1.1",
"@angular/platform-browser": "^7.2.14", "@angular/platform-browser": "^8.1.2",
"@angular/platform-browser-dynamic": "^7.2.14", "@angular/platform-browser-dynamic": "^8.1.2",
"@angular/router": "^7.2.14", "@angular/router": "^8.1.2",
"angular-persistence": "^1.0.1", "angular-persistence": "^1.0.1",
"angular2-hotkeys": "^2.1.4", "angular2-hotkeys": "^2.1.4",
"angular2-indexeddb": "^1.2.3", "angular2-indexeddb": "^1.2.3",
"bootstrap": "4.3.1", "bootstrap": "4.3.1",
"command-exists": "^1.2.8", "command-exists": "^1.2.8",
"core-js": "^3.0.1", "core-js": "^3.1.4",
"css-tree": "^1.0.0-alpha.29", "css-tree": "^1.0.0-alpha.33",
"d3-ng2-service": "^2.1.0", "d3-ng2-service": "^2.1.0",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"ini": "^1.3.5", "ini": "^1.3.5",
"material-design-icons": "^3.0.1", "material-design-icons": "^3.0.1",
"ng2-file-upload": "^1.3.0", "ng2-file-upload": "^1.3.0",
"ngx-electron": "^2.1.1", "ngx-electron": "^2.1.1",
"node-fetch": "^2.4.1", "node-fetch": "^2.6.0",
"notosans-fontface": "^1.1.0", "notosans-fontface": "^1.1.0",
"raven-js": "^3.27.0", "raven-js": "^3.27.2",
"rxjs": "^6.5.1", "rxjs": "^6.5.2",
"rxjs-compat": "^6.5.1", "rxjs-compat": "^6.5.2",
"tree-kill": "^1.2.1", "tree-kill": "^1.2.1",
"typeface-roboto": "^0.0.54", "typeface-roboto": "^0.0.75",
"yargs": "^13.2.2", "yargs": "^13.3.0",
"zone.js": "^0.9.0" "zone.js": "^0.9.1"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.13.8", "@angular-devkit/build-angular": "~0.801.2",
"@angular/cli": "^7.3.8", "@angular/cli": "^8.1.2",
"@angular/compiler-cli": "^7.2.14", "@angular/compiler-cli": "^8.1.2",
"@angular/language-service": "^7.2.14", "@angular/language-service": "^8.1.2",
"@sentry/cli": "^1.41.2", "@sentry/cli": "^1.47.0",
"@sentry/electron": "^0.17.1", "@sentry/electron": "^0.17.3",
"@types/jasmine": "~3.3.12", "@types/jasmine": "~3.3.15",
"@types/jasminewd2": "~2.0.6", "@types/jasminewd2": "~2.0.6",
"@types/node": "~12.0.0", "@types/node": "~12.6.8",
"codelyzer": "~5.0.1", "codelyzer": "~5.1.0",
"electron": "5.0.2", "electron": "5.0.8",
"electron-builder": "20.39.0", "electron-builder": "21.1.5",
"jasmine-core": "~3.4.0", "jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"jquery": "^3.4.0", "jquery": "^3.4.1",
"karma": "~4.1.0", "karma": "~4.2.0",
"karma-chrome-launcher": "~2.2.0", "karma-chrome-launcher": "~3.0.0",
"karma-cli": "~2.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": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2", "karma-jasmine-html-reporter": "^1.4.2",
"license-checker": "^25.0.1", "license-checker": "^25.0.1",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"popper.js": "^1.15.0", "popper.js": "^1.15.0",
"prettier": "^1.17.0", "prettier": "^1.18.2",
"protractor": "~5.4.2", "protractor": "~5.4.2",
"replace": "^1.1.0", "replace": "^1.1.0",
"ts-mockito": "^2.3.1", "ts-mockito": "^2.4.2",
"ts-node": "~8.1.0", "ts-node": "~8.3.0",
"tslint": "~5.16.0", "tslint": "~5.18.0",
"tslint-config-prettier": "^1.18.0", "tslint-config-prettier": "^1.18.0",
"typescript": "<3.3.0" "typescript": ">=3.4.0 <3.5.0"
}, },
"greenkeeper": { "greenkeeper": {
"ignore": [ "ignore": [

View File

@ -48,8 +48,8 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy {
@Input() width = 1500; @Input() width = 1500;
@Input() height = 600; @Input() height = 600;
@ViewChild('svg') svgRef: ElementRef; @ViewChild('svg', {static: false}) svgRef: ElementRef;
@ViewChild('textEditor') textEditor: TextEditorComponent; @ViewChild('textEditor', {static: false}) textEditor: TextEditorComponent;
private parentNativeElement: any; private parentNativeElement: any;
private svg: Selection<SVGSVGElement, any, null, undefined>; private svg: Selection<SVGSVGElement, any, null, undefined>;

View File

@ -13,7 +13,7 @@ export class TextComponent implements OnInit, DoCheck {
@Input('app-text') text: TextElement; @Input('app-text') text: TextElement;
@ViewChild('text') textRef: ElementRef; @ViewChild('text', {static: false}) textRef: ElementRef;
lines: string[] = []; lines: string[] = [];

View File

@ -43,7 +43,7 @@ export class ExperimentalMapComponent implements OnInit, OnChanges, OnDestroy {
@Input() width = 1500; @Input() width = 1500;
@Input() height = 600; @Input() height = 600;
@ViewChild('svg') svg: ElementRef; @ViewChild('svg', {static: false}) svg: ElementRef;
private changesDetected: Subscription; private changesDetected: Subscription;

View File

@ -10,7 +10,7 @@ import { CssFixer } from '../../../helpers/css-fixer';
export class InterfaceLabelComponent implements OnInit { export class InterfaceLabelComponent implements OnInit {
@Input('app-interface-label') ignore: any; @Input('app-interface-label') ignore: any;
@ViewChild('textSvg') textRef: ElementRef; @ViewChild('textSvg', {static: false}) textRef: ElementRef;
private label = { private label = {
x: 0, x: 0,

View File

@ -26,7 +26,7 @@ export class LinkComponent implements OnInit, OnDestroy {
@Input('node-changed') nodeChanged: EventEmitter<Node>; @Input('node-changed') nodeChanged: EventEmitter<Node>;
@Input('show-interface-labels') showInterfaceLabels: boolean; @Input('show-interface-labels') showInterfaceLabels: boolean;
@ViewChild('path') path: ElementRef; @ViewChild('path', {static: false}) path: ElementRef;
private ethernetLinkStrategy = new EthernetLinkStrategy(); private ethernetLinkStrategy = new EthernetLinkStrategy();
private serialLinkStrategy = new SerialLinkStrategy(); private serialLinkStrategy = new SerialLinkStrategy();

View File

@ -30,8 +30,8 @@ import { DraggedDataEvent } from '../../../events/event-source';
export class NodeComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit { export class NodeComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit {
static NODE_LABEL_MARGIN = 3; static NODE_LABEL_MARGIN = 3;
@ViewChild('label') label: ElementRef; @ViewChild('label', {static: false}) label: ElementRef;
@ViewChild('image') imageRef: ElementRef; @ViewChild('image', {static: false}) imageRef: ElementRef;
@Input('app-node') node: MapNode; @Input('app-node') node: MapNode;
@Input('symbols') symbols: Symbol[]; @Input('symbols') symbols: Symbol[];

View File

@ -14,7 +14,7 @@ import { MapScaleService } from '../../../services/mapScale.service';
styleUrls: ['./text-editor.component.scss'] styleUrls: ['./text-editor.component.scss']
}) })
export class TextEditorComponent implements OnInit, OnDestroy { export class TextEditorComponent implements OnInit, OnDestroy {
@ViewChild('temporaryTextElement') temporaryTextElement: ElementRef; @ViewChild('temporaryTextElement', {static: false}) temporaryTextElement: ElementRef;
@Input('svg') svg: SVGSVGElement; @Input('svg') svg: SVGSVGElement;
leftPosition: string = '0px'; leftPosition: string = '0px';

View File

@ -14,7 +14,7 @@ export class AdbutlerComponent implements OnInit, AfterViewInit, OnDestroy {
sparkCounter: number; sparkCounter: number;
divId: string; divId: string;
@ViewChild('code') code: ElementRef; @ViewChild('code', {static: false}) code: ElementRef;
constructor() { } constructor() { }

View File

@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone
export class CloudNodesTemplatesComponent implements OnInit { export class CloudNodesTemplatesComponent implements OnInit {
server: Server; server: Server;
cloudNodesTemplates: CloudTemplate[] = []; cloudNodesTemplates: CloudTemplate[] = [];
@ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,

View File

@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone
export class EthernetHubsTemplatesComponent implements OnInit { export class EthernetHubsTemplatesComponent implements OnInit {
server: Server; server: Server;
ethernetHubsTemplates: EthernetHubTemplate[] = []; ethernetHubsTemplates: EthernetHubTemplate[] = [];
@ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,

View File

@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone
export class EthernetSwitchesTemplatesComponent implements OnInit { export class EthernetSwitchesTemplatesComponent implements OnInit {
server: Server; server: Server;
ethernetSwitchesTemplates: EthernetSwitchTemplate[] = []; ethernetSwitchesTemplates: EthernetSwitchTemplate[] = [];
@ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,

View File

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

View File

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

View File

@ -15,7 +15,7 @@ import { IouService } from '../../../../services/iou.service';
export class IouTemplatesComponent implements OnInit { export class IouTemplatesComponent implements OnInit {
server: Server; server: Server;
iouTemplates: IouTemplate[] = []; iouTemplates: IouTemplate[] = [];
@ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,

View File

@ -34,7 +34,7 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type']; displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type'];
generalSettingsForm: FormGroup; generalSettingsForm: FormGroup;
@ViewChild("customAdaptersConfigurator") @ViewChild("customAdaptersConfigurator", {static: false})
customAdaptersConfigurator: CustomAdaptersComponent; customAdaptersConfigurator: CustomAdaptersComponent;
constructor( constructor(

View File

@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/
export class QemuVmTemplatesComponent implements OnInit { export class QemuVmTemplatesComponent implements OnInit {
server: Server; server: Server;
qemuTemplates: QemuTemplate[] = []; qemuTemplates: QemuTemplate[] = [];
@ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,

View File

@ -29,7 +29,7 @@ export class VirtualBoxTemplateDetailsComponent implements OnInit {
generalSettingsForm: FormGroup; generalSettingsForm: FormGroup;
networkForm: FormGroup networkForm: FormGroup
@ViewChild("customAdaptersConfigurator") @ViewChild("customAdaptersConfigurator", {static: false})
customAdaptersConfigurator: CustomAdaptersComponent; customAdaptersConfigurator: CustomAdaptersComponent;
constructor( constructor(

View File

@ -16,7 +16,7 @@ import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
export class VirtualBoxTemplatesComponent implements OnInit { export class VirtualBoxTemplatesComponent implements OnInit {
server: Server; server: Server;
virtualBoxTemplates: VirtualBoxTemplate[] = []; virtualBoxTemplates: VirtualBoxTemplate[] = [];
@ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,

View File

@ -28,7 +28,7 @@ export class VmwareTemplateDetailsComponent implements OnInit {
onCloseOptions = []; onCloseOptions = [];
networkTypes = []; networkTypes = [];
@ViewChild("customAdaptersConfigurator") @ViewChild("customAdaptersConfigurator", {static: false})
customAdaptersConfigurator: CustomAdaptersComponent; customAdaptersConfigurator: CustomAdaptersComponent;
constructor( constructor(

View File

@ -15,7 +15,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/
export class VmwareTemplatesComponent implements OnInit { export class VmwareTemplatesComponent implements OnInit {
server: Server; server: Server;
vmwareTemplates: VmwareTemplate[] = []; vmwareTemplates: VmwareTemplate[] = [];
@ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @ViewChild(DeleteTemplateComponent, {static: false}) deleteComponent: DeleteTemplateComponent;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,

View File

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

View File

@ -47,15 +47,6 @@ describe('ContextMenuComponent', () => {
expect(component.isElectronApp).toBeTruthy(); 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', () => { it('should reset capabilities while opening menu for drawing', () => {
component.contextMenu = { openMenu() {} } as MatMenuTrigger; component.contextMenu = { openMenu() {} } as MatMenuTrigger;
let drawing = {} as Drawing; let drawing = {} as Drawing;

View File

@ -22,7 +22,7 @@ export class ContextMenuComponent implements OnInit {
@Input() project: Project; @Input() project: Project;
@Input() server: Server; @Input() server: Server;
@ViewChild(MatMenuTrigger) contextMenu: MatMenuTrigger; @ViewChild(MatMenuTrigger, {static: false}) contextMenu: MatMenuTrigger;
topPosition; topPosition;
leftPosition; leftPosition;

View File

@ -19,7 +19,7 @@ import { NodeToMapNodeConverter } from '../../../cartography/converters/map/node
}) })
export class DrawLinkToolComponent implements OnInit, OnDestroy { export class DrawLinkToolComponent implements OnInit, OnDestroy {
@Input() links: Link[]; @Input() links: Link[];
@ViewChild(NodeSelectInterfaceComponent) nodeSelectInterfaceMenu: NodeSelectInterfaceComponent; @ViewChild(NodeSelectInterfaceComponent, {static: false}) nodeSelectInterfaceMenu: NodeSelectInterfaceComponent;
private nodeClicked$: Subscription; private nodeClicked$: Subscription;

View File

@ -26,7 +26,7 @@ import { RotationValidator } from '../../../../validators/rotation-validator';
styleUrls: ['./text-editor.component.scss'] styleUrls: ['./text-editor.component.scss']
}) })
export class TextEditorDialogComponent implements OnInit { export class TextEditorDialogComponent implements OnInit {
@ViewChild('textArea') textArea: ElementRef; @ViewChild('textArea', {static: false}) textArea: ElementRef;
server: Server; server: Server;
project: Project; project: Project;

View File

@ -15,7 +15,7 @@ export class NodeSelectInterfaceComponent implements OnInit {
@Input() links: Link[]; @Input() links: Link[];
@Output() onChooseInterface = new EventEmitter<any>(); @Output() onChooseInterface = new EventEmitter<any>();
@ViewChild(MatMenuTrigger) contextMenu: MatMenuTrigger; @ViewChild(MatMenuTrigger, {static: false}) contextMenu: MatMenuTrigger;
protected topPosition; protected topPosition;
protected leftPosition; protected leftPosition;

View File

@ -78,9 +78,9 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
protected settings: Settings; protected settings: Settings;
private inReadOnlyMode = false; private inReadOnlyMode = false;
@ViewChild(ContextMenuComponent) contextMenu: ContextMenuComponent; @ViewChild(ContextMenuComponent, {static: false}) contextMenu: ContextMenuComponent;
@ViewChild(D3MapComponent) mapChild: D3MapComponent; @ViewChild(D3MapComponent, {static: false}) mapChild: D3MapComponent;
@ViewChild(ProjectMapMenuComponent) projectMapMenuComponent: ProjectMapMenuComponent; @ViewChild(ProjectMapMenuComponent, {static: false}) projectMapMenuComponent: ProjectMapMenuComponent;
private subscriptions: Subscription[] = []; private subscriptions: Subscription[] = [];

View File

@ -29,7 +29,7 @@ export class ProjectsComponent implements OnInit {
displayedColumns = ['name', 'actions']; displayedColumns = ['name', 'actions'];
settings: Settings; settings: Settings;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort, {static: true}) sort: MatSort;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,

View File

@ -20,7 +20,7 @@ export class TemplateListDialogComponent implements OnInit {
dataSource: TemplateDataSource; dataSource: TemplateDataSource;
displayedColumns = ['name']; displayedColumns = ['name'];
@ViewChild('filter') filter: ElementRef; @ViewChild('filter', {static: false}) filter: ElementRef;
constructor( constructor(
public dialogRef: MatDialogRef<TemplateListDialogComponent>, public dialogRef: MatDialogRef<TemplateListDialogComponent>,

3078
yarn.lock

File diff suppressed because it is too large Load Diff