Merge pull request #80 from mdrillin/upgrade_to_angular5

Mods for ng-packagr build

ui/src/app/app-routing.module.ts

@@ -18,10 +18,10 @@
 import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { Routes } from "@angular/router";
-import { ConnectionsConstants } from "@connections/shared/connections-constants";
-import { DataservicesConstants } from "@dataservices/shared/dataservices-constants";
-import { environment } from "@environments/environment";
-import { PageNotFoundComponent } from "@shared/page-not-found/page-not-found.component";
+import { ConnectionsConstants } from "./connections/shared/connections-constants";
+import { DataservicesConstants } from "./dataservices/shared/dataservices-constants";
+import { environment } from "../environments/environment";
+import { PageNotFoundComponent } from "./shared/page-not-found/page-not-found.component";
 
 const appRoutes: Routes = [
   { path: "", redirectTo: environment.homePagePath, pathMatch: "full" },

ui/src/app/app.component.spec.ts

@@ -1,8 +1,8 @@
 import { async, TestBed } from "@angular/core/testing";
 import { RouterTestingModule } from "@angular/router/testing";
-import { AppSettingsService } from "@core/app-settings.service";
-import { CoreModule } from "@core/core.module";
-import { MockAppSettingsService } from "@core/mock-app-settings.service";
+import { AppSettingsService } from "./core/app-settings.service";
+import { CoreModule } from "./core/core.module";
+import { MockAppSettingsService } from "./core/mock-app-settings.service";
 import { ModalModule } from "ngx-bootstrap";
 import { AppComponent } from "./app.component";
 

ui/src/app/app.module.ts

@@ -20,12 +20,12 @@ import { BrowserModule } from "@angular/platform-browser";
 import { RouterModule } from "@angular/router";
 import { AppRoutingModule } from "@app/app-routing.module";
 import { AppComponent } from "@app/app.component";
-import { ConnectionsRoutingModule } from "@connections/connections-routing.module";
-import { ConnectionsModule } from "@connections/connections.module";
-import { CoreModule } from "@core/core.module";
-import { DataservicesRoutingModule } from "@dataservices/dataservices-routing.module";
-import { DataservicesModule } from "@dataservices/dataservices.module";
-import { SharedModule } from "@shared/shared.module";
+import { ConnectionsRoutingModule } from "./connections/connections-routing.module";
+import { ConnectionsModule } from "./connections/connections.module";
+import { CoreModule } from "./core/core.module";
+import { DataservicesRoutingModule } from "./dataservices/dataservices-routing.module";
+import { DataservicesModule } from "./dataservices/dataservices.module";
+import { SharedModule } from "./shared/shared.module";
 
 @NgModule({
   declarations: [

ui/src/app/connections/add-connection-wizard/add-connection-wizard.component.ts

@@ -25,12 +25,12 @@ import {
 import { FormControl, FormGroup } from "@angular/forms";
 import { AbstractControl } from "@angular/forms";
 import { Router } from "@angular/router";
-import { ConnectionType } from "@connections/shared/connection-type.model";
-import { ConnectionService } from "@connections/shared/connection.service";
-import { ConnectionsConstants } from "@connections/shared/connections-constants";
-import { NewConnection } from "@connections/shared/new-connection.model";
-import { ServiceCatalogSource } from "@connections/shared/service-catalog-source.model";
-import { LoggerService } from "@core/logger.service";
+import { ConnectionType } from "../../connections/shared/connection-type.model";
+import { ConnectionService } from "../../connections/shared/connection.service";
+import { ConnectionsConstants } from "../../connections/shared/connections-constants";
+import { NewConnection } from "../../connections/shared/new-connection.model";
+import { ServiceCatalogSource } from "../../connections/shared/service-catalog-source.model";
+import { LoggerService } from "../../core/logger.service";
 import { NotificationType, WizardEvent } from "patternfly-ng";
 import { WizardStepConfig } from "patternfly-ng";
 import { WizardConfig } from "patternfly-ng";
@@ -192,7 +192,7 @@ export class AddConnectionWizardComponent implements OnInit {
 
   /**
    * Handles service catalog source change
-   * @param {string} newValue the new serviceCatalog source
+   * @param newValue the new serviceCatalog source
    */
   public selectedServiceCatalogSourceChanged( newValue ): void {
     this.selectedServiceCatalogSource = this.serviceCatSources.find((src) => src.getId() === newValue);
@@ -210,14 +210,14 @@ export class AddConnectionWizardComponent implements OnInit {
   }
 
   /**
-   * @returns {boolean} `true` if a service catalog source has been selected
+   * @returns `true` if a service catalog source has been selected
    */
   public get hasSelectedServiceCatalogSource(): boolean {
     return ( this.selectedServiceCatalogSource != null ) && ( this.selectedServiceCatalogSource !== this.emptyServiceCatalogSource );
   }
 
   /**
-   * @returns {boolean} `true` if the serviceCatalogSource is selected, but type is different than
+   * @returns `true` if the serviceCatalogSource is selected, but type is different than
    * the selected connection type.
    */
   public get serviceCatalogSelectedWrongType(): boolean {
@@ -247,7 +247,7 @@ export class AddConnectionWizardComponent implements OnInit {
   }
 
   /**
-   * @returns {string} the error details message
+   * @returns the error details message
    */
   public get errorDetails(): string {
     return this.errorDetailMessage;
@@ -309,7 +309,7 @@ export class AddConnectionWizardComponent implements OnInit {
 
   /**
    * Handles connection type selection
-   * @param {ConnectionType} connectionType the connection type
+   * @param connectionType the connection type
    */
   public onConnectionTypeSelected(connectionType: ConnectionType): void {
     // Only allow one item to be selected
@@ -322,7 +322,7 @@ export class AddConnectionWizardComponent implements OnInit {
 
   /**
    * Handles connection type de-selection
-   * @param {ConnectionType} connectionType the connection type
+   * @param connectionType the connection type
    */
   public onConnectionTypeDeselected(connectionType: ConnectionType): void {
     // Only one item is selected at a time
@@ -393,14 +393,14 @@ export class AddConnectionWizardComponent implements OnInit {
   }
 
   /**
-   * @returns {string} the name of the connection
+   * @returns the name of the connection
    */
   public get connectionName(): string {
     return this.connectionBasicPropertyForm.controls["name"].value;
   }
 
   /**
-   * @returns {string} the description of the connection
+   * @returns the description of the connection
    */
   public get connectionDescription(): string {
     return this.connectionBasicPropertyForm.controls["description"].value;
@@ -438,7 +438,7 @@ export class AddConnectionWizardComponent implements OnInit {
 
   /**
    * Load the available service catalog sources for the supplied connection type
-   * @param {ConnectionType} connType the connection type
+   * @param connType the connection type
    */
   private loadServiceCatalogSources(connType: ConnectionType): void {
     // Load the available service catalog sources for the second step
@@ -516,7 +516,7 @@ export class AddConnectionWizardComponent implements OnInit {
   /**
    * Creates the workspace connection, binds to serviceCatalogSource,
    * and deploys a corresponding connection VDB to teiid.
-   * @param {Connection} connection the new connection
+   * @param connection the new connection
    */
   private createDeployConnection(connection: NewConnection): void {
     const self = this;
@@ -539,7 +539,7 @@ export class AddConnectionWizardComponent implements OnInit {
   /**
    * Updates the workspace connection, binds to serviceCatalogSource,
    * and re-deploys the corresponding connection VDB to teiid.
-   * @param {Connection} connection the new connection
+   * @param connection the new connection
    */
   private updateDeployConnection(connection: NewConnection): void {
     const self = this;
@@ -576,7 +576,7 @@ export class AddConnectionWizardComponent implements OnInit {
 
   /**
    * Sets the final page completion status
-   * @param {boolean} wasSuccessful 'true' if the create or update was successful
+   * @param wasSuccessful 'true' if the create or update was successful
    */
   private setFinalPageComplete(wasSuccessful: boolean): void {
     this.createComplete = true;

ui/src/app/connections/add-connection/add-connection.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, OnInit } from "@angular/core";
-import { ConnectionsConstants } from "@connections/shared/connections-constants";
+import { ConnectionsConstants } from "../../connections/shared/connections-constants";
 
 @Component({
   selector: "app-add-connection-page",

ui/src/app/connections/connection-type-cards/connection-type-card/connection-type-card.component.ts

@@ -30,35 +30,35 @@ export class ConnectionTypeCardComponent implements OnInit {
   }
 
   /**
-   * @returns {string} the ConnectionType name
+   * @returns  the ConnectionType name
    */
   public get name(): string {
     return this.connectionType.getName();
   }
 
   /**
-   * @returns {string} the ConnectionType description
+   * @returns  the ConnectionType description
    */
   public get description(): string {
     return this.connectionType.getDescription();
   }
 
   /**
-   * @returns {string} the ConnectionType image source
+   * @returns  the ConnectionType image source
    */
   public get imageSrc(): string {
     return this.connectionType.getImageSrc();
   }
 
   /**
-   * @returns {string} the ConnectionType image alt text
+   * @returns  the ConnectionType image alt text
    */
   public get imageAlt(): string {
     return this.connectionType.getImageAlt();
   }
 
   /**
-   * @returns {boolean} `true` if the ConnectionType represented by this card is selected
+   * @returns  `true` if the ConnectionType represented by this card is selected
    */
   public isSelected(): boolean {
     return this.selectedConnectionTypes.indexOf( this.connectionType ) !== -1;

ui/src/app/connections/connection-type-cards/connection-type-cards.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, EventEmitter, Input, Output, ViewEncapsulation } from "@angular/core";
-import { ConnectionType } from "@connections/shared/connection-type.model";
+import { ConnectionType } from "../../connections/shared/connection-type.model";
 
 @Component({
   moduleId: module.id,

ui/src/app/connections/connections-cards/connection-card/connection-card.component.spec.ts

@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 import { RouterTestingModule } from "@angular/router/testing";
-import { ConnectionStatus } from "@connections/shared/connection-status";
-import { Connection } from "@connections/shared/connection.model";
-import { LoggerService } from "@core/logger.service";
+import { ConnectionStatus } from "../../../connections/shared/connection-status";
+import { Connection } from "../../../connections/shared/connection.model";
+import { LoggerService } from "../../../core/logger.service";
 import {
   ActionModule,
   CardModule,

ui/src/app/connections/connections-cards/connection-card/connection-card.component.ts

@@ -16,9 +16,9 @@
  */
 
 import { Component, DoCheck, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from "@angular/core";
-import { Connection } from "@connections/shared/connection.model";
-import { ConnectionsConstants } from "@connections/shared/connections-constants";
-import { LoggerService } from "@core/logger.service";
+import { Connection } from "../../../connections/shared/connection.model";
+import { ConnectionsConstants } from "../../../connections/shared/connections-constants";
+import { LoggerService } from "../../../core/logger.service";
 import { Action, ActionConfig, CardAction, CardConfig, ListConfig } from "patternfly-ng";
 
 @Component({
@@ -63,7 +63,7 @@ export class ConnectionCardComponent implements DoCheck, OnInit {
 
   /**
    * Event handler for when a toolbar kebab action is clicked.
-   * @param {Action} action the action that was selected.
+   * @param action the action that was selected.
    */
   public handleAction( action: Action ): void {
     if ( action.id === this.activateActionId ) {
@@ -76,7 +76,7 @@ export class ConnectionCardComponent implements DoCheck, OnInit {
   }
 
   /**
-   * @returns {boolean} `true` if the connection represented by this card is selected
+   * @returns `true` if the connection represented by this card is selected
    */
   public isSelected(): boolean {
     return this.selectedConnections.indexOf( this.connection ) !== -1;
@@ -137,7 +137,7 @@ export class ConnectionCardComponent implements DoCheck, OnInit {
 
   /**
    * An event handler for when a toolbar action is invoked.
-   * @param {string} type the type of event being processed
+   * @param type the type of event being processed
    */
   public onClick( type: string ): void {
     this.cardEvent.emit( { eventType: type, connectionName: this.connection.getId() } );
@@ -152,15 +152,15 @@ export class ConnectionCardComponent implements DoCheck, OnInit {
 
   /**
    * An event handler for footer action link.
-   * @param {CardAction} $event the event being processed
+   * @param $event the event being processed
    */
   public onShowDetails( $event: CardAction ): void {
     this.showDetails = !this.showDetails;
     $event.hypertext = this.showDetailsTitle;
   }
 
   /**
-   * @returns {string[][]} the properties of a connection
+   * @returns the properties of a connection
    */
   public get properties(): string[][] {
     const props = [
@@ -173,7 +173,7 @@ export class ConnectionCardComponent implements DoCheck, OnInit {
   }
 
   /**
-   * @returns {string} the footer details action text
+   * @returns the footer details action text
    */
   public get showDetailsTitle(): string {
     return this.showDetails ? "Less" : "More";

ui/src/app/connections/connections-cards/connections-cards.component.spec.ts

@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 import { RouterTestingModule } from "@angular/router/testing";
-import { ConnectionCardComponent } from "@connections/connections-cards/connection-card/connection-card.component";
-import { ConnectionsCardsComponent } from "@connections/connections-cards/connections-cards.component";
-import { LoggerService } from "@core/logger.service";
+import { ConnectionCardComponent } from "../../connections/connections-cards/connection-card/connection-card.component";
+import { ConnectionsCardsComponent } from "../../connections/connections-cards/connections-cards.component";
+import { LoggerService } from "../../core/logger.service";
 import {
   ActionModule,
   CardModule,

ui/src/app/connections/connections-cards/connections-cards.component.ts

@@ -16,9 +16,9 @@
  */
 
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { ConnectionCardComponent } from "@connections/connections-cards/connection-card/connection-card.component";
-import { Connection } from "@connections/shared/connection.model";
-import { LoggerService } from "@core/logger.service";
+import { ConnectionCardComponent } from "../../connections/connections-cards/connection-card/connection-card.component";
+import { Connection } from "../../connections/shared/connection.model";
+import { LoggerService } from "../../core/logger.service";
 
 @Component({
   moduleId: module.id,
@@ -40,7 +40,7 @@ export class ConnectionsCardsComponent {
   public logger: LoggerService;
 
   /**
-   * @param {LoggerService} logger the logging service
+   * @param logger the logging service
    */
   constructor( logger: LoggerService ) {
     this.logger = logger;

ui/src/app/connections/connections-list/connection-details.component.ts

@@ -16,8 +16,8 @@
  */
 
 import { Component, Input, OnInit, ViewEncapsulation } from "@angular/core";
-import { Connection } from "@connections/shared/connection.model";
-import { ConnectionsConstants } from "@connections/shared/connections-constants";
+import { Connection } from "../../connections/shared/connection.model";
+import { ConnectionsConstants } from "../../connections/shared/connections-constants";
 import { ListConfig } from "patternfly-ng";
 
 @Component({

ui/src/app/connections/connections-list/connections-list.component.spec.ts

@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 import { RouterTestingModule } from "@angular/router/testing";
-import { ConnectionDetailsComponent } from "@connections/connections-list/connection-details.component";
-import { ConnectionsListComponent } from "@connections/connections-list/connections-list.component";
+import { ConnectionDetailsComponent } from "../../connections/connections-list/connection-details.component";
+import { ConnectionsListComponent } from "../../connections/connections-list/connections-list.component";
 import {
   ActionModule,
   CardModule,