Adding aliases for imports

Issue-ID: NONRTRIC-451
Signed-off-by: ychacon <yennifer.chacon@est.tech>
Change-Id: I80eb19116929600fe2cc6adcb82bb8f28fb15559

diff --git a/webapp-frontend/src/app/app-routing.module.ts b/webapp-frontend/src/app/app-routing.module.ts
index 5881dc7..387fdc1 100644 (file)
--- a/webapp-frontend/src/app/app-routing.module.ts
+++ b/webapp-frontend/src/app/app-routing.module.ts
@@ -22,8 +22,8 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { Routes, RouterModule } from '@angular/router';
 import { MainComponent } from './main/main.component';
-import { PolicyControlComponent } from './policy/policy-control.component';
-import { EICoordinatorComponent } from './ei-coordinator/ei-coordinator.component';
+import { PolicyControlComponent } from '@policy/policy-control.component';
+import { EICoordinatorComponent } from '@ei-coordinator/ei-coordinator.component';
 
 
 const routes: Routes = [

diff --git a/webapp-frontend/src/app/app.component.spec.ts b/webapp-frontend/src/app/app.component.spec.ts
index 1ade262..8558057 100644 (file)
--- a/webapp-frontend/src/app/app.component.spec.ts
+++ b/webapp-frontend/src/app/app.component.spec.ts
@@ -22,7 +22,7 @@ import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { CookieService } from 'ngx-cookie-service';
 import { AppComponent } from './app.component';
-import { UiService } from './services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 
 describe('AppComponent', () => {
   let fixture: ComponentFixture<AppComponent>;

diff --git a/webapp-frontend/src/app/app.component.ts b/webapp-frontend/src/app/app.component.ts
index 3546b5e..64f79fd 100644 (file)
--- a/webapp-frontend/src/app/app.component.ts
+++ b/webapp-frontend/src/app/app.component.ts
@@ -18,7 +18,7 @@
  * ========================LICENSE_END===================================
  */
 import { Component, OnInit } from '@angular/core';
-import { UiService } from './services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 import { CookieService } from 'ngx-cookie-service';
 
 @Component({

diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts
index fd65452..46948c3 100644 (file)
--- a/webapp-frontend/src/app/app.module.ts
+++ b/webapp-frontend/src/app/app.module.ts
@@ -29,21 +29,21 @@ import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { MDBBootstrapModule } from 'angular-bootstrap-md';
 import { ToastrModule } from 'ngx-toastr';
-import { ConfirmDialogComponent } from './ui/confirm-dialog/confirm-dialog.component';
-import { ErrorDialogComponent } from './ui/error-dialog/error-dialog.component';
-import { ErrorDialogService } from './services/ui/error-dialog.service';
+import { ConfirmDialogComponent } from '@ui/confirm-dialog/confirm-dialog.component';
+import { ErrorDialogComponent } from '@ui/error-dialog/error-dialog.component';
+import { ErrorDialogService } from '@services/ui/error-dialog.service';
 import { FooterComponent } from './footer/footer.component';
 import { MainComponent } from './main/main.component';
 import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
-import { PolicyModule } from './policy/policy.module'
-import { EiCoordinatorModule } from './ei-coordinator/ei-coordinator.module'
+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 { SidenavListComponent } from '@navigation/sidenav-list/sidenav-list.component';
+import { UiService } from '@services/ui/ui.service';
 import { CookieService } from 'ngx-cookie-service';
 import { HttpMockRequestInterceptor } from './interceptor.mock';
-import { environment } from 'src/environments/environment';
+import { environment } from 'environments/environment';
 import { HttpRequestInterceptor } from './interceptor';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-card/ei-card.component.spec.ts b/webapp-frontend/src/app/ei-coordinator/ei-card/ei-card.component.spec.ts
index d092383..bad9ec8 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-card/ei-card.component.spec.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-card/ei-card.component.spec.ts
@@ -22,7 +22,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {EiCardComponent} from './ei-card.component';
 import { MatIconModule } from '@angular/material/icon';
 import { RouterTestingModule } from '@angular/router/testing';
-import {UiService} from '../../services/ui/ui.service';
+import {UiService} from '@services/ui/ui.service';
 
 describe('EICardComponent', () => {
   let component: EiCardComponent;

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-card/ei-card.component.ts b/webapp-frontend/src/app/ei-coordinator/ei-card/ei-card.component.ts
index fa05aa9..2a6408e 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-card/ei-card.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-card/ei-card.component.ts
@@ -19,7 +19,7 @@
  */
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { UiService } from '../../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 
 @Component({
   selector: 'nrcp-ei-card',

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.spec.ts b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.spec.ts
index ae7ee40..1759c69 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.spec.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.spec.ts
@@ -28,7 +28,7 @@ import { MatTableModule } from '@angular/material/table';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 
 import { EICoordinatorComponent } from './ei-coordinator.component';
-import { UiService } from '../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 import { ProducersListComponent } from './producers-list/producers-list.component';
 import { JobsListComponent } from './jobs-list/jobs-list.component';
 

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
index 5f4317f..15a9b4a 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
@@ -19,7 +19,7 @@
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
 
-import { UiService } from '../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 import { JobsListComponent } from './jobs-list/jobs-list.component';
 import { ProducersListComponent } from './producers-list/producers-list.component';
 

diff --git a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.spec.ts b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.spec.ts
index 0e1f9d3..f7d4924 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.spec.ts
+++ b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.spec.ts
@@ -33,9 +33,9 @@ import { MatTableModule } from '@angular/material/table';
 import { MatTableHarness } from '@angular/material/table/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { of } from 'rxjs/observable/of';
-import { EIJob } from '../../interfaces/ei.types';
-import { EIService } from '../../services/ei/ei.service';
-import { UiService } from '../../services/ui/ui.service';
+import { EIJob } from '@interfaces/ei.types';
+import { EIService } from '@services/ei/ei.service';
+import { UiService } from '@services/ui/ui.service';
 
 import { JobsListComponent } from './jobs-list.component';
 

diff --git a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
index fc82b92..b891021 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
@@ -25,9 +25,9 @@ import { MatTableDataSource } from '@angular/material/table';
 import { forkJoin } from 'rxjs';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { mergeMap, finalize } from 'rxjs/operators';
-import { EIJob } from '../../interfaces/ei.types';
-import { EIService } from '../../services/ei/ei.service';
-import { UiService } from '../../services/ui/ui.service';
+import { EIJob } from '@interfaces/ei.types';
+import { EIService } from '@services/ei/ei.service';
+import { UiService } from '@services/ui/ui.service';
 
 @Component({
   selector: 'nrcp-jobs-list',

diff --git a/webapp-frontend/src/app/ei-coordinator/producers-list/producers-list.component.spec.ts b/webapp-frontend/src/app/ei-coordinator/producers-list/producers-list.component.spec.ts
index ce54d18..f67939e 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/producers-list/producers-list.component.spec.ts
+++ b/webapp-frontend/src/app/ei-coordinator/producers-list/producers-list.component.spec.ts
@@ -5,15 +5,15 @@ import { HarnessLoader } from '@angular/cdk/testing';
 import { MatTableHarness } from '@angular/material/table/testing';
 import { MatSortHarness } from '@angular/material/sort/testing';
 import { ProducersListComponent } from "./producers-list.component";
-import { EIService } from 'src/app/services/ei/ei.service';
-import { EIProducer, OperationalState, ProducerRegistrationInfo, ProducerStatus } from 'src/app/interfaces/ei.types';
+import { EIService } from '@services/ei/ei.service';
+import { EIProducer, OperationalState, ProducerRegistrationInfo, ProducerStatus } from '@interfaces/ei.types';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatTableModule } from '@angular/material/table';
 import { MatInputHarness } from '@angular/material/input/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { UiService } from 'src/app/services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 import { of } from 'rxjs';
 import { MatSortModule } from '@angular/material/sort';
 

diff --git a/webapp-frontend/src/app/ei-coordinator/producers-list/producers-list.component.ts b/webapp-frontend/src/app/ei-coordinator/producers-list/producers-list.component.ts
index 7ffdf54..fa4e609 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/producers-list/producers-list.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/producers-list/producers-list.component.ts
@@ -24,9 +24,9 @@ import { MatTableDataSource } from '@angular/material/table';
 import { forkJoin, of } from 'rxjs';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { mergeMap, finalize } from 'rxjs/operators';
-import { EIService } from 'src/app/services/ei/ei.service';
-import { EIProducer } from '../../interfaces/ei.types';
-import { UiService } from '../../services/ui/ui.service';
+import { EIService } from '@services/ei/ei.service';
+import { EIProducer } from '@interfaces/ei.types';
+import { UiService } from '@services/ui/ui.service';
 
 @Component({
   selector: 'nrcp-producers-list',

diff --git a/webapp-frontend/src/app/footer/footer.component.spec.ts b/webapp-frontend/src/app/footer/footer.component.spec.ts
index 2c8321c..76f3573 100644 (file)
--- a/webapp-frontend/src/app/footer/footer.component.spec.ts
+++ b/webapp-frontend/src/app/footer/footer.component.spec.ts
@@ -20,7 +20,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { FooterComponent } from './footer.component';
-import { UiService } from '../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 
 describe('FooterComponent', () => {
   let component: FooterComponent;

diff --git a/webapp-frontend/src/app/footer/footer.component.ts b/webapp-frontend/src/app/footer/footer.component.ts
index dd57545..9ef1873 100644 (file)
--- a/webapp-frontend/src/app/footer/footer.component.ts
+++ b/webapp-frontend/src/app/footer/footer.component.ts
@@ -20,7 +20,7 @@
  * ========================LICENSE_END===================================
  */
 import { Component, OnInit } from '@angular/core';
-import { UiService } from '../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 
 @Component({
   selector: 'nrcp-footer',

diff --git a/webapp-frontend/src/app/interceptor.spec.ts b/webapp-frontend/src/app/interceptor.spec.ts
index 775daac..e299b64 100644 (file)
--- a/webapp-frontend/src/app/interceptor.spec.ts
+++ b/webapp-frontend/src/app/interceptor.spec.ts
@@ -25,8 +25,8 @@ import {
 } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { HttpRequestInterceptor } from './interceptor';
-import { NotificationService } from './services/ui/notification.service';
-import { EIService } from './services/ei/ei.service';
+import { NotificationService } from '@services/ui/notification.service';
+import { EIService } from '@services/ei/ei.service';
 import { of } from 'rxjs/observable/of';
 
 describe(`HttpRequestInterceptor`, () => {

diff --git a/webapp-frontend/src/app/interceptor.ts b/webapp-frontend/src/app/interceptor.ts
index b1b2aa5..db5f447 100644 (file)
--- a/webapp-frontend/src/app/interceptor.ts
+++ b/webapp-frontend/src/app/interceptor.ts
@@ -23,7 +23,7 @@ import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest
 import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { throwError } from 'rxjs';
-import { NotificationService } from './services/ui/notification.service';
+import { NotificationService } from '@services/ui/notification.service';
 
 @Injectable()
 export class HttpRequestInterceptor implements HttpInterceptor {

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 486a8cd..d44da90 100644 (file)
--- a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts
+++ b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts
@@ -18,7 +18,7 @@
  * ========================LICENSE_END===================================
  */
 import { Component, OnInit, Output, EventEmitter } from '@angular/core';
-import { UiService } from '../../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 
 @Component({
   selector: 'nrcp-sidenav-list',

diff --git a/webapp-frontend/src/app/policy/policy-card/policy-card.component.spec.ts b/webapp-frontend/src/app/policy/policy-card/policy-card.component.spec.ts
index d97014e..786c9de 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-card/policy-card.component.spec.ts
+++ b/webapp-frontend/src/app/policy/policy-card/policy-card.component.spec.ts
@@ -23,7 +23,7 @@ import {PolicyCardComponent} from './policy-card.component';
 import { MatIconModule } from '@angular/material/icon';
 import { MatCardModule } from '@angular/material/card';
 import { RouterTestingModule} from '@angular/router/testing';
-import {UiService} from '../../services/ui/ui.service';
+import {UiService} from '@services/ui/ui.service';
 
 describe('PolicyCardComponent', () => {
   let component: PolicyCardComponent;

diff --git a/webapp-frontend/src/app/policy/policy-card/policy-card.component.ts b/webapp-frontend/src/app/policy/policy-card/policy-card.component.ts
index c628b8f..794c0ee 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-card/policy-card.component.ts
+++ b/webapp-frontend/src/app/policy/policy-card/policy-card.component.ts
@@ -19,7 +19,7 @@
  */
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { UiService } from '../../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 
 @Component({
   selector: 'nrcp-policy-card',

diff --git a/webapp-frontend/src/app/policy/policy-control.component.spec.ts b/webapp-frontend/src/app/policy/policy-control.component.spec.ts
index 80c9d8c..dfc225c 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-control.component.spec.ts
+++ b/webapp-frontend/src/app/policy/policy-control.component.spec.ts
@@ -25,11 +25,11 @@ import { MatTableModule } from '@angular/material/table';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { of } from 'rxjs';
 
-import { NotificationService } from '../services/ui/notification.service';
+import { NotificationService } from '@services/ui/notification.service';
 import { PolicyControlComponent } from './policy-control.component';
 import { PolicyTypeDataSource } from './policy-type/policy-type.datasource';
-import { UiService } from '../services/ui/ui.service';
-import { PolicyTypeSchema } from '../interfaces/policy.types';
+import { UiService } from '@services/ui/ui.service';
+import { PolicyTypeSchema } from '@interfaces/policy.types';
 
 describe('PolicyControlComponent', () => {
   let component: PolicyControlComponent;

diff --git a/webapp-frontend/src/app/policy/policy-control.component.ts b/webapp-frontend/src/app/policy/policy-control.component.ts
index 28253c8..1c5b7d8 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-control.component.ts
+++ b/webapp-frontend/src/app/policy/policy-control.component.ts
@@ -23,11 +23,11 @@ import { MatDialog } from '@angular/material/dialog';
 
 import { BehaviorSubject, Observable } from 'rxjs';
 
-import { PolicyTypeSchema } from '../interfaces/policy.types';
+import { PolicyTypeSchema } from '@interfaces/policy.types';
 import { PolicyTypeDataSource } from './policy-type/policy-type.datasource';
 import { getPolicyDialogProperties } from './policy-instance-dialog/policy-instance-dialog.component';
 import { PolicyInstanceDialogComponent } from './policy-instance-dialog/policy-instance-dialog.component';
-import { UiService } from '../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 
 class PolicyTypeInfo {
     constructor(public type: PolicyTypeSchema) { }

diff --git a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.spec.ts b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.spec.ts
index 3bd9cd7..564824f 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.spec.ts
+++ b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.spec.ts
@@ -35,18 +35,18 @@ import { TestbedHarnessEnvironment } from "@angular/cdk/testing/testbed";
 import { ToastrModule } from "ngx-toastr";
 import { MockComponent } from "ng-mocks";
 
-import { PolicyService } from "../../services/policy/policy.service";
-import { ErrorDialogService } from "../../services/ui/error-dialog.service";
-import { UiService } from "../../services/ui/ui.service";
+import { PolicyService } from "@services/policy/policy.service";
+import { ErrorDialogService } from "@services/ui/error-dialog.service";
+import { UiService } from "@services/ui/ui.service";
 import { PolicyInstanceDialogComponent } from "./policy-instance-dialog.component";
 import { ChangeDetectorRef, CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
 import { TypedPolicyEditorComponent } from "../typed-policy-editor/typed-policy-editor.component";
 import { RicSelectorComponent } from "../ric-selector/ric-selector.component";
 import { NoTypePolicyEditorComponent } from "../no-type-policy-editor/no-type-policy-editor.component";
 import { By } from "@angular/platform-browser";
-import { CreatePolicyInstance } from "src/app/interfaces/policy.types";
+import { CreatePolicyInstance } from "@interfaces/policy.types";
 import { of } from "rxjs";
-import { NotificationService } from "src/app/services/ui/notification.service";
+import { NotificationService } from "@services/ui/notification.service";
 import * as uuid from "uuid";
 
 describe("PolicyInstanceDialogComponent", () => {

diff --git a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
index f1ff68f..65d61a6 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
+++ b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
@@ -29,17 +29,17 @@ import {
   MatDialogRef,
   MAT_DIALOG_DATA,
 } from "@angular/material/dialog";
-import { PolicyService } from "../../services/policy/policy.service";
-import { NotificationService } from "../../services/ui/notification.service";
-import { UiService } from "../../services/ui/ui.service";
+import { PolicyService } from "@services/policy/policy.service";
+import { NotificationService } from "@services/ui/notification.service";
+import { UiService } from "@services/ui/ui.service";
 import { HttpErrorResponse } from "@angular/common/http";
-import { ErrorDialogService } from "../../services/ui/error-dialog.service";
+import { ErrorDialogService } from "@services/ui/error-dialog.service";
 import * as uuid from "uuid";
 import {
   CreatePolicyInstance,
   PolicyInstance,
   PolicyTypeSchema,
-} from "../../interfaces/policy.types";
+} from "@interfaces/policy.types";
 
 @Component({
   selector: "nrcp-policy-instance-dialog",

diff --git a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
index 0f34c43..eb9747d 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
+++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
@@ -21,18 +21,18 @@
 import { MatSort } from '@angular/material/sort';
 import { Component, OnInit, ViewChild, Input, AfterViewInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { PolicyTypeSchema } from '../../interfaces/policy.types';
+import { PolicyTypeSchema } from '@interfaces/policy.types';
 import { PolicyInstanceDataSource } from './policy-instance.datasource';
-import { ErrorDialogService } from '../../services/ui/error-dialog.service';
-import { NotificationService } from '../../services/ui/notification.service';
-import { PolicyService } from '../../services/policy/policy.service';
-import { ConfirmDialogService } from '../../services/ui/confirm-dialog.service';
-import { PolicyInstance } from '../../interfaces/policy.types';
+import { ErrorDialogService } from '@services/ui/error-dialog.service';
+import { NotificationService } from '@services/ui/notification.service';
+import { PolicyService } from '@services/policy/policy.service';
+import { ConfirmDialogService } from '@services/ui/confirm-dialog.service';
+import { PolicyInstance } from '@interfaces/policy.types';
 import { PolicyInstanceDialogComponent } from '../policy-instance-dialog/policy-instance-dialog.component';
 import { getPolicyDialogProperties } from '../policy-instance-dialog/policy-instance-dialog.component';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { UiService } from '../../services/ui/ui.service';
+import { UiService } from '@services/ui/ui.service';
 
 @Component({
     selector: 'nrcp-policy-instance',

diff --git a/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts b/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
index 03a156d..031c0eb 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
+++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
@@ -24,8 +24,8 @@ import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { merge } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { PolicyInstance, PolicyTypeSchema } from '../../interfaces/policy.types';
-import { PolicyService } from '../../services/policy/policy.service';
+import { PolicyInstance, PolicyTypeSchema } from '@interfaces/policy.types';
+import { PolicyService } from '@services/policy/policy.service';
 
 export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
 

diff --git a/webapp-frontend/src/app/policy/policy-type/policy-type.datasource.spec.ts b/webapp-frontend/src/app/policy/policy-type/policy-type.datasource.spec.ts
index dcbea18..770d6c7 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-type/policy-type.datasource.spec.ts
+++ b/webapp-frontend/src/app/policy/policy-type/policy-type.datasource.spec.ts
@@ -22,8 +22,8 @@ import { TestBed } from '@angular/core/testing';
 import { BehaviorSubject, of } from 'rxjs';
 import { ToastrModule } from 'ngx-toastr';
 import { PolicyTypeDataSource } from './policy-type.datasource';
-import { PolicyService } from '../../services/policy/policy.service';
-import { PolicyTypeSchema } from '../../interfaces/policy.types';
+import { PolicyService } from '@services/policy/policy.service';
+import { PolicyTypeSchema } from '@interfaces/policy.types';
 
 describe('PolicyTypeDataSource', () => {
   let policyTypeDataSource: PolicyTypeDataSource;

diff --git a/webapp-frontend/src/app/policy/policy-type/policy-type.datasource.ts b/webapp-frontend/src/app/policy/policy-type/policy-type.datasource.ts
index 698e760..8766084 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-type/policy-type.datasource.ts
+++ b/webapp-frontend/src/app/policy/policy-type/policy-type.datasource.ts
@@ -24,8 +24,8 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { of } from 'rxjs/observable/of';
 import { Observable } from 'rxjs/Observable';
 
-import { PolicyType, PolicyTypes, PolicyTypeSchema } from '../../interfaces/policy.types';
-import { PolicyService } from '../../services/policy/policy.service';
+import { PolicyType, PolicyTypes, PolicyTypeSchema } from '@interfaces/policy.types';
+import { PolicyService } from '@services/policy/policy.service';
 
 @Injectable({
     providedIn: 'root'

diff --git a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.spec.ts b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.spec.ts
index fb69cd1..34abab4 100644 (file)
--- a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.spec.ts
+++ b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.spec.ts
@@ -27,8 +27,8 @@ import { MatSelectModule } from "@angular/material/select";
 import { MatSelectHarness } from "@angular/material/select/testing";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { of } from "rxjs/observable/of";
-import { Ric } from "src/app/interfaces/ric";
-import { PolicyService } from "src/app/services/policy/policy.service";
+import { Ric } from "@interfaces/ric";
+import { PolicyService } from "@services/policy/policy.service";
 
 import { RicSelectorComponent } from "./ric-selector.component";
 

diff --git a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.ts b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.ts
index c4bed4c..bfa9d97 100644 (file)
--- a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.ts
+++ b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.ts
@@ -28,8 +28,8 @@ import {
   Validators,
 } from "@angular/forms";
 import { EventEmitter } from "@angular/core";
-import { Rics } from "src/app/interfaces/ric";
-import { PolicyService } from "src/app/services/policy/policy.service";
+import { Rics } from "@interfaces/ric";
+import { PolicyService } from "@services/policy/policy.service";
 import { MatSelectChange } from "@angular/material/select";
 
 @Component({

diff --git a/webapp-frontend/src/app/services/ei/ei.service.spec.ts b/webapp-frontend/src/app/services/ei/ei.service.spec.ts
index 7b5ece5..13d8698 100644 (file)
--- a/webapp-frontend/src/app/services/ei/ei.service.spec.ts
+++ b/webapp-frontend/src/app/services/ei/ei.service.spec.ts
@@ -20,7 +20,7 @@
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'
 import { TestBed } from '@angular/core/testing';
 
-import { EIJob, ProducerStatus, OperationalState, ProducerRegistrationInfo } from '../../interfaces/ei.types';
+import { EIJob, ProducerStatus, OperationalState, ProducerRegistrationInfo } from '@interfaces/ei.types';
 import { EIService } from './ei.service';
 
 describe('EIService', () => {

diff --git a/webapp-frontend/src/app/services/ei/ei.service.ts b/webapp-frontend/src/app/services/ei/ei.service.ts
index 42ad221..1237b58 100644 (file)
--- a/webapp-frontend/src/app/services/ei/ei.service.ts
+++ b/webapp-frontend/src/app/services/ei/ei.service.ts
@@ -21,7 +21,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { EIJob, ProducerStatus, ProducerRegistrationInfo } from '../../interfaces/ei.types';
+import { EIJob, ProducerStatus, ProducerRegistrationInfo } from '@interfaces/ei.types';
 
 /**
  * Services for calling the EI endpoints.

diff --git a/webapp-frontend/src/app/services/policy/policy.service.spec.ts b/webapp-frontend/src/app/services/policy/policy.service.spec.ts
index 095443b..185a8eb 100644 (file)
--- a/webapp-frontend/src/app/services/policy/policy.service.spec.ts
+++ b/webapp-frontend/src/app/services/policy/policy.service.spec.ts
@@ -21,7 +21,7 @@ import { TestBed } from '@angular/core/testing';
 
 import { PolicyService } from './policy.service';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'
-import { PolicyInstance, PolicyInstances, PolicyTypes } from '../../interfaces/policy.types';
+import { PolicyInstance, PolicyInstances, PolicyTypes } from '@interfaces/policy.types';
 
 describe('PolicyService', () => {
   let apiVersion2 = 'v2'

diff --git a/webapp-frontend/src/app/services/policy/policy.service.ts b/webapp-frontend/src/app/services/policy/policy.service.ts
index 2e7273f..354173c 100644 (file)
--- a/webapp-frontend/src/app/services/policy/policy.service.ts
+++ b/webapp-frontend/src/app/services/policy/policy.service.ts
@@ -21,8 +21,8 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { CreatePolicyInstance, PolicyInstance, PolicyInstanceAck, PolicyInstances, PolicyStatus, PolicyType, PolicyTypes } from '../../interfaces/policy.types';
-import { Rics } from 'src/app/interfaces/ric';
+import { CreatePolicyInstance, PolicyInstance, PolicyInstanceAck, PolicyInstances, PolicyStatus, PolicyType, PolicyTypes } from '@interfaces/policy.types';
+import { Rics } from '@interfaces/ric';
 
 /**
  * Services for calling the policy endpoints.

diff --git a/webapp-frontend/src/app/services/ui/confirm-dialog.service.ts b/webapp-frontend/src/app/services/ui/confirm-dialog.service.ts
index 184d64f..29cbad5 100644 (file)
--- a/webapp-frontend/src/app/services/ui/confirm-dialog.service.ts
+++ b/webapp-frontend/src/app/services/ui/confirm-dialog.service.ts
@@ -20,7 +20,7 @@
 
 import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { ConfirmDialogComponent } from './../../ui/confirm-dialog/confirm-dialog.component';
+import { ConfirmDialogComponent } from '@ui/confirm-dialog/confirm-dialog.component';
 import { UiService } from './ui.service';
 
 @Injectable({

diff --git a/webapp-frontend/src/app/services/ui/error-dialog.service.ts b/webapp-frontend/src/app/services/ui/error-dialog.service.ts
index 82faeac..eafc9e5 100644 (file)
--- a/webapp-frontend/src/app/services/ui/error-dialog.service.ts
+++ b/webapp-frontend/src/app/services/ui/error-dialog.service.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { ErrorDialogComponent } from '../../ui/error-dialog/error-dialog.component';
+import { ErrorDialogComponent } from '@ui/error-dialog/error-dialog.component';
 import { MatDialog } from '@angular/material/dialog';
 import { Injectable } from '@angular/core';
 import { UiService } from './ui.service';

diff --git a/webapp-frontend/tsconfig.json b/webapp-frontend/tsconfig.json
index 5931c27..7cfd875 100644 (file)
--- a/webapp-frontend/tsconfig.json
+++ b/webapp-frontend/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "baseUrl": "./",
+    "baseUrl": "./src",
     "downlevelIteration": true,
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
@@ -13,6 +13,16 @@
     "importHelpers": true,
     "resolveJsonModule": true,
     "target": "es2015",
+    "paths": {
+      "@angular/*": [ "../node_modules/@angular/*" ],
+      "@app/*": ["app/*"],
+      "@interfaces/*": ["app/interfaces/*"],
+      "@ei-coordinator/*": ["app/ei-coordinator/*"],
+      "@policy/*": ["app/policy/*"],
+      "@services/*": ["app/services/*"],
+      "@navigation/*": ["app/navigation/*"],
+      "@ui/*": ["app/ui/*"],
+    },
     "typeRoots": [
       "node_modules/@types"
     ],