Update angular material

@@ -301,12 +301,11 @@
       "integrity": "sha512-jB8+SC3vMztW5zt5UYVmtVwqIWE33UyEjbP5JPba3I3bLRK5E059LcJmN1rSdJHItgIAdG9Y1I0WJ6aiSFyp4Q=="
       "integrity": "sha512-jB8+SC3vMztW5zt5UYVmtVwqIWE33UyEjbP5JPba3I3bLRK5E059LcJmN1rSdJHItgIAdG9Y1I0WJ6aiSFyp4Q=="
     },
     },
     "@angular/cdk": {
     "@angular/cdk": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-8.2.3.tgz",
-      "integrity": "sha512-ZwO5Sn720RA2YvBqud0JAHkZXjmjxM0yNzCO8RVtRE9i8Gl26Wk0j0nQeJkVm4zwv2QO8MwbKUKGTMt8evsokA==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.0.0.tgz",
+      "integrity": "sha512-2kYpyYbewIB6fubSIDMvSprJLNplRZoL/AtXW3od4dLyRxtzX+7iWTAtzUG/dhq8CKev0lpd1HENh5lLR/Lhjw==",
       "requires": {
       "requires": {
-        "parse5": "^5.0.0",
-        "tslib": "^1.7.1"
+        "parse5": "^5.0.0"
       }
       }
     },
     },
     "@angular/cli": {
     "@angular/cli": {
@@ -524,12 +523,9 @@
       "dev": true
       "dev": true
     },
     },
     "@angular/material": {
     "@angular/material": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-8.2.3.tgz",
-      "integrity": "sha512-SOczkIaqes+r+9XF/UUiokidfFKBpHkOPIaFK857sFD0FBNPvPEpOr5oHKCG3feERRwAFqHS7Wo2ohVEWypb5A==",
-      "requires": {
-        "tslib": "^1.7.1"
-      }
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.0.0.tgz",
+      "integrity": "sha512-QxN2rmR5mvg2YE1NoIGWLpbnmcJq0iFidzy6odzvN17+XkoCJBZ65IdYsHrJgfwGpoIy6bywuixrDHHcSh9I5w=="
     },
     },
     "@angular/platform-browser": {
     "@angular/platform-browser": {
       "version": "9.0.0",
       "version": "9.0.0",

@@ -13,13 +13,13 @@
   "private": true,
   "private": true,
   "dependencies": {
   "dependencies": {
     "@angular/animations": "~9.0.0",
     "@angular/animations": "~9.0.0",
-    "@angular/cdk": "~8.2.3",
+    "@angular/cdk": "~9.0.0",
     "@angular/common": "~9.0.0",
     "@angular/common": "~9.0.0",
     "@angular/compiler": "~9.0.0",
     "@angular/compiler": "~9.0.0",
     "@angular/core": "~9.0.0",
     "@angular/core": "~9.0.0",
     "@angular/flex-layout": "^9.0.0-beta.29",
     "@angular/flex-layout": "^9.0.0-beta.29",
     "@angular/forms": "~9.0.0",
     "@angular/forms": "~9.0.0",
-    "@angular/material": "^8.2.3",
+    "@angular/material": "^9.0.0",
     "@angular/platform-browser": "~9.0.0",
     "@angular/platform-browser": "~9.0.0",
     "@angular/platform-browser-dynamic": "~9.0.0",
     "@angular/platform-browser-dynamic": "~9.0.0",
     "@angular/router": "~9.0.0",
     "@angular/router": "~9.0.0",
@@ -48,7 +48,6 @@
     "flot": "git://github.com/thingsboard/flot.git#0.9-work",
     "flot": "git://github.com/thingsboard/flot.git#0.9-work",
     "flot.curvedlines": "git://github.com/MichaelZinsmaier/CurvedLines.git#master",
     "flot.curvedlines": "git://github.com/MichaelZinsmaier/CurvedLines.git#master",
     "font-awesome": "^4.7.0",
     "font-awesome": "^4.7.0",
-    "hammerjs": "^2.0.8",
     "javascript-detect-element-resize": "^0.5.3",
     "javascript-detect-element-resize": "^0.5.3",
     "jquery": "^3.4.1",
     "jquery": "^3.4.1",
     "jquery.terminal": "^1.5.0",
     "jquery.terminal": "^1.5.0",

@@ -23,7 +23,7 @@ import { select, Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { LocalStorageService } from '@core/local-storage/local-storage.service';
 import { LocalStorageService } from '@core/local-storage/local-storage.service';
 import { DomSanitizer } from '@angular/platform-browser';
 import { DomSanitizer } from '@angular/platform-browser';
-import { MatIconRegistry } from '@angular/material';
+import { MatIconRegistry } from '@angular/material/icon';
 import { combineLatest } from 'rxjs';
 import { combineLatest } from 'rxjs';
 import { selectIsAuthenticated, selectIsUserLoaded } from '@core/auth/auth.selectors';
 import { selectIsAuthenticated, selectIsUserLoaded } from '@core/auth/auth.selectors';
 import { distinctUntilChanged, filter, map, skip } from 'rxjs/operators';
 import { distinctUntilChanged, filter, map, skip } from 'rxjs/operators';

@@ -32,7 +32,9 @@ import {
 } from '@ngx-translate/core';
 } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { TbMissingTranslationHandler } from './translate/missing-translate-handler';
 import { TbMissingTranslationHandler } from './translate/missing-translate-handler';
-import { MatButtonModule, MatDialogModule, MatSnackBarModule } from '@angular/material';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component';
 import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { TranslateDefaultCompiler } from '@core/translate/translate-default-compiler';
 import { TranslateDefaultCompiler } from '@core/translate/translate-default-compiler';

@@ -16,7 +16,7 @@
 
 
 import { Injectable } from '@angular/core';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Observable } from 'rxjs';
-import { MatDialog, MatDialogConfig } from '@angular/material';
+import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component';
 import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { AlertDialogComponent } from '@core/services/dialog/alert-dialog.component';
 import { AlertDialogComponent } from '@core/services/dialog/alert-dialog.component';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, Inject } from '@angular/core';
 import { Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 
 
 export interface AlertDialogData {
 export interface AlertDialogData {
   title: string;
   title: string;

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, Inject } from '@angular/core';
 import { Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 
 
 export interface ConfirmDialogData {
 export interface ConfirmDialogData {
   title: string;
   title: string;

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import {Component} from '@angular/core';
 import {Component} from '@angular/core';
-import {MatDialogRef} from '@angular/material';
+import { MatDialogRef } from '@angular/material/dialog';
 
 
 @Component({
 @Component({
   selector: 'tb-todo-dialog',
   selector: 'tb-todo-dialog',

@@ -18,7 +18,7 @@ import { Injectable } from '@angular/core';
 import { Observable, of } from 'rxjs';
 import { Observable, of } from 'rxjs';
 import { RuleChainService } from '@core/http/rule-chain.service';
 import { RuleChainService } from '@core/http/rule-chain.service';
 import { map, switchMap } from 'rxjs/operators';
 import { map, switchMap } from 'rxjs/operators';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { NodeScriptTestDialogComponent, NodeScriptTestDialogData } from '@shared/components/dialog/node-script-test-dialog.component';
 import { NodeScriptTestDialogComponent, NodeScriptTestDialogData } from '@shared/components/dialog/node-script-test-dialog.component';
 
 
 @Injectable({
 @Injectable({

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit } from '@angular/core';
 import { Component, Inject, OnInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { FormBuilder, FormGroup } from '@angular/forms';

@@ -23,7 +23,7 @@ import { EntityType, EntityTypeResource, entityTypeTranslations } from '@shared/
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { DatePipe } from '@angular/common';
 import { DatePipe } from '@angular/common';
 import { Direction } from '@shared/models/page/sort-order';
 import { Direction } from '@shared/models/page/sort-order';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { TimePageLink } from '@shared/models/page/page-link';
 import { TimePageLink } from '@shared/models/page/page-link';
 import { Observable } from 'rxjs';
 import { Observable } from 'rxjs';
 import { PageData } from '@shared/models/page/page-data';
 import { PageData } from '@shared/models/page/page-data';

@@ -17,7 +17,7 @@
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { DatePipe } from '@angular/common';
 import { DatePipe } from '@angular/common';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { EntityId } from '@shared/models/id/entity-id';
 import { EntityId } from '@shared/models/id/entity-id';
 import { EntitiesTableComponent } from '@home/components/entity/entities-table.component';
 import { EntitiesTableComponent } from '@home/components/entity/entities-table.component';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, Inject, Input, OnDestroy, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
 import { Component, Inject, Input, OnDestroy, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
-import { TooltipPosition } from '@angular/material';
+import { TooltipPosition } from '@angular/material/tooltip';
 import { IAliasController } from '@core/api/widget-api.models';
 import { IAliasController } from '@core/api/widget-api.models';
 import { CdkOverlayOrigin, ConnectedPosition, Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay';
 import { CdkOverlayOrigin, ConnectedPosition, Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import {
 import {

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import {
 import {

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, InjectionToken, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import { Component, Inject, InjectionToken, OnInit, SkipSelf, ViewChild } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, ElementRef, Inject, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { Component, ElementRef, Inject, OnInit, Renderer2, ViewChild } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { ActionStatus, AuditLog } from '@shared/models/audit-log.models';
 import { ActionStatus, AuditLog } from '@shared/models/audit-log.models';

@@ -34,7 +34,7 @@ import { AuditLogService } from '@core/http/audit-log.service';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { DatePipe } from '@angular/common';
 import { DatePipe } from '@angular/common';
 import { Direction } from '@shared/models/page/sort-order';
 import { Direction } from '@shared/models/page/sort-order';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { PageLink, TimePageLink } from '@shared/models/page/page-link';
 import { PageLink, TimePageLink } from '@shared/models/page/page-link';
 import { Observable } from 'rxjs';
 import { Observable } from 'rxjs';
 import { PageData } from '@shared/models/page/page-data';
 import { PageData } from '@shared/models/page/page-data';

@@ -18,7 +18,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { AuditLogService } from '@core/http/audit-log.service';
 import { AuditLogService } from '@core/http/audit-log.service';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { DatePipe } from '@angular/common';
 import { DatePipe } from '@angular/common';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { AuditLogMode } from '@shared/models/audit-log.models';
 import { AuditLogMode } from '@shared/models/audit-log.models';
 import { EntityId } from '@shared/models/id/entity-id';
 import { EntityId } from '@shared/models/id/entity-id';
 import { UserId } from '@shared/models/id/user-id';
 import { UserId } from '@shared/models/id/user-id';

@@ -49,7 +49,7 @@ import { BreakpointObserver } from '@angular/cdk/layout';
 import { MediaBreakpoints } from '@shared/models/constants';
 import { MediaBreakpoints } from '@shared/models/constants';
 import { IAliasController, IStateController } from '@app/core/api/widget-api.models';
 import { IAliasController, IStateController } from '@app/core/api/widget-api.models';
 import { Widget, WidgetPosition } from '@app/shared/models/widget.models';
 import { Widget, WidgetPosition } from '@app/shared/models/widget.models';
-import { MatMenuTrigger } from '@angular/material';
+import { MatMenuTrigger } from '@angular/material/menu';
 import { SafeStyle } from '@angular/platform-browser';
 import { SafeStyle } from '@angular/platform-browser';
 
 
 @Component({
 @Component({

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import {Component, ComponentFactoryResolver, Inject, OnInit, SkipSelf, ViewChild} from '@angular/core';
 import {Component, ComponentFactoryResolver, Inject, OnInit, SkipSelf, ViewChild} from '@angular/core';
-import {ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import {PageComponent} from '@shared/components/page.component';
 import {PageComponent} from '@shared/components/page.component';
 import {Store} from '@ngrx/store';
 import {Store} from '@ngrx/store';
 import {AppState} from '@core/core.state';
 import {AppState} from '@core/core.state';

@@ -28,7 +28,9 @@ import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { PageLink, TimePageLink } from '@shared/models/page/page-link';
 import { PageLink, TimePageLink } from '@shared/models/page/page-link';
-import { MatDialog, MatPaginator, MatSort } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
+import { MatPaginator } from '@angular/material/paginator';
+import { MatSort } from '@angular/material/sort';
 import { EntitiesDataSource } from '@home/models/datasource/entity-datasource';
 import { EntitiesDataSource } from '@home/models/datasource/entity-datasource';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
 import { Direction, SortOrder } from '@shared/models/page/sort-order';
 import { Direction, SortOrder } from '@shared/models/page/sort-order';

@@ -43,7 +43,7 @@ import { EntityComponent } from './entity.component';
 import { TbAnchorComponent } from '@shared/components/tb-anchor.component';
 import { TbAnchorComponent } from '@shared/components/tb-anchor.component';
 import { EntityAction } from '@home/models/entity/entity-component.models';
 import { EntityAction } from '@home/models/entity/entity-component.models';
 import { Subscription } from 'rxjs';
 import { Subscription } from 'rxjs';
-import { MatTabGroup, MatTab } from '@angular/material';
+import { MatTabGroup, MatTab } from '@angular/material/tabs';
 import { EntityTabsComponent } from '@home/components/entity/entity-tabs.component';
 import { EntityTabsComponent } from '@home/components/entity/entity-tabs.component';
 
 
 @Component({
 @Component({

@@ -20,7 +20,7 @@ import { AfterViewInit, ContentChildren, EventEmitter, Input, OnInit, Output, Qu
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { EntityTableConfig } from '@home/models/entity/entities-table-config.models';
 import { EntityTableConfig } from '@home/models/entity/entities-table-config.models';
-import { MatTab } from '@angular/material';
+import { MatTab } from '@angular/material/tabs';
 import { EntityAction } from '@home/models/entity/entity-component.models';
 import { EntityAction } from '@home/models/entity/entity-component.models';
 import { BehaviorSubject } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
 import { Authority } from '@app/shared/models/authority.enum';
 import { Authority } from '@app/shared/models/authority.enum';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, ElementRef, Inject, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { Component, ElementRef, Inject, OnInit, Renderer2, ViewChild } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 
 

@@ -18,7 +18,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { AuditLogService } from '@core/http/audit-log.service';
 import { AuditLogService } from '@core/http/audit-log.service';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { DatePipe } from '@angular/common';
 import { DatePipe } from '@angular/common';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { AuditLogMode } from '@shared/models/audit-log.models';
 import { AuditLogMode } from '@shared/models/audit-log.models';
 import { EntityId } from '@shared/models/id/entity-id';
 import { EntityId } from '@shared/models/id/entity-id';
 import { UserId } from '@shared/models/id/user-id';
 import { UserId } from '@shared/models/id/user-id';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { Component, Inject, OnInit, ViewChild } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import {
 import {

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, ElementRef, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import { Component, ElementRef, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import {
 import {

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -39,7 +39,8 @@ import { filter, map, mergeMap, share, tap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@app/core/core.state';
 import { AppState } from '@app/core/core.state';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
-import { MatAutocomplete, MatChipInputEvent, MatChipList } from '@angular/material';
+import { MatAutocomplete } from '@angular/material/autocomplete';
+import { MatChipInputEvent, MatChipList } from '@angular/material/chips';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { DataKey, DatasourceType, widgetType } from '@shared/models/widget.models';
 import { DataKey, DatasourceType, widgetType } from '@shared/models/widget.models';

@@ -16,7 +16,7 @@
 
 
 import { Injectable, Injector, NgModule } from '@angular/core';
 import { Injectable, Injector, NgModule } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Observable } from 'rxjs';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { AuthService } from '@core/auth/auth.service';
 import { AuthService } from '@core/auth/auth.service';
 import { DynamicComponentFactoryService } from '@core/services/dynamic-component-factory.service';
 import { DynamicComponentFactoryService } from '@core/services/dynamic-component-factory.service';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import {Component, Inject, OnInit, SkipSelf} from '@angular/core';
 import {Component, Inject, OnInit, SkipSelf} from '@angular/core';
-import {ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import {PageComponent} from '@shared/components/page.component';
 import {PageComponent} from '@shared/components/page.component';
 import {Store} from '@ngrx/store';
 import {Store} from '@ngrx/store';
 import {AppState} from '@core/core.state';
 import {AppState} from '@core/core.state';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import {Component, Inject, OnInit, SkipSelf} from '@angular/core';
 import {Component, Inject, OnInit, SkipSelf} from '@angular/core';
-import {ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import {PageComponent} from '@shared/components/page.component';
 import {PageComponent} from '@shared/components/page.component';
 import {Store} from '@ngrx/store';
 import {Store} from '@ngrx/store';
 import {AppState} from '@core/core.state';
 import {AppState} from '@core/core.state';

@@ -31,7 +31,7 @@ import { MediaBreakpoints } from '@shared/models/constants';
 import { ActionNotificationShow } from '@core/notification/notification.actions';
 import { ActionNotificationShow } from '@core/notification/notification.actions';
 import { Router } from '@angular/router';
 import { Router } from '@angular/router';
 import * as screenfull from 'screenfull';
 import * as screenfull from 'screenfull';
-import { MatSidenav } from '@angular/material';
+import { MatSidenav } from '@angular/material/sidenav';
 import { AuthState } from '@core/auth/auth.models';
 import { AuthState } from '@core/auth/auth.models';
 import { WINDOW } from '@core/services/window.service';
 import { WINDOW } from '@core/services/window.service';
 import { ISearchableComponent, instanceOfSearchableComponent } from '@home/models/searchable-component.models';
 import { ISearchableComponent, instanceOfSearchableComponent } from '@home/models/searchable-component.models';

@@ -40,7 +40,7 @@ import { CustomerService } from '@core/http/customer.service';
 import { Customer } from '@app/shared/models/customer.model';
 import { Customer } from '@app/shared/models/customer.model';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { BroadcastService } from '@core/services/broadcast.service';
 import { BroadcastService } from '@core/services/broadcast.service';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { DialogService } from '@core/services/dialog.service';
 import { DialogService } from '@core/services/dialog.service';
 import {
 import {
   AssignToCustomerDialogComponent,
   AssignToCustomerDialogComponent,

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm } from '@angular/forms';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -38,7 +38,7 @@ import {AppState} from '@core/core.state';
 import {Authority} from '@app/shared/models/authority.enum';
 import {Authority} from '@app/shared/models/authority.enum';
 import {CustomerService} from '@core/http/customer.service';
 import {CustomerService} from '@core/http/customer.service';
 import {Customer} from '@app/shared/models/customer.model';
 import {Customer} from '@app/shared/models/customer.model';
-import {MatDialog} from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import {DialogService} from '@core/services/dialog.service';
 import {DialogService} from '@core/services/dialog.service';
 import {
 import {
   AddEntitiesToCustomerDialogComponent,
   AddEntitiesToCustomerDialogComponent,

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm } from '@angular/forms';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
-import { MatDialogRef } from '@angular/material';
+import { MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { Router } from '@angular/router';
 import { Router } from '@angular/router';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import {Component, Inject, OnInit, SkipSelf} from '@angular/core';
 import {Component, Inject, OnInit, SkipSelf} from '@angular/core';
-import {ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import {PageComponent} from '@shared/components/page.component';
 import {PageComponent} from '@shared/components/page.component';
 import {Store} from '@ngrx/store';
 import {Store} from '@ngrx/store';
 import {AppState} from '@core/core.state';
 import {AppState} from '@core/core.state';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import {Component, Inject, OnInit, SkipSelf} from '@angular/core';
 import {Component, Inject, OnInit, SkipSelf} from '@angular/core';
-import {ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import {PageComponent} from '@shared/components/page.component';
 import {PageComponent} from '@shared/components/page.component';
 import {Store} from '@ngrx/store';
 import {Store} from '@ngrx/store';
 import {AppState} from '@core/core.state';
 import {AppState} from '@core/core.state';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import {
 import {

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { AfterViewInit, Component, ElementRef, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import { AfterViewInit, Component, ElementRef, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm } from '@angular/forms';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import {Component, OnInit, SkipSelf, Inject} from '@angular/core';
 import {Component, OnInit, SkipSelf, Inject} from '@angular/core';
-import {ErrorStateMatcher, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { PageComponent } from '@shared/components/page.component';
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';

@@ -44,7 +44,7 @@ import { Customer } from '@app/shared/models/customer.model';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { BroadcastService } from '@core/services/broadcast.service';
 import { BroadcastService } from '@core/services/broadcast.service';
 import { DeviceTableHeaderComponent } from '@modules/home/pages/device/device-table-header.component';
 import { DeviceTableHeaderComponent } from '@modules/home/pages/device/device-table-header.component';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import {
 import {
   DeviceCredentialsDialogComponent,
   DeviceCredentialsDialogComponent,
   DeviceCredentialsDialogData
   DeviceCredentialsDialogData

@@ -40,7 +40,7 @@ import {CustomerService} from '@core/http/customer.service';
 import {Customer} from '@app/shared/models/customer.model';
 import {Customer} from '@app/shared/models/customer.model';
 import {NULL_UUID} from '@shared/models/id/has-uuid';
 import {NULL_UUID} from '@shared/models/id/has-uuid';
 import {BroadcastService} from '@core/services/broadcast.service';
 import {BroadcastService} from '@core/services/broadcast.service';
-import {MatDialog} from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import {DialogService} from '@core/services/dialog.service';
 import {DialogService} from '@core/services/dialog.service';
 import {
 import {
   AssignToCustomerDialogComponent,
   AssignToCustomerDialogComponent,

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
-import { MatDialogRef } from '@angular/material';
+import { MatDialogRef } from '@angular/material/dialog';
 import { PageComponent } from '@shared/components/page.component';
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';

@@ -28,7 +28,7 @@ import {environment as env} from '@env/environment';
 import {TranslateService} from '@ngx-translate/core';
 import {TranslateService} from '@ngx-translate/core';
 import {ActionSettingsChangeLanguage} from '@core/settings/settings.actions';
 import {ActionSettingsChangeLanguage} from '@core/settings/settings.actions';
 import {ChangePasswordDialogComponent} from '@modules/home/pages/profile/change-password-dialog.component';
 import {ChangePasswordDialogComponent} from '@modules/home/pages/profile/change-password-dialog.component';
-import {MatDialog} from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import {DialogService} from '@core/services/dialog.service';
 import {DialogService} from '@core/services/dialog.service';
 import {AuthService} from '@core/auth/auth.service';
 import {AuthService} from '@core/auth/auth.service';
 import {ActivatedRoute} from '@angular/router';
 import {ActivatedRoute} from '@angular/router';

@@ -21,7 +21,8 @@ import { Observable, of } from 'rxjs';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { deepClone } from '@core/utils';
 import { deepClone } from '@core/utils';
 import { TruncatePipe } from '@shared/pipe/truncate.pipe';
 import { TruncatePipe } from '@shared/pipe/truncate.pipe';
-import { MatAutocomplete, MatAutocompleteSelectedEvent, MatChipInputEvent, MatChipList } from '@angular/material';
+import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { MatChipInputEvent, MatChipList } from '@angular/material/chips';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
 import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
 import { map, mergeMap, share, startWith } from 'rxjs/operators';
 import { map, mergeMap, share, startWith } from 'rxjs/operators';

@@ -33,7 +33,9 @@ import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { HasDirtyFlag } from '@core/guards/confirm-on-exit.guard';
 import { HasDirtyFlag } from '@core/guards/confirm-on-exit.guard';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialog, MatDialogRef, MatExpansionPanel } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { MatExpansionPanel } from '@angular/material/expansion';
 import { DialogService } from '@core/services/dialog.service';
 import { DialogService } from '@core/services/dialog.service';
 import { AuthService } from '@core/auth/auth.service';
 import { AuthService } from '@core/auth/auth.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ActivatedRoute, Router } from '@angular/router';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit } from '@angular/core';
 import { Component, Inject, OnInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { PageComponent } from '@shared/components/page.component';
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { Component, Inject, OnInit, ViewChild } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { PageComponent } from '@shared/components/page.component';
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';

@@ -37,7 +37,7 @@ import { map, mergeMap, take, tap } from 'rxjs/operators';
 import { forkJoin, noop, Observable, of } from 'rxjs';
 import { forkJoin, noop, Observable, of } from 'rxjs';
 import { Authority } from '@shared/models/authority.enum';
 import { Authority } from '@shared/models/authority.enum';
 import { CustomerId } from '@shared/models/id/customer-id';
 import { CustomerId } from '@shared/models/id/customer-id';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { EntityAction } from '@home/models/entity/entity-component.models';
 import { EntityAction } from '@home/models/entity/entity-component.models';
 import {
 import {
   AddUserDialogComponent,
   AddUserDialogComponent,

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
-import { MatDialogRef } from '@angular/material';
+import { MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component } from '@angular/core';
 import { Component } from '@angular/core';
-import { MatDialogRef } from '@angular/material';
+import { MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { DialogComponent } from '@shared/components/dialog.component';
 import { DialogComponent } from '@shared/components/dialog.component';

@@ -16,7 +16,8 @@
 
 
 import { Directive, ElementRef, ViewContainerRef, ComponentFactoryResolver, ComponentRef, Input } from '@angular/core';
 import { Directive, ElementRef, ViewContainerRef, ComponentFactoryResolver, ComponentRef, Input } from '@angular/core';
 import { Overlay } from '@angular/cdk/overlay';
 import { Overlay } from '@angular/cdk/overlay';
-import { MatProgressBar, MatSpinner } from '@angular/material';
+import { MatProgressBar } from '@angular/material/progress-bar';
+import { MatSpinner } from '@angular/material/progress-spinner';
 
 
 @Directive({
 @Directive({
   selector: '[tb-circular-progress]'
   selector: '[tb-circular-progress]'

@@ -15,7 +15,8 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -15,7 +15,7 @@
 ///
 ///
 
 
 import { Component, Inject, OnInit, QueryList, ViewChildren, TemplateRef, AfterViewInit } from '@angular/core';
 import { Component, Inject, OnInit, QueryList, ViewChildren, TemplateRef, AfterViewInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { Router } from '@angular/router';
 import { Router } from '@angular/router';

@@ -25,7 +25,8 @@ import {
   ViewChildren,
   ViewChildren,
   ViewEncapsulation
   ViewEncapsulation
 } from '@angular/core';
 } from '@angular/core';
-import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ErrorStateMatcher } from '@angular/material/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AppState } from '@core/core.state';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';

@@ -33,7 +33,9 @@ import {AliasEntityType, EntityType} from '@shared/models/entity-type.models';
 import {BaseData} from '@shared/models/base-data';
 import {BaseData} from '@shared/models/base-data';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EntityService} from '@core/http/entity.service';
 import {EntityService} from '@core/http/entity.service';
-import {ErrorStateMatcher, MatAutocomplete, MatAutocompleteSelectedEvent, MatChipList, MatChipInputEvent} from '@angular/material';
+import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { MatChipList, MatChipInputEvent } from '@angular/material/chips';
+import { ErrorStateMatcher } from '@angular/material/core';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import {DataKeyType} from '@shared/models/telemetry/telemetry.models';
 import {DataKeyType} from '@shared/models/telemetry/telemetry.models';
 import * as equal from 'deep-equal';
 import * as equal from 'deep-equal';

@@ -42,7 +42,9 @@ import {AliasEntityType, EntityType} from '@shared/models/entity-type.models';
 import {BaseData} from '@shared/models/base-data';
 import {BaseData} from '@shared/models/base-data';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EntityService} from '@core/http/entity.service';
 import {EntityService} from '@core/http/entity.service';
-import {ErrorStateMatcher, MatAutocomplete, MatAutocompleteSelectedEvent, MatChipList} from '@angular/material';
+import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { MatChipList } from '@angular/material/chips';
+import { ErrorStateMatcher } from '@angular/material/core';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { emptyPageData } from '@shared/models/page/page-data';
 import { emptyPageData } from '@shared/models/page/page-data';
 
 

@@ -42,7 +42,9 @@ import { AliasEntityType, EntitySubtype, EntityType, entityTypeTranslations } fr
 import {BaseData} from '@shared/models/base-data';
 import {BaseData} from '@shared/models/base-data';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EntityService} from '@core/http/entity.service';
 import {EntityService} from '@core/http/entity.service';
-import {ErrorStateMatcher, MatAutocomplete, MatAutocompleteSelectedEvent, MatChipList} from '@angular/material';
+import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { MatChipList } from '@angular/material/chips';
+import { ErrorStateMatcher } from '@angular/material/core';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { emptyPageData } from '@shared/models/page/page-data';
 import { emptyPageData } from '@shared/models/page/page-data';
 import { AssetService } from '@core/http/asset.service';
 import { AssetService } from '@core/http/asset.service';

@@ -42,7 +42,9 @@ import { AliasEntityType, EntityType, entityTypeTranslations } from '@shared/mod
 import {BaseData} from '@shared/models/base-data';
 import {BaseData} from '@shared/models/base-data';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EntityService} from '@core/http/entity.service';
 import {EntityService} from '@core/http/entity.service';
-import {ErrorStateMatcher, MatAutocomplete, MatAutocompleteSelectedEvent, MatChipList} from '@angular/material';
+import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { MatChipList } from '@angular/material/chips';
+import { ErrorStateMatcher } from '@angular/material/core';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { emptyPageData } from '@shared/models/page/page-data';
 import { emptyPageData } from '@shared/models/page/page-data';
 
 

@@ -27,7 +27,7 @@ import {
 } from '@angular/core';
 } from '@angular/core';
 import { PageComponent } from '@shared/components/page.component';
 import { PageComponent } from '@shared/components/page.component';
 import { WINDOW } from '@core/services/window.service';
 import { WINDOW } from '@core/services/window.service';
-import { mixinColor, CanColorCtor } from '@angular/material';
+import { mixinColor, CanColorCtor } from '@angular/material/core';
 
 
 export declare type FabToolbarDirection = 'left' | 'right';
 export declare type FabToolbarDirection = 'left' | 'right';
 
 

@@ -23,12 +23,7 @@ import {
   OnDestroy, ViewChild,
   OnDestroy, ViewChild,
   ViewContainerRef
   ViewContainerRef
 } from '@angular/core';
 } from '@angular/core';
-import {
-  MAT_SNACK_BAR_DATA,
-  MatSnackBar,
-  MatSnackBarConfig,
-  MatSnackBarRef
-} from '@angular/material';
+import { MAT_SNACK_BAR_DATA, MatSnackBar, MatSnackBarConfig, MatSnackBarRef } from '@angular/material/snack-bar';
 import { NotificationMessage } from '@app/core/notification/notification.models';
 import { NotificationMessage } from '@app/core/notification/notification.models';
 import { onParentScrollOrWindowResize } from '@app/core/utils';
 import { onParentScrollOrWindowResize } from '@app/core/utils';
 import { Subscription } from 'rxjs';
 import { Subscription } from 'rxjs';

@@ -24,36 +24,34 @@ import { NgxFlowModule, FlowInjectionToken } from '@flowjs/ngx-flow';
 import { NgxFlowchartModule } from 'ngx-flowchart/dist/ngx-flowchart';
 import { NgxFlowchartModule } from 'ngx-flowchart/dist/ngx-flowchart';
 import Flow from '@flowjs/flow.js';
 import Flow from '@flowjs/flow.js';
 
 
-import {
-  MatAutocompleteModule,
-  MatButtonModule,
-  MatCardModule,
-  MatCheckboxModule,
-  MatChipsModule,
-  MatDatepickerModule,
-  MatDialogModule,
-  MatDividerModule,
-  MatExpansionModule,
-  MatGridListModule,
-  MatIconModule,
-  MatInputModule,
-  MatMenuModule,
-  MatPaginatorModule,
-  MatProgressBarModule,
-  MatProgressSpinnerModule,
-  MatRadioModule,
-  MatSelectModule,
-  MatSidenavModule,
-  MatSliderModule,
-  MatSlideToggleModule,
-  MatSnackBarModule,
-  MatSortModule,
-  MatStepperModule,
-  MatTableModule,
-  MatTabsModule,
-  MatToolbarModule,
-  MatTooltipModule
-} from '@angular/material';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+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 { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatExpansionModule } from '@angular/material/expansion';
+import { MatGridListModule } from '@angular/material/grid-list';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+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 { MatSidenavModule } from '@angular/material/sidenav';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatSliderModule } from '@angular/material/slider';
+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 { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core';
 import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core';
 import { GridsterModule } from 'angular-gridster2';
 import { GridsterModule } from 'angular-gridster2';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { FlexLayoutModule } from '@angular/flex-layout';

-///
-/// Copyright © 2016-2019 The Thingsboard Authors
-///
-/// Licensed under the Apache License, Version 2.0 (the "License");
-/// you may not use this file except in compliance with the License.
-/// You may obtain a copy of the License at
-///
-///     http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing, software
-/// distributed under the License is distributed on an "AS IS" BASIS,
-/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// See the License for the specific language governing permissions and
-/// limitations under the License.
-///
 
 
-import 'hammerjs';
 
 
 import { enableProdMode } from '@angular/core';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';