From 1379dce23d47c42d169ed13a337bbee827714830 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Mon, 1 Jul 2019 11:06:28 -0400 Subject: [PATCH] Rename component selectors to use prefix "rd" Dropped use of the generated "app" prefix Change-Id: I072fc4348b29007b2f52078ab0d685ad0f29396d Signed-off-by: Lott, Christopher (cl778h) --- docs/release-notes.rst | 5 +- webapp-backend/README.md | 4 + webapp-frontend/angular.json | 2 +- .../src/app/ac-xapp/ac-xapp.component.spec.ts | 2 +- .../src/app/ac-xapp/ac-xapp.component.ts | 2 +- webapp-frontend/src/app/admin/user.component.ts | 2 +- .../app/anr-xapp/anr-edit-ncr-dialog.component.ts | 6 +- .../src/app/anr-xapp/anr-xapp.component.ts | 6 +- .../src/app/app-control/app-control.component.ts | 2 +- .../src/app/catalog/catalog.component.ts | 2 +- .../src/app/control/control.component.html | 5 +- .../src/app/control/control.component.ts | 2 +- webapp-frontend/src/app/footer/footer.component.ts | 2 +- webapp-frontend/src/app/login/login.component.html | 6 +- webapp-frontend/src/app/login/login.component.ts | 9 +- .../sidenav-list/sidenav-list.component.ts | 5 +- .../ran-control/ran-connection-dialog.component.ts | 6 +- .../src/app/ran-control/ran-control.component.ts | 6 +- ...{app-routing.module.ts => rd-routing.module.ts} | 3 +- .../app/{app.component.css => rd.component.css} | 0 .../app/{app.component.html => rd.component.html} | 9 +- ...{app.component.spec.ts => rd.component.spec.ts} | 0 .../src/app/{app.component.ts => rd.component.ts} | 10 +- .../src/app/{app.module.ts => rd.module.ts} | 107 +++++++------- webapp-frontend/src/app/stats/stats.component.html | 156 +++++++++------------ webapp-frontend/src/app/stats/stats.component.ts | 2 +- .../app/ui/catalog-card/catalog-card.component.ts | 2 +- .../app/ui/config-event/config-event.component.ts | 2 +- .../ui/confirm-dialog/confirm-dialog.component.ts | 2 +- .../ui/control-card/control-card.component.html | 2 +- .../app/ui/control-card/control-card.component.ts | 13 +- .../app/ui/error-dialog/error-dialog.component.ts | 2 +- .../app/ui/modal-event/modal-event.component.ts | 2 +- .../src/app/ui/stat-card/stat-card.component.ts | 2 +- webapp-frontend/src/index.html | 2 +- webapp-frontend/src/main.ts | 4 +- 36 files changed, 184 insertions(+), 210 deletions(-) rename webapp-frontend/src/app/{app-routing.module.ts => rd-routing.module.ts} (98%) rename webapp-frontend/src/app/{app.component.css => rd.component.css} (100%) rename webapp-frontend/src/app/{app.component.html => rd.component.html} (96%) rename webapp-frontend/src/app/{app.component.spec.ts => rd.component.spec.ts} (100%) rename webapp-frontend/src/app/{app.component.ts => rd.component.ts} (85%) rename webapp-frontend/src/app/{app.module.ts => rd.module.ts} (86%) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 3e270421..691098a6 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -20,13 +20,14 @@ 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 --------------------------- diff --git a/webapp-backend/README.md b/webapp-backend/README.md index 04da1a91..2909dede 100644 --- a/webapp-backend/README.md +++ b/webapp-backend/README.md @@ -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. diff --git a/webapp-frontend/angular.json b/webapp-frontend/angular.json index 76246fba..772f7506 100644 --- a/webapp-frontend/angular.json +++ b/webapp-frontend/angular.json @@ -7,7 +7,7 @@ "root": "", "sourceRoot": "src", "projectType": "application", - "prefix": "app", + "prefix": "rd", "schematics": { "@schematics/angular:component": { "styleext": "scss" diff --git a/webapp-frontend/src/app/ac-xapp/ac-xapp.component.spec.ts b/webapp-frontend/src/app/ac-xapp/ac-xapp.component.spec.ts index d42065f2..779d4e9b 100644 --- a/webapp-frontend/src/app/ac-xapp/ac-xapp.component.spec.ts +++ b/webapp-frontend/src/app/ac-xapp/ac-xapp.component.spec.ts @@ -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'; diff --git a/webapp-frontend/src/app/ac-xapp/ac-xapp.component.ts b/webapp-frontend/src/app/ac-xapp/ac-xapp.component.ts index a0b4327d..9b9f23c7 100644 --- a/webapp-frontend/src/app/ac-xapp/ac-xapp.component.ts +++ b/webapp-frontend/src/app/ac-xapp/ac-xapp.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/admin/user.component.ts b/webapp-frontend/src/app/admin/user.component.ts index 2f751021..5d631c8d 100644 --- a/webapp-frontend/src/app/admin/user.component.ts +++ b/webapp-frontend/src/app/admin/user.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/anr-xapp/anr-edit-ncr-dialog.component.ts b/webapp-frontend/src/app/anr-xapp/anr-edit-ncr-dialog.component.ts index 96c1f3d8..24c4811e 100644 --- a/webapp-frontend/src/app/anr-xapp/anr-edit-ncr-dialog.component.ts +++ b/webapp-frontend/src/app/anr-xapp/anr-edit-ncr-dialog.component.ts @@ -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, + private dialogRef: MatDialogRef, private dataService: ANRXappService, private errorService: ErrorDialogService, @Inject(MAT_DIALOG_DATA) private data: ANRNeighborCellRelation) { } diff --git a/webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts b/webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts index 02b1f3f1..3440482c 100644 --- a/webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts +++ b/webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts @@ -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 }); diff --git a/webapp-frontend/src/app/app-control/app-control.component.ts b/webapp-frontend/src/app/app-control/app-control.component.ts index 0e2c06a2..f87b9b5b 100644 --- a/webapp-frontend/src/app/app-control/app-control.component.ts +++ b/webapp-frontend/src/app/app-control/app-control.component.ts @@ -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] diff --git a/webapp-frontend/src/app/catalog/catalog.component.ts b/webapp-frontend/src/app/catalog/catalog.component.ts index f22b09f0..57814803 100644 --- a/webapp-frontend/src/app/catalog/catalog.component.ts +++ b/webapp-frontend/src/app/catalog/catalog.component.ts @@ -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'], }) diff --git a/webapp-frontend/src/app/control/control.component.html b/webapp-frontend/src/app/control/control.component.html index dcd09fcd..0840eeec 100644 --- a/webapp-frontend/src/app/control/control.component.html +++ b/webapp-frontend/src/app/control/control.component.html @@ -18,8 +18,7 @@ ========================LICENSE_END=================================== -->
- +
- +
- diff --git a/webapp-frontend/src/app/control/control.component.ts b/webapp-frontend/src/app/control/control.component.ts index 573f7051..eec53e3d 100644 --- a/webapp-frontend/src/app/control/control.component.ts +++ b/webapp-frontend/src/app/control/control.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/footer/footer.component.ts b/webapp-frontend/src/app/footer/footer.component.ts index 1dbd4b6d..1d8763c7 100644 --- a/webapp-frontend/src/app/footer/footer.component.ts +++ b/webapp-frontend/src/app/footer/footer.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/login/login.component.html b/webapp-frontend/src/app/login/login.component.html index 2eefce6a..9a2a795e 100644 --- a/webapp-frontend/src/app/login/login.component.html +++ b/webapp-frontend/src/app/login/login.component.html @@ -18,7 +18,7 @@ ========================LICENSE_END=================================== -->
- - - + + +
diff --git a/webapp-frontend/src/app/login/login.component.ts b/webapp-frontend/src/app/login/login.component.ts index ba89c33c..f7acfdb8 100644 --- a/webapp-frontend/src/app/login/login.component.ts +++ b/webapp-frontend/src/app/login/login.component.ts @@ -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() { } } diff --git a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts index 6ebd79bd..cb4470ed 100644 --- a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts +++ b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts @@ -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(); diff --git a/webapp-frontend/src/app/ran-control/ran-connection-dialog.component.ts b/webapp-frontend/src/app/ran-control/ran-connection-dialog.component.ts index 8ea07a9a..c146084b 100644 --- a/webapp-frontend/src/app/ran-control/ran-connection-dialog.component.ts +++ b/webapp-frontend/src/app/ran-control/ran-connection-dialog.component.ts @@ -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, + private dialogRef: MatDialogRef, private service: E2ManagerService, private errorService: ErrorDialogService, private notifService: NotificationService, diff --git a/webapp-frontend/src/app/ran-control/ran-control.component.ts b/webapp-frontend/src/app/ran-control/ran-control.component.ts index 262dd03c..ca9240f4 100644 --- a/webapp-frontend/src/app/ran-control/ran-control.component.ts +++ b/webapp-frontend/src/app/ran-control/ran-control.component.ts @@ -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: {} }); diff --git a/webapp-frontend/src/app/app-routing.module.ts b/webapp-frontend/src/app/rd-routing.module.ts similarity index 98% rename from webapp-frontend/src/app/app-routing.module.ts rename to webapp-frontend/src/app/rd-routing.module.ts index 8a8e1ec0..cc5a06b8 100644 --- a/webapp-frontend/src/app/app-routing.module.ts +++ b/webapp-frontend/src/app/rd-routing.module.ts @@ -48,4 +48,5 @@ const routes: Routes = [ ], declarations: [] }) -export class AppRoutingModule { } + +export class RdRoutingModule { } diff --git a/webapp-frontend/src/app/app.component.css b/webapp-frontend/src/app/rd.component.css similarity index 100% rename from webapp-frontend/src/app/app.component.css rename to webapp-frontend/src/app/rd.component.css diff --git a/webapp-frontend/src/app/app.component.html b/webapp-frontend/src/app/rd.component.html similarity index 96% rename from webapp-frontend/src/app/app.component.html rename to webapp-frontend/src/app/rd.component.html index fa5ddb3d..9aa2a04f 100644 --- a/webapp-frontend/src/app/app.component.html +++ b/webapp-frontend/src/app/rd.component.html @@ -56,7 +56,7 @@
- +
@@ -116,10 +116,11 @@
-
- +
+ +
- \ No newline at end of file + diff --git a/webapp-frontend/src/app/app.component.spec.ts b/webapp-frontend/src/app/rd.component.spec.ts similarity index 100% rename from webapp-frontend/src/app/app.component.spec.ts rename to webapp-frontend/src/app/rd.component.spec.ts diff --git a/webapp-frontend/src/app/app.component.ts b/webapp-frontend/src/app/rd.component.ts similarity index 85% rename from webapp-frontend/src/app/app.component.ts rename to webapp-frontend/src/app/rd.component.ts index a071606e..8323b55a 100644 --- a/webapp-frontend/src/app/app.component.ts +++ b/webapp-frontend/src/app/rd.component.ts @@ -18,14 +18,14 @@ * ========================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; diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/rd.module.ts similarity index 86% rename from webapp-frontend/src/app/app.module.ts rename to webapp-frontend/src/app/rd.module.ts index 9f2522d8..f45072c5 100644 --- a/webapp-frontend/src/app/app.module.ts +++ b/webapp-frontend/src/app/rd.module.ts @@ -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 { } diff --git a/webapp-frontend/src/app/stats/stats.component.html b/webapp-frontend/src/app/stats/stats.component.html index 54c606b1..4b3d2ef2 100644 --- a/webapp-frontend/src/app/stats/stats.component.html +++ b/webapp-frontend/src/app/stats/stats.component.html @@ -19,99 +19,73 @@ -->
-

Platform stats

+

Platform stats

- - - RIC Total Load - - - - - - - - - - - - -
Additional Delay
- - - - - - - Pendulum Control Loop Latency - - - - - - - - - - - Pendulum Control Load - - - - - - - - + + + RIC Total Load + + + + + + - - - - - - - -
Additional Load
- - - - - - - - + + + + + + +
Additional Delay
+ + + + + + + Pendulum Control Loop Latency + + + + + + + + + + + Pendulum Control Load + + + + + + + + + + + + + +
Additional Load
+ + + + + +
- + + diff --git a/webapp-frontend/src/app/stats/stats.component.ts b/webapp-frontend/src/app/stats/stats.component.ts index b4e96e17..97399692 100644 --- a/webapp-frontend/src/app/stats/stats.component.ts +++ b/webapp-frontend/src/app/stats/stats.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts index fa7811b6..da35f8dd 100644 --- a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts +++ b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/ui/config-event/config-event.component.ts b/webapp-frontend/src/app/ui/config-event/config-event.component.ts index e44933d8..08ac6273 100644 --- a/webapp-frontend/src/app/ui/config-event/config-event.component.ts +++ b/webapp-frontend/src/app/ui/config-event/config-event.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/ui/confirm-dialog/confirm-dialog.component.ts b/webapp-frontend/src/app/ui/confirm-dialog/confirm-dialog.component.ts index cf93f300..8f632f34 100644 --- a/webapp-frontend/src/app/ui/confirm-dialog/confirm-dialog.component.ts +++ b/webapp-frontend/src/app/ui/confirm-dialog/confirm-dialog.component.ts @@ -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 { diff --git a/webapp-frontend/src/app/ui/control-card/control-card.component.html b/webapp-frontend/src/app/ui/control-card/control-card.component.html index 94372bfc..eed26c04 100644 --- a/webapp-frontend/src/app/ui/control-card/control-card.component.html +++ b/webapp-frontend/src/app/ui/control-card/control-card.component.html @@ -19,7 +19,7 @@ -->
- xApp Control


+ RIC Control


play_circle_outline Start
diff --git a/webapp-frontend/src/app/ui/control-card/control-card.component.ts b/webapp-frontend/src/app/ui/control-card/control-card.component.ts index 04c4fb85..e8599bca 100644 --- a/webapp-frontend/src/app/ui/control-card/control-card.component.ts +++ b/webapp-frontend/src/app/ui/control-card/control-card.component.ts @@ -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'); diff --git a/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.ts b/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.ts index 85df9c38..a91eb2c3 100644 --- a/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.ts +++ b/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/ui/modal-event/modal-event.component.ts b/webapp-frontend/src/app/ui/modal-event/modal-event.component.ts index e48790b1..674107ae 100644 --- a/webapp-frontend/src/app/ui/modal-event/modal-event.component.ts +++ b/webapp-frontend/src/app/ui/modal-event/modal-event.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/app/ui/stat-card/stat-card.component.ts b/webapp-frontend/src/app/ui/stat-card/stat-card.component.ts index 3f8277af..a34d4f87 100644 --- a/webapp-frontend/src/app/ui/stat-card/stat-card.component.ts +++ b/webapp-frontend/src/app/ui/stat-card/stat-card.component.ts @@ -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'] }) diff --git a/webapp-frontend/src/index.html b/webapp-frontend/src/index.html index 4cb3ec23..83fcbcd0 100644 --- a/webapp-frontend/src/index.html +++ b/webapp-frontend/src/index.html @@ -27,6 +27,6 @@ - + diff --git a/webapp-frontend/src/main.ts b/webapp-frontend/src/main.ts index ca13d086..24de600c 100644 --- a/webapp-frontend/src/main.ts +++ b/webapp-frontend/src/main.ts @@ -20,12 +20,12 @@ 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)); -- 2.16.6