From c7d7a97279b0c58a623d98df9fdf467d742dad93 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Tue, 30 Jun 2020 16:35:17 +0200 Subject: [PATCH] Upgrading angular material --- package.json | 3 +- src/app/app.component.ts | 2 +- src/app/app.module.ts | 2 +- src/app/cartography/cartography.module.ts | 3 +- .../progress-dialog.component.ts | 2 +- .../progress-dialog.service.ts | 2 +- .../delete-confirmation-dialog.component.ts | 2 +- .../delete-template.component.ts | 2 +- .../change-hostname-dialog.component.ts | 2 +- .../change-symbol-dialog.component.ts | 2 +- .../change-hostname-action.component.ts | 2 +- .../change-symbol-action.component.ts | 2 +- .../config-action/config-action.component.ts | 2 +- .../edit-config-action.component.ts | 2 +- .../edit-style-action.component.ts | 2 +- .../edit-text-action.component.ts | 2 +- .../export-config-action.component.ts | 2 +- .../import-config-action.component.ts | 2 +- .../packet-filters-action.component.ts | 2 +- .../show-node-action.component.ts | 2 +- .../start-capture-action.component.ts | 2 +- .../context-menu/context-menu.component.ts | 2 +- .../config-dialog/config-dialog.component.ts | 2 +- .../style-editor/style-editor.component.ts | 2 +- .../text-editor/text-editor.component.ts | 2 +- .../help-dialog/help-dialog.component.ts | 2 +- .../info-dialog/info-dialog.component.ts | 2 +- .../appliance-info-dialog.component.ts | 2 +- .../new-template-dialog.component.ts | 7 ++- .../config-editor/config-editor.component.ts | 2 +- .../configurator-atm-switch.component.ts | 2 +- .../cloud/configurator-cloud.component.ts | 2 +- .../docker/configurator-docker.component.ts | 2 +- .../configurator-ethernet-switch.component.ts | 2 +- .../configurator-ethernet-hub.component.ts | 2 +- .../ios/configurator-ios.component.ts | 2 +- .../iou/configurator-iou.component.ts | 2 +- .../nat/configurator-nat.component.ts | 2 +- .../qemu/configurator-qemu.component.ts | 2 +- .../qemu-image-creator.component.ts | 2 +- .../switch/configurator-switch.component.ts | 2 +- .../traceng/configurator-traceng.component.ts | 2 +- .../configurator-virtualbox.component.ts | 2 +- .../vmware/configurator-vmware.component.ts | 2 +- .../vpcs/configurator-vpcs.component.ts | 2 +- .../node-select-interface.component.ts | 2 +- .../packet-filters.component.ts | 2 +- .../start-capture/start-capture.component.ts | 2 +- .../project-map-menu.component.ts | 2 +- .../project-map/project-map.component.ts | 4 +- .../screenshot-dialog.component.ts | 2 +- .../add-blank-project-dialog.component.ts | 2 +- .../choose-name-dialog.component.ts | 2 +- .../confirmation-bottomsheet.component.ts | 3 +- .../confirmation-dialog.component.ts | 2 +- .../edit-project-dialog.component.ts | 2 +- .../import-project-dialog.component.ts | 2 +- .../navigation-dialog.component.ts | 3 +- .../components/projects/projects.component.ts | 4 +- .../save-project-dialog.component.ts | 2 +- .../add-server-dialog.component.ts | 2 +- .../configure-gns3vm-dialog.component.ts | 2 +- .../components/servers/servers.component.ts | 3 +- .../create-snapshot-dialog.component.ts | 2 +- .../list-of-snapshots.component.ts | 2 +- .../snapshot-menu-item.component.ts | 2 +- .../template-list-dialog.component.ts | 2 +- .../components/template/template.component.ts | 2 +- src/app/guards/console-guard.ts | 2 +- src/app/material.imports.ts | 54 +++++++++---------- src/app/services/toaster.service.ts | 2 +- src/main.ts | 2 +- src/test.ts | 3 +- 73 files changed, 111 insertions(+), 102 deletions(-) diff --git a/package.json b/package.json index 18f02a82..e69c49fc 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@angular/core": "^10.0.1", "@angular/forms": "^10.0.1", "@angular/http": "^7.2.16", - "@angular/material": "^8.2.3", + "@angular/material": "^10.0.1", "@angular/platform-browser": "^10.0.1", "@angular/platform-browser-dynamic": "^10.0.1", "@angular/router": "^10.0.1", @@ -63,7 +63,6 @@ "css-tree": "^1.0.0-alpha.36", "d3-ng2-service": "^2.1.0", "file-saver": "^2.0.2", - "hammerjs": "^2.0.8", "ini": "^1.3.5", "material-design-icons": "^3.0.1", "ng-circle-progress": "^1.5.1", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 012a3f64..1302dd1f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatIconRegistry } from '@angular/material'; +import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; import { ElectronService } from 'ngx-electron'; import { SettingsService } from './services/settings.service'; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c99e98e2..8e6c3a70 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -72,7 +72,7 @@ import { SnapshotMenuItemComponent } from './components/snapshots/snapshot-menu- import { MATERIAL_IMPORTS } from './material.imports'; import { DrawingService } from './services/drawing.service'; import { ProjectNameValidator } from './components/projects/models/projectNameValidator'; -import { MatSidenavModule } from '@angular/material'; +import { MatSidenavModule } from '@angular/material/sidenav'; import { NodeSelectInterfaceComponent } from './components/project-map/node-select-interface/node-select-interface.component'; import { DrawLinkToolComponent } from './components/project-map/draw-link-tool/draw-link-tool.component'; diff --git a/src/app/cartography/cartography.module.ts b/src/app/cartography/cartography.module.ts index 11eff982..3ebad213 100644 --- a/src/app/cartography/cartography.module.ts +++ b/src/app/cartography/cartography.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MatMenuModule, MatIconModule } from '@angular/material'; +import { MatIconModule } from '@angular/material/icon'; +import { MatMenuModule } from '@angular/material/menu'; import { CssFixer } from './helpers/css-fixer'; import { FontFixer } from './helpers/font-fixer'; diff --git a/src/app/common/progress-dialog/progress-dialog.component.ts b/src/app/common/progress-dialog/progress-dialog.component.ts index 21a9d918..099907c7 100644 --- a/src/app/common/progress-dialog/progress-dialog.component.ts +++ b/src/app/common/progress-dialog/progress-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-progress-dialog', diff --git a/src/app/common/progress-dialog/progress-dialog.service.ts b/src/app/common/progress-dialog/progress-dialog.service.ts index 5f0f12e1..925f5217 100644 --- a/src/app/common/progress-dialog/progress-dialog.service.ts +++ b/src/app/common/progress-dialog/progress-dialog.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ProgressDialogComponent } from './progress-dialog.component'; @Injectable() diff --git a/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.ts b/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.ts index 92e4bded..011d2b67 100644 --- a/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.ts +++ b/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ diff --git a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts index 098f6967..1c79461e 100644 --- a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts +++ b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts @@ -1,6 +1,6 @@ import { Component, Input, Output, EventEmitter } from "@angular/core"; import { TemplateService } from '../../../../services/template.service'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { DeleteConfirmationDialogComponent } from '../delete-confirmation-dialog/delete-confirmation-dialog.component'; import { ToasterService } from '../../../../services/toaster.service'; import { Server } from '../../../../models/server'; diff --git a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts index a5733ae1..65b42935 100644 --- a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts +++ b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../cartography/models/node'; import { Server } from '../../../models/server'; import { NodeService } from '../../../services/node.service'; import { ToasterService } from '../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts index 6fbd4bdb..e3ebfc93 100644 --- a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts +++ b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { Message } from '../../../models/message'; import { Server } from '../../../models/server'; import { Node } from '../../../cartography/models/node'; diff --git a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts index 327118a6..23e92371 100644 --- a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { Server } from '../../../../../models/server'; import { Node } from '../../../../../cartography/models/node'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ChangeHostnameDialogComponent } from '../../../change-hostname-dialog/change-hostname-dialog.component'; @Component({ diff --git a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts index 46761ed9..207f888e 100644 --- a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { Server } from '../../../../../models/server'; import { Node } from '../../../../../cartography/models/node'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ChangeSymbolDialogComponent } from '../../../change-symbol-dialog/change-symbol-dialog.component'; @Component({ diff --git a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts index 28fb67de..a4f73e13 100644 --- a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit, OnChanges } from '@angular/core'; import { Server } from '../../../../../models/server'; import { Node } from '../../../../../cartography/models/node'; -import { MatDialog, MatDialogRef } from '@angular/material'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { ConfiguratorDialogVpcsComponent } from '../../../node-editors/configurator/vpcs/configurator-vpcs.component'; import { ConfiguratorDialogEthernetHubComponent } from '../../../node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component'; import { ConfiguratorDialogEthernetSwitchComponent } from '../../../node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component'; diff --git a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts index 59299bd8..6f61809b 100644 --- a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts @@ -3,7 +3,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Project } from '../../../../../models/project'; import { Server } from '../../../../../models/server'; import { ConfigEditorDialogComponent } from '../../../node-editors/config-editor/config-editor.component'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; @Component({ selector: 'app-edit-config-action', diff --git a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts index 6f22d7a3..e08754e4 100644 --- a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnChanges } from '@angular/core'; import { Drawing } from '../../../../../cartography/models/drawing'; import { Server } from '../../../../../models/server'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { Project } from '../../../../../models/project'; import { StyleEditorDialogComponent } from '../../../drawings-editors/style-editor/style-editor.component'; import { ImageElement } from '../../../../../cartography/models/drawings/image-element'; diff --git a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts index f7314709..1efa051e 100644 --- a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { Server } from '../../../../../models/server'; import { Project } from '../../../../../models/project'; import { Drawing } from '../../../../../cartography/models/drawing'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TextEditorDialogComponent } from '../../../drawings-editors/text-editor/text-editor.component'; import { Label } from '../../../../../cartography/models/label'; import { Node } from '../../../../../cartography/models/node'; diff --git a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts index 42c502ec..f54842f1 100644 --- a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; import { NodeService } from '../../../../../services/node.service'; import { Server } from '../../../../../models/server'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog.component'; @Component({ diff --git a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts index aa4779cb..59866b58 100644 --- a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts @@ -3,7 +3,7 @@ import { Node } from '../../../../../cartography/models/node'; import { NodeService } from '../../../../../services/node.service'; import { Server } from '../../../../../models/server'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog.component'; @Component({ diff --git a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts index b6e6b7c0..f7df9c58 100644 --- a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from "@angular/core"; import { Link } from '../../../../../models/link'; import { Server } from '../../../../../models/server'; import { Project } from '../../../../../models/project'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { PacketFiltersDialogComponent } from '../../../packet-capturing/packet-filters/packet-filters.component'; @Component({ diff --git a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts index 533d6ad2..58eb8181 100644 --- a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit, OnChanges } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { InfoDialogComponent } from '../../../info-dialog/info-dialog.component'; import { Server } from '../../../../../models/server'; diff --git a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts index 500ff9c5..678a81e7 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { Server } from '../../../../../models/server'; import { Link } from '../../../../../models/link'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { StartCaptureDialogComponent } from '../../../packet-capturing/start-capture/start-capture.component'; import { Project } from '../../../../../models/project'; diff --git a/src/app/components/project-map/context-menu/context-menu.component.ts b/src/app/components/project-map/context-menu/context-menu.component.ts index 7d17b4c2..47d50764 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.ts +++ b/src/app/components/project-map/context-menu/context-menu.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core'; -import { MatMenuTrigger } from '@angular/material'; +import { MatMenuTrigger } from '@angular/material/menu'; import { DomSanitizer } from '@angular/platform-browser'; import { Node } from '../../../cartography/models/node'; import { Server } from '../../../models/server'; diff --git a/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.ts b/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.ts index e156e5d1..9f7fcb0a 100644 --- a/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.ts +++ b/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-config-dialog', diff --git a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts index 6a553f70..a49b059e 100644 --- a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts +++ b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, Injectable } from '@angular/core'; import { Server } from '../../../../models/server'; import { Project } from '../../../../models/project'; import { Drawing } from '../../../../cartography/models/drawing'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { DrawingToMapDrawingConverter } from '../../../../cartography/converters/map/drawing-to-map-drawing-converter'; import { MapDrawingToSvgConverter } from '../../../../cartography/converters/map/map-drawing-to-svg-converter'; import { DrawingService } from '../../../../services/drawing.service'; diff --git 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 index f203b378..ec55e88b 100644 --- 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 @@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild, ElementRef, Renderer2 } from '@angular/co import { Project } from '../../../../models/project'; import { Drawing } from '../../../../cartography/models/drawing'; import { Server } from '../../../../models/server'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { DrawingToMapDrawingConverter } from '../../../../cartography/converters/map/drawing-to-map-drawing-converter'; import { MapDrawingToSvgConverter } from '../../../../cartography/converters/map/map-drawing-to-svg-converter'; import { DrawingService } from '../../../../services/drawing.service'; diff --git a/src/app/components/project-map/help-dialog/help-dialog.component.ts b/src/app/components/project-map/help-dialog/help-dialog.component.ts index 7145c03c..65d97ab1 100644 --- a/src/app/components/project-map/help-dialog/help-dialog.component.ts +++ b/src/app/components/project-map/help-dialog/help-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { Message } from '../../../models/message'; @Component({ diff --git a/src/app/components/project-map/info-dialog/info-dialog.component.ts b/src/app/components/project-map/info-dialog/info-dialog.component.ts index 893919fe..7bfd0839 100644 --- a/src/app/components/project-map/info-dialog/info-dialog.component.ts +++ b/src/app/components/project-map/info-dialog/info-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../cartography/models/node'; import { InfoService } from '../../../services/info.service'; import { Server } from '../../../models/server'; diff --git a/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.ts b/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.ts index 069ade1b..bc69255c 100644 --- a/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Appliance } from '../../../../models/appliance'; @Component({ diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts index e6f15653..4b324f0e 100644 --- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts @@ -1,5 +1,10 @@ import { Component, Input, OnInit, ChangeDetectorRef, ViewChild } from '@angular/core'; -import { MatDialogRef, Sort, MatTableDataSource, MatPaginator, MatDialog, MatStepper, MatSelectionList, MatSelectionListChange } from '@angular/material'; +import { MatDialogRef, MatDialog } from '@angular/material/dialog'; +import { MatSelectionList, MatSelectionListChange } from '@angular/material/list'; +import { MatPaginator } from '@angular/material/paginator'; +import { Sort } from '@angular/material/sort'; +import { MatStepper } from '@angular/material/stepper'; +import { MatTableDataSource } from '@angular/material/table'; import { Server } from '../../../models/server'; import { Node } from '../../../cartography/models/node'; import { Project } from '../../../models/project'; diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts index 2a5d25d2..c5cab711 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { Node } from '../../../../cartography/models/node'; import { Project } from '../../../../models/project'; import { Server } from '../../../../models/server'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { NodeService } from '../../../../services/node.service'; import { ToasterService } from '../../../../services/toaster.service'; diff --git a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts index 98114c56..e854a632 100644 --- a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts index fcfe1ee3..92ba0343 100644 --- a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts +++ b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; import { QemuBinary } from '../../../../../models/qemu/qemu-binary'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts index 07f25d73..b855e85f 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { DockerConfigurationService } from '../../../../../services/docker-configuration.service'; diff --git a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts index fee5351c..8184b55a 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { PortsComponent } from '../../../../../components/preferences/common/ports/ports.component'; diff --git a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts index fe6d969b..73f22b28 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts @@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts index 4af94677..3cff737b 100644 --- a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { IosConfigurationService } from '../../../../../services/ios-configuration.service'; diff --git a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts index 5f0421c0..a433c130 100644 --- a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts +++ b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { IouConfigurationService } from '../../../../../services/iou-configuration.service'; diff --git a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts index ea7b2ed7..f31c558d 100644 --- a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts +++ b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts index 330384b0..c7291097 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts +++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef, MatDialog } from '@angular/material'; +import { MatDialogRef, MatDialog } from '@angular/material/dialog'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; import { QemuService } from '../../../../../services/qemu.service'; import { QemuConfigurationService } from '../../../../../services/qemu-configuration.service'; diff --git a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts index d5e59ecd..87d8e5a6 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts +++ b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms' import { Server } from '../../../../../../models/server'; import { NodeService } from '../../../../../../services/node.service'; import { ToasterService } from '../../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { QemuService } from '../../../../../../services/qemu.service'; import { QemuImg } from '../../../../../../models/qemu/qemu-img'; diff --git a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts index 744b423d..0bc51497 100644 --- a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git a/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.ts b/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.ts index 47811847..4cb45eae 100644 --- a/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.ts +++ b/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts index a1398965..ee427a7d 100644 --- a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts +++ b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { VirtualBoxConfigurationService } from '../../../../../services/virtual-box-configuration.service'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; diff --git a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts index 974611b7..75c5196a 100644 --- a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts +++ b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts @@ -4,7 +4,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; import { VmwareConfigurationService } from '../../../../../services/vmware-configuration.service'; diff --git a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts index 9c802eed..c97f9a78 100644 --- a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts +++ b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts @@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git 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 index 8d2f6311..177d12c7 100644 --- 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 @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; -import { MatMenuTrigger } from '@angular/material'; +import { MatMenuTrigger } from '@angular/material/menu'; import { DomSanitizer } from '@angular/platform-browser'; import { Node } from '../../../cartography/models/node'; import { Port } from '../../../models/port'; diff --git a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts index 653f0fad..afbcf5e5 100644 --- a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts +++ b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { Link } from '../../../../models/link'; import { Server } from '../../../../models/server'; import { Project } from '../../../../models/project'; -import { MatDialogRef, MatDialog } from '@angular/material'; +import { MatDialogRef, MatDialog } from '@angular/material/dialog'; import { LinkService } from '../../../../services/link.service'; import { FilterDescription } from '../../../../models/filter-description'; import { HelpDialogComponent } from '../../help-dialog/help-dialog.component'; diff --git a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts index bb49e46b..3f46f43e 100644 --- a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts +++ b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { Link } from '../../../../models/link'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { PacketFiltersDialogComponent } from '../packet-filters/packet-filters.component'; import { LinkService } from '../../../../services/link.service'; import { CapturingSettings } from '../../../../models/capturingSettings'; diff --git a/src/app/components/project-map/project-map-menu/project-map-menu.component.ts b/src/app/components/project-map/project-map-menu/project-map-menu.component.ts index f8a8106a..dba46728 100644 --- a/src/app/components/project-map/project-map-menu/project-map-menu.component.ts +++ b/src/app/components/project-map/project-map-menu/project-map-menu.component.ts @@ -9,7 +9,7 @@ import { SymbolService } from '../../../services/symbol.service'; import { select } from 'd3-selection'; import downloadSvg from 'svg-crowbar'; import { ElectronService } from 'ngx-electron'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ScreenshotDialogComponent, Screenshot } from '../screenshot-dialog/screenshot-dialog.component'; import { saveAsPng, saveAsJpeg } from 'save-html-as-image'; import { ThemeService } from '../../../services/theme.service'; diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts index 0a72f019..df3fa06f 100644 --- a/src/app/components/project-map/project-map.component.ts +++ b/src/app/components/project-map/project-map.component.ts @@ -53,7 +53,9 @@ import { MapLinkNodeToLinkNodeConverter } from '../../cartography/converters/map import { ProjectMapMenuComponent } from './project-map-menu/project-map-menu.component'; import { ToasterService } from '../../services/toaster.service'; import { ImportProjectDialogComponent } from '../projects/import-project-dialog/import-project-dialog.component'; -import { MatDialog, MatBottomSheet, mixinColor } from '@angular/material'; +import { MatBottomSheet } from '@angular/material/bottom-sheet'; +import { mixinColor } from '@angular/material/core'; +import { MatDialog } from '@angular/material/dialog'; import { AddBlankProjectDialogComponent } from '../projects/add-blank-project-dialog/add-blank-project-dialog.component'; import { SaveProjectDialogComponent } from '../projects/save-project-dialog/save-project-dialog.component'; import { MapNodesDataSource, MapLinksDataSource, MapDrawingsDataSource, MapSymbolsDataSource, Indexed } from '../../cartography/datasources/map-datasource'; diff --git a/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.ts b/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.ts index 5a456ac0..54c98319 100644 --- a/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.ts +++ b/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { ToasterService } from '../../../services/toaster.service'; import { ElectronService } from 'ngx-electron'; diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts index efb3894d..c47c5996 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, EventEmitter } from '@angular/core'; import { Router } from '@angular/router'; -import { MatDialog, MatDialogRef } from '@angular/material'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Project } from '../../../models/project'; import { Server } from '../../../models/server'; diff --git a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts index 06cc3df3..cc710248 100644 --- a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts +++ b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { Server } from '../../../models/server'; import { ProjectService } from '../../../services/project.service'; import { Project } from '../../../models/project'; diff --git a/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.ts b/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.ts index 7e952b34..238b59b4 100644 --- a/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.ts +++ b/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA, MatBottomSheetRef } from '@angular/material'; +import { MatBottomSheetRef } from '@angular/material/bottom-sheet'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ThemeService } from '../../../services/theme.service'; @Component({ diff --git a/src/app/components/projects/confirmation-dialog/confirmation-dialog.component.ts b/src/app/components/projects/confirmation-dialog/confirmation-dialog.component.ts index 41edff00..07f1fb89 100644 --- a/src/app/components/projects/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/app/components/projects/confirmation-dialog/confirmation-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Project } from '../../../models/project'; @Component({ diff --git a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts index dc77f0f9..e08e09ae 100644 --- a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts +++ b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Injectable } from '@angular/core'; -import { MatDialogRef } from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; import { Server } from '../../../models/server'; import { Project, ProjectVariable } from '../../../models/project'; diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts index ad58bbdd..43287c05 100644 --- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts +++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Inject, EventEmitter } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; import { FileUploader, ParsedResponseHeaders, FileItem } from 'ng2-file-upload'; import { Server } from '../../../models/server'; import { v4 as uuid } from 'uuid'; diff --git a/src/app/components/projects/navigation-dialog/navigation-dialog.component.ts b/src/app/components/projects/navigation-dialog/navigation-dialog.component.ts index 65ddb77e..62f1b2ae 100644 --- a/src/app/components/projects/navigation-dialog/navigation-dialog.component.ts +++ b/src/app/components/projects/navigation-dialog/navigation-dialog.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA, MatBottomSheetRef } from '@angular/material'; +import { MatBottomSheetRef } from '@angular/material/bottom-sheet'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ThemeService } from '../../../services/theme.service'; @Component({ diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts index 1e35872f..fe0d17e7 100644 --- a/src/app/components/projects/projects.component.ts +++ b/src/app/components/projects/projects.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { MatSort, MatSortable, MatDialog, MatBottomSheet } from '@angular/material'; +import { MatBottomSheet } from '@angular/material/bottom-sheet'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSort, MatSortable } from '@angular/material/sort'; import { DataSource } from '@angular/cdk/collections'; diff --git a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts index 97473c6e..2bf08b28 100644 --- a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts +++ b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, EventEmitter } from '@angular/core'; import { Router } from '@angular/router'; -import { MatDialog, MatDialogRef } from '@angular/material'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Project } from '../../../models/project'; import { Server } from '../../../models/server'; diff --git a/src/app/components/servers/add-server-dialog/add-server-dialog.component.ts b/src/app/components/servers/add-server-dialog/add-server-dialog.component.ts index 12a354bb..d47ada14 100644 --- a/src/app/components/servers/add-server-dialog/add-server-dialog.component.ts +++ b/src/app/components/servers/add-server-dialog/add-server-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Server } from '../../../models/server'; import { ElectronService } from 'ngx-electron'; import { FormGroup, FormControl, Validators } from '@angular/forms'; diff --git a/src/app/components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component.ts b/src/app/components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component.ts index 61ef0c69..6e60c46d 100644 --- a/src/app/components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component.ts +++ b/src/app/components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatDialogRef} from '@angular/material'; +import { MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-configure-gns3-vm-dialog', diff --git a/src/app/components/servers/servers.component.ts b/src/app/components/servers/servers.component.ts index 0ee25f50..6f90c66d 100644 --- a/src/app/components/servers/servers.component.ts +++ b/src/app/components/servers/servers.component.ts @@ -1,6 +1,7 @@ import { Component, Inject, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core'; import { DataSource } from '@angular/cdk/collections'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA, MatBottomSheet } from '@angular/material'; +import { MatBottomSheet } from '@angular/material/bottom-sheet'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Observable, merge, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import { Router } from '@angular/router'; diff --git a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts index 3518b334..06c40d32 100644 --- a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts +++ b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { Snapshot } from '../../../models/snapshot'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Server } from '../../../models/server'; import { Project } from '../../../models/project'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts index 4c7fdb45..5ea0c685 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts @@ -4,7 +4,7 @@ import { ServerService } from '../../../services/server.service'; import { ActivatedRoute } from '@angular/router'; import { Server } from '../../..//models/server'; import { Snapshot } from '../../../models/snapshot'; -import { Sort } from '@angular/material'; +import { Sort } from '@angular/material/sort'; import { ProgressDialogService } from '../../../common/progress-dialog/progress-dialog.service'; import { ToasterService } from '../../../services/toaster.service'; import { Project } from '../../../models/project'; diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts index 41084a14..574c4239 100644 --- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts +++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { CreateSnapshotDialogComponent } from '../create-snapshot-dialog/create-snapshot-dialog.component'; import { SnapshotService } from '../../../services/snapshot.service'; diff --git 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 index 311d3e77..337e0338 100644 --- 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 @@ -1,5 +1,5 @@ import { Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DataSource } from '@angular/cdk/collections'; import { Observable, BehaviorSubject, fromEvent, merge } from 'rxjs'; import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'; diff --git a/src/app/components/template/template.component.ts b/src/app/components/template/template.component.ts index 0ee5fe02..e71ef850 100644 --- a/src/app/components/template/template.component.ts +++ b/src/app/components/template/template.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, OnDestroy } from '@angular/core'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TemplateListDialogComponent, NodeAddedEvent } from './template-list-dialog/template-list-dialog.component'; import { Server } from '../../models/server'; diff --git a/src/app/guards/console-guard.ts b/src/app/guards/console-guard.ts index c19ec417..c744bf07 100644 --- a/src/app/guards/console-guard.ts +++ b/src/app/guards/console-guard.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { CanDeactivate } from '@angular/router'; import { NodeConsoleService } from '../services/nodeConsole.service'; import { Observable } from 'rxjs'; -import { MatBottomSheet } from '@angular/material'; +import { MatBottomSheet } from '@angular/material/bottom-sheet'; import { ConfirmationBottomSheetComponent } from '../components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component'; export interface CanComponentDeactivate { diff --git a/src/app/material.imports.ts b/src/app/material.imports.ts index c48a9632..89932d59 100644 --- a/src/app/material.imports.ts +++ b/src/app/material.imports.ts @@ -1,31 +1,29 @@ -import { - MatButtonModule, - MatCardModule, - MatMenuModule, - MatToolbarModule, - MatIconModule, - MatFormFieldModule, - MatInputModule, - MatTableModule, - MatDialogModule, - MatProgressBarModule, - MatProgressSpinnerModule, - MatSnackBarModule, - MatCheckboxModule, - MatListModule, - MatExpansionModule, - MatSortModule, - MatSelectModule, - MatTooltipModule, - MatStepperModule, - MatRadioModule, - MatGridListModule, - MatTabsModule, - MatTreeModule, - MatBottomSheetModule, - MatChipsModule, - MatPaginatorModule -} from '@angular/material'; +import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatExpansionModule } from '@angular/material/expansion'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatGridListModule } from '@angular/material/grid-list'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatSortModule } from '@angular/material/sort'; +import { MatStepperModule } from '@angular/material/stepper'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatToolbarModule } from '@angular/material/toolbar'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatTreeModule } from '@angular/material/tree'; export const MATERIAL_IMPORTS = [ MatPaginatorModule, diff --git a/src/app/services/toaster.service.ts b/src/app/services/toaster.service.ts index 8238e9a2..525a7f46 100644 --- a/src/app/services/toaster.service.ts +++ b/src/app/services/toaster.service.ts @@ -1,5 +1,5 @@ import { Injectable, NgZone } from '@angular/core'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; @Injectable() export class ToasterService { diff --git a/src/main.ts b/src/main.ts index 16c67809..a9a45d87 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,4 +1,4 @@ -import 'hammerjs'; + import { enableProdMode, ApplicationRef } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; diff --git a/src/test.ts b/src/test.ts index 295dec25..6d3dea89 100644 --- a/src/test.ts +++ b/src/test.ts @@ -1,5 +1,4 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'hammerjs'; + import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';