Rename component selectors to use prefix "rd" 51/451/6
authorLott, Christopher (cl778h) <cl778h@att.com>
Mon, 1 Jul 2019 15:06:28 +0000 (11:06 -0400)
committerLott, Christopher (cl778h) <cl778h@att.com>
Mon, 1 Jul 2019 18:55:11 +0000 (14:55 -0400)
Dropped use of the generated "app" prefix

Change-Id: I072fc4348b29007b2f52078ab0d685ad0f29396d
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
36 files changed:
docs/release-notes.rst
webapp-backend/README.md
webapp-frontend/angular.json
webapp-frontend/src/app/ac-xapp/ac-xapp.component.spec.ts
webapp-frontend/src/app/ac-xapp/ac-xapp.component.ts
webapp-frontend/src/app/admin/user.component.ts
webapp-frontend/src/app/anr-xapp/anr-edit-ncr-dialog.component.ts
webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts
webapp-frontend/src/app/app-control/app-control.component.ts
webapp-frontend/src/app/catalog/catalog.component.ts
webapp-frontend/src/app/control/control.component.html
webapp-frontend/src/app/control/control.component.ts
webapp-frontend/src/app/footer/footer.component.ts
webapp-frontend/src/app/login/login.component.html
webapp-frontend/src/app/login/login.component.ts
webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts
webapp-frontend/src/app/ran-control/ran-connection-dialog.component.ts
webapp-frontend/src/app/ran-control/ran-control.component.ts
webapp-frontend/src/app/rd-routing.module.ts [moved from webapp-frontend/src/app/app-routing.module.ts with 98% similarity]
webapp-frontend/src/app/rd.component.css [moved from webapp-frontend/src/app/app.component.css with 100% similarity]
webapp-frontend/src/app/rd.component.html [moved from webapp-frontend/src/app/app.component.html with 96% similarity]
webapp-frontend/src/app/rd.component.spec.ts [moved from webapp-frontend/src/app/app.component.spec.ts with 100% similarity]
webapp-frontend/src/app/rd.component.ts [moved from webapp-frontend/src/app/app.component.ts with 85% similarity]
webapp-frontend/src/app/rd.module.ts [moved from webapp-frontend/src/app/app.module.ts with 86% similarity]
webapp-frontend/src/app/stats/stats.component.html
webapp-frontend/src/app/stats/stats.component.ts
webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts
webapp-frontend/src/app/ui/config-event/config-event.component.ts
webapp-frontend/src/app/ui/confirm-dialog/confirm-dialog.component.ts
webapp-frontend/src/app/ui/control-card/control-card.component.html
webapp-frontend/src/app/ui/control-card/control-card.component.ts
webapp-frontend/src/app/ui/error-dialog/error-dialog.component.ts
webapp-frontend/src/app/ui/modal-event/modal-event.component.ts
webapp-frontend/src/app/ui/stat-card/stat-card.component.ts
webapp-frontend/src/index.html
webapp-frontend/src/main.ts

index 3e27042..691098a 100644 (file)
 RIC Dashboard Release Notes
 ===========================
 
-Version 1.0.5, 1 July 2019
----------------------------
+Version 1.0.5, 2 July 2019
+--------------------------
 * Upgrade to Angular version 8
 * Upgrade to Spring-Boot 2.1.6.RELEASE
 * Fixed AC xApp policy page title is not aligned
 * Update E2 manager client to spec version 20190630
 * Add configuration-driven mock of E2 getNodebIdList
+* Revise front-end components to use prefix 'rd'
 
 Version 1.0.4, 27 June 2019
 ---------------------------
index 04da1a9..2909ded 100644 (file)
@@ -4,6 +4,10 @@
 
 Run `mvn -Dspring.profiles.active=mock spring-boot:run` for a dev server. Navigate to `http://localhost:8080/swagger-ui.html`. 
 
+## Alternate configuration
+
+Run `mvn -Dspring.config.name=application-abc spring-boot:run` to read configuration from the file 'application-abc.properties' in the local directory.
+
 ## License
 
 Copyright (C) 2019 AT&T Intellectual Property & Nokia. All rights reserved.
index 76246fb..772f750 100644 (file)
@@ -7,7 +7,7 @@
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
-      "prefix": "app",
+      "prefix": "rd",
       "schematics": {
         "@schematics/angular:component": {
             "styleext": "scss"
index d42065f..779d4e9 100644 (file)
@@ -18,7 +18,7 @@
  * ========================LICENSE_END===================================
  */
 
- import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AcXappComponent } from './ac-xapp.component';
 
index a0b4327..9b9f23c 100644 (file)
@@ -26,7 +26,7 @@ import { ErrorDialogService } from '../services/ui/error-dialog.service';
 import { NotificationService } from './../services/ui/notification.service';
 
 @Component({
-  selector: 'app-ac-xapp',
+  selector: 'rd-ac-xapp',
   templateUrl: './ac-xapp.component.html',
   styleUrls: ['./ac-xapp.component.scss']
 })
index 2f75102..5d631c8 100644 (file)
@@ -30,7 +30,7 @@ import { AddDashboardUserDialogComponent } from './add-dashboard-user-dialog/add
 import { EditDashboardUserDialogComponent } from './edit-dashboard-user-dialog/edit-dashboard-user-dialog.component';
 
 @Component({
-  selector: 'app-user',
+  selector: 'rd-user',
   templateUrl: './user.component.html',
   styleUrls: ['./user.component.css']
 })
index 96c1f3d..24c4811 100644 (file)
@@ -25,17 +25,17 @@ import { ErrorDialogService } from '../services/ui/error-dialog.service';
 import { ANRNeighborCellRelation, ANRNeighborCellRelationMod } from '../interfaces/anr-xapp.types';
 
 @Component({
-    selector: 'app-ncr-edit-dialog',
+    selector: 'rd-ncr-edit-dialog',
     templateUrl: './anr-edit-ncr-dialog.component.html',
     styleUrls: ['./anr-edit-ncr-dialog.component.scss']
 })
 
-export class ANREditNCRDialogComponent implements OnInit {
+export class AnrEditNcrDialogComponent implements OnInit {
 
     private ncrDialogForm: FormGroup;
 
     constructor(
-        private dialogRef: MatDialogRef<ANREditNCRDialogComponent>,
+        private dialogRef: MatDialogRef<AnrEditNcrDialogComponent>,
         private dataService: ANRXappService,
         private errorService: ErrorDialogService,
         @Inject(MAT_DIALOG_DATA) private data: ANRNeighborCellRelation) { }
index 02b1f3f..3440482 100644 (file)
@@ -28,11 +28,11 @@ import { ANRXappService } from '../services/anr-xapp/anr-xapp.service';
 import { ErrorDialogService } from '../services/ui/error-dialog.service';
 import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
 import { NotificationService } from './../services/ui/notification.service';
-import { ANREditNCRDialogComponent } from './anr-edit-ncr-dialog.component';
+import { AnrEditNcrDialogComponent } from './anr-edit-ncr-dialog.component';
 import { ANRXappDataSource } from './anr-xapp.datasource';
 
 @Component({
-  selector: 'app-anr',
+  selector: 'rd-anr',
   templateUrl: './anr-xapp.component.html',
   styleUrls: ['./anr-xapp.component.scss']
 })
@@ -94,7 +94,7 @@ export class AnrXappComponent implements AfterViewInit, OnInit {
   }
 
   modifyNcr(ncr: ANRNeighborCellRelation): void {
-    const dialogRef = this.dialog.open(ANREditNCRDialogComponent, {
+    const dialogRef = this.dialog.open(AnrEditNcrDialogComponent, {
       width: '300px',
       data: ncr
     });
index 0e2c06a..f87b9b5 100644 (file)
@@ -29,7 +29,7 @@ import { AppControlAnimations } from './app-control.animations';
 import { AppControlDataSource } from './app-control.datasource';
 
 @Component({
-  selector: 'control-app-control',
+  selector: 'rd-app-control',
   templateUrl: './app-control.component.html',
   styleUrls: ['./app-control.component.css'],
   animations: [AppControlAnimations.messageTrigger]
index f22b09f..5781480 100644 (file)
@@ -27,7 +27,7 @@ import { NotificationService } from './../services/ui/notification.service';
 import { CatalogDataSource } from './catalog.datasource';
 
 @Component({
-  selector: 'app-catalog',
+  selector: 'rd-app-catalog',
   templateUrl: './catalog.component.html',
   styleUrls: ['./catalog.component.css'],
 })
index dcd09fc..0840eee 100644 (file)
@@ -18,8 +18,7 @@
   ========================LICENSE_END===================================
   -->
 <div class="control__section">
-  <control-ran-control></control-ran-control>
+  <rd-ran-control></rd-ran-control>
   <hr>
-  <control-app-control></control-app-control>
+  <rd-app-control></rd-app-control>
 </div>
-
index 573f705..eec53e3 100644 (file)
@@ -20,7 +20,7 @@
 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-control',
+  selector: 'rd-control',
   templateUrl: './control.component.html',
   styleUrls: ['./control.component.css']
 })
index 1dbd4b6..1d8763c 100644 (file)
@@ -22,7 +22,7 @@ import { DashboardService } from '../services/dashboard/dashboard.service';
 import { DashboardSuccessTransport } from '../interfaces/dashboard.types';
 
 @Component({
-  selector: 'app-footer',
+  selector: 'rd-footer',
   templateUrl: './footer.component.html',
   styleUrls: ['./footer.component.scss']
 })
index 2eefce6..9a2a795 100644 (file)
@@ -18,7 +18,7 @@
   ========================LICENSE_END===================================
   -->
 <div class = "main__container">
-    <app-catalog-card></app-catalog-card>
-       <app-control-card></app-control-card>
-       <app-stat-card></app-stat-card>          
+  <rd-app-catalog-card></rd-app-catalog-card>
+  <rd-control-card></rd-control-card>
+  <rd-stat-card></rd-stat-card>
 </div>
index ba89c33..f7acfdb 100644 (file)
@@ -7,9 +7,9 @@
  * 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.
@@ -20,7 +20,7 @@
 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-login',
+  selector: 'rd-login',
   templateUrl: './login.component.html',
   styleUrls: ['./login.component.css']
 })
@@ -28,7 +28,6 @@ export class LoginComponent implements OnInit {
 
   constructor() { }
 
-  ngOnInit() {
-  }
+  ngOnInit() { }
 
 }
index 6ebd79b..cb4470e 100644 (file)
@@ -20,7 +20,7 @@
 import { Component, OnInit, Output, EventEmitter } from '@angular/core';
 
 @Component({
-  selector: 'app-sidenav-list',
+  selector: 'rd-sidenav-list',
   templateUrl: './sidenav-list.component.html',
   styleUrls: ['./sidenav-list.component.css']
 })
@@ -29,8 +29,7 @@ export class SidenavListComponent implements OnInit {
 
   constructor() { }
 
-  ngOnInit() {
-  }
+  ngOnInit() { }
 
   public onSidenavClose = () => {
     this.sidenavClose.emit();
index 8ea07a9..c146084 100644 (file)
@@ -27,17 +27,17 @@ import { E2SetupRequest } from '../interfaces/e2-mgr.types';
 import { HttpErrorResponse } from '@angular/common/http';
 
 @Component({
-    selector: 'app-signal-ranconnect-dialog',
+    selector: 'rd-ran-control-connect-dialog',
     templateUrl: './ran-connection-dialog.component.html',
     styleUrls: ['./ran-connection-dialog.component.css']
 })
 
-export class RANConnectionDialogComponent implements OnInit {
+export class RanControlConnectDialogComponent implements OnInit {
 
     public ranDialogForm: FormGroup;
 
     constructor(
-        private dialogRef: MatDialogRef<RANConnectionDialogComponent>,
+        private dialogRef: MatDialogRef<RanControlConnectDialogComponent>,
         private service: E2ManagerService,
         private errorService: ErrorDialogService,
         private notifService: NotificationService,
index 262dd03..ca9240f 100644 (file)
@@ -19,7 +19,7 @@
  */
 import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { RANConnectionDialogComponent } from './ran-connection-dialog.component';
+import { RanControlConnectDialogComponent } from './ran-connection-dialog.component';
 import { E2ManagerService } from '../services/e2-mgr/e2-mgr.service';
 import { ErrorDialogService } from '../services/ui/error-dialog.service';
 import { ConfirmDialogService } from '../services/ui/confirm-dialog.service';
@@ -28,7 +28,7 @@ import { RANControlDataSource } from './ran-control.datasource';
 import { HttpErrorResponse } from '@angular/common/http';
 
 @Component({
-  selector: 'control-ran-control',
+  selector: 'rd-ran-control',
   templateUrl: './ran-control.component.html',
   styleUrls: ['./ran-control.component.scss']
 })
@@ -48,7 +48,7 @@ export class RanControlComponent implements OnInit {
   }
 
   setupRANConnection() {
-    const dialogRef = this.dialog.open(RANConnectionDialogComponent, {
+    const dialogRef = this.dialog.open(RanControlConnectDialogComponent, {
       width: '450px',
       data: {}
     });
similarity index 98%
rename from webapp-frontend/src/app/app-routing.module.ts
rename to webapp-frontend/src/app/rd-routing.module.ts
index 8a8e1ec..cc5a06b 100644 (file)
@@ -48,4 +48,5 @@ const routes: Routes = [
     ],
     declarations: []
 })
-export class AppRoutingModule { }
+
+export class RdRoutingModule { }
similarity index 96%
rename from webapp-frontend/src/app/app.component.html
rename to webapp-frontend/src/app/rd.component.html
index fa5ddb3..9aa2a04 100644 (file)
@@ -56,7 +56,7 @@
       </div>
     </section>
     <section #sidenav class="menu-body">
-       <app-sidenav-list></app-sidenav-list>
+       <rd-sidenav-list></rd-sidenav-list>
     </section>
     <section class="menu-footer">
 
 
   <!-- Footer -->
   <footer class="main__footer">
-       <div class="main-footer__bg" [ngClass]="{'main-footer__bg-dark': darkModeActive}"></div>
-    <app-footer></app-footer>
+    <div class="main-footer__bg" [ngClass]="{'main-footer__bg-dark': darkModeActive}">
+      <rd-footer></rd-footer>
+    </div>
   </footer>
 
 </div>
 </mat-drawer-content>
-</mat-drawer-container>
\ No newline at end of file
+</mat-drawer-container>
similarity index 85%
rename from webapp-frontend/src/app/app.component.ts
rename to webapp-frontend/src/app/rd.component.ts
index a071606..8323b55 100644 (file)
  * ========================LICENSE_END===================================
  */
 import { Component, OnInit } from '@angular/core';
-import {UiService} from './services/ui/ui.service';
+import { UiService } from './services/ui/ui.service';
 
 @Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+  selector: 'rd-root',
+  templateUrl: './rd.component.html',
+  styleUrls: ['./rd.component.css']
 })
-export class AppComponent implements OnInit {
+export class RdComponent implements OnInit {
   showMenu = false;
   darkModeActive: boolean;
 
similarity index 86%
rename from webapp-frontend/src/app/app.module.ts
rename to webapp-frontend/src/app/rd.module.ts
index 9f2522d..f45072c 100644 (file)
@@ -34,64 +34,63 @@ import { ChartsModule } from 'ng2-charts';
 import { MDBBootstrapModule } from 'angular-bootstrap-md';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
-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 { 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 { AcXappComponent } from './ac-xapp/ac-xapp.component';
+import { AddDashboardUserDialogComponent } from './admin/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 { AppControlComponent } from './app-control/app-control.component';
-import { ControlComponent } from './control/control.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 { UserComponent } from './admin/user.component';
+import { AppMgrService } from './services/app-mgr/app-mgr.service';
 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';
-import { ModalEventComponent } from './ui/modal-event/modal-event.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 { FooterComponent } from './footer/footer.component';
-import { AnrXappComponent } from './anr-xapp/anr-xapp.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 './admin/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 { 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';
+import { FooterComponent } from './footer/footer.component';
+import { LoginComponent } from './login/login.component';
+import { ModalEventComponent } from './ui/modal-event/modal-event.component';
+import { RanControlComponent } from './ran-control/ran-control.component';
+import { RanControlConnectDialogComponent } from './ran-control/ran-connection-dialog.component';
+import { RdComponent } from './rd.component';
+import { RdRoutingModule } from './rd-routing.module';
+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 './admin/user.component';
 
 @NgModule({
   declarations: [
     AcXappComponent,
-    UserComponent,
-    ANREditNCRDialogComponent,
+    AddDashboardUserDialogComponent,
+    AnrEditNcrDialogComponent,
     AnrXappComponent,
-    AppComponent,
-    CatalogComponent,
+    AppControlComponent,
     CatalogCardComponent,
+    CatalogComponent,
     ConfigEventComponent,
     ConfirmDialogComponent,
     ControlCardComponent,
-    AppControlComponent,
+    ControlComponent,
+    EditDashboardUserDialogComponent,
     ErrorDialogComponent,
     FooterComponent,
     LoginComponent,
     ModalEventComponent,
     RanControlComponent,
-    RANConnectionDialogComponent,
+    RanControlConnectDialogComponent,
+    RdComponent,
     SidenavListComponent,
     StatCardComponent,
     StatsComponent,
-    AddDashboardUserDialogComponent,
-    EditDashboardUserDialogComponent,
-    ControlComponent
+    UserComponent
   ],
-    imports: [
-    AppRoutingModule,
+  imports: [
     BrowserModule,
     BrowserAnimationsModule,
     ChartsModule,
@@ -120,10 +119,11 @@ import { EditDashboardUserDialogComponent } from './admin/edit-dashboard-user-di
     MatTableModule,
     MatTabsModule,
     MatTooltipModule,
-    ReactiveFormsModule,
     MDBBootstrapModule.forRoot(),
+    RdRoutingModule,
+    ReactiveFormsModule,
   ],
-    exports: [
+  exports: [
     FormsModule,
     MatDialogModule,
     MatButtonToggleModule,
@@ -139,25 +139,24 @@ import { EditDashboardUserDialogComponent } from './admin/edit-dashboard-user-di
     MatFormFieldModule,
     MatButtonModule,
     MatInputModule,
-    RANConnectionDialogComponent,
-    ErrorDialogComponent
-    ],
-    entryComponents: [
-    RANConnectionDialogComponent,
-    ANREditNCRDialogComponent,
-    ConfirmDialogComponent,
+    RanControlConnectDialogComponent,
     ErrorDialogComponent,
+  ],
+  entryComponents: [
     AddDashboardUserDialogComponent,
-    EditDashboardUserDialogComponent
-    ],
+    AnrEditNcrDialogComponent,
+    ConfirmDialogComponent,
+    EditDashboardUserDialogComponent,
+    ErrorDialogComponent,
+    RanControlConnectDialogComponent,
+  ],
   providers: [
-      UiService,
-      AppMgrService,
-      DashboardService,
-      E2ManagerService,
-      ErrorDialogService
-    ],
-  bootstrap: [AppComponent]
+    AppMgrService,
+    DashboardService,
+    E2ManagerService,
+    ErrorDialogService,
+    UiService
+  ],
+  bootstrap: [RdComponent]
 })
-export class AppModule { }
-
+export class RdModule { }
index 54c606b..4b3d2ef 100644 (file)
   -->
 <div class="stats__section">
 
-    <h3 class="stats__header">Platform stats</h3>
+       <h3 class="stats__header">Platform stats</h3>
 
-     <mat-card class="bar-chart-card">
-        <mat-card-header>
-            <mat-card-title>RIC Total Load</mat-card-title>
-        </mat-card-header>
-        <mat-card-content>
-            <canvas baseChart
-                [datasets]="cpuChartData"
-                [labels]="cpuChartLabels"
-                [options]="cpuChartOptions"
-                [colors]="cpuChartColors"
-                [legend]="cpuChartLegend"
-                [chartType]="cpuChartType"
-                (click)="loadClickData()">
-        </canvas>
-        </mat-card-content>
-    </mat-card>
-<mat-divider></mat-divider>
-            <mat-tab-group>
-                         <mat-tab label="Pendulum xApp">  
-                                   <mat-grid-list cols="3" rowHeight="3:2">
-                                           <mat-grid-tile>
-                                               <mat-card>
-                                       <div>Additional Delay</div>
-                                       <mat-slider
-                                           thumbLabel
-                                           tickInterval="1"
-                                           min="0"
-                                           [max]="sliderDelayMax"
-                                           [(ngModel)]="delay" (click)="saveDelay()" ></mat-slider>
-                                                       </mat-card>
-                                           </mat-grid-tile>
-                                       <mat-grid-tile>
-                                           <mat-card class="bar-chart-card">
-                                               <mat-card-header>
-                                                   <mat-card-title>Pendulum Control Loop Latency</mat-card-title>
-                                               </mat-card-header>
-                                               <mat-card-content>
-                                                   <canvas baseChart
-                                                       [datasets]="latencyChartData"
-                                                       [labels]="latencyChartLabels"
-                                                       [options]="latencyChartOptions"
-                                                       [colors]="latencyChartColors"
-                                                       [legend]="latencyChartLegend"
-                                                       [chartType]="latencyChartType"
-                                                       (click)="loadClickData()">
-                                               </canvas>
-                                               </mat-card-content>
-                                           </mat-card>
-                                       </mat-grid-tile>
-                                       <mat-grid-tile>
-                                           <mat-card class="bar-chart-card">
-                                               <mat-card-header>
-                                                   <mat-card-title>Pendulum Control Load</mat-card-title>
-                                               </mat-card-header>
-                                               <mat-card-content>
-                                                   <canvas baseChart
-                                                       [datasets]="loadChartData"
-                                                       [labels]="loadChartLabels"
-                                                       [options]="loadChartOptions"
-                                                       [colors]="loadChartColors"
-                                                       [legend]="loadChartLegend"
-                                                       [chartType]="loadChartType"
-                                                       (click)="loadClickData()">
-                                               </canvas>
-                                               </mat-card-content>
-                                           </mat-card>
-                                       </mat-grid-tile>
-                                   </mat-grid-list>
+       <mat-card class="bar-chart-card">
+               <mat-card-header>
+                       <mat-card-title>RIC Total Load</mat-card-title>
+               </mat-card-header>
+               <mat-card-content>
+                       <canvas baseChart [datasets]="cpuChartData" [labels]="cpuChartLabels" [options]="cpuChartOptions"
+                               [colors]="cpuChartColors" [legend]="cpuChartLegend" [chartType]="cpuChartType"
+                               (click)="loadClickData()">
+                       </canvas>
+               </mat-card-content>
+       </mat-card>
 
-                         </mat-tab>
-                         <mat-tab label="Reporting xApp">  
-                               <mat-grid-list cols="3" rowHeight="3:2">
-                                   <mat-grid-tile>
-
-<!--                                           <mat-slide-toggle labelPosition="before" [(ngModel)]="checked" (click)="saveLoad($event)" >Additional Load</mat-slide-toggle> -->
-                                               <mat-card>
-                                       <div>Additional Load</div>
-                                       <mat-slider
-                                           thumbLabel
-                                           tickInterval="1"
-                                           min="0"
-                                           [max]="sliderLoadMax"
-                                           [(ngModel)]="load" (click)="saveLoad()" ></mat-slider>
-                                                       </mat-card>
-
-                                   </mat-grid-tile>
-                               </mat-grid-list>
-                               
-                         </mat-tab>
-                       </mat-tab-group>
+       <mat-divider></mat-divider>
 
+       <mat-tab-group>
+               <mat-tab label="Pendulum xApp">
+                       <mat-grid-list cols="3" rowHeight="3:2">
+                               <mat-grid-tile>
+                                       <mat-card>
+                                               <div>Additional Delay</div>
+                                               <mat-slider thumbLabel tickInterval="1" min="0" [max]="sliderDelayMax" [(ngModel)]="delay"
+                                                       (click)="saveDelay()"></mat-slider>
+                                       </mat-card>
+                               </mat-grid-tile>
+                               <mat-grid-tile>
+                                       <mat-card class="bar-chart-card">
+                                               <mat-card-header>
+                                                       <mat-card-title>Pendulum Control Loop Latency</mat-card-title>
+                                               </mat-card-header>
+                                               <mat-card-content>
+                                                       <canvas baseChart [datasets]="latencyChartData" [labels]="latencyChartLabels"
+                                                               [options]="latencyChartOptions" [colors]="latencyChartColors"
+                                                               [legend]="latencyChartLegend" [chartType]="latencyChartType" (click)="loadClickData()">
+                                                       </canvas>
+                                               </mat-card-content>
+                                       </mat-card>
+                               </mat-grid-tile>
+                               <mat-grid-tile>
+                                       <mat-card class="bar-chart-card">
+                                               <mat-card-header>
+                                                       <mat-card-title>Pendulum Control Load</mat-card-title>
+                                               </mat-card-header>
+                                               <mat-card-content>
+                                                       <canvas baseChart [datasets]="loadChartData" [labels]="loadChartLabels"
+                                                               [options]="loadChartOptions" [colors]="loadChartColors" [legend]="loadChartLegend"
+                                                               [chartType]="loadChartType" (click)="loadClickData()">
+                                                       </canvas>
+                                               </mat-card-content>
+                                       </mat-card>
+                               </mat-grid-tile>
+                       </mat-grid-list>
+               </mat-tab>
+               <mat-tab label="Reporting xApp">
+                       <mat-grid-list cols="3" rowHeight="3:2">
+                               <mat-grid-tile>
+                                       <mat-card>
+                                               <div>Additional Load</div>
+                                               <mat-slider thumbLabel tickInterval="1" min="0" [max]="sliderLoadMax" [(ngModel)]="load"
+                                                       (click)="saveLoad()"></mat-slider>
+                                       </mat-card>
+                               </mat-grid-tile>
+                       </mat-grid-list>
+               </mat-tab>
+       </mat-tab-group>
 
 </div>
-       <app-config-event></app-config-event>
+
+<rd-app-config-event></rd-app-config-event>
index b4e96e1..9739969 100644 (file)
@@ -28,7 +28,7 @@ import { HttpErrorResponse } from "@angular/common/http";
 import { map } from 'rxjs/operators';
 
 @Component({
-    selector: 'app-stats',
+    selector: 'rd-stats',
     templateUrl: './stats.component.html',
     styleUrls: ['./stats.component.scss']
 })
index fa7811b..da35f8d 100644 (file)
@@ -22,7 +22,7 @@ import {Router} from '@angular/router';
 import {UiService} from '../../services/ui/ui.service';
 
 @Component({
-  selector: 'app-catalog-card',
+  selector: 'rd-app-catalog-card',
   templateUrl: './catalog-card.component.html',
   styleUrls: ['./catalog-card.component.css']
 })
index e44933d..08ac627 100644 (file)
@@ -22,7 +22,7 @@ import { FormControl, Validators } from '@angular/forms';
 import { StatsService } from '../../services/stats/stats.service';
 
 @Component({
-  selector: 'app-config-event',
+  selector: 'rd-app-config-event',
   templateUrl: './config-event.component.html',
   styleUrls: ['./config-event.component.scss']
 })
index cf93f30..8f632f3 100644 (file)
@@ -22,7 +22,7 @@ import { Component, OnInit, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
 @Component({
-  selector: 'app-confirm-dialog',
+  selector: 'rd-confirm-dialog',
   templateUrl: './confirm-dialog.component.html',
 })
 export class ConfirmDialogComponent implements OnInit {
index 94372bf..eed26c0 100644 (file)
@@ -19,7 +19,7 @@
   -->
 <div class="add__card" routerLink="/control" [ngClass]="{'add__card-dark': darkMode}">
   <div class="header__container">
-    <span class="card__title">xApp Control</span><br><br><br>
+    <span class="card__title">RIC Control</span><br><br><br>
     <div style="color: black; size: 1em; text-align: center">
         <mat-icon>play_circle_outline</mat-icon> Start</div>
     <div style="color: black; size: 1em; text-align: center">
index 04c4fb8..e8599bc 100644 (file)
@@ -7,9 +7,9 @@
  * 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.
@@ -22,15 +22,14 @@ import {Router} from '@angular/router';
 import {UiService} from '../../services/ui/ui.service';
 
 @Component({
-  selector: 'app-control-card',
+  selector: 'rd-control-card',
   templateUrl: './control-card.component.html',
   styleUrls: ['./control-card.component.css']
 })
 export class ControlCardComponent implements OnInit, OnDestroy {
   darkMode: boolean;
 
-  constructor(public router: Router, public ui: UiService) {
-  }
+  constructor(public router: Router, public ui: UiService) { }
 
   ngOnInit() {
     this.ui.darkModeState.subscribe((isDark) => {
@@ -38,9 +37,7 @@ export class ControlCardComponent implements OnInit, OnDestroy {
     });
   }
 
-  ngOnDestroy() {
-
-  }
+  ngOnDestroy() { }
 
   openDetails() {
     this.router.navigateByUrl('../../control');
index 85df9c3..a91eb2c 100644 (file)
@@ -25,7 +25,7 @@ export interface ErrorData {
 }
 
 @Component({
-  selector: 'app-error-dialog',
+  selector: 'rd-error-dialog',
   templateUrl: './error-dialog.component.html',
   styleUrls: ['./error-dialog.component.scss']
 })
index e48790b..674107a 100644 (file)
@@ -21,7 +21,7 @@ import { Component, Input, OnInit , Output, EventEmitter  } from '@angular/core'
 import { FormControl, Validators } from '@angular/forms';
 
 @Component({
-  selector: 'app-modal-event',
+  selector: 'rd-modal-event',
   templateUrl: './modal-event.component.html',
   styleUrls: ['./modal-event.component.scss']
 })
index 3f8277a..a34d4f8 100644 (file)
@@ -22,7 +22,7 @@ import {Router} from '@angular/router';
 import {UiService} from '../../services/ui/ui.service';
 
 @Component({
-  selector: 'app-stat-card',
+  selector: 'rd-stat-card',
   templateUrl: './stat-card.component.html',
   styleUrls: ['./stat-card.component.css']
 })
index 4cb3ec2..83fcbcd 100644 (file)
@@ -27,6 +27,6 @@
     <link rel="icon" type="image/x-icon" href="assets/oran-logo.png">
   </head>
   <body>
-    <app-root></app-root>
+    <rd-root></rd-root>
   </body>
 </html>
index ca13d08..24de600 100644 (file)
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppModule } from './app/app.module';
+import { RdModule } from './app/rd.module';
 import { environment } from './environments/environment';
 
 if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule)
+platformBrowserDynamic().bootstrapModule(RdModule)
   .catch(err => console.error(err));