improve dashboard UI

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

diff --git a/webapp-frontend/src/app/rd.module.ts b/webapp-frontend/src/app/rd.module.ts
index b7eb0d4..0a1e2bf 100644 (file)
--- a/webapp-frontend/src/app/rd.module.ts
+++ b/webapp-frontend/src/app/rd.module.ts
@@ -17,7 +17,15 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
+
+ // Angular
 import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { ChartsModule } from 'ng2-charts';
+import { FlexLayoutModule } from '@angular/flex-layout';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { HttpClientModule } from '@angular/common/http';
+import { MDBBootstrapModule } from 'angular-bootstrap-md';
 import { MatButtonModule } from '@angular/material/button';
 import { MatButtonToggleModule } from '@angular/material/button-toggle';
 import { MatCardModule } from '@angular/material/card';
@@ -31,6 +39,7 @@ import { MatInputModule } from '@angular/material/input';
 import { MatListModule } from '@angular/material/list';
 import { MatPaginatorModule } from '@angular/material/paginator';
 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';
@@ -39,63 +48,57 @@ 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 { 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';
+import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
+import { NgModule } from '@angular/core';
 import { ToastrModule } from 'ngx-toastr';
+
+// RD components
 import { AcXappComponent } from './ac-xapp/ac-xapp.component';
 import { AddDashboardUserDialogComponent } from './user/add-dashboard-user-dialog/add-dashboard-user-dialog.component';
-import { AnrEditNcrDialogComponent } from './anr-xapp/anr-edit-ncr-dialog.component';
-import { AnrXappComponent } from './anr-xapp/anr-xapp.component';
 import { AppConfigurationComponent } from './app-configuration/app-configuration.component';
 import { AppControlComponent } from './app-control/app-control.component';
-import { AppMgrService } from './services/app-mgr/app-mgr.service';
 import { CaasIngressComponent } from './caas-ingress/caas-ingress.component';
 import { CatalogCardComponent } from './ui/catalog-card/catalog-card.component';
 import { CatalogComponent } from './catalog/catalog.component';
-import { ConfigEventComponent } from './ui/config-event/config-event.component';
 import { ConfirmDialogComponent } from './ui/confirm-dialog/confirm-dialog.component';
 import { ControlCardComponent } from './ui/control-card/control-card.component';
 import { ControlComponent } from './control/control.component';
-import { DashboardService } from './services/dashboard/dashboard.service';
-import { E2ManagerService } from './services/e2-mgr/e2-mgr.service';
 import { EditDashboardUserDialogComponent } from './user/edit-dashboard-user-dialog/edit-dashboard-user-dialog.component';
 import { ErrorDialogComponent } from './ui/error-dialog/error-dialog.component';
-import { ErrorDialogService } from './services/ui/error-dialog.service';
-import { FlexLayoutModule } from '@angular/flex-layout';
 import { FooterComponent } from './footer/footer.component';
+import { InstanceSelectorDialogComponent } from './ui/instance-selector-dialog/instance-selector-dialog.component';
 import { LoadingDialogComponent } from './ui/loading-dialog/loading-dialog.component';
 import { MainComponent } from './main/main.component';
-import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
-import { ModalEventComponent } from './ui/modal-event/modal-event.component';
 import { PlatformComponent } from './platform/platform.component';
-import { RanControlComponent } from './ran-control/ran-control.component';
 import { RanControlConnectDialogComponent } from './ran-control/ran-connection-dialog.component';
-import { RdComponent } from './rd.component';
+import { RanControlComponent } from './ran-control/ran-control.component';
 import { RdRoutingModule } from './rd-routing.module';
+import { RdComponent } from './rd.component';
 import { SidenavListComponent } from './navigation/sidenav-list/sidenav-list.component';
 import { StatCardComponent } from './ui/stat-card/stat-card.component';
 import { StatsComponent } from './stats/stats.component';
-import { UiService } from './services/ui/ui.service';
 import { UserComponent } from './user/user.component';
 
+// RD services
+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 { ErrorDialogService } from './services/ui/error-dialog.service';
+import { InstanceSelectorService } from './services/instance-selector/instance-selector.service';
+import { InstanceSelectorDialogService } from './services/ui/instance-selector-dialog.service';
+import { UiService } from './services/ui/ui.service';
+
+
 @NgModule({
   declarations: [
     AcXappComponent,
     AddDashboardUserDialogComponent,
-    AnrEditNcrDialogComponent,
-    AnrXappComponent,
     AppConfigurationComponent,
     AppControlComponent,
     CaasIngressComponent,
     CatalogCardComponent,
     CatalogComponent,
-    ConfigEventComponent,
     ConfirmDialogComponent,
     ControlCardComponent,
     ControlComponent,
@@ -104,7 +107,6 @@ import { UserComponent } from './user/user.component';
     FooterComponent,
     LoadingDialogComponent,
     MainComponent,
-    ModalEventComponent,
     PlatformComponent,
     RanControlComponent,
     RanControlConnectDialogComponent,
@@ -112,7 +114,8 @@ import { UserComponent } from './user/user.component';
     SidenavListComponent,
     StatCardComponent,
     StatsComponent,
-    UserComponent
+    UserComponent,
+    InstanceSelectorDialogComponent
   ],
   imports: [
     BrowserModule,
@@ -171,11 +174,11 @@ import { UserComponent } from './user/user.component';
   ],
   entryComponents: [
     AddDashboardUserDialogComponent,
-    AnrEditNcrDialogComponent,
     AppConfigurationComponent,
     ConfirmDialogComponent,
     EditDashboardUserDialogComponent,
     ErrorDialogComponent,
+    InstanceSelectorDialogComponent,
     LoadingDialogComponent,
     RanControlConnectDialogComponent
   ],
@@ -184,6 +187,8 @@ import { UserComponent } from './user/user.component';
     DashboardService,
     E2ManagerService,
     ErrorDialogService,
+    InstanceSelectorService,
+    InstanceSelectorDialogService,
     UiService
   ],
   bootstrap: [RdComponent]