X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fapp.module.ts;h=6ea9f0346333a556bcd3c97625c27f0ff32d09ec;hb=869354bad80ea5db92893ad3017eaf9c421c0731;hp=6cfabc82e8f6321b6fcfaf9c1d493b42936cad15;hpb=5d7de18e40bb0da67d375d9461f9106ec3ea8e51;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts
index 6cfabc8..6ea9f03 100644
--- a/webapp-frontend/src/app/app.module.ts
+++ b/webapp-frontend/src/app/app.module.ts
@@ -20,20 +20,31 @@
  * ========================LICENSE_END===================================
  */
 import { BrowserModule } from '@angular/platform-browser';
-// tslint:disable-next-line:max-line-length
-import {
-  MatButtonModule, MatButtonToggleModule, MatCardModule, MatCheckboxModule,
-  MatDialogModule, MatExpansionModule, MatFormFieldModule, MatGridListModule,
-  MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatPaginatorModule,
-  MatProgressSpinnerModule, MatSelectModule, MatSidenavModule, MatSliderModule,
-  MatSlideToggleModule, MatSnackBarModule, MatSortModule, MatTableModule,
-  MatTabsModule, MatToolbarModule
-} from '@angular/material';
+import { MatButtonModule } from '@angular/material/button';
+import { MatButtonToggleModule } from '@angular/material/button-toggle';
+import { MatCardModule } from '@angular/material/card';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+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 { MatSelectModule } from '@angular/material/select';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { MatSliderModule } from '@angular/material/slider';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatSortModule } from '@angular/material/sort';
+import { MatTableModule } from '@angular/material/table';
+import { MatTabsModule } from '@angular/material/tabs';
+import { MatToolbarModule } from '@angular/material/toolbar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { MatRadioModule } from '@angular/material/radio';
-import { MatTooltipModule } from '@angular/material/tooltip';
 import { ChartsModule } from 'ng2-charts';
 import { MDBBootstrapModule } from 'angular-bootstrap-md';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -45,19 +56,15 @@ import { FlexLayoutModule } from '@angular/flex-layout';
 import { FooterComponent } from './footer/footer.component';
 import { MainComponent } from './main/main.component';
 import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
-import { NoTypePolicyInstanceDialogComponent } from './policy-control/no-type-policy-instance-dialog.component';
-import { PolicyCardComponent } from './ui/policy-card/policy-card.component';
-import { PolicyControlComponent } from './policy-control/policy-control.component';
-import { PolicyInstanceComponent } from './policy-control/policy-instance.component';
-import { PolicyInstanceDialogComponent } from './policy-control/policy-instance-dialog.component';
+import { PolicyModule } from './policy/policy.module'
+import { EiCoordinatorModule } from './ei-coordinator/ei-coordinator.module'
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
 import { SidenavListComponent } from './navigation/sidenav-list/sidenav-list.component';
 import { UiService } from './services/ui/ui.service';
-import { CookieModule } from 'ngx-cookie';
+import { CookieService } from 'ngx-cookie-service';
 import { NodeModulesComponent } from './node-modules/node-modules.component';
 import { EICardComponent } from './ui/ei-card/ei-card.component';
-import { EICoordinatorComponent } from './ei-coordinator/ei-coordinator.component';
 import { HttpMockRequestInterceptor } from './interceptor.mock';
 import { environment } from 'src/environments/environment';
 import { HttpRequestInterceptor } from './interceptor';
@@ -69,16 +76,10 @@ export const isMock = environment.mock;
     AppComponent,
     ConfirmDialogComponent,
     EICardComponent,
-    EICoordinatorComponent,
     ErrorDialogComponent,
     FooterComponent,
     MainComponent,
     NodeModulesComponent,
-    NoTypePolicyInstanceDialogComponent,
-    PolicyCardComponent,
-    PolicyControlComponent,
-    PolicyInstanceComponent,
-    PolicyInstanceDialogComponent,
     SidenavListComponent,
   ],
   imports: [
@@ -86,7 +87,6 @@ export const isMock = environment.mock;
     BrowserModule,
     BrowserAnimationsModule,
     ChartsModule,
-    CookieModule.forRoot(),
     FlexLayoutModule,
     FormsModule,
     HttpClientModule,
@@ -95,7 +95,6 @@ export const isMock = environment.mock;
     MatCardModule,
     MatCheckboxModule,
     MatDialogModule,
-    MaterialDesignFrameworkModule,
     MatExpansionModule,
     MatFormFieldModule,
     MatGridListModule,
@@ -104,19 +103,19 @@ export const isMock = environment.mock;
     MatListModule,
     MatMenuModule,
     MatPaginatorModule,
-    MatProgressSpinnerModule,
-    MatRadioModule,
     MatSelectModule,
-    MatSliderModule,
     MatSidenavModule,
+    MatSliderModule,
     MatSlideToggleModule,
     MatSnackBarModule,
     MatSortModule,
     MatTableModule,
     MatTabsModule,
     MatToolbarModule,
-    MatTooltipModule,
+    MaterialDesignFrameworkModule,
     MDBBootstrapModule.forRoot(),
+    PolicyModule,
+    EiCoordinatorModule,
     ReactiveFormsModule,
     ToastrModule.forRoot(),
   ],
@@ -141,10 +140,9 @@ export const isMock = environment.mock;
   entryComponents: [
     ConfirmDialogComponent,
     ErrorDialogComponent,
-    NoTypePolicyInstanceDialogComponent,
-    PolicyInstanceDialogComponent
   ],
   providers: [
+    CookieService,
     ErrorDialogService,
     UiService,
     {