Upgrade Angular and Spring-Boot

[portal/ric-dashboard.git] / webapp-frontend / src / app / app.module.ts

diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts
index 5d8a611..9f2522d 100644 (file)
--- a/webapp-frontend/src/app/app.module.ts
+++ b/webapp-frontend/src/app/app.module.ts
@@ -26,30 +26,30 @@ import {MatButtonModule, MatButtonToggleModule, MatCardModule, MatCheckboxModule
     MatSlideToggleModule, MatSnackBarModule, MatSortModule, MatTableModule,
     MatTabsModule} from '@angular/material';
 import { BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import { HttpClientModule } 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';
 
-// RETIRE THIS
-import { Ng2SmartTableModule } from 'ng2-smart-table';
-
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { LoginComponent } from './login/login.component';
 import { CatalogComponent } from './catalog/catalog.component';
 import { UiService } from './services/ui/ui.service';
-import { XappMgrService } from './services/xapp-mgr/xapp-mgr.service';
+import { AppMgrService } from './services/app-mgr/app-mgr.service';
 import { DashboardService } from './services/dashboard/dashboard.service';
 import { E2ManagerService } from './services/e2-mgr/e2-mgr.service';
 import { SidenavListComponent } from './navigation/sidenav-list/sidenav-list.component';
+import { AppControlComponent } from './app-control/app-control.component';
 import { ControlComponent } from './control/control.component';
-import { RANConnectionDialogComponent } from './ran-connection/ran-connection-dialog.component';
-import { RANConnectionComponent } from './ran-connection/ran-connection.component';
+import { RANConnectionDialogComponent } from './ran-control/ran-connection-dialog.component';
+import { RanControlComponent } from './ran-control/ran-control.component';
 import { ANREditNCRDialogComponent } from './anr-xapp/anr-edit-ncr-dialog.component';
 import { StatsComponent } from './stats/stats.component';
-import { AdminComponent } from './admin/admin.component';
+import { UserComponent } from './admin/user.component';
 import { CatalogCardComponent } from './ui/catalog-card/catalog-card.component';
 import { ControlCardComponent } from './ui/control-card/control-card.component';
 import { StatCardComponent } from './ui/stat-card/stat-card.component';
@@ -61,11 +61,13 @@ import { AnrXappComponent } from './anr-xapp/anr-xapp.component';
 import { ErrorDialogComponent } from './ui/error-dialog/error-dialog.component';
 import { ErrorDialogService } from './services/ui/error-dialog.service';
 import { AcXappComponent } from './ac-xapp/ac-xapp.component';
+import { AddDashboardUserDialogComponent } from './admin/add-dashboard-user-dialog/add-dashboard-user-dialog.component';
+import { EditDashboardUserDialogComponent } from './admin/edit-dashboard-user-dialog/edit-dashboard-user-dialog.component';
 
 @NgModule({
   declarations: [
     AcXappComponent,
-    AdminComponent,
+    UserComponent,
     ANREditNCRDialogComponent,
     AnrXappComponent,
     AppComponent,
@@ -74,16 +76,19 @@ import { AcXappComponent } from './ac-xapp/ac-xapp.component';
     ConfigEventComponent,
     ConfirmDialogComponent,
     ControlCardComponent,
-    ControlComponent,
+    AppControlComponent,
     ErrorDialogComponent,
     FooterComponent,
     LoginComponent,
     ModalEventComponent,
-    RANConnectionComponent,
+    RanControlComponent,
     RANConnectionDialogComponent,
     SidenavListComponent,
     StatCardComponent,
-    StatsComponent
+    StatsComponent,
+    AddDashboardUserDialogComponent,
+    EditDashboardUserDialogComponent,
+    ControlComponent
   ],
     imports: [
     AppRoutingModule,
@@ -91,6 +96,7 @@ import { AcXappComponent } from './ac-xapp/ac-xapp.component';
     BrowserAnimationsModule,
     ChartsModule,
     FormsModule,
+    HttpClientModule,
     MatButtonModule,
     MatButtonToggleModule,
     MatCardModule,
@@ -113,7 +119,7 @@ import { AcXappComponent } from './ac-xapp/ac-xapp.component';
     MatSortModule,
     MatTableModule,
     MatTabsModule,
-    Ng2SmartTableModule,
+    MatTooltipModule,
     ReactiveFormsModule,
     MDBBootstrapModule.forRoot(),
   ],
@@ -140,11 +146,13 @@ import { AcXappComponent } from './ac-xapp/ac-xapp.component';
     RANConnectionDialogComponent,
     ANREditNCRDialogComponent,
     ConfirmDialogComponent,
-    ErrorDialogComponent
+    ErrorDialogComponent,
+    AddDashboardUserDialogComponent,
+    EditDashboardUserDialogComponent
     ],
   providers: [
       UiService,
-      XappMgrService,
+      AppMgrService,
       DashboardService,
       E2ManagerService,
       ErrorDialogService